# HG changeset patch
# User Christian Mesh <meshca@clarkson.edu>
# Date 1338679662 18000
# Node ID cab731b9a98ce58f7f5b33cc1be0b7af38a8e601
# Parent  adda870c48459bf072e5b8d9427abe789c56e80e
small output changes to spk-rm

diff -r adda870c4845 -r cab731b9a98c spk-rm
--- a/spk-rm	Sat Jun 02 18:20:32 2012 -0500
+++ b/spk-rm	Sat Jun 02 18:27:42 2012 -0500
@@ -49,7 +49,7 @@
 
 # Remove a single package
 remove() {
-	altered=""
+	local altered
 	boldify $(gettext "Removing") $pkg
 	separator
 	[ "$verbose" ] && echo "DB: $installed"
@@ -58,13 +58,13 @@
 	for i in $(ls $installed); do
 		[ -f $installed/$i/receipt ] || continue
 		unset_receipt
-		. $installed/$i/receipt
+		source_receipt $installed/$i/receipt
 		case " $DEPENDS " in
 			*\ $pkg\ *) altered="$altered $i" ;;
 		esac
 	done
 	unset_receipt
-	. $installed/$pkg/receipt
+	source_receipt $installed/$pkg/receipt
 
 	if [ "$altered" ]; then
 		gettext "The following packages depend on"; colorize 31 " $pkg"
@@ -75,10 +75,10 @@
 
 	# Reverse deps are displayed, confirm uninstall.
 	if [ "$confirm" ]; then
-		gettext "Confirm uninstallation of:"; echo -n " $pkg"
+		echo $(gettext "Confirm uninstallation of:") " $pkg"
 		if ! confirm; then
 			gettext "Uninstallation cancelled"
-			echo -e "\n" && continue
+			newline && continue
 		fi
 	fi
 
@@ -118,7 +118,7 @@
 	# Do we have packages depending on $pkg to remove ?
 	if [ "$altered" ]; then
 		if [ "$confirm" ]; then
-			gettext "Removing packages depending on:"; echo -n " $pkg"
+			echo $(gettext "Removing packages depending on:") $pkg
 			if ! confirm; then
 				gettext "Keeping packages..."; newline
 				newline && continue