# HG changeset patch
# User Xander Ziiryanoff <psychomaniak@xakep.ru>
# Date 1447192000 -3600
# Node ID 6e2c8b742f47afafe4dc057c809eec84b7909c3a
# Parent  5d7c04a1ac79a6a24471ee09712feb2973c040df
get-flavor: run "upgrade-flavor" before extracting

diff -r 5d7c04a1ac79 -r 6e2c8b742f47 tazlito
--- a/tazlito	Thu Nov 05 21:48:22 2015 +0100
+++ b/tazlito	Tue Nov 10 22:46:40 2015 +0100
@@ -92,7 +92,7 @@
   gen-flavor      Generate a new live-CD description.
   gen-liveflavor  Generate a live-CD description from current system.
   show-flavor     Show live-CD description.
-  get-flavor      Get a flavor's list of packages.
+  get-flavor      Get a flavor's list of packages ( --noup to skip upgrade).
   upgrade-flavor  Update package list to the latest available versions.
   extract-flavor  Extract a (*.flavor) flavor into $FLAVORS_REPOSITORY.
   pack-flavor     Pack (and update) a flavor from $FLAVORS_REPOSITORY.
@@ -1762,6 +1762,7 @@
 			mkdir -p $DISTRO
 			status
 			mkdir $TMP_DIR
+			[ -z $noup ] || tazlito upgrade-flavor $FLAVOR.flavor
 			echo -n "Extracting flavor $FLAVOR.flavor... "
 			zcat < $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i --quiet >/dev/null )
 			status
diff -r 5d7c04a1ac79 -r 6e2c8b742f47 tazlito-wiz
--- a/tazlito-wiz	Thu Nov 05 21:48:22 2015 +0100
+++ b/tazlito-wiz	Tue Nov 10 22:46:40 2015 +0100
@@ -77,15 +77,15 @@
 	esac
 	# Deal with $main values
 	text=$(gettext "Getting flavor file and packages list...")
-	(echo "30" && xterm='xterm -fa fixed-8 '
-	[ -z $(which xterm) ] && xterm='terminal'
-	$xterm -geometry 80x10-0-0 -e tazpkg recharge
+	(echo "30" && \
+	[ -z $(which xterm) ] && xterm='terminal' || xterm='xterm'
+	$xterm -geometry 70x10-0-0 -e tazpkg recharge
 	name=$(echo $main | cut -d "|" -f 1)
 	skel=$(echo $main | cut -d "|" -f 2)
 	echo "$skel" > $live/skel
 	echo "60"
 	[ "$name" ] || name="custom"
-	tazlito get-flavor $skel
+	$xterm -geometry 60x12-0-0 -e tazlito get-flavor $skel
 	echo "90" && sleep 1
 	sed -i s"/^ISO_NAME=.*/ISO_NAME=\"$name\"/" tazlito.conf
 	sed -i s"/^VOLUM_NAME=.*/VOLUM_NAME=\"SliTaz $name\"/" \
@@ -99,7 +99,7 @@
 	text=$(eval_gettext "Packages - The \$skel has \$pkgs packages")
 	yad --form $opts --text="<b>$text</b>" --separator=" " \
 		--field="$(gettext "Additional packages separated by space or by line:")\\n\(will be auto added to \'Edit packages list\'\)":TXT \
-		--button="$(gettext "Edit packages list"):2" \
+		--button="$(gettext "Edit packages list")!document-properties:2" \
 		--button="gtk-cancel:1" --button="gtk-ok:0" --image=tazpkg
 }