cookutils rev 527 slitaz-tank
cookiso: Add some fixes so its less depend on tazlito.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Sat Aug 25 07:23:25 2012 +0000 (2012-08-25) |
parents | 6eb46b5c9bea |
children | 6e1095403ba9 |
files | cookiso |
line diff
1.1 --- a/cookiso Sat Aug 25 06:45:02 2012 +0000 1.2 +++ b/cookiso Sat Aug 25 07:23:25 2012 +0000 1.3 @@ -112,11 +112,11 @@ 1.4 rm -f $log && touch $log 1.5 echo "Building $string <a href='?distro=$string-$flavor'>$flavor</a>" | log 1.6 echo "Cookiso started: $(date '+%Y-%m-%d %H:%M')" | tee -a $log 1.7 - tazlito pack-flavor $flavor | tee -a $log 1.8 - tazlito get-flavor $flavor | tee -a $log 1.9 + pack_flavor $flavor | tee -a $log 1.10 + get_flavor $flavor | tee -a $log 1.11 # BUG: script sometimes screws up conspy on Tank 1.12 #script -c "yes '' | tazlito gen-distro" -a $log 1.13 - tazlito gen-distro 2>&1 | tee -a $log 1.14 + gen_distro 2>&1 | tee -a $log 1.15 # Rename ISO and md5 1.16 echo "Moving ISO to: $iso/$name.iso" | tee -a $log 1.17 mv -f $SLITAZ/distro/slitaz-$flavor.iso $iso/$name.iso 1.18 @@ -160,13 +160,13 @@ 1.19 # Needed packages 1.20 for pkg in mercurial tazlito rsync dropbear squashfs 1.21 do 1.22 - [ -d "$INSTALLED/$pkg" ] || tazpkg -gi $pkg 1.23 + [ -f "$INSTALLED/$pkg/receipt" ] || tazpkg -gi $pkg 1.24 done 1.25 echo "Creating directories and files..." 1.26 mkdir -p $cache $iso 1.27 touch $activity 1.28 sed -i "s|WORK_DIR=.*|WORK_DIR="$SLITAZ"|g" \ 1.29 - /etc/tazlito/tazlito.conf 1.30 + /etc/slitaz/cookiso.conf 1.31 newline 1.32 echo "Flavors files : $SLITAZ/flavors" 1.33 echo "Cache files : $cache"