# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1596997890 0
# Node ID ea2154c4b6d5528e4b3d567692755b5ae7c0775c
# Parent  fc57e40b85bc3d4058bfbbb3d8318467fc52d315
installer.cgi: typos

diff -r fc57e40b85bc -r ea2154c4b6d5 installer.cgi
--- a/installer.cgi	Sat Aug 08 17:52:08 2020 +0000
+++ b/installer.cgi	Sun Aug 09 18:31:30 2020 +0000
@@ -720,9 +720,8 @@
 		echo "</script>"
 		br
 		br
-		br
-		p $(_ "Installation is now finished, you can exit the installer \
-or reboot on your new SliTaz GNU/Linux operating system.")
+		p "$(_ "Installation is now finished, you can exit the installer \
+or reboot on your new SliTaz GNU/Linux operating system.")"
 	fi
 	return "$error"
 
@@ -854,10 +853,10 @@
 	if ! [ -x /usr/sbin/tazinst ]; then
 		{
 		h4 $(_ 'Tazinst Error')
-		p $(_ '%s, the backend to %s is missing.' '<strong>tazinst</strong>' 'slitaz-installer';
-		_ 'Any installation can not be done without %s.' 'tazinst')
-		p $(_ "Check %s permissions, or reinstall the %s package." \
-		'tazinst' 'slitaz-installer')
+		p "$(_ '%s, the backend to %s is missing.' '<strong>tazinst</strong>' 'slitaz-installer';
+		_ 'Any installation can not be done without %s.' 'tazinst')"
+		p "$(_ "Check %s permissions, or reinstall the %s package." \
+		'tazinst' 'slitaz-installer')"
 		} >> $buffer
 		errorcode=1
 	else
@@ -868,11 +867,11 @@
 				'{v=$v+0}{ if (v < r) exit 1}') ; then
 			{
 			h4 $(_ 'Tazinst Error')
-			p $(_ '%s, the %s backend, is not at the minimum required version.' \
+			p "$(_ '%s, the %s backend, is not at the minimum required version.' \
 			'<strong>tazinst</strong>' 'slitaz-installer';
-			_ 'Any installation can not be done without %s.' 'tazinst')
-			p $(_ 'Reinstall the %s package, or use %s in CLI mode.' \
-			'slitaz-installer' 'tazinst')
+			_ 'Any installation can not be done without %s.' 'tazinst')"
+			p "$(_ 'Reinstall the %s package, or use %s in CLI mode.' \
+			'slitaz-installer' 'tazinst')"
 			} >> $buffer
 			errorcode=1
 		fi
@@ -883,11 +882,11 @@
 				'{v=$v+0}{ if (v > r) exit 1}') ; then
 			{
 			h4 $(_ 'Tazinst Error')
-			p $(_ "%s, the %s backend, is at a higher version than the maximum authorized \
+			p "$(_ "%s, the %s backend, is at a higher version than the maximum authorized \
 by the %s." '<strong>tazinst</strong>' 'slitaz-installer' 'slitaz-installer';
-			_ 'Any installation cannot be done.')
-			p $(_ 'Reinstall the %s package, or use %s in CLI mode.' \
-			'slitaz-installer' 'tazinst')
+			_ 'Any installation cannot be done.')"
+			p "$(_ 'Reinstall the %s package, or use %s in CLI mode.' \
+			'slitaz-installer' 'tazinst')"
 			} >> $buffer
 			errorcode=1
 		fi
diff -r fc57e40b85bc -r ea2154c4b6d5 tazinst
--- a/tazinst	Sat Aug 08 17:52:08 2020 +0000
+++ b/tazinst	Sun Aug 09 18:31:30 2020 +0000
@@ -938,7 +938,7 @@
 # list Windows partitions
 list_winboot()
 {
-	/usr/sbin/parted -lms 2>&1 | /bin/busybox awk '
+	/usr/sbin/parted -lms 2>&1 | sed '/zram/,$d' | /bin/busybox awk '
 	BEGIN{
 		FS=":"
 		disknum=-1
@@ -1108,7 +1108,7 @@
 	local uuid="$1" removable=1
 	local disk="$(uuid2disk $uuid | /bin/busybox awk '{print substr($0,6,3)}')"
 	if [ "$(printf "%s" $disk | wc -w)" -eq "1" ]; then
-		[ "$(cat /sys/block/"$disk"/removable)" -gt "0" ] \
+		[ "$(cat /sys/block/"$disk"/removable 2> /dev/null)" -gt "0" ] \
 			&& removable=0
 	fi
 	return "$removable"
@@ -2217,6 +2217,7 @@
 	new)
 		new_file "$2" ;;
 	set)
+		[ -s "$4" ] || new_file "$4"
 		read_file "$4"
 		change "$2" "$3" "$4" ;;
 	unset)