/deinstalled/uninstalled/

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2011-03-03 10:37:49 +01:00
parent b9ff43c657
commit 614ff21f4a
4 changed files with 5 additions and 6 deletions

View file

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

View file

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

View file

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

View file

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