SliTaz Repositories

     1.1 --- a/tazpkg	Wed Apr 29 14:47:11 2015 +0200
     1.2 +++ b/tazpkg	Wed Apr 29 14:59:24 2015 +0200
     1.3 @@ -948,9 +948,13 @@
     1.4  	# Clean to save RAM memory before installation
     1.5  	rm -rf $PACKAGE-$VERSION
     1.6  
     1.7 -	# Install pseudo package
     1.8 -	tazpkg install $PACKAGE-$VERSION.tazpkg --root=$ROOT
     1.9 -	mv $PACKAGE-$VERSION.tazpkg $CACHE_DIR
    1.10 +	if [ "$3" == "--get" ]; then
    1.11 +		mv $PACKAGE-$VERSION.tazpkg $TOP_DIR
    1.12 +	else
    1.13 +		# Install pseudo package
    1.14 +		tazpkg install $PACKAGE-$VERSION.tazpkg --root=$ROOT
    1.15 +		mv $PACKAGE-$VERSION.tazpkg $CACHE_DIR
    1.16 +	fi
    1.17  
    1.18  	# Clean
    1.19  	cd $TOP_DIR
    1.20 @@ -2618,23 +2622,28 @@
    1.21  		look_for_priority
    1.22  
    1.23  		CURRENT_DIR=$PWD
    1.24 -		check_for_package_in_list
    1.25  		cd $CACHE_DIR
    1.26 -		if [ -f "$PACKAGE.tazpkg" ]; then
    1.27 -			_ 'Package "%s" already in the cache' $PACKAGE
    1.28 -			# Check package download was finished
    1.29 -			tail -c 2k $PACKAGE.tazpkg | fgrep -q 00000000TRAILER || {
    1.30 -				_ 'Continuing package "%s" download' $PACKAGE
    1.31 -				download $PACKAGE.tazpkg
    1.32 -			}
    1.33 -			if [ "$($CHECKSUM $PACKAGE.tazpkg)" != "$(fgrep "  $PACKAGE.tazpkg" $rep/packages.$SUM)" ]; then
    1.34 -				rm -f $PACKAGE.tazpkg
    1.35 +		if check_for_package_in_list check ; then
    1.36 +			if [ -f "$PACKAGE.tazpkg" ]; then
    1.37 +				_ 'Package "%s" already in the cache' $PACKAGE
    1.38 +				# Check package download was finished
    1.39 +				tail -c 2k $PACKAGE.tazpkg | fgrep -q 00000000TRAILER || {
    1.40 +					_ 'Continuing package "%s" download' $PACKAGE
    1.41 +					download $PACKAGE.tazpkg
    1.42 +				}
    1.43 +				if [ "$($CHECKSUM $PACKAGE.tazpkg)" != "$(fgrep "  $PACKAGE.tazpkg" $rep/packages.$SUM)" ]; then
    1.44 +					rm -f $PACKAGE.tazpkg
    1.45 +					download $PACKAGE.tazpkg
    1.46 +				fi
    1.47 +			else
    1.48  				download $PACKAGE.tazpkg
    1.49  			fi
    1.50 -		else
    1.51 -			download $PACKAGE.tazpkg
    1.52 +			PACKAGE_FILE=$CACHE_DIR/$PACKAGE.tazpkg
    1.53 +		elif download_get_script $PACKAGE /tmp/$PACKAGE.$$ ; then
    1.54 +			install_package_from_get_script /tmp/$PACKAGE.$$ "$ROOT" --get
    1.55 +			PACKAGE_FILE=$(ls $PWD/$PACKAGE-*.tazpkg)
    1.56  		fi
    1.57 -		PACKAGE_FILE=$CACHE_DIR/$PACKAGE.tazpkg
    1.58 +		[ "$PWD" != "$CURRENT_DIR" ] &&
    1.59  		cp -a $PACKAGE_FILE $CURRENT_DIR ;;
    1.60  
    1.61