tazpkg rev 371

Fixed my --root for tazpkg remove.
author Christopher Rogers <slaxemulator@gmail.com>
date Fri Oct 29 23:22:34 2010 +0000 (2010-10-29)
parents d731d9af86d8
children 2275a8cb7a55
files tazpkg
line diff
     1.1 --- a/tazpkg	Fri Oct 29 17:02:32 2010 +0000
     1.2 +++ b/tazpkg	Fri Oct 29 23:22:34 2010 +0000
     1.3 @@ -1757,6 +1757,11 @@
     1.4  			case "$3" in
     1.5  			--root=*)
     1.6  				ROOT="${3#--root=}"
     1.7 +				if [ "$ROOT" ]; then
     1.8 +					ROOTOPTS="--root=$ROOT"
     1.9 +				else
    1.10 +					ROOTOPTS=""
    1.11 +				fi
    1.12  				;;
    1.13  			*)	shift 2
    1.14  				echo -e "\nUnknown option $*.\n"
    1.15 @@ -1804,7 +1809,7 @@
    1.16  			echo -e "\033[1m`gettext \"Removing:\"`\033[0m $PACKAGE"
    1.17  			echo "================================================================================"
    1.18  			# Pre remove commands.
    1.19 -			if grep -q ^pre_remove $ROOT/$INSTALLED/$PACKAGE/receipt; then
    1.20 +			if grep -q ^pre_remove $ROOT$INSTALLED/$PACKAGE/receipt; then
    1.21  				pre_remove
    1.22  			fi
    1.23  			gettext "Removing all files installed..."
    1.24 @@ -1814,13 +1819,13 @@
    1.25  				for file in `cat $ROOT$INSTALLED/$PACKAGE/files.list`
    1.26  				do
    1.27  					[ $(grep ^$file$ $ROOT$INSTALLED/$mod/files.list | wc -l) -gt 1 ] && continue
    1.28 -					remove_with_path $file
    1.29 +					remove_with_path $ROOT$file
    1.30  				done
    1.31  			    done
    1.32  			else
    1.33  				for file in `cat $ROOT$INSTALLED/$PACKAGE/files.list`
    1.34  				do
    1.35 -					remove_with_path $file
    1.36 +					remove_with_path $ROOT$file
    1.37  				done
    1.38  			fi
    1.39  			status
    1.40 @@ -1841,7 +1846,7 @@
    1.41  				if [ "$anser" = "y" ]; then
    1.42  					for i in $ALTERED; do
    1.43  						if [ -d "$ROOT$INSTALLED/$i" ]; then
    1.44 -							tazpkg remove $i
    1.45 +							tazpkg remove $i $ROOTOPTS
    1.46  						fi
    1.47  					done
    1.48  				fi
    1.49 @@ -1856,7 +1861,7 @@
    1.50  							continue
    1.51  						fi
    1.52  						rm -r $ROOT$INSTALLED/$i
    1.53 -						tazpkg get-install ${i%/modifiers} --forced
    1.54 +						tazpkg get-install ${i%/modifiers} $ROOTOPTS --forced
    1.55  					done
    1.56  				fi
    1.57  			fi