SliTaz Repositories

     1.1 --- a/tazlito	Sat Nov 07 13:28:44 2009 +0100
     1.2 +++ b/tazlito	Sat Nov 07 16:16:26 2009 +0100
     1.3 @@ -474,10 +474,11 @@
     1.4  
     1.5  get_size()
     1.6  {
     1.7 -awk "{ \
     1.8 +cat /var/lib/tazpkg/packages.list $TMP_DIR/packages.list 2>/dev/null | awk "{ \
     1.9  if (/^$(echo $1 | sed 's/[$+.\]/\\&/g')$/) get=1; \
    1.10 -if (/installed/ && get) { print ; get=0 } \
    1.11 -}" < /var/lib/tazpkg/packages.txt  | \
    1.12 +if (/installed/ && get == 1) { print ; get++ } \
    1.13 +}
    1.14 +END { if (get < 2) print \" 0.0k  (0.0k installed)\" }" | \
    1.15  sed 's/ *\(.*\) .\(.*\) installed./\1 \2/' | while read packed unpacked; do
    1.16    echo "$(human2cent $packed) $(human2cent $unpacked)"
    1.17  done
    1.18 @@ -766,7 +767,7 @@
    1.19  			exit 1
    1.20  		fi
    1.21  		mkdir $TMP_DIR
    1.22 -		zcat $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i > /dev/null )
    1.23 +		zcat $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i 2> /dev/null)
    1.24  		if [ "$3" = "--brief" ]; then
    1.25  			if [ "$4" != "--noheader" ]; then
    1.26  				echo "Name              ISO   Rootfs  Description"
    1.27 @@ -774,7 +775,7 @@
    1.28  			fi
    1.29  			printf "%-16.16s %6.6s %6.6s %s\n" "$FLAVOR" \
    1.30  				"$(field ISO $TMP_DIR/$FLAVOR.desc)" \
    1.31 -				"$(field Rootfs $TMP_DIR/$FLAVOR.desc)" \
    1.32 +				"$(field 'Rootfs size' $TMP_DIR/$FLAVOR.desc)" \
    1.33  				"$(grep ^Description $TMP_DIR/$FLAVOR.desc | cut -d: -f2)"
    1.34  		else
    1.35  			echo "================================================================================"
    1.36 @@ -994,7 +995,7 @@
    1.37  		FLAVOR=${2%.flavor}
    1.38  		if [ -s $FLAVORS_REPOSITORY/$FLAVOR/receipt ]; then
    1.39  			mkdir $TMP_DIR
    1.40 -			echo -n "Create $FLAVOR..."
    1.41 +			echo -n "Create flavor $FLAVOR..."
    1.42  			[ -s /var/lib/tazpkg/packages.list ] || tazpkg recharge
    1.43  			if [ -s $FLAVORS_REPOSITORY/$FLAVOR/mirrors ]; then
    1.44  				cp $FLAVORS_REPOSITORY/$FLAVOR/mirrors \
    1.45 @@ -1018,7 +1019,8 @@
    1.46  				[ -d $FLAVORS_REPOSITORY/$FLAVOR/$i ] || \
    1.47  					continue
    1.48  				( cd $FLAVORS_REPOSITORY/$FLAVOR/$i ; find . | \
    1.49 -				cpio -o -H newc ) | gzip -9 >$TMP_DIR/$FLAVOR.$i
    1.50 +				cpio -o -H newc 2> /dev/null ) | \
    1.51 +				gzip -9 >$TMP_DIR/$FLAVOR.$i
    1.52  			done
    1.53  			if [ -s $TMP_DIR/$FLAVOR.rootfs ]; then
    1.54  				packed_size=$(($packed_size \
    1.55 @@ -1066,8 +1068,8 @@
    1.56  
    1.57  EOT
    1.58  			rm -f $TMP_DIR/packages.list
    1.59 -			( cd $TMP_DIR ; ls | cpio -o -H newc ) | gzip -9 > \
    1.60 -				$FLAVOR.flavor
    1.61 +			( cd $TMP_DIR ; ls | cpio -o -H newc 2> /dev/null) | \
    1.62 +				gzip -9 > $FLAVOR.flavor
    1.63  			status
    1.64  			rm -Rf $TMP_DIR
    1.65  		else