SliTaz Repositories

     1.1 --- a/tazlito	Tue Feb 18 17:14:31 2014 +0100
     1.2 +++ b/tazlito	Tue Feb 18 20:40:19 2014 +0100
     1.3 @@ -453,8 +453,7 @@
     1.4  empty_config_file()
     1.5  {
     1.6  	cat >> tazlito.conf << "EOF"
     1.7 -# tazlito.conf: Tazlito (SliTaz Live Tool)
     1.8 -# configuration file.
     1.9 +# tazlito.conf: Tazlito (SliTaz Live Tool) configuration file.
    1.10  #
    1.11  
    1.12  # Name of the ISO image to generate.
    1.13 @@ -1340,7 +1339,7 @@
    1.14  			download flavors.list -O - > /etc/tazlito/flavors.list
    1.15  		fi
    1.16  		newline
    1.17 -		echo -e "\033[1mList of flavors\033[0m"
    1.18 +		boldify "List of flavors"
    1.19  		separator
    1.20  		cat /etc/tazlito/flavors.list
    1.21  		newline ;;
    1.22 @@ -1418,7 +1417,7 @@
    1.23  		# Generate a new flavor from the last iso image generated.
    1.24  		FLAVOR=${2%.flavor}
    1.25  		newline
    1.26 -		echo -e "\033[1mFlavor generation\033[0m"
    1.27 +		boldify "Flavor generation"
    1.28  		separator
    1.29  		if [ -z "$FLAVOR" ]; then
    1.30  			echo -n "Flavor name : "
    1.31 @@ -1863,9 +1862,9 @@
    1.32  		[ -f "$2" ] && DISTRO_PKGS_LIST=$2
    1.33  		[ ! -f $DISTRO_PKGS_LIST ] && echo "No packages list found." && exit 0
    1.34  		newline
    1.35 -		echo -e "\033[1mLiveCD packages list check\033[0m"
    1.36 +		boldify "LiveCD packages list check"
    1.37  		separator
    1.38 -		for pkg in `cat $DISTRO_PKGS_LIST`
    1.39 +		for pkg in $(cat $DISTRO_PKGS_LIST)
    1.40  		do
    1.41  			if ! grep -q "$pkg" $LOCALSTATE/packages.list; then
    1.42  				echo "Updating: $pkg"
    1.43 @@ -1903,8 +1902,9 @@
    1.44  				exit 0
    1.45  			fi
    1.46  		fi
    1.47 +		
    1.48 +		# Build list with installed packages
    1.49  		if [ ! -f "$LIST_NAME" -a -d $INSTALLED ] ; then
    1.50 -		# Build list with installed packages
    1.51  			for i in $(ls $INSTALLED); do
    1.52  				if grep -q ^_realver $INSTALLED/$i/receipt ; then
    1.53  					VERSION=$(. $INSTALLED/$i/receipt 2>/dev/null ; echo $VERSION) 
    1.54 @@ -2034,7 +2034,7 @@
    1.55  		for pkg in $(cat $DISTRO/list-packages)
    1.56  		do
    1.57  			echo -n "Installing package: $pkg"
    1.58 -			yes y | tazpkg install $pkg --root=$ROOTFS 2>&1 >> $log || exit 1
    1.59 +			yes y | tazpkg -i $pkg --root=$ROOTFS 2>&1 >> $log || exit 1
    1.60  			status
    1.61  		done
    1.62  		rm -f $ROOTFS/var/lib/tazpkg/packages.*
    1.63 @@ -2126,15 +2126,11 @@
    1.64  					status
    1.65  				done
    1.66  				rm -rf ${ROOTFS}0$n/boot ${ROOTFS}0$n/var/lib/tazpkg/packages.*
    1.67 -				
    1.68  				cd $DISTRO
    1.69 -				
    1.70  				if [ -s $flavor.rootfs ]; then
    1.71  					echo -n "Adding $flavor rootfs extra files..."
    1.72 -					zcat < $flavor.rootfs | \
    1.73 -					( cd ${ROOTFS}0$n ; cpio -idmu )
    1.74 +					zcat < $flavor.rootfs | ( cd ${ROOTFS}0$n ; cpio -idmu )
    1.75  				fi
    1.76 -				
    1.77  				echo -n "Moving list-packages0$n to rootfs0$n"
    1.78  				mv $DISTRO/list-packages0$n ${ROOTFS}0$n/etc/tazlito/distro-packages.list
    1.79  				status
    1.80 @@ -2359,8 +2355,8 @@
    1.81  		md5sum $ISO_NAME.iso > $ISO_NAME.md5
    1.82  		status
    1.83  
    1.84 -		echo "==============================================================================="
    1.85 -		echo "ISO image: `du -sh /home/slitaz/distro/$ISO_NAME.iso`"
    1.86 +		separator
    1.87 +		echo "ISO image: $(du -sh /home/slitaz/distro/$ISO_NAME.iso)"
    1.88  		newline
    1.89  		echo -n "Exit or burn ISO to cdrom (Exit|burn)? "; read anser
    1.90  		case $anser in
    1.91 @@ -2391,7 +2387,7 @@
    1.92  			exit 0
    1.93  		fi
    1.94  		newline
    1.95 -		echo -e "\033[1mTazlito burn ISO\033[0m "
    1.96 +		boldify "Tazlito burn ISO"
    1.97  		separator
    1.98  		echo "Cdrom device  : /dev/$DRIVE_NAME"
    1.99  		echo "Drive speed   : $DRIVE_SPEED"