spk rev 100
Small fixes to spk-add
author | Christian Mesh <meshca@clarkson.edu> |
---|---|
date | Sat Jun 02 17:58:18 2012 -0500 (2012-06-02) |
parents | 89cfb082a1b9 |
children | f017035fd1f5 |
files | spk-add |
line diff
1.1 --- a/spk-add Sat Jun 02 17:46:46 2012 -0500 1.2 +++ b/spk-add Sat Jun 02 17:58:18 2012 -0500 1.3 @@ -171,7 +171,10 @@ 1.4 # If gawk is installed for example we will never remove Busybox 1.5 # Use CONFLICTS receipt variable to avoid 1.6 if [ "$confirm" ]; then 1.7 - echo -n "NOTE: confirm: spk-rm $name ???"; read 1.8 + echo -n "NOTE: confirm: spk-rm $name ???"; 1.9 + if ! confirm; then 1.10 + exit 1 1.11 + fi 1.12 fi 1.13 done 1.14 fi 1.15 @@ -271,7 +274,7 @@ 1.16 # Install .tazpkg packages. 1.17 # Parameters: package_file 1.18 install_local() { 1.19 - package_file="$1" 1.20 + local package_file="$1" 1.21 #check_valid_tazpkg $package_file 1.22 if [ -f "$package_file" ]; then 1.23 if [ $(dirname $package_file) == "." ]; then 1.24 @@ -379,7 +382,7 @@ 1.25 *.tazpkg|*.spk) 1.26 count=$(($count + 1)) 1.27 install_local $pkg | log_install $pkg;; 1.28 - *.deb|.rmp) 1.29 + *.deb|.rpm) 1.30 echo "TODO: spk-convert then install" ;; 1.31 *.*) gettext "WARNING: Not a valid package:"; echo " $pkg" ;; 1.32 --*) continue ;;