SliTaz Repositories

     1.1 --- a/tazlito	Thu Jan 02 19:22:15 2014 +0100
     1.2 +++ b/tazlito	Sun Jan 05 11:30:04 2014 +0000
     1.3 @@ -1358,7 +1358,7 @@
     1.4  			exit 1
     1.5  		fi
     1.6  		mkdir $TMP_DIR
     1.7 -		zcat $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i > /dev/null)
     1.8 +		zcat < $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i > /dev/null)
     1.9  		if [ "$3" = "--brief" ]; then
    1.10  			if [ "$4" != "--noheader" ]; then
    1.11  				echo "Name              ISO   Rootfs  Description"
    1.12 @@ -1482,7 +1482,7 @@
    1.13  		FLAVOR=${2%.flavor}
    1.14  		if [ -f $FLAVOR.flavor ] || download $FLAVOR.flavor; then
    1.15  			mkdir $TMP_DIR
    1.16 -			zcat $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i >/dev/null )
    1.17 +			zcat < $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i >/dev/null )
    1.18  			echo -n "Updating $FLAVOR package list..."
    1.19  			[ -s $LOCALSTATE/packages.list ] || tazpkg recharge
    1.20  			packed_size=0; unpacked_size=0
    1.21 @@ -1508,14 +1508,14 @@
    1.22  				packed_size=$(($packed_size \
    1.23  					+ $(cat $TMP_DIR/$FLAVOR.rootfs | wc -c ) / 100 ))
    1.24  				unpacked_size=$(($unpacked_size \
    1.25 -					+ $(zcat $TMP_DIR/$FLAVOR.rootfs | wc -c ) / 100 ))
    1.26 +					+ $(zcat < $TMP_DIR/$FLAVOR.rootfs | wc -c ) / 100 ))
    1.27  			fi
    1.28  			# Estimate lzma
    1.29  			packed_size=$(($packed_size * 2 / 3))
    1.30  			iso_size=$(( $packed_size + 26000 ))
    1.31  			if [ -s $TMP_DIR/$FLAVOR.rootcd ]; then
    1.32  				iso_size=$(($iso_size \
    1.33 -					+ $(zcat $TMP_DIR/$FLAVOR.rootcd | wc -c ) / 100 ))
    1.34 +					+ $(zcat < $TMP_DIR/$FLAVOR.rootcd | wc -c ) / 100 ))
    1.35  			fi
    1.36  			sed -i -e '/Image is ready/d' \
    1.37  			       -e "s/Rootfs size\( *:\) \(.*\)/Rootfs size\1 $(cent2human $unpacked_size)  (estimated)/" \
    1.38 @@ -1534,7 +1534,7 @@
    1.39  		FLAVOR=${2%.flavor}
    1.40  		if [ -f $FLAVOR.flavor ] || download $FLAVOR.flavor; then
    1.41  			mkdir $TMP_DIR
    1.42 -			zcat $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i >/dev/null )
    1.43 +			zcat < $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i >/dev/null )
    1.44  			echo -n "Extracting $FLAVOR..."
    1.45  			rm -rf $FLAVORS_REPOSITORY/$FLAVOR 2> /dev/null
    1.46  			mkdir -p $FLAVORS_REPOSITORY/$FLAVOR
    1.47 @@ -1565,7 +1565,7 @@
    1.48  			for i in rootcd rootfs; do
    1.49  				[ -f $TMP_DIR/$FLAVOR.$i ] || continue
    1.50  				mkdir $FLAVORS_REPOSITORY/$FLAVOR/$i
    1.51 -				zcat $TMP_DIR/$FLAVOR.$i | \
    1.52 +				zcat < $TMP_DIR/$FLAVOR.$i | \
    1.53  				  (cd $FLAVORS_REPOSITORY/$FLAVOR/$i; \
    1.54  				   cpio -idm > /dev/null)
    1.55  			done
    1.56 @@ -1661,14 +1661,14 @@
    1.57  				packed_size=$(($packed_size \
    1.58  					+ $(cat $TMP_DIR/$FLAVOR.rootfs | wc -c ) / 100 ))
    1.59  				unpacked_size=$(($unpacked_size \
    1.60 -					+ $(zcat $TMP_DIR/$FLAVOR.rootfs | wc -c ) / 100 ))
    1.61 +					+ $(zcat < $TMP_DIR/$FLAVOR.rootfs | wc -c ) / 100 ))
    1.62  			fi
    1.63  			# Estimate lzma
    1.64  			packed_size=$(($packed_size * 2 / 3))
    1.65  			iso_size=$(( $packed_size + 26000 ))
    1.66  			if [ -s $TMP_DIR/$FLAVOR.rootcd ]; then
    1.67  				iso_size=$(($iso_size \
    1.68 -					+ $(zcat $TMP_DIR/$FLAVOR.rootcd | wc -c ) / 100 ))
    1.69 +					+ $(zcat < $TMP_DIR/$FLAVOR.rootcd | wc -c ) / 100 ))
    1.70  			fi
    1.71  			VERSION=""
    1.72  			MAINTAINER=""
    1.73 @@ -1723,7 +1723,7 @@
    1.74  			status
    1.75  			mkdir $TMP_DIR
    1.76  			echo -n "Extracting flavor $FLAVOR.flavor... "
    1.77 -			zcat $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i >/dev/null )
    1.78 +			zcat < $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i >/dev/null )
    1.79  			status
    1.80  			echo -n "Creating distro-packages.list..."
    1.81  			mv $TMP_DIR/$FLAVOR.nonfree non-free.list 2> /dev/null
    1.82 @@ -1744,9 +1744,9 @@
    1.83  				if [ -f $TMP_DIR/$FLAVOR.$i ]; then
    1.84  					echo -n "Adding $i files... "
    1.85  					mkdir -p "$ADDFILES/$i"
    1.86 -					zcat $TMP_DIR/$FLAVOR.$i | \
    1.87 +					zcat < $TMP_DIR/$FLAVOR.$i | \
    1.88  						( cd "$ADDFILES/$i"; cpio -id > /dev/null)
    1.89 -					zcat $TMP_DIR/$FLAVOR.$i | cpio -tv 2> /dev/null \
    1.90 +					zcat < $TMP_DIR/$FLAVOR.$i | cpio -tv 2> /dev/null \
    1.91  						> $TMP_DIR/$FLAVOR.list$i
    1.92  					infos="$infos\n$FLAVOR.list$i"
    1.93  					status
    1.94 @@ -2123,7 +2123,7 @@
    1.95  				[ -s $TOP_DIR/$flavor.flavor ] &&
    1.96  					cp $TOP_DIR/$flavor.flavor .
    1.97  				[ -s $flavor.flavor ] || download $flavor.flavor
    1.98 -				zcat $flavor.flavor | cpio -i \
    1.99 +				zcat < $flavor.flavor | cpio -i \
   1.100  					$flavor.pkglist $flavor.rootfs
   1.101  				sed 's/.*/&.tazpkg/' < $flavor.pkglist \
   1.102  					> $DISTRO/list-packages0$n
   1.103 @@ -2136,7 +2136,7 @@
   1.104  				cd $DISTRO
   1.105  				if [ -s $flavor.rootfs ]; then
   1.106  					echo "Adding $flavor rootfs extra files..."
   1.107 -					zcat $flavor.rootfs | \
   1.108 +					zcat < $flavor.rootfs | \
   1.109  					( cd ${ROOTFS}0$n ; cpio -idmu )
   1.110  				fi
   1.111  				mv $flavor.pkglist ${ROOTFS}0$n/etc/tazlito/distro-packages.list