# HG changeset patch
# User Christophe Lincoln <pankso@slitaz.org>
# Date 1398788448 -7200
# Node ID 464a844053636c86e4a1ece41827b88fb1f7d092
# Parent  9259857e24b93e7db3a7c91e99e728438e7c6172
sat: exit if wrong flavor, add cgi-adm packge to rpi-flavors

diff -r 9259857e24b9 -r 464a84405363 flavors/rpi-base/packages.list
--- a/flavors/rpi-base/packages.list	Mon Apr 28 22:02:06 2014 +0200
+++ b/flavors/rpi-base/packages.list	Tue Apr 29 18:20:48 2014 +0200
@@ -6,6 +6,7 @@
 slitaz-base-files
 slitaz-boot-scripts
 slitaz-configs-base
+slitaz-arm-adm
 slitaz-arm-rpi
 slitaz-tools
 spk
diff -r 9259857e24b9 -r 464a84405363 flavors/rpi-desktop/packages.list
--- a/flavors/rpi-desktop/packages.list	Mon Apr 28 22:02:06 2014 +0200
+++ b/flavors/rpi-desktop/packages.list	Tue Apr 29 18:20:48 2014 +0200
@@ -6,8 +6,9 @@
 slitaz-base-files
 slitaz-boot-scripts
 slitaz-configs-base
+slitaz-arm-adm
+slitaz-arm-configs
 slitaz-arm-rpi
-slitaz-arm-configs
 slitaz-tools
 slitaz-icon
 slitaz-polar-cursors
@@ -112,4 +113,5 @@
 alsa-utils
 mpg123
 lua
+sqlite
 raspberrypi-boot
diff -r 9259857e24b9 -r 464a84405363 sat
--- a/sat	Mon Apr 28 22:02:06 2014 +0200
+++ b/sat	Tue Apr 29 18:20:48 2014 +0200
@@ -56,6 +56,10 @@
 EOT
 }
 
+error() {
+	echo "[ $(colorize 31 'ERROR') ] $@"
+}
+
 # --> use libpkg.sh when released (function is shared with spk)
 # Check mirror ID: return 1 if no changes or mirror unreachable
 check_mirror_id() {
@@ -86,6 +90,12 @@
 		separator
 		rm -rf ${distro} && mkdir -p ${rootfs} ${cache}
 		
+		# We need a valid flavor
+		if [ "$flavor" ] && [ ! -f "$flavors/$flavor/packages.list" ]; then
+			error "Missing '$flavor' flavor packages.list" 
+			newline && exit 1
+		fi
+		
 		# Get --flavor= packages lists
 		if [ "$flavor" ]; then
 			echo -n "Getting $flavor packages.list..."
diff -r 9259857e24b9 -r 464a84405363 sat-rpi
--- a/sat-rpi	Mon Apr 28 22:02:06 2014 +0200
+++ b/sat-rpi	Tue Apr 29 18:20:48 2014 +0200
@@ -150,7 +150,8 @@
 		
 		# We may want to simply regenerate the RPi distro
 		if [ ! "$nosat" ]; then
-			sat gen --work="$work" --flavor="$flavor" --noinit --nolinux
+			sat gen --work="$work" --flavor="$flavor" \
+				--noinit --nolinux || exit 1
 		else
 			newline
 		fi