tazpkg rev 515

tazpkg convert: may specify LOCALSTATE dir
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Jun 20 17:42:29 2011 +0200 (2011-06-20)
parents 3e2fe6e201d2
children 35fbd099024d
files tazpkg
line diff
     1.1 --- a/tazpkg	Fri Jun 03 13:24:52 2011 +0000
     1.2 +++ b/tazpkg	Mon Jun 20 17:42:29 2011 +0200
     1.3 @@ -64,6 +64,9 @@
     1.4  UP_LIST=$LOCALSTATE/packages.up
     1.5  DEFAULT_MIRROR="http://mirror.slitaz.org/packages/`cat /etc/slitaz-release`/"
     1.6  
     1.7 +# Need by check_depends
     1.8 +TMPLOCALSTATE=
     1.9 +
    1.10  # Check if the directories and files used by Tazpkg
    1.11  # exist. If not and user is root we create them.
    1.12  check_base_dir()
    1.13 @@ -1061,9 +1064,10 @@
    1.14  {
    1.15  	DEFAULT_DEPENDS="glibc-base gcc-lib-base"
    1.16  
    1.17 -	[ -f $LOCALSTATE/files.list.lzma ] || tazpkg recharge > /dev/null
    1.18 -	for i in $LOCALSTATE/files.list.lzma \
    1.19 - 		$LOCALSTATE/undigest/*/files.list.lzma ; do
    1.20 +	[ -n "$TMPLOCALSTATE" ] || TMPLOCALSTATE=$LOCALSTATE
    1.21 +	[ -f $TMPLOCALSTATE/files.list.lzma ] || tazpkg recharge > /dev/null
    1.22 +	for i in $TMPLOCALSTATE/files.list.lzma \
    1.23 + 		$TMPLOCALSTATE/undigest/*/files.list.lzma ; do
    1.24   		[ -f $i ] && lzma d $i -so >> $TMP_DIR/files.list
    1.25  	done
    1.26  	find $TMP_DIR/$file/fs -type f | while read chkfile ; do
    1.27 @@ -2836,6 +2840,8 @@
    1.28  	convert|-c)
    1.29  		# convert misc package format to .tazpkg
    1.30  		check_for_package_file
    1.31 +		[ -n "$TARGET_DIR" -a -s "$TARGET_DIR/files.list.lzma" ] && 
    1.32 +			TMPLOCALSTATE="$TARGET_DIR"
    1.33  		if [ "$(dd if=$PACKAGE_FILE bs=8 count=1 skip=1 2> /dev/null)" \
    1.34  		      == "debian-b" ]; then
    1.35  			convert_deb