SliTaz Repositories

     1.1 --- a/tazlito	Sun May 11 22:00:21 2008 +0000
     1.2 +++ b/tazlito	Thu May 22 14:48:49 2008 +0000
     1.3 @@ -627,7 +627,7 @@
     1.4  			[ -z "$FLAVOR" ] && exit 1
     1.5  		fi
     1.6  		check_rootfs
     1.7 -		FILES="$FLAVOR.pkglist $FLAVOR.nonfree"
     1.8 +		FILES="$FLAVOR.pkglist"
     1.9  		echo -n "Creating file $FLAVOR.flavor..."
    1.10  		for i in rootcd rootfs; do
    1.11  			if [ -d "$ADDFILES/$i" ] ; then
    1.12 @@ -647,7 +647,7 @@
    1.13  		echo "Flavor          : $FLAVOR" > $FLAVOR.desc
    1.14  		echo "Description     : $answer" >> $FLAVOR.desc
    1.15  		( cd $DISTRO; distro_sizes) >> $FLAVOR.desc
    1.16 -		\rm -f $FLAVOR.pkglist 2> /dev/null
    1.17 +		\rm -f $FLAVOR.pkglist $FLAVOR.nonfree 2> /dev/null
    1.18  		for i in $(ls $ROOTFS$INSTALLED); do
    1.19  			eval $(grep ^VERSION= $ROOTFS$INSTALLED/$i/receipt)
    1.20  			eval $(grep ^CATEGORY= $ROOTFS$INSTALLED/$i/receipt)
    1.21 @@ -658,8 +658,9 @@
    1.22  				echo "$i-$VERSION" >> $FLAVOR.pkglist
    1.23  			fi
    1.24  		done
    1.25 -		ls $FLAVOR.desc $FILES 2>/dev/null | \
    1.26 -			cpio -o -H newc 2>/dev/null | gzip -9 > $FLAVOR.flavor
    1.27 +		[ -s $FLAVOR.nonfree ] && $FILES="$FILES\n$FLAVOR.nonfree"
    1.28 +		echo -e "$FLAVOR.desc\n$FILES" | cpio -o -H newc 2>/dev/null | \
    1.29 +			gzip -9 > $FLAVOR.flavor
    1.30  		rm `echo -e $FILES`
    1.31  		status
    1.32  		echo "================================================================================"
    1.33 @@ -677,8 +678,8 @@
    1.34  			mkdir $TMP_DIR
    1.35  			zcat $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i 2>/dev/null )
    1.36  			echo -n "Create distro-packages.list..."
    1.37 +			mv $TMP_DIR/$FLAVOR.nonfree non-free.list 2> /dev/null
    1.38  			mv $TMP_DIR/$FLAVOR.pkglist distro-packages.list
    1.39 -			mv $TMP_DIR/$FLAVOR.nonfree non-free.list 2> /dev/null
    1.40  			status
    1.41  			for i in rootcd rootfs; do
    1.42  				if [ -f $TMP_DIR/$FLAVOR.$i ]; then