tazpkg rev 416 4.2.3

Fix regressions introduced with my lasts commits
author Antoine Bodin <gokhlayeh@slitaz.org>
date Fri Jan 28 23:02:59 2011 +0100 (2011-01-28)
parents 00b34cf95509
children 2f4f55db2600
files tazpkg
line diff
     1.1 --- a/tazpkg	Wed Jan 26 23:14:50 2011 +0100
     1.2 +++ b/tazpkg	Fri Jan 28 23:02:59 2011 +0100
     1.3 @@ -21,7 +21,7 @@
     1.4  #           Antoine Bodin <gokhlayeh@mailoo.org>
     1.5  #           Christopher Rogers <slaxemulator@gmail.com>
     1.6  #
     1.7 -VERSION=4.2.2
     1.8 +VERSION=4.2.3
     1.9  
    1.10  ####################
    1.11  # Script variables #
    1.12 @@ -48,7 +48,7 @@
    1.13  	# Pkg name for remove, search and all other cmds
    1.14  	PACKAGE=${2%.tazpkg}
    1.15  fi
    1.16 -PACKAGE_FILE=$2
    1.17 +PACKAGE_FILE="$PWD/$2"
    1.18  TARGET_DIR=$3
    1.19  TOP_DIR=`pwd`
    1.20  TMP_DIR=$tmp/$RANDOM
    1.21 @@ -544,12 +544,12 @@
    1.22  		# save 'official' configuration files
    1.23  		eval_gettext "Saving configuration files for \$PACKAGE... "
    1.24  		for i in $CONFIG_FILES; do
    1.25 -			{ cd fs ; find ${i#/} -type f; }
    1.26 -		done | { cd fs ; cpio -o -H newc --quiet | gzip -9; } > \
    1.27 +			{ cd fs ; find ${i#/} -type f; cd ..; }
    1.28 +		done | { cd fs ; cpio -o -H newc --quiet | gzip -9; cd ..; } > \
    1.29  			$ROOT$INSTALLED/$PACKAGE/volatile.cpio.gz
    1.30  		# keep user configuration files
    1.31  		for i in $CONFIG_FILES; do
    1.32 -			{ cd fs ; find ${i#/} -type f; }
    1.33 +			{ cd fs ; find ${i#/} -type f; cd ..; }
    1.34  		done | while read i; do
    1.35  			[ -e $ROOT/$i ] || continue
    1.36  			cp -a $ROOT/$i fs/$i
    1.37 @@ -2050,7 +2050,7 @@
    1.38  		done > files.list
    1.39  		mkdir fs
    1.40  		cd fs
    1.41 -		{ cd / ; cpio -o -H newc --quiet; } < ../files.list | cpio -idm --quiet > /dev/null
    1.42 +		( cd / ; cpio -o -H newc --quiet ) < ../files.list | cpio -idm --quiet > /dev/null
    1.43  		mkdir -p etc/tazlito
    1.44  		for i in $INSTALLED/*/receipt; do
    1.45  			EXTRAVERSION=""
    1.46 @@ -2115,11 +2115,11 @@
    1.47  		ln -s / rootfs
    1.48  		mkdir tmp
    1.49  		sed 's/^/rootfs/' < files.list | cpio -o -H newc --quiet |\
    1.50 -		      { cd tmp ; cpio -idm --quiet >/dev/null; }
    1.51 +		      { cd tmp ; cpio -idm --quiet >/dev/null; cd ..; }
    1.52  		mv tmp/rootfs fs
    1.53  		if [ -f $INSTALLED/$PACKAGE/volatile.cpio.gz ]; then
    1.54  			zcat $INSTALLED/$PACKAGE/volatile.cpio.gz | \
    1.55 -				{ cd fs; cpio -idm --quiet; }
    1.56 +				{ cd fs; cpio -idm --quiet; cd ..; }
    1.57  		fi
    1.58  		if fgrep -q repack_cleanup $INSTALLED/$PACKAGE/receipt; then
    1.59  			. $INSTALLED/$PACKAGE/receipt