spk rev 103
small output changes to spk-rm
author | Christian Mesh <meshca@clarkson.edu> |
---|---|
date | Sat Jun 02 18:27:42 2012 -0500 (2012-06-02) |
parents | adda870c4845 |
children | 8bcd11c1cc91 |
files | spk-rm |
line diff
1.1 --- a/spk-rm Sat Jun 02 18:20:32 2012 -0500 1.2 +++ b/spk-rm Sat Jun 02 18:27:42 2012 -0500 1.3 @@ -49,7 +49,7 @@ 1.4 1.5 # Remove a single package 1.6 remove() { 1.7 - altered="" 1.8 + local altered 1.9 boldify $(gettext "Removing") $pkg 1.10 separator 1.11 [ "$verbose" ] && echo "DB: $installed" 1.12 @@ -58,13 +58,13 @@ 1.13 for i in $(ls $installed); do 1.14 [ -f $installed/$i/receipt ] || continue 1.15 unset_receipt 1.16 - . $installed/$i/receipt 1.17 + source_receipt $installed/$i/receipt 1.18 case " $DEPENDS " in 1.19 *\ $pkg\ *) altered="$altered $i" ;; 1.20 esac 1.21 done 1.22 unset_receipt 1.23 - . $installed/$pkg/receipt 1.24 + source_receipt $installed/$pkg/receipt 1.25 1.26 if [ "$altered" ]; then 1.27 gettext "The following packages depend on"; colorize 31 " $pkg" 1.28 @@ -75,10 +75,10 @@ 1.29 1.30 # Reverse deps are displayed, confirm uninstall. 1.31 if [ "$confirm" ]; then 1.32 - gettext "Confirm uninstallation of:"; echo -n " $pkg" 1.33 + echo $(gettext "Confirm uninstallation of:") " $pkg" 1.34 if ! confirm; then 1.35 gettext "Uninstallation cancelled" 1.36 - echo -e "\n" && continue 1.37 + newline && continue 1.38 fi 1.39 fi 1.40 1.41 @@ -118,7 +118,7 @@ 1.42 # Do we have packages depending on $pkg to remove ? 1.43 if [ "$altered" ]; then 1.44 if [ "$confirm" ]; then 1.45 - gettext "Removing packages depending on:"; echo -n " $pkg" 1.46 + echo $(gettext "Removing packages depending on:") $pkg 1.47 if ! confirm; then 1.48 gettext "Keeping packages..."; newline 1.49 newline && continue