# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1332020351 -3600
# Node ID 103ba393cb28b708b14c9142dd0d32b061d22ba6
# Parent  bc3591cd6e77d96eb7b77a02f9480ec2978b5bac
cookiso and cgi do it better for default iso

diff -r bc3591cd6e77 -r 103ba393cb28 cookiso
--- a/cookiso	Sat Mar 17 22:30:46 2012 +0100
+++ b/cookiso	Sat Mar 17 22:39:11 2012 +0100
@@ -145,11 +145,7 @@
 	export DROPBEAR_PASSWORD=none
 	for flavor in $flavors
 	do
-		if echo $flavor | fgrep core-4in1; then
-			file=slitaz-$string
-		else
-			file=slitaz-$string-$flavor
-		fi
+		file=slitaz-${string}${$flavor%-core-4in1}.*
 		rsync $BWLIMIT -vtP -e "$SSH_CMD" $iso/$file.* \
 			${SSH_HOST}:$SSH_ISO/$string 2>&1 | tee $synclog
 	done
diff -r bc3591cd6e77 -r 103ba393cb28 web/cookiso.cgi
--- a/web/cookiso.cgi	Sat Mar 17 22:30:46 2012 +0100
+++ b/web/cookiso.cgi	Sat Mar 17 22:39:11 2012 +0100
@@ -76,12 +76,7 @@
 case "${QUERY_STRING}" in
 	distro=*)
 		distro=${QUERY_STRING#distro=}
-		if echo $distro | fgrep core-4in1; then
-			ver=${distro%-core-4in1}
-			log=$iso/slitaz-$ver.log
-		else
-			log=$iso/slitaz-$distro.log
-		fi
+		log=$iso/slitaz-${distro%-core-4in1}.log
 		. $SLITAZ/flavors/${distro#*-}/receipt
 		echo "<h2>Distro: $distro</h2>"
 		echo "<p>Description: $SHORT_DESC</p>"