cookutils rev 520

cookiso: Use variables that are in cook.conf.
author Christopher Rogers <slaxemulator@gmail.com>
date Sat Aug 11 10:12:48 2012 +0000 (2012-08-11)
parents b7d000612249
children 11c476b2bc1a
files cookiso
line diff
     1.1 --- a/cookiso	Wed Aug 08 13:17:57 2012 +0000
     1.2 +++ b/cookiso	Sat Aug 11 10:12:48 2012 +0000
     1.3 @@ -34,7 +34,7 @@
     1.4  # Default to rolling, or: cookiso [cmd] --version=stable
     1.5  case "$version" in
     1.6  	stable)
     1.7 -		string=$(cat /etc/slitaz-release) ;;
     1.8 +		string=stable ;;
     1.9  	cooking)
    1.10  		string=cooking ;;
    1.11  	*)
    1.12 @@ -156,15 +156,15 @@
    1.13  		if [ ! -d "flavors" ]; then
    1.14  			case $version in
    1.15  				cooking|rolling)
    1.16 -					hg clone http://hg.slitaz.org/flavors ;;
    1.17 +					hg clone $FLAVORS_URL ;;
    1.18  				stable)
    1.19 -					hg clone http://hg.slitaz.org/flavors-stable flavors ;;
    1.20 +					hg clone $FLAVORS_URL-stable flavors ;;
    1.21  			esac
    1.22  		fi
    1.23  		# Needed packages
    1.24  		for pkg in mercurial tazlito rsync dropbear
    1.25  		do
    1.26 -			[ -d "/var/lib/tazpkg/installed/$pkg" ] || tazpkg -gi $pkg
    1.27 +			[ -d "$INSTALLED/$pkg" ] || tazpkg -gi $pkg
    1.28  		done
    1.29  		echo "Creating directories and files..."
    1.30  		mkdir -p $cache $iso