/deinstalled/uninstalled/

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>

conf/manifest/init

@@ -16,7 +16,7 @@ case "$__target_host" in
 
    # Alias in /etc/hosts for localhost
    cdist-archlinux)
-      __package_pacman django --state deinstalled
+      __package_pacman django --state uninstalled
       __package_pacman wireshark-cli --state installed
       __package_pacman zsh --state installed
    ;;
@@ -27,6 +27,6 @@ case "$__target_host" in
    # Real machines
    ikq*)
       __package_apt zsh --state installed
-      __package_apt apache2 --state deinstalled
+      __package_apt apache2 --state uninstalled
    ;;
 esac

conf/type/__package_apt/gencode

@@ -38,7 +38,7 @@ case "$state" in
          echo apt-get --quiet --yes install \"$name\"
       fi
    ;;
-   deinstalled)
+   uninstalled)
       # Remove only if existent
       if [ -n "$is_installed" ]; then
          echo apt-get --quiet --yes remove \"$name\"

conf/type/__package_emerge/gencode

@@ -34,9 +34,8 @@ case "$state" in
       # FIXME: only install if not already installed
       echo "emerge -q \"$name\""
    ;;
-   deinstalled)
+   uninstalled)
       # FIXME: only uninstall if currently installed
-      # FIXME: rename deinstalled to uninstalled
       echo "emerge -q -C \"$name\""
    ;;
 esac

conf/type/__package_pacman/gencode

@@ -44,7 +44,7 @@ case "$state" in
          echo pacman "$pacopts" -S \"$name\"
       fi
    ;;
-   deinstalled)
+   uninstalled)
       if [ "$pkg_version" ]; then
          echo pacman "$pacopts" -R \"$name\"
       fi