tazlito rev 389

get-flavor: run "upgrade-flavor" before extracting
author Xander Ziiryanoff <psychomaniak@xakep.ru>
date Tue Nov 10 22:46:40 2015 +0100 (2015-11-10)
parents 5d7c04a1ac79
children cd5dddebaa7c
files tazlito tazlito-wiz
line diff
     1.1 --- a/tazlito	Thu Nov 05 21:48:22 2015 +0100
     1.2 +++ b/tazlito	Tue Nov 10 22:46:40 2015 +0100
     1.3 @@ -92,7 +92,7 @@
     1.4    gen-flavor      Generate a new live-CD description.
     1.5    gen-liveflavor  Generate a live-CD description from current system.
     1.6    show-flavor     Show live-CD description.
     1.7 -  get-flavor      Get a flavor's list of packages.
     1.8 +  get-flavor      Get a flavor's list of packages ( --noup to skip upgrade).
     1.9    upgrade-flavor  Update package list to the latest available versions.
    1.10    extract-flavor  Extract a (*.flavor) flavor into $FLAVORS_REPOSITORY.
    1.11    pack-flavor     Pack (and update) a flavor from $FLAVORS_REPOSITORY.
    1.12 @@ -1762,6 +1762,7 @@
    1.13  			mkdir -p $DISTRO
    1.14  			status
    1.15  			mkdir $TMP_DIR
    1.16 +			[ -z $noup ] || tazlito upgrade-flavor $FLAVOR.flavor
    1.17  			echo -n "Extracting flavor $FLAVOR.flavor... "
    1.18  			zcat < $FLAVOR.flavor | ( cd $TMP_DIR; cpio -i --quiet >/dev/null )
    1.19  			status
     2.1 --- a/tazlito-wiz	Thu Nov 05 21:48:22 2015 +0100
     2.2 +++ b/tazlito-wiz	Tue Nov 10 22:46:40 2015 +0100
     2.3 @@ -77,15 +77,15 @@
     2.4  	esac
     2.5  	# Deal with $main values
     2.6  	text=$(gettext "Getting flavor file and packages list...")
     2.7 -	(echo "30" && xterm='xterm -fa fixed-8 '
     2.8 -	[ -z $(which xterm) ] && xterm='terminal'
     2.9 -	$xterm -geometry 80x10-0-0 -e tazpkg recharge
    2.10 +	(echo "30" && \
    2.11 +	[ -z $(which xterm) ] && xterm='terminal' || xterm='xterm'
    2.12 +	$xterm -geometry 70x10-0-0 -e tazpkg recharge
    2.13  	name=$(echo $main | cut -d "|" -f 1)
    2.14  	skel=$(echo $main | cut -d "|" -f 2)
    2.15  	echo "$skel" > $live/skel
    2.16  	echo "60"
    2.17  	[ "$name" ] || name="custom"
    2.18 -	tazlito get-flavor $skel
    2.19 +	$xterm -geometry 60x12-0-0 -e tazlito get-flavor $skel
    2.20  	echo "90" && sleep 1
    2.21  	sed -i s"/^ISO_NAME=.*/ISO_NAME=\"$name\"/" tazlito.conf
    2.22  	sed -i s"/^VOLUM_NAME=.*/VOLUM_NAME=\"SliTaz $name\"/" \
    2.23 @@ -99,7 +99,7 @@
    2.24  	text=$(eval_gettext "Packages - The \$skel has \$pkgs packages")
    2.25  	yad --form $opts --text="<b>$text</b>" --separator=" " \
    2.26  		--field="$(gettext "Additional packages separated by space or by line:")\\n\(will be auto added to \'Edit packages list\'\)":TXT \
    2.27 -		--button="$(gettext "Edit packages list"):2" \
    2.28 +		--button="$(gettext "Edit packages list")!document-properties:2" \
    2.29  		--button="gtk-cancel:1" --button="gtk-ok:0" --image=tazpkg
    2.30  }
    2.31