# HG changeset patch # User Christopher Rogers # Date 1344679968 0 # Node ID 20b1c3b9a3cafbba20a9a9e6d5b996985830ec05 # Parent b7d0006122498235b940c755993d46e15ec52194 cookiso: Use variables that are in cook.conf. diff -r b7d000612249 -r 20b1c3b9a3ca cookiso --- a/cookiso Wed Aug 08 13:17:57 2012 +0000 +++ b/cookiso Sat Aug 11 10:12:48 2012 +0000 @@ -34,7 +34,7 @@ # Default to rolling, or: cookiso [cmd] --version=stable case "$version" in stable) - string=$(cat /etc/slitaz-release) ;; + string=stable ;; cooking) string=cooking ;; *) @@ -156,15 +156,15 @@ if [ ! -d "flavors" ]; then case $version in cooking|rolling) - hg clone http://hg.slitaz.org/flavors ;; + hg clone $FLAVORS_URL ;; stable) - hg clone http://hg.slitaz.org/flavors-stable flavors ;; + hg clone $FLAVORS_URL-stable flavors ;; esac fi # Needed packages for pkg in mercurial tazlito rsync dropbear do - [ -d "/var/lib/tazpkg/installed/$pkg" ] || tazpkg -gi $pkg + [ -d "$INSTALLED/$pkg" ] || tazpkg -gi $pkg done echo "Creating directories and files..." mkdir -p $cache $iso