SliTaz Repositories

     1.1 --- a/tazpkg	Tue Feb 01 20:54:43 2011 +0100
     1.2 +++ b/tazpkg	Wed Feb 02 03:48:02 2011 +0100
     1.3 @@ -1756,11 +1756,9 @@
     1.4  		get_options
     1.5  		
     1.6  		# Check if forced install.
     1.7 -		DO_CHECK="yes"
     1.8 -		[ "$forced" ] && DO_CHECK=no
     1.9  		[ "$root" ] && ROOT="$root" && check_dir "$root"
    1.10  		[ "$list" ] && INSTALL_LIST="$list"
    1.11 -		if [ "$DO_CHECK" = "yes" ]; then
    1.12 +		if ! [ "$forced" ]; then
    1.13  			check_for_installed_package $ROOT
    1.14  		fi
    1.15  		install_package $ROOT
    1.16 @@ -1851,24 +1849,9 @@
    1.17  		#
    1.18  		check_root
    1.19  		check_for_package_on_cmdline
    1.20 -		ROOT=""
    1.21 -		while [ -n "$3" ]; do
    1.22 -			case "$3" in
    1.23 -			--root=*)
    1.24 -				ROOT="${3#--root=}"
    1.25 -				if [ "$ROOT" ]; then
    1.26 -					ROOTOPTS="--root=$ROOT"
    1.27 -				else
    1.28 -					ROOTOPTS=""
    1.29 -				fi
    1.30 -				;;
    1.31 -			*)	shift 2
    1.32 -				echo -e "\n`gettext \"Unknow option\"` $*.\n" >&2
    1.33 -				exit 1
    1.34 -				;;
    1.35 -			esac
    1.36 -			shift
    1.37 -		done
    1.38 +		get_options_list="root auto"
    1.39 +		get_options
    1.40 +		[ "$root" ] && ROOT="$root" 
    1.41  		if [ ! -f "$ROOT$INSTALLED/$PACKAGE/receipt" ]; then
    1.42  			echo ""
    1.43  			eval_gettext "\$PACKAGE is not installed."; echo
    1.44 @@ -1901,9 +1884,13 @@
    1.45  				echo "  ${i%/modifiers}"
    1.46  			done
    1.47  		fi
    1.48 -		eval_gettext "Remove \$PACKAGE (\$VERSION\$EXTRAVERSION) ?"; echo
    1.49 -		gettext "Please confirm uninstallation"
    1.50 -		echo -n " (`translate_querry y`/`translate_querry N`) : "; read answer
    1.51 +		if [ "$auto" ]; then
    1.52 +			answer=`translate_querry y`
    1.53 +		else
    1.54 +			eval_gettext "Remove \$PACKAGE (\$VERSION\$EXTRAVERSION) ?"; echo
    1.55 +			gettext "Please confirm uninstallation"
    1.56 +			echo -n " (`translate_querry y`/`translate_querry N`) : "; read answer
    1.57 +		fi
    1.58  		if [ "$answer" = "$(translate_querry y)" ]; then
    1.59  			echo ""
    1.60  			echo -e "\033[1m`gettext \"Removing:\"`\033[0m $PACKAGE"
    1.61 @@ -1940,10 +1927,14 @@
    1.62  				$LOCALSTATE/installed.md5 2> /dev/null
    1.63  			# Log this activity
    1.64  			log Removed
    1.65 -			if [ -n "$ALTERED" ]; then
    1.66 +			if [ "$ALTERED" ]; then
    1.67 +				if [ "$auto" ]; then
    1.68 +					answer=`translate_querry y`
    1.69 +				else
    1.70  				eval_gettext "Remove packages depending on \$PACKAGE"
    1.71  				echo -n " (`translate_querry y`/`translate_querry N`) ? "
    1.72  				read answer
    1.73 +				fi
    1.74  				if [ "$answer" = "$(translate_querry y)" ]; then
    1.75  					for i in $ALTERED; do
    1.76  						if [ -d "$ROOT$INSTALLED/$i" ]; then
    1.77 @@ -1952,10 +1943,14 @@
    1.78  					done
    1.79  				fi
    1.80  			fi
    1.81 -			if [ -n "$REFRESH" ]; then
    1.82 +			if [ "$REFRESH" ]; then
    1.83 +				if [ "$auto" ]; then
    1.84 +					answer=`translate_querry y`
    1.85 +				else
    1.86  				eval_gettext "Reinstall packages modified by \$PACKAGE"
    1.87  				echo -n " (`translate_querry y`/`translate_querry N`) ? "
    1.88  				read answer
    1.89 +				fi
    1.90  				if [ "$answer" = "$(translate_querry y)" ]; then
    1.91  					for i in $REFRESH; do
    1.92  						if [ $(wc -l < $ROOT$INSTALLED/$i) -gt 1 ]; then
    1.93 @@ -2640,7 +2635,7 @@
    1.94  			fi
    1.95  		fi
    1.96  		# Check if forced install.
    1.97 -		if ! [ "$DO_CHECK" = "no" ]; then
    1.98 +		if ! [ "$forced" ]; then
    1.99  			check_for_installed_package $ROOT
   1.100  		fi
   1.101  		cd $CACHE_DIR