# HG changeset patch
# User Hans-G?nter Theisgen
# Date 1550073650 -3600
# Node ID 42cc18501ba6568c31d78ef8f6505cabb650fe44
# Parent  c552db5929eb70646bd0eec03d7d5543a1bf6ed8# Parent  02994416f01715b41567b1c36f99c773f81c4b64
updated cd-discid (1.1 -> 1.4)

diff -r c552db5929eb -r 42cc18501ba6 cpige/receipt
--- a/cpige/receipt	Wed Feb 13 16:59:39 2019 +0100
+++ b/cpige/receipt	Wed Feb 13 17:00:50 2019 +0100
@@ -38,9 +38,9 @@
 	cp -a $src/cpige $fs/usr/bin
 	cp -a $src/gui/cpigeGUI $fs/usr/bin
 
-	mkdir -p $fs/usr/share/doc/cpige
+	mkdir -p $fs/usr/share/doc/cpige $install/usr/share/man
 	cp -a $src/cpige.conf.example $fs/usr/share/doc/cpige
-#	cp -a $src/cpige.1.gz $fs/usr/share/doc/cpige
+	cp -a $src/cpige.1.gz $install/usr/share/man
 
 	# Because there is no label msgfmt in Makefile:
 	mkdir -p $fs/usr/share/locale/fr/LC_MESSAGES
diff -r c552db5929eb -r 42cc18501ba6 syslinux/stuff/iso2exe/README
--- a/syslinux/stuff/iso2exe/README	Wed Feb 13 16:59:39 2019 +0100
+++ b/syslinux/stuff/iso2exe/README	Wed Feb 13 17:00:50 2019 +0100
@@ -44,11 +44,11 @@
 
 ISO9660 format begins with 32Kb unused (16 sectors). Some programs may use it:
 
-- isolinux uses the first 512 bytes for hybrid iso boot (ISO image in a 
+- isolinux uses the first 512 bytes for hybrid iso boot (ISO image in a
   partition).
 - tazlito stores extra flavor info at the 2nd Kb for 'tazlito iso2flavor'.
 
-The iso2exe tool moves the isolinux boot sector, installs its own boot sector 
+The iso2exe tool moves the isolinux boot sector, installs its own boot sector
 with a DOS .EXE header, and adds a WIN32 .EXE installer, a DOS .COM Linux
 loader, a floppy bootstrap and an initramfs in the end of the first 32Kb.
 
@@ -73,7 +73,7 @@
     +-----------------+
     |  iso2exe boot + | Boot starts isohybrid (2), .EXE starts DOS .COM loader
     |  WIN32 PE .exe  | NT+ boot device creator / Win9x DOS .COM launcher.
-  0 +-----------------+ 
+  0 +-----------------+
 
 (1) The following script will show computed and stored md5 hash
 #!/bin/sh
diff -r c552db5929eb -r 42cc18501ba6 syslinux/stuff/iso2exe/init
--- a/syslinux/stuff/iso2exe/init	Wed Feb 13 16:59:39 2019 +0100
+++ b/syslinux/stuff/iso2exe/init	Wed Feb 13 17:00:50 2019 +0100
@@ -70,7 +70,7 @@
 		--menu|--radiolist)
 			[ "$1" == "--menu" ] && shft=2 || shft=3
 			label=""
-			[ "$2" ] && label="\n$2" 
+			[ "$2" ] && label="\n$2"
 			shift 5
 			echo -e "$title$label\n0	Cancel" > /tmp/data
 			n=1
@@ -372,19 +372,17 @@
 
 install()
 {
-	$DIALOG --clear \
-		--title " SliTaz UMSDOS way installation " \
+	$DIALOG --clear --title " SliTaz UMSDOS way installation " \
 		--yes-label "Install" --yesno \
 "\nSliTaz will be installed in the subdirectory \\slitaz of the current
 DOS/Windows partition. You will see your files from /mnt/dos.\n\n
 You can start SliTaz with \\slitaz\\boot\\tazboot.exe\n\n
 To uninstall SliTaz, you have only to remove this directory.
 The file \\boot.ini or \\config.sys may be modified too.\n\n
-SliTaz may run slowly on the 'UMSDOS way' installation due to the 
+SliTaz may run slowly on the 'UMSDOS way' installation due to the
 posixovl filesystem. The 'TAZUSB way' installation runs faster.\n\n
 To do a traditional installation with disk partitioning,
-start SliTaz Live with the 'SliTaz RAM boot' menu.\n
-" 19 70
+start SliTaz Live with the 'SliTaz RAM boot' menu.\n" 19 70
 	[ $? -eq 0 ] || return
 	doinstall || return
 	[ -x /mnt/slitaz/sbin/init ] || return
@@ -395,8 +393,7 @@
 
 installtaz()
 {
-	$DIALOG --clear \
-		--title " SliTaz TAZUSB way installation " \
+	$DIALOG --clear --title " SliTaz TAZUSB way installation " \
 		--yes-label "Install" --yesno \
 "\nSliTaz will be installed in the subdirectory \\slitaz of the current
 DOS/Windows partition. You will see your files from /mnt/dos.\n\n
@@ -406,11 +403,10 @@
 The filesystem is loaded entirely into memory upon boot to
 increase responsiveness. Only /home lands on the hard disk.\n\n
 To do a traditional installation with disk partitioning,
-start SliTaz Live with the 'SliTaz RAM boot' menu.\n
-" 19 70
+start SliTaz Live with the 'SliTaz RAM boot' menu.\n" 19 70
 	[ $? -eq 0 ] || return
 	doinstall tazusblike || return
-	dotwait 
+	dotwait
 	if [ -d /media/cdrom/fs ]; then
 		cp -a /media/cdrom/fs/. /
 	else
@@ -433,13 +429,12 @@
 
 tazboot()
 {
-	$DIALOG --clear \
-		--title " SliTaz bootloader for DOS " \
+	$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
-Usage: tazboot.exe [[@commands]|[kernel=<bzimage>] 
+Usage: tazboot.exe [[@commands]|[kernel=<bzimage>]
 [initrd=<rootfs>[,<rootfs2>...]] [bootfrom=<isofile>] cmdline args ...]\n\n
 Defaults: tazboot @tazboot.cmd or tazboot kernel=bzImage auto\n\n\
 Examples for tazboot.cmd:\n\n\
@@ -448,8 +443,7 @@
   initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz\n\
   rw root=/dev/null autologin\n\n\
   kernel=\\slitaz\\vmlinuz root=/dev/sda5 ro\n\n
-Unlike GRUB4DOS, it doesn't require unfragmented ISO image files.\n
-" 24 78
+Unlike GRUB4DOS, it doesn't require unfragmented ISO image files.\n" 24 78
 	[ $? -eq 0 ] || return
 	gettazboot /mnt/tazboot.exe
 }
@@ -459,9 +453,7 @@
 	dotwait "Checking files"
 	( cd /media/cdrom ; ${1:-md5sum -c md5sum*} | sort ) > /tmp/data
 	rm -f /tmp/wait
-	$DIALOG --clear \
-		--title " Checked files " \
-		--textbox /tmp/data 24 78
+	$DIALOG --clear --title " Checked files " --textbox /tmp/data 24 78
 	rm -f /tmp/data
 }
 
@@ -484,22 +476,18 @@
 readme()
 {
 	gotcdfile "README*"
-	$DIALOG --clear \
-		--title " Readme " \
-		--textbox $file 24 78
+	$DIALOG --clear --title " Readme " --textbox $file 24 78
 }
 
 bootlog()
 {
-	$DIALOG --clear \
-		--title " Linux boot messages " \
+	$DIALOG --clear --title " Linux boot messages " \
 		--textbox /tmp/dmesg 24 78
 }
 
 bzimage()
 {
-	$DIALOG --clear \
-		--title " Create linux.exe ? " \
+	$DIALOG --clear --title " Create linux.exe ? " \
 		--yes-label "Install" --yesno \
 "\nLinux.exe launches the linux kernel under DOS (in real mode only).
 The cmdline arguments are supported except initrd=,
@@ -512,13 +500,11 @@
 
 memtest()
 {
-	$DIALOG --clear \
-		--title " Create memtest.exe ? " \
+	$DIALOG --clear --title " Create memtest.exe ? " \
 		--yes-label "Install" --yesno \
 "\nMemtest86 is a thorough, stand alone memory test for x86 architecture
 computers. BIOS based memory tests are a quick, cursory check and often
-miss many of the failures that are detected by Memtest86.\n
-" 12 70
+miss many of the failures that are detected by Memtest86.\n" 12 70
 	[ $? -eq 0 ] && gotcdfile "memtest*" && cp $file /mnt/memtest.exe
 }
 
@@ -556,49 +542,43 @@
 
 fdmemtest()
 {
-	$DIALOG --clear \
-		--title " Create a Memtest86 boot floppy " \
+	$DIALOG --clear --title " Create a Memtest86 boot floppy " \
 		--yes-label "Create floppy" --yesno \
 "\nMemtest86 is a thorough, stand alone memory test for x86 architecture
 computers. BIOS based memory tests are a quick, cursory check and often
 miss many of the failures that are detected by Memtest86.\n\n
-Please insert a blank disk in floppy drive.\n
-" 12 70
+Please insert a blank disk in floppy drive.\n" 12 70
 	[ $? -eq 0 ] && gotcdfile "memtest*" && mkfloppy $file
 }
 
 pxe()
 {
 	gotcdfile "?pxe*"
-	$DIALOG --clear \
-		--title " Create $(basename $file).exe ? " \
+	$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
+from the Web using PXE and HTTP protocols.\n" 12 70
 	[ $? -eq 0 ] || return
 	cp $file /mnt/$(basename $file).exe
 }
 
 fdpxe()
 {
-	$DIALOG --clear \
-		--title " Create a SliTaz Web boot floppy " \
+	$DIALOG --clear --title " Create a SliTaz Web boot floppy " \
 		--yes-label "Create floppy" --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\n
-Please insert a blank disk in floppy drive.\n
-" 12 70
+Please insert a blank disk in floppy drive.\n" 12 70
 	[ $? -eq 0 ] && gotcdfile "?pxe*" && mkfloppy $file
 }
 
 gotposixovl()
 {
-	mount.posixovl 2>&1 | grep -qi usage && 
+	mount.posixovl 2>&1 | grep -qi usage &&
 	echo -en "\"$1\"	\"$2\""
 }
 
@@ -640,7 +620,7 @@
 
 fddata()
 {
-	[ -e /sys/block/fd0 ] && 
+	[ -e /sys/block/fd0 ] &&
 	[ $(get 26 /mnt/$ISO 1 2> /dev/null || echo 0) -ne 0 ] &&
 	echo -en "\"$1\"	\"$2\""
 }
@@ -707,7 +687,7 @@
 			    ddq bs=1 count=$(($cnt % 512)); } > initrd &&
 			  ls -l initrd
 			  break ;;
-		*)	  break ;;	  
+		*)	  break ;;
 		esac
 	done
 	cd - > /dev/null
@@ -747,7 +727,7 @@
 				  ddq bs=512 count=$((cnt / 512))
 				  ddq bs=1 count=$((cnt % 512))
 				  break ;;
-			*)	  break ;;	  
+			*)	  break ;;
 			esac
 		done | md5sum | cut -c1-32)"
 		[ "$md5" == "$(cat $TMP)" ] && echo "OK" || echo "ERROR"
@@ -761,6 +741,7 @@
 if [ "$1" == "--build" ]; then	#install-begin
 	cp $0 $0.tmp
 	uuencode -m - < ifmem.bin | sed -e 's|^[ \t]*||;s|[ \t]*###.*||' \
+	  -e 's| *;;|;;|;s|\t\t*|\t|g' \
 	  -e '/^ifmemcode$/r/dev/stdin' -e '/^ifmemcode$/d' -i $0.tmp
 	uuencode -m - < bootloader.bin | sed -e '/^bootloader$/r/dev/stdin' \
 	  -e '/^bootloader$/d' -e '/install-begin$/,/install-end$/d' -i $0.tmp
@@ -831,7 +812,7 @@
 		 $(dirname $file)/$(locase $KERNEL); do
 		[ -s $i ] && KERNEL=$i && break
 	done
-	rm -f /tmp/var$$ 
+	rm -f /tmp/var$$
 	[ $(get 514 $KERNEL 4) -eq 1400005704 ] || return
 	n=$(($(get 497 $KERNEL 1)+1))
 	ddq bs=512 count=$n if=$KERNEL of=/tmp/fd$$
@@ -919,13 +900,11 @@
 fdbootstrap()
 {
 	sz=$((512 * $(echo $(get 26 /mnt/$ISO 1))))
-	$DIALOG --clear \
-		--title " Create a floppy bootstrap " \
+	$DIALOG --clear --title " Create a floppy bootstrap " \
 		--yes-label "Continue" --yesno \
 "\nThe floppy will install a driver to access the ISO file
-on your hard disk and will emulate a CD-ROM during the boot process.\n\n 
-Please insert a floppy in drive now.\n 
-" 10 70
+on your hard disk and will emulate a CD-ROM during the boot process.\n\n
+Please insert a floppy in drive now.\n" 10 70
 	[ $? -eq 0 ] || return
 	ddq if=/mnt/$ISO of=/tmp/bootiso bs=1 count=512 \
 		skip=$(( $(get 64 /mnt/$ISO) - $sz ))
@@ -946,8 +925,7 @@
 	grep -qs 1 /sys/block/$DEV/ro && return
 	[ "$DEV" ] || return
 	cat > /tmp/dialog <<EOT
-$DIALOG  --clear \
-	--title " Select your USB key " \
+$DIALOG  --clear --title " Select your USB key " \
 	--menu "\nPlease select the USB key according to its known size.\n\n" \
 	14 70 4 \
 	$(for i in $DEV ; do
@@ -970,21 +948,19 @@
 
 usbbootkey()
 {
-	$DIALOG --clear \
-		--title " Create a USB boot key " \
+	$DIALOG --clear --title " Create a USB boot key " \
 		--yes-label "Continue" --yesno \
 "\nThe USB key will be used like a CD-ROM. You will not be able to write
 any data on the boot partition.\n\n
 An extra FAT32 partition will be created with the remaining free space.\n\n
-$(tazusbmsg)Please plug your USB stick in now.\n 
-" 16 70
+$(tazusbmsg)Please plug your USB stick in now.\n" 16 70
 	[ $? -eq 0 ] || return
 	usbdev || return
 	
 	### perform dd in progress bar
 	max=$(($(cat /sys/block/loop0/size)/2048))
-	i=0; ddq if=/mnt/$ISO bs=1024k | ( 
-	while ddq bs=1024k count=1 ; do 
+	i=0; ddq if=/mnt/$ISO bs=1024k | (
+	while ddq bs=1024k count=1 ; do
 		i=$(($i + 1))
 		[ $i -gt $max ] && break
 		echo $((($i*100)/$max)) | dialog --gauge \
@@ -1020,26 +996,23 @@
 
 usbkey()
 {
-	$DIALOG --clear \
-		--title " Create a SliTaz USB key " \
+	$DIALOG --clear --title " Create a SliTaz USB key " \
 		--yes-label "Continue" --yesno \
 "\nUnlike a hard drive install, the filesystem is kept in a compressed
 rootfs.gz. The filesystem is loaded entirely into memory upon boot.
 This should increase responsiveness, protect the filesystem against
 accidental corruption and reduce read/writes to the USB drive.
 Once setup, the tazusb utility can rewrite the root filesystem
-with any changes you have made since booting up, 
+with any changes you have made since booting up,
 giving the effective benefits of a hard drive install.\n\n
 /home is mounted on boot using the UUID of your particular flash drive.
 Unlike a device name, the UUID has the benefit of never changing from machine
 to machine.\n\n
-Please plug your USB stick in now.\n 
-" 19 70
+Please plug your USB stick in now.\n" 19 70
 	[ $? -eq 0 ] || return
 	usbdev || return
 	exec 3>&1
-	format=`$DIALOG  --clear \
-	--title " Select the filesystem " \
+	format=`$DIALOG  --clear --title " Select the filesystem " \
 	--radiolist "\nPlease select the filesystem type to create.\n\n\
 The filesystem creation will erase all the data \
 in the USB key." 14 70 4 \
@@ -1171,9 +1144,7 @@
 		echo "=== extra ${i#*list} files"
 		cat $i
 	done >> $file
-	$DIALOG --clear \
-		--title " Flavor info " \
-		--textbox $file 24 78
+	$DIALOG --clear --title " Flavor info " --textbox $file 24 78
 	rm -rf /tmp/data
 }
 
@@ -1189,7 +1160,7 @@
 
 shell()
 {
-	trap text 2 
+	trap text 2
 	getty -n -l /bin/ash 38400 tty1 || sh
 }
 
@@ -1218,12 +1189,11 @@
 isotitle="$(blkid /mnt/$ISO | sed 's/.*LABEL="\([^"]*\).*/\1/')  $(stat \
 	 -c %y /media/cdrom | sed 's/ .*//')  $(basename $ISO)"
 while true; do
-	trap shell 2 
+	trap shell 2
 	keymap="$(cat /etc/keymap.conf 2> /dev/null)"
 	locale="$(sed '/^LANG=/!d;s/.*=//' /etc/locale.conf 2> /dev/null)"
 	cat > /tmp/dialog <<EOT
-$DIALOG  --clear \
-	--title " ${isotitle:-Welcome to Linux} " \
+$DIALOG  --clear --title " ${isotitle:-Welcome to Linux} " \
 	--menu "" 23 70 17 \
 $(xfile tazkeymap	"tazkeymap"	"Select keyboard (${keymap:-none})") \
 $(xfile tazlocale	"tazlocale"	"Select locale (${locale:-none})") \
diff -r c552db5929eb -r 42cc18501ba6 syslinux/stuff/iso2exe/init.custom
--- a/syslinux/stuff/iso2exe/init.custom	Wed Feb 13 16:59:39 2019 +0100
+++ b/syslinux/stuff/iso2exe/init.custom	Wed Feb 13 17:00:50 2019 +0100
@@ -3,7 +3,7 @@
 if [ "$1" == "loramhack" ]; then
 	cp $0 $2/init.extra
 	sed -i 's|^exec |exec /sbin|' $2/init.extra
-	cp -a /extra/. $2 
+	cp -a /extra/. $2
 	exit
 fi
 if [ -d /etc ]; then
diff -r c552db5929eb -r 42cc18501ba6 syslinux/stuff/iso2exe/iso2exe.sh
--- a/syslinux/stuff/iso2exe/iso2exe.sh	Wed Feb 13 16:59:39 2019 +0100
+++ b/syslinux/stuff/iso2exe/iso2exe.sh	Wed Feb 13 17:00:50 2019 +0100
@@ -47,7 +47,7 @@
 add_dosexe()
 {
 	TMP=/tmp/bootiso$$
-	$0 --get bootiso.bin > $TMP 2> /dev/null 
+	$0 --get bootiso.bin > $TMP 2> /dev/null
 	OFS=$(($(get 20 $TMP) - 0xC0))
 	printf "Adding DOS/EXE stub at %04X (%d bytes) ...\n" $OFS $((0x7FF0 - $OFS))
 	ddq if=$TMP bs=1 skip=$OFS of=$1 seek=$OFS conv=notrunc
@@ -307,7 +307,7 @@
 	cp -a /dev/tty /dev/tty0 $TMP/dev
 	cat init > $TMP/init.exe
 	find $TMP -type f -print0 | xargs -0 chmod +x
-	find $TMP -print0 | xargs -0 touch -t 197001010100.00 
+	find $TMP -print0 | xargs -0 touch -t 197001010100.00
 	( cd $TMP; find dev init.exe | cpio -o -H newc ) | compress rootfs.gz
 	rm -rf $TMP
 	ls -l $@ rootfs.gz
@@ -611,7 +611,7 @@
 		if [ $newsz -gt $isosz ]; then
 			echo "$(($newsz - $isosz)) extra bytes."
 		else
-			echo "$(($isosz - 2048*$(get 32848 $1 4) 
+			echo "$(($isosz - 2048*$(get 32848 $1 4)
 				 - $(stat -c %s $DATA) - 24)) bytes free."
 		fi
 		rm -f $DATA > /dev/null
diff -r c552db5929eb -r 42cc18501ba6 syslinux/stuff/iso2exe/taziso
--- a/syslinux/stuff/iso2exe/taziso	Wed Feb 13 16:59:39 2019 +0100
+++ b/syslinux/stuff/iso2exe/taziso	Wed Feb 13 17:00:50 2019 +0100
@@ -309,11 +309,9 @@
 		DEV="$(blkid | grep -iE "(msdos|vfat|ntfs|ext[234]|xfs|btrfs)" | sed 's/:.*//;s|/dev/||')"
 		[ "$DEV" ] || return
 	cat > /tmp/dialog$$ <<EOT
-$DIALOG --clear \
-	--title " Select your Linux/Windows partition " \
+$DIALOG --clear --title " Select your Linux/Windows partition " \
 	--menu "\nPlease select the Linux/Windows partition according to its known size.
-The data will be kept untouched.\n" \
-	17 70 8 \
+The data will be kept untouched.\n" 17 70 8 \
 	$(for i in $DEV ; do
 		label="$(blkid | sed "/$i:/!d;s/.*://;s/[^ ]*UUID=[^ ]* //g;s/LABEL=//")"
 		echo -n "/dev/$i \"$(($(cat /sys/block/*/$i/size)/2048))MB $label\" "
@@ -333,18 +331,14 @@
 {
 	packages_list=
 	packages_dir=
-	$DIALOG --clear \
-		--title " Extra packages " \
+	$DIALOG --clear --title " Extra packages " \
 		--defaultno --yesno \
-"
-Do you want to add extra packages ?
-" 7 70
+"Do you want to add extra packages ?" 7 70
 	[ $? -eq 0 ] || return
 	[ -s /var/lib/tazpkg/packages.txt ] || tazpkg recharge
 	if [ -s $media/boot/vmlinuz-$(uname -r) ]; then
 		cat > /tmp/dialog$$ <<EOT
-$DIALOG --clear \
-	--title " Select the packages " \
+$DIALOG --clear --title " Select the packages " \
 	--separate-output \
 	--cancel-label "Skip" \
 	--checklist "Please select the packages you want to install. Try with the first letter." \
@@ -358,8 +352,7 @@
 	cat > /tmp/dialog$$ <<EOT
 $DIALOG --clear \
 	--title "Please select the directory with every custom package to install." \
-	--cancel-label "Skip" \
-	--dselect $PWD 13 78
+	--cancel-label "Skip" --dselect $PWD 13 78
 EOT
 	sh /tmp/dialog$$ 2> /tmp/dialog.out$$
 	[ $? -eq 0 ] && packages_dir="$(cat /tmp/dialog.out$$)"
@@ -369,19 +362,17 @@
 _install()
 {
 	extra_packages
-	$DIALOG --clear \
-		--title " SliTaz UMSDOS way installation " \
+	$DIALOG --clear --title " SliTaz UMSDOS way installation " \
 		--yes-label "Install" --yesno \
 "\nSliTaz will be installed in the subdirectory \\slitaz of the current
 Linux/DOS/Windows partition. You can see your files from /mnt/dos.\n\n
 You can start SliTaz with \\slitaz\\boot\\tazboot.exe\n\n
 To uninstall SliTaz, you have only to remove this directory.
 The file \\boot.ini or \\config.sys may be modified too.\n\n
-SliTaz may run slowly on the 'UMSDOS way' installation due to the 
+SliTaz may run slowly on the 'UMSDOS way' installation due to the
 posixovl filesystem. The 'TAZUSB way' installation runs faster.\n\n
 To do a traditional installation with disk partitioning,
-start SliTaz Live with the 'SliTaz RAM boot' menu.\n
-" 19 70
+start SliTaz Live with the 'SliTaz RAM boot' menu.\n" 19 70
 	[ $? -eq 0 ] || return
 	doinstall
 }
@@ -499,8 +490,7 @@
 
 _installtaz()
 {
-	$DIALOG --clear \
-		--title " SliTaz TAZUSB way installation " \
+	$DIALOG --clear --title " SliTaz TAZUSB way installation " \
 		--yes-label "Install" --yesno \
 "\nSliTaz will be installed in the subdirectory \\slitaz of the current
 Linux/DOS/Windows partition. You can see your files from /mnt/dos.\n\n
@@ -510,8 +500,7 @@
 The filesystem is loaded entirely into memory upon boot to
 increase responsiveness. Only /home lands on the hard disk.\n\n
 To do a traditional installation with disk partitioning,
-start SliTaz Live with the 'SliTaz RAM boot' menu.\n
-" 19 70
+start SliTaz Live with the 'SliTaz RAM boot' menu.\n" 19 70
 	[ $? -eq 0 ] || return
 	doinstall tazusblike
 }
@@ -566,13 +555,12 @@
 tazboot()
 {
 	if [ -z "$1" ]; then
-		$DIALOG --clear \
-			--title " SliTaz bootloader for DOS " \
+		$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
-Usage: tazboot.exe [[@commands]|[kernel=<bzimage>] 
+Usage: tazboot.exe [[@commands]|[kernel=<bzimage>]
 [initrd=<rootfs>[,<rootfs2>...]] [bootfrom=<isofile>] cmdline args ...]\n\n
 Defaults: tazboot @tazboot.cmd or tazboot kernel=bzImage auto\n\n\
 Examples for tazboot.cmd:\n\n\
@@ -581,8 +569,7 @@
   initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz\n\
   rw root=/dev/null autologin\n\n\
   kernel=\\slitaz\\vmlinuz root=/dev/sda5 ro\n\n
-Unlike GRUB4DOS, it doesn't require unfragmented ISO image files.\n
-" 0 0
+Unlike GRUB4DOS, it doesn't require unfragmented ISO image files.\n" 0 0
 		[ $? -eq 0 ] || return
 	fi
 	gettazboot tazboot.exe
@@ -598,8 +585,7 @@
 	if [ "$1" ]; then
 		cat /tmp/data
 	else
-		$DIALOG --clear \
-			--title " Checked files " \
+		$DIALOG --clear --title " Checked files " \
 			--textbox /tmp/data 0 0
 	fi
 	rm -f /tmp/data
@@ -627,23 +613,19 @@
 	if [ "$1" ]; then
 		cat $file
 	else
-		$DIALOG --clear \
-			--title " Readme " \
-			--textbox $file 0 0
+		$DIALOG --clear --title " Readme " --textbox $file 0 0
 	fi
 }
 
 bzimage()
 {
 	if [ -z "$1" ]; then
-		$DIALOG --clear \
-			--title " Create linux.exe ? " \
+		$DIALOG --clear --title " Create linux.exe ? " \
 			--yes-label "Install" --yesno \
 "\nLinux.exe launches the linux kernel under DOS (in real mode only).
 The cmdline arguments are supported except initrd=,
 vga= (you can try 'rdev -v') and mem= (partially).
-\nExample:\nC:\\> linux.exe root=/dev/hda2 ro panic=60\n
-" 12 70
+\nExample:\nC:\\> linux.exe root=/dev/hda2 ro panic=60\n" 12 70
 		[ $? -eq 0 ] || return
 	fi
 	cp $media/boot/bzImage linux.exe
@@ -653,13 +635,11 @@
 memtest()
 {
 	if [ -z "$1" ]; then
-		$DIALOG --clear \
-			--title " Create memtest.exe ? " \
+		$DIALOG --clear --title " Create memtest.exe ? " \
 			--yes-label "Install" --yesno \
 "\nMemtest86 is a thorough, stand alone memory test for x86 architecture
 computers. BIOS based memory tests are a quick, cursory check and often
-miss many of the failures that are detected by Memtest86.\n
-" 0 0
+miss many of the failures that are detected by Memtest86.\n" 0 0
 		[ $? -eq 0 ] || return
 	fi
 	gotcdfile 'memtest*' && cp $file memtest.exe
@@ -701,14 +681,12 @@
 fdmemtest()
 {
 	if [ -z "$1" ]; then
-		$DIALOG --clear \
-			--title " Create a Memtest86 boot floppy " \
+		$DIALOG --clear --title " Create a Memtest86 boot floppy " \
 			--yes-label "Create floppy" --yesno \
 "\nMemtest86 is a thorough, stand alone memory test for x86 architecture
 computers. BIOS based memory tests are a quick, cursory check and often
 miss many of the failures that are detected by Memtest86.\n\n
-Please insert a blank disk in floppy drive.\n
-" 0 0
+Please insert a blank disk in floppy drive.\n" 0 0
 		[ $? -eq 0 ] || return
 	fi
 	gotcdfile 'memtest*' && mkfloppy $file
@@ -718,14 +696,12 @@
 {
 	gotcdfile '?pxe*'
 	if [ -z "$1" ]; then
-		$DIALOG --clear \
-			--title " Create $(basename $file).exe ? " \
+		$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
-" 0 0
+from the Web using PXE and HTTP protocols.\n" 0 0
 		[ $? -eq 0 ] || return
 	fi
 	cp $file $(basename $file).exe
@@ -735,15 +711,13 @@
 fdpxe()
 {
 	if [ -z "$1" ]; then
-		$DIALOG --clear \
-			--title " Create a SliTaz Web boot floppy " \
+		$DIALOG --clear --title " Create a SliTaz Web boot floppy " \
 			--yes-label "Create floppy" --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\n
-Please insert a blank disk in floppy drive.\n
-" 0 0
+Please insert a blank disk in floppy drive.\n" 0 0
 		[ $? -eq 0 ] || return
 	fi
 	gotcdfile '?pxe*' && mkfloppy $file
@@ -901,7 +875,7 @@
 			    ddq bs=1 count=$(($cnt % 512)); } > initrd &&
 			  ls -l $PWD/initrd
 			  break ;;
-		*)	  break ;;	  
+		*)	  break ;;
 		esac
 	done
 	[ "$1" ] && return 0
@@ -935,7 +909,7 @@
 				  ddq bs=512 count=$((cnt / 512))
 				  ddq bs=1 count=$((cnt % 512))
 				  break ;;
-			*)	  break ;;	  
+			*)	  break ;;
 			esac
 		done | md5sum | cut -c1-32)"
 		[ "$md5" == "$(cat $TMP)" ] && echo "OK" || echo "ERROR"
@@ -957,8 +931,7 @@
 	grep -qs 1 /sys/block/$DEV/ro && return
 	[ "$DEV" ] || return
 	cat > /tmp/dialog$$ <<EOT
-$DIALOG  --clear \
-	--title " Select your USB key " \
+$DIALOG  --clear --title " Select your USB key " \
 	--menu "\nPlease select the USB key according to its known size.\n\n" \
 	0 0 0 \
 	$(for i in $DEV ; do
@@ -988,23 +961,21 @@
 		device=$1
 	elif [ "$1" ]; then
 		echo "Invalid USB key device"
-		return 1 
+		return 1
 	else
-		$DIALOG --clear \
-			--title " Create a USB boot key " \
+		$DIALOG --clear --title " Create a USB boot key " \
 			--yes-label "Continue" --yesno \
 "\nThe USB key will be used like a CD-ROM. You will not be able to write
 any data on the boot partition.\n\n
 An extra FAT32 partition will be created with the remaining free space.\n\n
-$(tazusbmsg)Please plug your USB stick in now.\n 
-" 16 70
+$(tazusbmsg)Please plug your USB stick in now.\n" 16 70
 		[ $? -eq 0 ] || return
 		usbdev || return
 	
 		# perform dd in progress bar
 		max=$(($(stat -c %s "$ISO")/2048))
-		i=0; ddq if="$ISO" bs=1024k | ( 
-		while ddq bs=1024k count=1 ; do 
+		i=0; ddq if="$ISO" bs=1024k | (
+		while ddq bs=1024k count=1 ; do
 			i=$(($i + 1))
 			[ $i -gt $max ] && break
 			echo $((($i*100)/$max)) | dialog --gauge \
@@ -1041,29 +1012,26 @@
 
 usbkey()
 {
-	$DIALOG --clear \
-		--title " Create a SliTaz USB key " \
+	$DIALOG --clear --title " Create a SliTaz USB key " \
 		--yes-label "Continue" --yesno \
 "\nUnlike a hard drive install, the filesystem is kept in a compressed
 rootfs.gz. The filesystem is loaded entirely into memory upon boot.
 This should increase responsiveness, protect the filesystem against
 accidental corruption and reduce read/writes to the USB drive.
 Once setup, the tazusb utility can rewrite the root filesystem
-with any changes you have made since booting up, 
+with any changes you have made since booting up,
 giving the effective benefits of a hard drive install.\n\n
 /home is mounted on boot using the UUID of your particular flash drive.
 Unlike a device name, the UUID has the benefit of never changing from machine
 to machine.\n\n
-Please plug your USB stick in now.\n 
-" 19 70
+Please plug your USB stick in now.\n" 19 70
 	[ $? -eq 0 ] || return
 	usbdev || return
 	exec 3>&1
 	format=`$DIALOG  --clear \
 	--title " Select the filesystem " \
 	--radiolist "\nPlease select the filesystem type to create.\n\n\
-The filesystem creation will erase all the data \
-in the USB key." 14 70 4 \
+The filesystem creation will erase all the data in the USB key." 14 70 4 \
 		"none"	"Do not erase the USB key" on \
 		"ext3"	"Ext3 journaling filesystem" off \
 		"ext2"	"Ext2 filesystem" off \
@@ -1123,8 +1091,7 @@
 	if [ "$1" ]; then
 		cat $file
 	else
-		$DIALOG --clear \
-			--title " Flavor info " \
+		$DIALOG --clear --title " Flavor info " \
 			--textbox $file 0 0
 	fi
 	rm -rf /tmp/data
@@ -1216,7 +1183,7 @@
 		i="$(ls $i* | sed q)"
 		[ -n "$i" ] && KERNEL=$i && break
 	done
-	rm -f /tmp/var$$ 
+	rm -f /tmp/var$$
 	[ $(get 514 $KERNEL 4) -eq 1400005704 ] || return
 	n=$(($(get 497 $KERNEL 1)+1))
 	ddq bs=512 count=$n if=$KERNEL of=/tmp/fd$$
@@ -1332,8 +1299,7 @@
 	if [ "$1" ]; then
 		cat /tmp/isoinfo$$
 	else
-		$DIALOG --clear \
-			--title " Info ISO " \
+		$DIALOG --clear --title " Info ISO " \
 			--textbox /tmp/isoinfo$$ 0 0
 	fi
 	rm -f /tmp/isoinfo$$
@@ -1379,9 +1345,7 @@
 
 while true; do
 	cat > /tmp/dialog$$ <<EOT
-$DIALOG  --clear \
-	--title " $(isotitle) " \
-	--menu "" -2 70 0 \
+$DIALOG  --clear --title " $(isotitle) " --menu "" -2 70 0 \
 $(cdfile 'README*'	"readme"	"Show the README file") \
 $(gotcustomconf		"getcustomconf"	"Get custom config") \
 $(gotisomd5		"isomd5"	"Check the ISO image") \