# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1520236817 -3600
# Node ID ac5d3d0f9b3ca72fc78d308798ff282f341a8711
# Parent  54c97f545127aaa76074490091b2f0e06eddc5de
cookiso: not 4 russian dolls only

diff -r 54c97f545127 -r ac5d3d0f9b3c cookiso
--- a/cookiso	Thu Feb 22 15:44:11 2018 +0200
+++ b/cookiso	Mon Mar 05 09:00:17 2018 +0100
@@ -117,11 +117,12 @@
 	mkdir -p $cache; cd $cache
 	rm -rf *.flavor *.list *.conf *.sh
 	for flavor in $flavors; do
-		if [ "$flavor" != 'core-4in1' ]; then
-			name="slitaz-$string-$flavor"
-		else
-			name="slitaz-$string"
-		fi
+		case "$flavor" in
+		core-*in1)
+			name="slitaz-$string-$flavor" ;;
+		*)
+			name="slitaz-$string" ;;
+		esac
 
 		log="$iso/$name.log"
 		for i in $(seq 9 -1 1); do # Rotate log
@@ -159,7 +160,7 @@
 	export DROPBEAR_PASSWORD=none
 	for flavor in $flavors; do
 		distro="slitaz-${string}-$flavor"
-		file="${distro%-core-4in1}"
+		file="${distro%-core-*in1}"
 		rsync $BWLIMIT -vtP -e "$SSH_CMD" $iso/$file.??? \
 			${SSH_HOST}:$SSH_ISO/$string 2>&1 | tee $synclog
 	done
@@ -211,9 +212,9 @@
 		echo -e "\nGenerating flavors:\n$flavors"
 		gen_flavors ;;
 
-	4in1)
-		echo -e "\nGenerating 4in1 distros..."
-		flavors="base justx gtkonly core core-4in1"
+	*in1)
+		echo -e "\nGenerating $1 distros..."
+		flavors="base justx gtkonly core core-$1"
 		gen_flavors ;;
 
 	rolling)