tazinst rev 19 3.92
tiny edits
author | Dominique Corbex <domcox@slitaz.org> |
---|---|
date | Fri Jan 03 19:02:02 2014 +0100 (2014-01-03) |
parents | dea6d5054908 |
children | 81aefe4fd7f9 |
files | installer.cgi slitaz-installer tazinst |
line diff
1.1 --- a/installer.cgi Fri Jan 03 18:01:10 2014 +0100 1.2 +++ b/installer.cgi Fri Jan 03 19:02:02 2014 +0100 1.3 @@ -11,7 +11,7 @@ 1.4 # restricted path 1.5 PATH="/usr/sbin:/usr/bin:/sbin:/bin" 1.6 1.7 -VERSION=3.91 1.8 +VERSION=3.92 1.9 1.10 # Common functions from libtazpanel 1.11 . lib/libtazpanel 1.12 @@ -164,7 +164,7 @@ 1.13 "$(gettext 'Enter the partition where SliTaz Live is located on 1.14 your USB Key')" 1.15 error="$?" 1.16 - select "$(/usr/sbin/tazinst list usb "$INSTFILE")" \ 1.17 + select "$(/usr/sbin/tazinst list usb "$INSTFILE" | cut -d' ' -f2)" \ 1.18 "$source" \ 1.19 "SRC_USB" 1.20 error_msg "$error" \ 1.21 @@ -272,7 +272,7 @@ 1.22 { 1.23 local home_uuid="$(/usr/sbin/tazinst get home_uuid "$INSTFILE")" 1.24 comment "home_uuid selection" 1.25 - h5 $(gettext "home partition") 1.26 + h5 "$(gettext "home partition")" 1.27 label "home_uuid" \ 1.28 "$(gettext 'Separate partition for /home:')" \ 1.29 "$(gettext 'Specify the partition containing /home')" 1.30 @@ -296,7 +296,7 @@ 1.31 { 1.32 local hostname="$(/usr/sbin/tazinst get hostname "$INSTFILE")" error 1.33 comment "hostname selection" 1.34 - h5 $(gettext "Hostname") 1.35 + h5 "$(gettext "Hostname")" 1.36 label "hostname" \ 1.37 "$(gettext 'Set Hostname to:')" \ 1.38 "$(gettext 'Hostname configuration allows you to specify the machine name')" 1.39 @@ -315,7 +315,7 @@ 1.40 { 1.41 local root_pwd="$(/usr/sbin/tazinst get root_pwd "$INSTFILE")" error 1.42 comment "root_pwd selection" 1.43 - h5 $(gettext "Root superuser") 1.44 + h5 "$(gettext "Root superuser")" 1.45 label "root_pwd" \ 1.46 "$(gettext 'Root passwd:')" \ 1.47 "$(gettext 'Enter the password for root')" 1.48 @@ -333,7 +333,7 @@ 1.49 { 1.50 local user_login="$(/usr/sbin/tazinst get user_login "$INSTFILE")" error 1.51 comment "user_login selection" 1.52 - h5 $(gettext "User") 1.53 + h5 "$(gettext "User")" 1.54 label "user_login" \ 1.55 "$(gettext 'User login:')" \ 1.56 "$(gettext 'Enter the name of the first user')" 1.57 @@ -369,7 +369,7 @@ 1.58 { 1.59 local bootloader="$(/usr/sbin/tazinst get bootloader "$INSTFILE")" error 1.60 comment "bootloader selection" 1.61 - h5 $(gettext "Bootloader") 1.62 + h5 "$(gettext "Bootloader")" 1.63 input "checkbox" \ 1.64 "bootloader" \ 1.65 "auto" \ 1.66 @@ -450,7 +450,7 @@ 1.67 1.68 save_settings() 1.69 { 1.70 - h5 $(gettext "Checking settings...") 1.71 + h5 "$(gettext "Checking settings...")" 1.72 # install type 1.73 /usr/sbin/tazinst set media "$(GET MEDIA)" "$INSTFILE" 1.74 # source File
2.1 --- a/slitaz-installer Fri Jan 03 18:01:10 2014 +0100 2.2 +++ b/slitaz-installer Fri Jan 03 19:02:02 2014 +0100 2.3 @@ -12,7 +12,7 @@ 2.4 TAZINST_REQUIRED_VERSION="2.98" 2.5 BACKLIST="SliTaz GNU/Linux installer" 2.6 DIALOG=dialog 2.7 -VERSION="3.91" 2.8 +VERSION="3.92" 2.9 2.10 #-------------- 2.11 # msgs section
3.1 --- a/tazinst Fri Jan 03 18:01:10 2014 +0100 3.2 +++ b/tazinst Fri Jan 03 19:02:02 2014 +0100 3.3 @@ -33,7 +33,7 @@ 3.4 [ -r /etc/slitaz/tazinst.conf ] && . /etc/slitaz/tazinst.conf 3.5 3.6 # version 3.7 -readonly VERSION=3.91 3.8 +readonly VERSION=3.92 3.9 3.10 # i18n 3.11 . /usr/bin/gettext.sh 3.12 @@ -847,7 +847,7 @@ 3.13 media="$media $key" 3.14 esac 3.15 done 3.16 - printf "%s" "$media" | sed 's/^\s//' 3.17 + printf "%s\n" "$media" | sed 's/^\s//' 3.18 } 3.19 3.20 list_usb() 3.21 @@ -863,7 +863,7 @@ 3.22 DEV=$1 3.23 gsub(/:/,"",DEV) 3.24 } 3.25 - /UUID/ { 3.26 + /^UUID/ { 3.27 UUID=$1 3.28 gsub(/"/,"",UUID) 3.29 printf "%s %s\n",UUID,DEV}'