tazlito diff tazlito @ rev 263

tazlito: Fix status and distro.sh extraction
author Christophe Lincoln <pankso@slitaz.org>
date Sat Mar 17 16:25:35 2012 +0100 (2012-03-17)
parents 24b1f91ec9b2
children a6c0d01e8a9c
line diff
     1.1 --- a/tazlito	Wed Mar 14 00:10:09 2012 +0100
     1.2 +++ b/tazlito	Sat Mar 17 16:25:35 2012 +0100
     1.3 @@ -1722,9 +1722,12 @@
     1.4  			echo -n "Creating distro-packages.list..."
     1.5  			mv $TMP_DIR/$FLAVOR.nonfree non-free.list 2> /dev/null
     1.6  			mv $TMP_DIR/$FLAVOR.pkglist distro-packages.list
     1.7 -			echo -n "Extracting distro.sh... "
     1.8 -			mv $TMP_DIR/$FLAVOR-distro.sh  distro.sh 2> /dev/null
     1.9  			status
    1.10 +			if [ -f "$TMP_DIR/$FLAVOR-distro.sh" ]; then
    1.11 +				echo -n "Extracting distro.sh... "
    1.12 +				mv $TMP_DIR/$FLAVOR-distro.sh  distro.sh 2> /dev/null
    1.13 +				status
    1.14 +			fi
    1.15  			infos="$FLAVOR.desc"
    1.16  			for i in rootcd rootfs; do
    1.17  				if [ -f $TMP_DIR/$FLAVOR.$i ]; then
    1.18 @@ -1732,7 +1735,7 @@
    1.19  					mkdir -p "$ADDFILES/$i"
    1.20  					zcat $TMP_DIR/$FLAVOR.$i | \
    1.21  						( cd "$ADDFILES/$i"; cpio -id > /dev/null)
    1.22 -					zcat $TMP_DIR/$FLAVOR.$i | cpio -tv \
    1.23 +					zcat $TMP_DIR/$FLAVOR.$i | cpio -tv 2> /dev/null \
    1.24  						> $TMP_DIR/$FLAVOR.list$i
    1.25  					infos="$infos\n$FLAVOR.list$i"
    1.26  				fi