cookutils rev 337
cookiso and cgi do it better for default iso
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sat Mar 17 22:39:11 2012 +0100 (2012-03-17) |
parents | bc3591cd6e77 |
children | 29926d2d8deb |
files | cookiso web/cookiso.cgi |
line diff
1.1 --- a/cookiso Sat Mar 17 22:30:46 2012 +0100 1.2 +++ b/cookiso Sat Mar 17 22:39:11 2012 +0100 1.3 @@ -145,11 +145,7 @@ 1.4 export DROPBEAR_PASSWORD=none 1.5 for flavor in $flavors 1.6 do 1.7 - if echo $flavor | fgrep core-4in1; then 1.8 - file=slitaz-$string 1.9 - else 1.10 - file=slitaz-$string-$flavor 1.11 - fi 1.12 + file=slitaz-${string}${$flavor%-core-4in1}.* 1.13 rsync $BWLIMIT -vtP -e "$SSH_CMD" $iso/$file.* \ 1.14 ${SSH_HOST}:$SSH_ISO/$string 2>&1 | tee $synclog 1.15 done
2.1 --- a/web/cookiso.cgi Sat Mar 17 22:30:46 2012 +0100 2.2 +++ b/web/cookiso.cgi Sat Mar 17 22:39:11 2012 +0100 2.3 @@ -76,12 +76,7 @@ 2.4 case "${QUERY_STRING}" in 2.5 distro=*) 2.6 distro=${QUERY_STRING#distro=} 2.7 - if echo $distro | fgrep core-4in1; then 2.8 - ver=${distro%-core-4in1} 2.9 - log=$iso/slitaz-$ver.log 2.10 - else 2.11 - log=$iso/slitaz-$distro.log 2.12 - fi 2.13 + log=$iso/slitaz-${distro%-core-4in1}.log 2.14 . $SLITAZ/flavors/${distro#*-}/receipt 2.15 echo "<h2>Distro: $distro</h2>" 2.16 echo "<p>Description: $SHORT_DESC</p>"