SliTaz Repositories

     1.1 --- a/tazpkg	Wed Dec 08 16:02:06 2010 +0100
     1.2 +++ b/tazpkg	Wed Dec 08 16:14:17 2010 +0100
     1.3 @@ -372,14 +372,17 @@
     1.4  extract_package()
     1.5  {
     1.6  	gettext "Extracting $PACKAGE... "
     1.7 -	cpio -idm < $PACKAGE.tazpkg && rm -f $PACKAGE.tazpkg
     1.8 +	cpio -idm --quiet < $PACKAGE.tazpkg && rm -f $PACKAGE.tazpkg
     1.9 +	status
    1.10  	if [ -f fs.cpio.lzma ]; then
    1.11  		gettext "Extracting the pseudo fs... "
    1.12  		echo -n "(lzma) "
    1.13 -		unlzma -c fs.cpio.lzma | cpio -idm && rm fs.cpio.lzma
    1.14 +		unlzma -c fs.cpio.lzma | cpio -idm --quiet && rm fs.cpio.lzma
    1.15 +		status
    1.16  	elif [ -f fs.cpio.gz ]; then
    1.17  		gettext "Extracting the pseudo fs... "
    1.18 -		zcat fs.cpio.gz | cpio -idm && rm fs.cpio.gz
    1.19 +		zcat fs.cpio.gz | cpio -idm --quiet && rm fs.cpio.gz
    1.20 +		status
    1.21  	fi
    1.22  }
    1.23  
    1.24 @@ -507,7 +510,7 @@
    1.25  		grep -qs ^$PACKAGE$ $dir/modifiers && continue
    1.26  		if [ -s "$dir/volatile.cpio.gz" ]; then
    1.27  			# We can modify backed up files without notice
    1.28 -			zcat $dir/volatile.cpio.gz | cpio -t 2> /dev/null | \
    1.29 +			zcat $dir/volatile.cpio.gz | cpio -t --quiet | \
    1.30  				grep -q "^${file#/}$" && continue
    1.31  		fi
    1.32  		echo "$PACKAGE" >> $dir/modifiers
    1.33 @@ -532,7 +535,7 @@
    1.34  		eval_gettext "Saving configuration files for \$PACKAGE... "
    1.35  		for i in $CONFIG_FILES; do
    1.36  			( cd fs ; find ${i#/} -type f )
    1.37 -		done | ( cd fs ; cpio -o -H newc | gzip -9 ) > \
    1.38 +		done | ( cd fs ; cpio -o -H newc --quiet | gzip -9 ) > \
    1.39  			$ROOT$INSTALLED/$PACKAGE/volatile.cpio.gz
    1.40  		# keep user configuration files
    1.41  		for i in $CONFIG_FILES; do
    1.42 @@ -862,7 +865,7 @@
    1.43  	[ -f $FLAVOR.flavor ] && cp $FLAVOR.flavor $TMP_DIR
    1.44  	cd $TMP_DIR
    1.45  	if [ -f $FLAVOR.flavor ] || download $FLAVOR.flavor; then
    1.46 -		zcat $FLAVOR.flavor | cpio -i >/dev/null
    1.47 +		zcat $FLAVOR.flavor | cpio --quiet -i >/dev/null
    1.48  		while read file; do
    1.49  			for pkg in $(ls -d $INSTALLED/${file%%-*}*); do
    1.50  				[ -f $pkg/receipt ] || continue
    1.51 @@ -1295,7 +1298,7 @@
    1.52  }
    1.53  ' > $TMP_DIR/$file/description.txt
    1.54  	cd $TMP_DIR/$file/fs/
    1.55 -	rpm2cpio $PACKAGE_FILE | cpio -idm
    1.56 +	rpm2cpio $PACKAGE_FILE | cpio -idm --quiet
    1.57  	cd ../..
    1.58  	echo "DEPENDS=\"$(find_depends)\"" >> $TMP_DIR/$file/receipt
    1.59  	show_unresolved_lib $TMP_DIR/$file/receipt
    1.60 @@ -1914,11 +1917,11 @@
    1.61  		cd $TMP_DIR
    1.62  		extract_package
    1.63  		gettext "Recompressing the fs... "
    1.64 -		find fs | cpio -o -H newc 2> /dev/null | lzma e fs.cpio.lzma -si
    1.65 +		find fs | cpio -o -H newc --quiet | lzma e fs.cpio.lzma -si
    1.66  		rm -rf fs
    1.67  		status
    1.68  		gettext "Creating new package... "
    1.69 -		find . -print | cpio -o -H newc > \
    1.70 +		find . -print | cpio -o -H newc --quiet > \
    1.71  			$TOP_DIR/$(basename $PACKAGE_FILE).$$ && mv -f \
    1.72  			$TOP_DIR/$(basename $PACKAGE_FILE).$$ \
    1.73  			$TOP_DIR/$(basename $PACKAGE_FILE)
    1.74 @@ -1933,7 +1936,7 @@
    1.75  			FILES="$INSTALLED/*/volatile.cpio.gz"
    1.76  			[ -n "$3" ] && FILES="$INSTALLED/$3/volatile.cpio.gz"
    1.77  			for i in $FILES; do
    1.78 -				zcat $i | cpio -idm > /dev/null
    1.79 +				zcat $i | cpio -idm --quiet > /dev/null
    1.80  				find * -type f 2>/dev/null | while read file; do
    1.81  					if [ ! -e /$file ]; then
    1.82  					echo -n "|--|--|--|File lost"
    1.83 @@ -1955,7 +1958,7 @@
    1.84  			for i in $INSTALLED/*/volatile.cpio.gz; do
    1.85  				[ -n "$2" -a "$i" != "$INSTALLED/$2/volatile.cpio.gz" ] && continue
    1.86  				[ -f "$i" ] || continue
    1.87 -				zcat $i | cpio -t | grep -v "[0-9]* blocks"
    1.88 +				zcat $i | cpio -t --quiet
    1.89  			done | sed 's|^|/|' | sort
    1.90  			echo "================================================================================"
    1.91  			echo ""
    1.92 @@ -1968,11 +1971,11 @@
    1.93  		mkdir config-$CONFIG_VERSION
    1.94  		cd config-$CONFIG_VERSION
    1.95  		for i in $INSTALLED/*/volatile.cpio.gz; do
    1.96 -			zcat $i | cpio -t | grep -v "[0-9]* blocks"
    1.97 +			zcat $i | cpio -t --quiet
    1.98  		done > files.list
    1.99  		mkdir fs
   1.100  		cd fs
   1.101 -		( cd / ; cpio -o -H newc ) < ../files.list | cpio -idm > /dev/null
   1.102 +		( cd / ; cpio -o -H newc --quiet ) < ../files.list | cpio -idm --quiet > /dev/null
   1.103  		mkdir -p etc/tazlito
   1.104  		for i in $INSTALLED/*/receipt; do
   1.105  			EXTRAVERSION=""
   1.106 @@ -2036,12 +2039,12 @@
   1.107  		done
   1.108  		ln -s / rootfs
   1.109  		mkdir tmp
   1.110 -		sed 's/^/rootfs/' < files.list | cpio -o -H newc 2>/dev/null |\
   1.111 -		      ( cd tmp ; cpio -idm >/dev/null )
   1.112 +		sed 's/^/rootfs/' < files.list | cpio -o -H newc --quiet |\
   1.113 +		      ( cd tmp ; cpio -idm --quiet >/dev/null )
   1.114  		mv tmp/rootfs fs
   1.115  		if [ -f $INSTALLED/$PACKAGE/volatile.cpio.gz ]; then
   1.116  			zcat $INSTALLED/$PACKAGE/volatile.cpio.gz | \
   1.117 -				( cd fs; cpio -idm )
   1.118 +				( cd fs; cpio -idm --quiet )
   1.119  		fi
   1.120  		if grep -q repack_cleanup $INSTALLED/$PACKAGE/receipt; then
   1.121  			. $INSTALLED/$PACKAGE/receipt
   1.122 @@ -2056,8 +2059,8 @@
   1.123  				exit 1
   1.124  			}
   1.125  		fi
   1.126 -		find fs | cpio -o -H newc 2> /dev/null | lzma e fs.cpio.lzma -si
   1.127 -		echo -e "$FILES" | cpio -o -H newc 2> /dev/null > \
   1.128 +		find fs | cpio -o -H newc --quiet | lzma e fs.cpio.lzma -si
   1.129 +		echo -e "$FILES" | cpio -o -H newc --quiet > \
   1.130  			$TOP_DIR/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg
   1.131  		cd $TOP_DIR
   1.132  		\rm -R $TMP_DIR
   1.133 @@ -2097,7 +2100,7 @@
   1.134  				'{ sz=$1 } END { print sz }')
   1.135  			# Build cpio archives.
   1.136  			gettext "Compressing the fs... "
   1.137 -			find fs | cpio -o -H newc | lzma e fs.cpio.lzma -si
   1.138 +			find fs | cpio -o -H newc --quiet | lzma e fs.cpio.lzma -si
   1.139  			rm -rf fs
   1.140  			status
   1.141  			PACKED_SIZE=$(du -chs fs.cpio.lzma receipt files.list \
   1.142 @@ -2109,10 +2112,10 @@
   1.143  			sed -i "s/^PACKAGE=/PACKED_SIZE=\"$PACKED_SIZE\"\nUNPACKED_SIZE=\"$UNPACKED_SIZE\"\nPACKAGE=/" receipt
   1.144  			status
   1.145  			gettext "Creating full cpio archive... "
   1.146 -			find . -print | cpio -o -H newc > ../$PACKAGE.tazpkg
   1.147 +			find . -print | cpio -o -H newc --quiet > ../$PACKAGE.tazpkg
   1.148  			status
   1.149  			gettext "Restoring original package tree... "
   1.150 -			unlzma -c fs.cpio.lzma | cpio -idm
   1.151 +			unlzma -c fs.cpio.lzma | cpio -idm --quiet
   1.152  			status
   1.153  			rm fs.cpio.lzma && cd ..
   1.154  			echo "================================================================================"