SliTaz Repositories

     1.1 --- a/spk-add	Tue May 15 19:02:53 2012 +0200
     1.2 +++ b/spk-add	Tue May 15 19:35:44 2012 +0200
     1.3 @@ -27,6 +27,8 @@
     1.4  $(gettext "Install SliTaz Packages")
     1.5  
     1.6  $(boldify $(gettext "Options:"))
     1.7 +  --forced    $(gettext "Force package reinstallation")
     1.8 +  --root=     $(gettext "Set the root file system path")
     1.9  
    1.10  $(boldify $(gettext "Examples:"))
    1.11    $name package1 package2 packageN
    1.12 @@ -259,8 +261,6 @@
    1.13  install_web() {
    1.14  	local package_name="$1"
    1.15  
    1.16 -	check_root
    1.17 -
    1.18  	# Check if get-Package
    1.19  	if ! is_package_mirrored $package_name; then
    1.20  		package_name="get-$package_name"
    1.21 @@ -283,18 +283,17 @@
    1.22  
    1.23  	cd $CACHE_DIR > /dev/null
    1.24  	if [ -f "$package_full.tazpkg" ]; then
    1.25 -		eval_gettext "\$package_full is already in the cache : \$CACHE_DIR"; newline
    1.26 +		echo -n "$(colorize "$package_full" 34) "; echo ": $CACHE_DIR)"
    1.27  		# Check package download was finished
    1.28  		if ! tail -c 2k $package_full.tazpkg | fgrep -q 00000000TRAILER; then
    1.29  			eval_gettext "Continuing \$package_name download"; newline
    1.30  			download "$package_full.tazpkg"
    1.31  		fi
    1.32 -
    1.33  		# Check that the package has the correct checksum
    1.34 -#		if [ "$($CHECKSUM $package_full.tazpkg)" != "$(fgrep \"  $package_full.tazpkg\" $pkgsmd5)" ]; then
    1.35 -#			rm -f $package.tazpkg
    1.36 -#			download "$package_full.tazpkg"
    1.37 -#		fi
    1.38 +		#if [ "$($CHECKSUM $package_full.tazpkg)" != "$(fgrep \"  $package_full.tazpkg\" $pkgsmd5)" ]; then
    1.39 +		#	rm -f $package.tazpkg
    1.40 +		#	download "$package_full.tazpkg"
    1.41 +		#fi
    1.42  	else
    1.43  		newline
    1.44  		download "$package_full.tazpkg"
    1.45 @@ -338,15 +337,12 @@
    1.46  	fi
    1.47  }
    1.48  
    1.49 -# Old style
    1.50 -case $1 in
    1.51 -	install|-i)
    1.52 -		install_local $2 $3
    1.53 -		exit 0 ;;
    1.54 -	get-install|-gi)
    1.55 -		install_web $2
    1.56 -		exit 0 ;;
    1.57 -	"") usage ;;
    1.58 +#
    1.59 +# Commands and exit
    1.60 +#
    1.61 +
    1.62 +case "$1" in
    1.63 +	""|*usage|*help) usage ;;
    1.64  esac
    1.65  
    1.66  #
    1.67 @@ -358,9 +354,15 @@
    1.68  for pkg in $@
    1.69  do
    1.70  	case "$pkg" in
    1.71 -		*.tazpkg|.spk)
    1.72 -			echo "Local package" ;;
    1.73 +		*.tazpkg|*.spk)
    1.74 +			[ "$forced" ] || check_installed $(package_name $package_file)
    1.75 +			echo "Local package"
    1.76 +			#install_local $pkg
    1.77 +			;;
    1.78 +		--*) continue ;;
    1.79 +		*)
    1.80 +			[ "$forced" ] || check_installed $pkg
    1.81 +			install_web $pkg ;;
    1.82  	esac
    1.83 -	echo "Adding: $pkg"
    1.84  done
    1.85  exit 0