# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1337129604 -7200
# Node ID 4a7b284956e11eea5e80f7e6a65578d7d0ac98e8
# Parent  0a61f00e23739bf25c62df175314812dd6f87963
Few cosmetic changes

diff -r 0a61f00e2373 -r 4a7b284956e1 spk-rm
--- a/spk-rm	Wed May 16 02:32:22 2012 +0200
+++ b/spk-rm	Wed May 16 02:53:24 2012 +0200
@@ -50,8 +50,12 @@
 # Remove a single package
 remove() {
 	altered=""
-	for i in $(ls $installed)
-	do
+	boldify $(gettext "Removing"; echo " $pkg")
+	separator
+	[ "$verbose" ] && echo "DB: $installed"
+
+	# Reverse deps
+	for i in $(ls $installed); do
 		[ -f $installed/$i/receipt ] || continue
 		unset_receipt
 		. $installed/$i/receipt
@@ -62,7 +66,6 @@
 	unset_receipt
 	. $installed/$pkg/receipt
 
-	# Reverse dep.
 	if [ "$altered" ]; then
 		gettext "The following packages depend on"; colorize " $pkg" 31
 		for i in $altered; do
@@ -85,9 +88,11 @@
 	fi
 
 	# Remove all files
-	gettext "Removing all installed files..."
+	fileslist=$installed/$PACKAGE/files.list
+	gettext "Removing installed files:"
+	echo -n " $(wc -l $fileslist | cut -d " " -f 1)"
 	[ "$verbose" ] && newline
-	for file in $(cat $installed/$PACKAGE/files.list)
+	for file in $(cat $fileslist)
 	do
 		if [ "$verbose" ]; then
 			gettext "Removing:"; echo -n " ${root}${file}"
@@ -129,8 +134,7 @@
 	# Handle modified packages
 	modified=$(cd $installed; grep -sl ^$pkg$ */modifiers)
 	if [ "$modified" ]; then
-		for i in $modified
-		do
+		for i in $modified; do
 			gettext "Removed package  :"; boldify " $pkg"
 			gettext "Modified package :"; colorize " ${i%/modifiers}" 31
 			# Remove package from the modifiers list
@@ -180,9 +184,6 @@
 	fi
 	count=$(($count + 1))
 	[ "$count" == 1 ] && newline
-	boldify $(gettext "Removing"; echo " $pkg")
-	separator
-	[ "$verbose" ] && echo "DB: $installed"
 	remove
 	log "Removed package: $pkg"
 done