SliTaz Repositories

     1.1 --- a/spk-rm	Wed May 16 02:32:22 2012 +0200
     1.2 +++ b/spk-rm	Wed May 16 02:53:24 2012 +0200
     1.3 @@ -50,8 +50,12 @@
     1.4  # Remove a single package
     1.5  remove() {
     1.6  	altered=""
     1.7 -	for i in $(ls $installed)
     1.8 -	do
     1.9 +	boldify $(gettext "Removing"; echo " $pkg")
    1.10 +	separator
    1.11 +	[ "$verbose" ] && echo "DB: $installed"
    1.12 +
    1.13 +	# Reverse deps
    1.14 +	for i in $(ls $installed); do
    1.15  		[ -f $installed/$i/receipt ] || continue
    1.16  		unset_receipt
    1.17  		. $installed/$i/receipt
    1.18 @@ -62,7 +66,6 @@
    1.19  	unset_receipt
    1.20  	. $installed/$pkg/receipt
    1.21  
    1.22 -	# Reverse dep.
    1.23  	if [ "$altered" ]; then
    1.24  		gettext "The following packages depend on"; colorize " $pkg" 31
    1.25  		for i in $altered; do
    1.26 @@ -85,9 +88,11 @@
    1.27  	fi
    1.28  
    1.29  	# Remove all files
    1.30 -	gettext "Removing all installed files..."
    1.31 +	fileslist=$installed/$PACKAGE/files.list
    1.32 +	gettext "Removing installed files:"
    1.33 +	echo -n " $(wc -l $fileslist | cut -d " " -f 1)"
    1.34  	[ "$verbose" ] && newline
    1.35 -	for file in $(cat $installed/$PACKAGE/files.list)
    1.36 +	for file in $(cat $fileslist)
    1.37  	do
    1.38  		if [ "$verbose" ]; then
    1.39  			gettext "Removing:"; echo -n " ${root}${file}"
    1.40 @@ -129,8 +134,7 @@
    1.41  	# Handle modified packages
    1.42  	modified=$(cd $installed; grep -sl ^$pkg$ */modifiers)
    1.43  	if [ "$modified" ]; then
    1.44 -		for i in $modified
    1.45 -		do
    1.46 +		for i in $modified; do
    1.47  			gettext "Removed package  :"; boldify " $pkg"
    1.48  			gettext "Modified package :"; colorize " ${i%/modifiers}" 31
    1.49  			# Remove package from the modifiers list
    1.50 @@ -180,9 +184,6 @@
    1.51  	fi
    1.52  	count=$(($count + 1))
    1.53  	[ "$count" == 1 ] && newline
    1.54 -	boldify $(gettext "Removing"; echo " $pkg")
    1.55 -	separator
    1.56 -	[ "$verbose" ] && echo "DB: $installed"
    1.57  	remove
    1.58  	log "Removed package: $pkg"
    1.59  done