SliTaz Repositories

     1.1 --- a/tazpkg	Sat Jun 23 00:51:57 2012 +0000
     1.2 +++ b/tazpkg	Sat Jul 14 15:18:53 2012 +0000
     1.3 @@ -86,7 +86,7 @@
     1.4  fi
     1.5  TARGET_DIR=$3
     1.6  TOP_DIR=`pwd`
     1.7 -TMP_DIR=$tmp/$RANDOM
     1.8 +TMP_DIR=/tmp/$RANDOM
     1.9  INSTALL_LIST=""
    1.10  SAVE_CACHE_DIR="$CACHE_DIR"
    1.11  
    1.12 @@ -1349,6 +1349,23 @@
    1.13  ' > $TMP_DIR/$file/description.txt
    1.14  	cd $TMP_DIR/$file/fs/
    1.15  	rpm2cpio $PACKAGE_FILE | cpio -idm --quiet
    1.16 +	# rpm2cpio can't extract some new RPMs
    1.17 +	if [ $? == 1 ]; then
    1.18 +		if [ ! -e $INSTALLED/p7zip-full/receipt ]; then
    1.19 +			boldify $(gettext "Unable to extract the RPM using standard tools (rpm2cpio).")
    1.20 +			gettext "Do you want to install 'p7zip-full' package" && confirm
    1.21 +			if [ $? = 0 ]; then
    1.22 +				tazpkg -gi p7zip-full
    1.23 +			else
    1.24 +				rm -rf $TMP_DIR
    1.25 +				exit 1
    1.26 +			fi
    1.27 +		fi
    1.28 +		# we may already have 7z or may just installed it in the step above
    1.29 +		if [ -e $INSTALLED/p7zip-full/receipt ]; then
    1.30 +			7z x -so $PACKAGE_FILE | cpio -idm --quiet
    1.31 +		fi
    1.32 +	fi
    1.33  	cd ../..
    1.34  	echo "DEPENDS=\"$(find_depends)\"" >> $TMP_DIR/$file/receipt
    1.35  	show_unresolved_lib $TMP_DIR/$file/receipt