tazlito diff tazlito-wiz @ 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 | d7aa98b45a0f |
line diff
1.1 --- a/tazlito-wiz Thu Nov 05 21:48:22 2015 +0100 1.2 +++ b/tazlito-wiz Tue Nov 10 22:46:40 2015 +0100 1.3 @@ -77,15 +77,15 @@ 1.4 esac 1.5 # Deal with $main values 1.6 text=$(gettext "Getting flavor file and packages list...") 1.7 - (echo "30" && xterm='xterm -fa fixed-8 ' 1.8 - [ -z $(which xterm) ] && xterm='terminal' 1.9 - $xterm -geometry 80x10-0-0 -e tazpkg recharge 1.10 + (echo "30" && \ 1.11 + [ -z $(which xterm) ] && xterm='terminal' || xterm='xterm' 1.12 + $xterm -geometry 70x10-0-0 -e tazpkg recharge 1.13 name=$(echo $main | cut -d "|" -f 1) 1.14 skel=$(echo $main | cut -d "|" -f 2) 1.15 echo "$skel" > $live/skel 1.16 echo "60" 1.17 [ "$name" ] || name="custom" 1.18 - tazlito get-flavor $skel 1.19 + $xterm -geometry 60x12-0-0 -e tazlito get-flavor $skel 1.20 echo "90" && sleep 1 1.21 sed -i s"/^ISO_NAME=.*/ISO_NAME=\"$name\"/" tazlito.conf 1.22 sed -i s"/^VOLUM_NAME=.*/VOLUM_NAME=\"SliTaz $name\"/" \ 1.23 @@ -99,7 +99,7 @@ 1.24 text=$(eval_gettext "Packages - The \$skel has \$pkgs packages") 1.25 yad --form $opts --text="<b>$text</b>" --separator=" " \ 1.26 --field="$(gettext "Additional packages separated by space or by line:")\\n\(will be auto added to \'Edit packages list\'\)":TXT \ 1.27 - --button="$(gettext "Edit packages list"):2" \ 1.28 + --button="$(gettext "Edit packages list")!document-properties:2" \ 1.29 --button="gtk-cancel:1" --button="gtk-ok:0" --image=tazpkg 1.30 } 1.31