# HG changeset patch # User Christophe Lincoln # Date 1331997935 -3600 # Node ID 2f32c1a5e1045827fd0bbb8e069de8abe851cc13 # Parent e8f4014b75f90ab1698ee0657ec05ad3c9d89494 tazlito: Fix status and distro.sh extraction diff -r e8f4014b75f9 -r 2f32c1a5e104 tazlito --- a/tazlito Fri Mar 16 12:06:01 2012 +0100 +++ b/tazlito Sat Mar 17 16:25:35 2012 +0100 @@ -1722,9 +1722,12 @@ echo -n "Creating distro-packages.list..." mv $TMP_DIR/$FLAVOR.nonfree non-free.list 2> /dev/null mv $TMP_DIR/$FLAVOR.pkglist distro-packages.list - echo -n "Extracting distro.sh... " - mv $TMP_DIR/$FLAVOR-distro.sh distro.sh 2> /dev/null status + if [ -f "$TMP_DIR/$FLAVOR-distro.sh" ]; then + echo -n "Extracting distro.sh... " + mv $TMP_DIR/$FLAVOR-distro.sh distro.sh 2> /dev/null + status + fi infos="$FLAVOR.desc" for i in rootcd rootfs; do if [ -f $TMP_DIR/$FLAVOR.$i ]; then @@ -1732,7 +1735,7 @@ mkdir -p "$ADDFILES/$i" zcat $TMP_DIR/$FLAVOR.$i | \ ( cd "$ADDFILES/$i"; cpio -id > /dev/null) - zcat $TMP_DIR/$FLAVOR.$i | cpio -tv \ + zcat $TMP_DIR/$FLAVOR.$i | cpio -tv 2> /dev/null \ > $TMP_DIR/$FLAVOR.list$i infos="$infos\n$FLAVOR.list$i" fi