SliTaz Repositories

     1.1 --- a/spk-rm	Tue May 15 19:35:44 2012 +0200
     1.2 +++ b/spk-rm	Tue May 15 20:32:41 2012 +0200
     1.3 @@ -62,14 +62,15 @@
     1.4  	. $installed/$pkg/receipt
     1.5  
     1.6  	if [ -n "$altered" ]; then
     1.7 -		eval_gettext "The following packages depend on \$PACKAGE:"; echo
     1.8 +		gettext "The following packages depend on"; boldify " $PACKAGE:"
     1.9  		for i in $altered; do
    1.10  			echo "  $i"
    1.11  		done
    1.12  	fi
    1.13  	refresh=$(cd $installed ; grep -sl ^$PACKAGE$ */modifiers)
    1.14  	if [ -n "$refresh" ]; then
    1.15 -		eval_gettext "The following packages have been modified by \$PACKAGE:"; echo
    1.16 +		gettext "The following packages have been modified by"
    1.17 +		boldify " $PACKAGE:"
    1.18  		for i in $refresh; do
    1.19  			echo "  ${i%/modifiers}"
    1.20  		done
    1.21 @@ -87,7 +88,7 @@
    1.22  		for i in $altered; do
    1.23  			if [ -d "$installed/$i" ]; then
    1.24  				# TODO: use spk-rm
    1.25 -				echo "tazpkg remove $i --root=$root"
    1.26 +				echo "spk-rm $i --root=$root"
    1.27  			fi
    1.28  		done
    1.29  	fi
    1.30 @@ -101,9 +102,9 @@
    1.31  	gettext "Removing all installed files..."
    1.32  	[ "$verbose" ] && newline
    1.33  	if [ -f $installed/$PACKAGE/modifiers ]; then
    1.34 -	    for file in `cat $installed/$PACKAGE/files.list`
    1.35 +	    for file in $(cat $installed/$PACKAGE/files.list)
    1.36  	    do
    1.37 -			for mod in `cat $installed/$PACKAGE/modifiers`
    1.38 +			for mod in $(cat $installed/$PACKAGE/modifiers)
    1.39  			do
    1.40  				[ -f $installed/$mod/files.list ] && \
    1.41  					[ $(grep "^$(echo $file | grepesc)$" $installed/$mod/files.list | wc -l) -gt 1 ] \
    1.42 @@ -115,7 +116,9 @@
    1.43  	else
    1.44  		for file in $(cat $installed/$PACKAGE/files.list)
    1.45  		do
    1.46 -			[ "$verbose" ] && (gettext "Removing:"; echo -n " ${root}${file}")
    1.47 +			if [ "$verbose" ]; then
    1.48 +				gettext "Removing:"; echo -n " ${root}${file}"
    1.49 +			fi
    1.50  			remove_file ${root}${file}
    1.51  			[ "$verbose" ] && status
    1.52  		done
    1.53 @@ -131,8 +134,7 @@
    1.54  	gettext "Removing package receipt..."
    1.55  	rm -rf $installed/$PACKAGE
    1.56  	status
    1.57 -	sed -i "/ $PACKAGE-$VERSION$EXTRAVERSION$/d" \
    1.58 -		${root}${PKGS_DB}/installed.$SUM 2> /dev/null
    1.59 +	sed -i "/ $PACKAGE-${VERSION}${EXTRAVERSION}$/d" $pkgsmd5 2> /dev/null
    1.60  
    1.61  	# Mofified ?
    1.62  	if [ "$refresh" ]; then
    1.63 @@ -150,7 +152,7 @@
    1.64  			fi
    1.65  			# TODO: use spk-add
    1.66  			rm -r $installed/$i
    1.67 -			tazpkg -gi ${i%/modifiers} --forced --root=$root
    1.68 +			spk-add ${i%/modifiers} --forced --root=$root
    1.69  		done
    1.70  	fi
    1.71  }