tazpkg rev 23

Repack: do not forget description.txt
author Pascal Bellard <pascal.bellard@slitaz.org>
date Fri Dec 14 19:22:56 2007 +0000 (2007-12-14)
parents 28c9ef6dbf16
children a74b3a7e64e7
files tazpkg
line diff
     1.1 --- a/tazpkg	Fri Dec 14 17:28:43 2007 +0000
     1.2 +++ b/tazpkg	Fri Dec 14 19:22:56 2007 +0000
     1.3 @@ -230,7 +230,7 @@
     1.4  	# Remember modified packages
     1.5  	for i in $MODIFY_PACKAGES; do
     1.6  		[ -d $ROOT$INSTALLED/$i ] || continue
     1.7 -		grep -q ^$PACKAGE$ $ROOT$INSTALLED/$i/modifiers && continue
     1.8 +		grep -qs ^$PACKAGE$ $ROOT$INSTALLED/$i/modifiers && continue
     1.9  		echo "$PACKAGE" >> $ROOT$INSTALLED/$i/modifiers
    1.10  	done
    1.11  	# Make the installed package data dir to store
    1.12 @@ -684,10 +684,15 @@
    1.13  			exit 1
    1.14  		fi
    1.15  		HERE=`pwd`
    1.16 +		FILES="receipt\nfiles.list\nfs.cpio.gz"
    1.17  		mkdir -p $TMP_DIR
    1.18  		cd $TMP_DIR
    1.19  		cp $INSTALLED/$PACKAGE/files.list .
    1.20  		cp $INSTALLED/$PACKAGE/receipt .
    1.21 +		if [ -f "$INSTALLED/$PACKAGE/description.txt" ]; then
    1.22 +			cp $INSTALLED/$PACKAGE/description.txt .
    1.23 +			FILES="${FILES}\ndescription.txt"
    1.24 +		fi
    1.25  		cpio -pd fs < files.list 2> /dev/null
    1.26  		. ./receipt
    1.27  		src=$TMP_DIR/nowhere
    1.28 @@ -697,11 +702,8 @@
    1.29  		( set +e ; genpkg_rules > /dev/null 2>&1 )
    1.30  		cd $TMP_DIR
    1.31  		find fs | cpio -o -H newc 2> /dev/null | gzip -9 > fs.cpio.gz
    1.32 -		cpio -o -H newc > $HERE/$PACKAGE-$VERSION.tazpkg 2> /dev/null <<EOT
    1.33 -receipt
    1.34 -files.list
    1.35 -fs.cpio.gz
    1.36 -EOT
    1.37 +		echo -e "$FILES" | cpio -o -H newc > \
    1.38 +			$HERE/$PACKAGE-$VERSION.tazpkg 2> /dev/null
    1.39  		cd $HERE
    1.40  		\rm -R $TMP_DIR
    1.41  		echo "Package $PACKAGE repacked successfully."