# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1428766838 -7200
# Node ID 7034b53ca07c5fb141a359e12ba3bb272914094c
# Parent  47e39240dfce661c48f22366d059dea87813f7cb
 Up to latest: tazinst-gui, tazinst, tazpanel

diff -r 47e39240dfce -r 7034b53ca07c syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Sat Apr 11 17:49:13 2015 +0300
+++ b/syslinux/stuff/iso2exe/taziso	Sat Apr 11 17:40:38 2015 +0200
@@ -258,6 +258,9 @@
 {
 	if [ -b "$1" ]; then
 		device=$1
+	elif [ "$1" ]; then
+		echo "Invalid Windows partition"
+		return 1
 	else
 		DEV="$(blkid | grep -iE "(msdos|vfat|ntfs)" | sed 's/:.*//;s|/dev/||')"
 		[ "$DEV" ] || return
@@ -506,9 +509,10 @@
 
 tazboot()
 {
-	$DIALOG --clear \
-		--title " SliTaz bootloader for DOS " \
-		--yes-label "Install" --yesno \
+	if [ -z "$1" ]; then
+		$DIALOG --clear \
+			--title " SliTaz bootloader for DOS " \
+			--yes-label "Install" --yesno \
 "\nThe file TAZBOOT.EXE will be created in the top directory. It supports
 any linux kernel, multiple initramfs, a kernel command line and
 an ISO image file loopback (retrieves files from an ISO file).\n\n
@@ -523,16 +527,18 @@
   kernel=\\slitaz\\vmlinuz root=/dev/sda5 ro\n\n
 Unlike GRUB4DOS, it doesn't require unfragmented ISO image files.\n
 " 24 78
-	[ $? -eq 0 ] || return
+		[ $? -eq 0 ] || return
+	fi
 	gettazboot tazboot.exe
 }
 
 md5()
 {
 	dotwait "Checking files"
-	( cd /media/cdrom ; ${1:-md5sum -c md5sum*} ) > /tmp/data
+	( cd /media/cdrom ; ${md5sum:-md5sum -c md5sum*} ) > /tmp/data
+	unset md5sum
 	rm -f /tmp/wait
-	if [ "$1 "]; then
+	if [ "$1" ]; then
 		cat /tmp/data
 	else
 		$DIALOG --clear \
@@ -555,7 +561,8 @@
 {
 	gotcdfile 'sha*sum*'
 	sha=$(basename $file)
-	md5 "${sha%sum*}sum -c ${file#/media/cdrom/}" $@
+	md5sum="${sha%sum*}sum -c ${file#/media/cdrom/}"
+	md5 $@
 }
 
 readme()
@@ -572,7 +579,7 @@
 
 bzimage()
 {
-	if [ "$1" ]; then
+	if [ -z "$1" ]; then
 		$DIALOG --clear \
 			--title " Create linux.exe ? " \
 			--yes-label "Install" --yesno \
@@ -652,15 +659,17 @@
 pxe()
 {
 	gotcdfile '?pxe'
-	$DIALOG --clear \
-		--title " Create $(basename $file).exe ? " \
-		--yes-label "Install" --yesno \
+	if [ -z "$1" ]; then
+		$DIALOG --clear \
+			--title " Create $(basename $file).exe ? " \
+			--yes-label "Install" --yesno \
 "\nBoot your operating system from the internet and enjoy a full system
 working entirely in RAM with speed and stability in mind. The Linux Kernel
 and the complete SliTaz compressed root filesystem will be loaded into RAM
 from the Web using PXE and HTTP protocols.\n
 " 12 70
-	[ $? -eq 0 ] || return
+		[ $? -eq 0 ] || return
+	fi
 	cp $file $(basename $file).exe
 }
 
@@ -780,7 +789,7 @@
 		echo "OK" || echo "ERROR"
 	fi
 	rm -f /tmp/wait
-	[ "$1" ] || return 0
+	[ "$1" ] && return 0
 	echo -e "\rPress RETURN to continue."
 	read n
 }
@@ -824,6 +833,9 @@
 {
 	if [ -b "$1" ]; then
 		device=$1
+	elif [ "$1" ]; then
+		echo "Invalid USB key device"
+		return 1 
 	else
 		$DIALOG --clear \
 			--title " Create a USB boot key " \
@@ -938,6 +950,13 @@
 [ -z "$(isiso 2> /dev/null)" ] && echo "Usage : $0 file.iso" && exit 1
 mount -o loop,ro $ISO /media/cdrom
 
+if [ "$2" == "list" ]; then
+	sed '/^\$(.*") \\/!d;s/^\$(\(.*\)").*/\1"/' $0 | while read line; do
+		eval $line
+		echo
+	done | sed '/^$/d;/"usbkey"/d'
+	quit
+fi
 if grep -q "^$2()" $0; then
 	exe=$2
 	shift 2
diff -r 47e39240dfce -r 7034b53ca07c tazinst-gui/receipt
--- a/tazinst-gui/receipt	Sat Apr 11 17:49:13 2015 +0300
+++ b/tazinst-gui/receipt	Sat Apr 11 17:40:38 2015 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="tazinst-gui"
-VERSION="52"
+VERSION="53"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz installer (Gui frontend)."
 MAINTAINER="domcox@slitaz.org"
diff -r 47e39240dfce -r 7034b53ca07c tazinst/receipt
--- a/tazinst/receipt	Sat Apr 11 17:49:13 2015 +0300
+++ b/tazinst/receipt	Sat Apr 11 17:40:38 2015 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="tazinst"
-VERSION="52"
+VERSION="53"
 CATEGORY="base-system"
 SHORT_DESC="SliTaz installer."
 MAINTAINER="domcox@slitaz.org"
diff -r 47e39240dfce -r 7034b53ca07c tazpanel/receipt
--- a/tazpanel/receipt	Sat Apr 11 17:49:13 2015 +0300
+++ b/tazpanel/receipt	Sat Apr 11 17:40:38 2015 +0200
@@ -1,7 +1,7 @@
 # SliTaz package receipt.
 
 PACKAGE="tazpanel"
-VERSION="453"
+VERSION="454"
 CATEGORY="system-tools"
 SHORT_DESC="SliTaz administration and configuration panel."
 MAINTAINER="pankso@slitaz.org"