# HG changeset patch
# User Dominique Corbex <domcox@slitaz.org>
# Date 1388772122 -3600
# Node ID eba42025e5c1f8f804f401bdcb0b99ada95d5287
# Parent  dea6d5054908775519a90696c37f00ebdddba37b
tiny edits

diff -r dea6d5054908 -r eba42025e5c1 installer.cgi
--- a/installer.cgi	Fri Jan 03 18:01:10 2014 +0100
+++ b/installer.cgi	Fri Jan 03 19:02:02 2014 +0100
@@ -11,7 +11,7 @@
 # restricted path
 PATH="/usr/sbin:/usr/bin:/sbin:/bin"
 
-VERSION=3.91
+VERSION=3.92
 
 # Common functions from libtazpanel
 . lib/libtazpanel
@@ -164,7 +164,7 @@
 			"$(gettext 'Enter the partition where SliTaz Live is located on
  your USB Key')"
 		error="$?"
-		select "$(/usr/sbin/tazinst list usb "$INSTFILE")" \
+		select "$(/usr/sbin/tazinst list usb "$INSTFILE" | cut -d' ' -f2)" \
 			"$source" \
 			"SRC_USB"
 		error_msg "$error" \
@@ -272,7 +272,7 @@
 {
 	local home_uuid="$(/usr/sbin/tazinst get home_uuid "$INSTFILE")"
 	comment "home_uuid selection"
-	h5 $(gettext "home partition")
+	h5 "$(gettext "home partition")"
 	label "home_uuid" \
 		"$(gettext 'Separate partition for /home:')" \
 		"$(gettext 'Specify the partition containing /home')"
@@ -296,7 +296,7 @@
 {
 	local hostname="$(/usr/sbin/tazinst get hostname "$INSTFILE")" error
 	comment "hostname selection"
-	h5 $(gettext "Hostname")
+	h5 "$(gettext "Hostname")"
 	label "hostname" \
 		"$(gettext 'Set Hostname to:')" \
 		"$(gettext 'Hostname configuration allows you to specify the machine name')"
@@ -315,7 +315,7 @@
 {
 	local root_pwd="$(/usr/sbin/tazinst get root_pwd "$INSTFILE")" error
 	comment "root_pwd selection"
-	h5 $(gettext "Root superuser")
+	h5 "$(gettext "Root superuser")"
 	label "root_pwd" \
 		"$(gettext 'Root passwd:')" \
 		"$(gettext 'Enter the password for root')"
@@ -333,7 +333,7 @@
 {
 	local user_login="$(/usr/sbin/tazinst get user_login "$INSTFILE")" error
 	comment "user_login selection"
-	h5 $(gettext "User")
+	h5 "$(gettext "User")"
 	label "user_login" \
 		"$(gettext 'User login:')" \
 		"$(gettext 'Enter the name of the first user')"
@@ -369,7 +369,7 @@
 {
 	local bootloader="$(/usr/sbin/tazinst get bootloader "$INSTFILE")" error
 	comment "bootloader selection"
-	h5 $(gettext "Bootloader")
+	h5 "$(gettext "Bootloader")"
 	input "checkbox" \
 		"bootloader" \
 		"auto" \
@@ -450,7 +450,7 @@
 
 save_settings()
 {
-	h5 $(gettext "Checking settings...")
+	h5 "$(gettext "Checking settings...")"
 	# install type
 	/usr/sbin/tazinst set media "$(GET MEDIA)" "$INSTFILE"
 	# source File
diff -r dea6d5054908 -r eba42025e5c1 slitaz-installer
--- a/slitaz-installer	Fri Jan 03 18:01:10 2014 +0100
+++ b/slitaz-installer	Fri Jan 03 19:02:02 2014 +0100
@@ -12,7 +12,7 @@
 TAZINST_REQUIRED_VERSION="2.98"
 BACKLIST="SliTaz GNU/Linux installer"
 DIALOG=dialog
-VERSION="3.91"
+VERSION="3.92"
 
 #--------------
 # msgs section
diff -r dea6d5054908 -r eba42025e5c1 tazinst
--- a/tazinst	Fri Jan 03 18:01:10 2014 +0100
+++ b/tazinst	Fri Jan 03 19:02:02 2014 +0100
@@ -33,7 +33,7 @@
 [ -r /etc/slitaz/tazinst.conf ] && . /etc/slitaz/tazinst.conf
 
 # version
-readonly VERSION=3.91
+readonly VERSION=3.92
 
 # i18n
 . /usr/bin/gettext.sh
@@ -847,7 +847,7 @@
 				media="$media $key"
 		esac
 	done
-	printf "%s" "$media" | sed 's/^\s//'
+	printf "%s\n" "$media" | sed 's/^\s//'
 }
 
 list_usb()
@@ -863,7 +863,7 @@
 							DEV=$1
 							gsub(/:/,"",DEV)
 						}
-						/UUID/ {
+						/^UUID/ {
 							UUID=$1
 							gsub(/"/,"",UUID)
 							printf "%s %s\n",UUID,DEV}'