slitaz-pizza rev 55
Fix: when a simple 'unset IFS' break the tool... Now all packages.desc are correctly created
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sat May 19 17:45:33 2012 +0200 (2012-05-19) |
parents | e93f523cc91f |
children | a56361bbb30e |
files | pizza |
line diff
1.1 --- a/pizza Thu Apr 12 18:15:41 2012 +0200 1.2 +++ b/pizza Sat May 19 17:45:33 2012 +0200 1.3 @@ -73,6 +73,7 @@ 1.4 do 1.5 echo "$PACKAGE $VERSION \"$SHORT_DESC\"" >> $pkgsdesc 1.6 done 1.7 + unset IFS 1.8 done 1.9 status 1.10 done 1.11 @@ -117,7 +118,7 @@ 1.12 echo "Installing package: $pkg" 1.13 tazpkg get-install $pkg --root=$chroot >/dev/null 1.14 done 1.15 - 1.16 + 1.17 # Files 1.18 echo -n "Creating needed files..." 1.19 cp -f /etc/resolv.conf $chroot/etc 1.20 @@ -128,24 +129,24 @@ 1.21 echo '# Check pizza queue every 15 mins' > $crontabs/root 1.22 echo '*/15 * * * * /usr/bin/pizza-bot' >> $crontabs/root 1.23 status 1.24 - 1.25 + 1.26 # We want Tazlito to build ISOs in /home/slitaz 1.27 echo -n "Updating Tazlito default configuration..." 1.28 sed -i s'/^WORK_DIR=.*/WORK_DIR="\/home\/slitaz"/' \ 1.29 $chroot/etc/tazlito/tazlito.conf 1.30 status 1.31 - 1.32 - echo -n "Installing Pizza Bot..." 1.33 + 1.34 + echo -n "Installing Pizza Bot..." 1.35 cp -a $DATA/pizza-bot $chroot/usr/bin 1.36 status 1.37 cd $cache 1.38 - 1.39 + 1.40 # We use files from Hg repo defined in pizza.conf. 1.41 if [ ! -d "$hgflavors" ]; then 1.42 cd $cache && hg clone $HG && cd - 1.43 fi 1.44 get_pkgs_lists 1.45 - 1.46 + 1.47 # Web interface and public dir 1.48 echo -n "Installing the web interface..." 1.49 mkdir -p $public && chmod 0777 $public 1.50 @@ -160,7 +161,7 @@ 1.51 # Update files in chroot when pizza is updated on host. 1.52 echo -n "Updating chroot and virtual host..." 1.53 cp -a $DATA/web/* $VHOST 1.54 - cp -a $DATA/pizza-bot $chroot/usr/bin 1.55 + cp -a $DATA/pizza-bot $chroot/usr/bin 1.56 bot_config 1.57 status ;; 1.58 exec) 1.59 @@ -179,7 +180,7 @@ 1.60 mount -o bind $SLITAZ/$SLITAZ_VERSION/packages $pkgs 1.61 mount -o bind $public $bindpub 1.62 fi 1.63 - chroot $chroot /etc/init.d/crond start 1.64 + chroot $chroot /etc/init.d/crond start 1.65 [ "$MAIL_DOMAIN" ] && chroot $chroot /etc/init.d/postfix start ;; 1.66 stop) 1.67 # unmount and stop Pizza 1.68 @@ -187,8 +188,8 @@ 1.69 gettext -e "Unmounting packages and public...\n" 1.70 umount $pkgs 1.71 umount $bindpub 1.72 - fi 1.73 - chroot $chroot /etc/init.d/crond stop 1.74 + fi 1.75 + chroot $chroot /etc/init.d/crond stop 1.76 [ "$MAIL_DOMAIN" ] && chroot $chroot /etc/init.d/postfix stop ;; 1.77 get-lists) 1.78 get_pkgs_lists ;; 1.79 @@ -214,7 +215,7 @@ 1.80 fi 1.81 done 1.82 tar cf $bak.tar $bak && rm -rf $bak 1.83 - lzma e $bak.tar $bak.tar.lzma 1.84 + lzma e $bak.tar $bak.tar.lzma 1.85 du -sh $bak.tar.lzma ;; 1.86 purge) 1.87 # Remove tmp file older than 24 hours and ISO older than 15 days.