cookutils rev 528 slitaz-tank

cook: Start using functions that are in libcookiso.sh. Less depended on tazlito.
author Christopher Rogers <slaxemulator@gmail.com>
date Sat Aug 25 07:24:43 2012 +0000 (2012-08-25)
parents 0c124623a7cd
children 39f3a73df0ea
files cook
line diff
     1.1 --- a/cook	Sat Aug 25 07:23:25 2012 +0000
     1.2 +++ b/cook	Sat Aug 25 07:24:43 2012 +0000
     1.3 @@ -8,6 +8,7 @@
     1.4  #
     1.5  . /usr/lib/slitaz/libcook.sh
     1.6  . /usr/lib/slitaz/libcookorder.sh
     1.7 +. /usr/lib/slitaz/libcookiso.sh
     1.8  
     1.9  COMMAND="$1"
    1.10  
    1.11 @@ -1487,18 +1488,18 @@
    1.12  		fi
    1.13  		exit 0 ;;
    1.14  	flavors)
    1.15 -		[ -d "$flavors" ] && echo -e "Missing flavors: $flavors\n" && exit 1
    1.16 -		[ -d "$live" ] && || mkdir -p $live
    1.17 +		[ -d "$flavors" ] || $(echo -e "Missing flavors: $flavors\n" && exit 1)
    1.18 +		[ -d "$live" ] || mkdir -p $live
    1.19  		gettext "Creating flavors files in:"; echo " $live"
    1.20  		echo "Cook pkgdb: Creating all flavors" | log
    1.21  		separator
    1.22  		gettext -e "Recharging lists to use latest packages...\n"
    1.23  		tazpkg recharge >/dev/null 2>/dev/null
    1.24  		
    1.25 -		if [ ! -f "$live/tazlito.conf" ]; then
    1.26 +		if [ ! -f "$live/cookiso.conf" ]; then
    1.27  			echo "Creating configuration file: tazlito.conf"
    1.28 -			cp /etc/tazlito/tazlito.conf $live
    1.29 -			sed -i "s|WORK_DIR=.*|WORK_DIR="$SLITAZ"|g" $live/tazlito.conf
    1.30 +			cp /etc/slitaz/cookiso.conf $live
    1.31 +			sed -i "s|WORK_DIR=.*|WORK_DIR="$SLITAZ"|g" $live/cookiso.conf
    1.32  		fi
    1.33  		
    1.34  		#[ -d "$flavors/.hg" ] && $flavors && hg pull -u
    1.35 @@ -1510,8 +1511,8 @@
    1.36  		do
    1.37  			fl=$(basename $i)
    1.38  			echo "Packing flavor: $(basename $i)"
    1.39 -			tazlito pack-flavor $fl >/dev/null || exit 1
    1.40 -			tazlito show-flavor $fl --brief --noheader 2> \
    1.41 +			pack_flavor $fl >/dev/null || exit 1
    1.42 +			show_flavor $fl --brief --noheader 2> \
    1.43  				/dev/null >> flavors.list
    1.44  		done
    1.45  		cp -f $live/*.flavor $live/flavors.list $PKGS