SliTaz Repositories

     1.1 --- a/cookiso	Thu Feb 22 15:44:11 2018 +0200
     1.2 +++ b/cookiso	Mon Mar 05 09:00:17 2018 +0100
     1.3 @@ -117,11 +117,12 @@
     1.4  	mkdir -p $cache; cd $cache
     1.5  	rm -rf *.flavor *.list *.conf *.sh
     1.6  	for flavor in $flavors; do
     1.7 -		if [ "$flavor" != 'core-4in1' ]; then
     1.8 -			name="slitaz-$string-$flavor"
     1.9 -		else
    1.10 -			name="slitaz-$string"
    1.11 -		fi
    1.12 +		case "$flavor" in
    1.13 +		core-*in1)
    1.14 +			name="slitaz-$string-$flavor" ;;
    1.15 +		*)
    1.16 +			name="slitaz-$string" ;;
    1.17 +		esac
    1.18  
    1.19  		log="$iso/$name.log"
    1.20  		for i in $(seq 9 -1 1); do # Rotate log
    1.21 @@ -159,7 +160,7 @@
    1.22  	export DROPBEAR_PASSWORD=none
    1.23  	for flavor in $flavors; do
    1.24  		distro="slitaz-${string}-$flavor"
    1.25 -		file="${distro%-core-4in1}"
    1.26 +		file="${distro%-core-*in1}"
    1.27  		rsync $BWLIMIT -vtP -e "$SSH_CMD" $iso/$file.??? \
    1.28  			${SSH_HOST}:$SSH_ISO/$string 2>&1 | tee $synclog
    1.29  	done
    1.30 @@ -211,9 +212,9 @@
    1.31  		echo -e "\nGenerating flavors:\n$flavors"
    1.32  		gen_flavors ;;
    1.33  
    1.34 -	4in1)
    1.35 -		echo -e "\nGenerating 4in1 distros..."
    1.36 -		flavors="base justx gtkonly core core-4in1"
    1.37 +	*in1)
    1.38 +		echo -e "\nGenerating $1 distros..."
    1.39 +		flavors="base justx gtkonly core core-$1"
    1.40  		gen_flavors ;;
    1.41  
    1.42  	rolling)