cookutils rev 339

cookiso: this time it should work
author Christophe Lincoln <pankso@slitaz.org>
date Sat Mar 17 22:58:41 2012 +0100 (2012-03-17)
parents 29926d2d8deb
children ab08b97140dc
files cookiso web/cookiso.cgi
line diff
     1.1 --- a/cookiso	Sat Mar 17 22:41:14 2012 +0100
     1.2 +++ b/cookiso	Sat Mar 17 22:58:41 2012 +0100
     1.3 @@ -145,7 +145,8 @@
     1.4  	export DROPBEAR_PASSWORD=none
     1.5  	for flavor in $flavors
     1.6  	do
     1.7 -		file=slitaz-${string}${flavor%-core-4in1}
     1.8 +		distro=slitaz-${string}-$flavor
     1.9 +		file=${distro%-core-4in1}
    1.10  		rsync $BWLIMIT -vtP -e "$SSH_CMD" $iso/$file.* \
    1.11  			${SSH_HOST}:$SSH_ISO/$string 2>&1 | tee $synclog
    1.12  	done
     2.1 --- a/web/cookiso.cgi	Sat Mar 17 22:41:14 2012 +0100
     2.2 +++ b/web/cookiso.cgi	Sat Mar 17 22:58:41 2012 +0100
     2.3 @@ -76,7 +76,8 @@
     2.4  case "${QUERY_STRING}" in
     2.5  	distro=*)
     2.6  		distro=${QUERY_STRING#distro=}
     2.7 -		log=$iso/slitaz-${distro%-core-4in1}.log
     2.8 +		ver=${distro%-core-4in1}
     2.9 +		log=$iso/slitaz-$ver.log
    2.10  		. $SLITAZ/flavors/${distro#*-}/receipt
    2.11  		echo "<h2>Distro: $distro</h2>"
    2.12  		echo "<p>Description: $SHORT_DESC</p>"