# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1209900830 0
# Node ID 9dce06cbb12e8cf64fac3f67b9795c063a6c91db
# Parent  d23c06d2d05366b6762f84d886d6d18b9bfebb20
gen-liveflavor: add non-free support

diff -r d23c06d2d053 -r 9dce06cbb12e tazlito
--- a/tazlito	Sat May 03 12:58:47 2008 +0000
+++ b/tazlito	Sun May 04 11:33:50 2008 +0000
@@ -578,7 +578,7 @@
 		'')	echo -n "Flavor name : "
 			read FLAVOR
 			[ -z "$FLAVOR" ] && exit 1;;
-		-?|-h*|--help) cat <<EOT
+		-?|-h*|--help) echo -e "
 
 SliTaz Live Tool - Version: $VERSION
 \033[1mUsage: \033[0m `basename $0` gen-liveflavor flavor-name [flavor-patch-file]
@@ -586,6 +586,7 @@
 code	data
 +	package to add
 -	package to remove
+!	non-free package to add
 ?	display message
 @	flavor description
 
@@ -593,7 +594,7 @@
 @	Developper tools for slitaz maintainers
 +	slitaz-toolchain
 +	mercurial
-EOT
+"
 			exit 1;;
 		esac
 		mv /etc/tazlito/distro-packages.list \
@@ -604,6 +605,7 @@
 			case "$action" in
 			+)	yes | tazpkg get-install $pkg;;
 			-)	yes | tazpkg remove $pkg;;
+			!)	echo $pkg >> non-free.list;;
 			@)	DESC="$pkg";;
 			\?)	echo -en "$pkg"; read action;;
 			esac