# HG changeset patch
# User Christian Mesh <meshca@clarkson.edu>
# Date 1338677898 18000
# Node ID 37137af42a776a14f210243ba11e23384a997699
# Parent  89cfb082a1b9c27652aa80e64f9b2a4201ab3726
Small fixes to spk-add

diff -r 89cfb082a1b9 -r 37137af42a77 spk-add
--- a/spk-add	Sat Jun 02 17:46:46 2012 -0500
+++ b/spk-add	Sat Jun 02 17:58:18 2012 -0500
@@ -171,7 +171,10 @@
 				# If gawk is installed for example we will never remove Busybox
 				# Use CONFLICTS receipt variable to avoid
 				if [ "$confirm" ]; then
-					echo -n "NOTE: confirm: spk-rm $name ???"; read
+					echo -n "NOTE: confirm: spk-rm $name ???";
+					if ! confirm; then
+						exit 1
+					fi
 				fi
 			done
 		fi
@@ -271,7 +274,7 @@
 # Install .tazpkg packages.
 # Parameters: package_file
 install_local() {
-	package_file="$1"
+	local package_file="$1"
 	#check_valid_tazpkg $package_file
 	if [ -f "$package_file" ]; then
 		if [ $(dirname $package_file) == "." ]; then
@@ -379,7 +382,7 @@
 		*.tazpkg|*.spk)
 			count=$(($count + 1))
 			install_local $pkg | log_install $pkg;;
-		*.deb|.rmp)
+		*.deb|.rpm)
 			echo "TODO: spk-convert then install" ;;
 		*.*) gettext "WARNING: Not a valid package:"; echo " $pkg" ;;
 		--*) continue ;;