SliTaz Repositories

     1.1 --- a/installer.cgi	Sat Aug 08 17:52:08 2020 +0000
     1.2 +++ b/installer.cgi	Sun Aug 09 18:31:30 2020 +0000
     1.3 @@ -720,9 +720,8 @@
     1.4  		echo "</script>"
     1.5  		br
     1.6  		br
     1.7 -		br
     1.8 -		p $(_ "Installation is now finished, you can exit the installer \
     1.9 -or reboot on your new SliTaz GNU/Linux operating system.")
    1.10 +		p "$(_ "Installation is now finished, you can exit the installer \
    1.11 +or reboot on your new SliTaz GNU/Linux operating system.")"
    1.12  	fi
    1.13  	return "$error"
    1.14  
    1.15 @@ -854,10 +853,10 @@
    1.16  	if ! [ -x /usr/sbin/tazinst ]; then
    1.17  		{
    1.18  		h4 $(_ 'Tazinst Error')
    1.19 -		p $(_ '%s, the backend to %s is missing.' '<strong>tazinst</strong>' 'slitaz-installer';
    1.20 -		_ 'Any installation can not be done without %s.' 'tazinst')
    1.21 -		p $(_ "Check %s permissions, or reinstall the %s package." \
    1.22 -		'tazinst' 'slitaz-installer')
    1.23 +		p "$(_ '%s, the backend to %s is missing.' '<strong>tazinst</strong>' 'slitaz-installer';
    1.24 +		_ 'Any installation can not be done without %s.' 'tazinst')"
    1.25 +		p "$(_ "Check %s permissions, or reinstall the %s package." \
    1.26 +		'tazinst' 'slitaz-installer')"
    1.27  		} >> $buffer
    1.28  		errorcode=1
    1.29  	else
    1.30 @@ -868,11 +867,11 @@
    1.31  				'{v=$v+0}{ if (v < r) exit 1}') ; then
    1.32  			{
    1.33  			h4 $(_ 'Tazinst Error')
    1.34 -			p $(_ '%s, the %s backend, is not at the minimum required version.' \
    1.35 +			p "$(_ '%s, the %s backend, is not at the minimum required version.' \
    1.36  			'<strong>tazinst</strong>' 'slitaz-installer';
    1.37 -			_ 'Any installation can not be done without %s.' 'tazinst')
    1.38 -			p $(_ 'Reinstall the %s package, or use %s in CLI mode.' \
    1.39 -			'slitaz-installer' 'tazinst')
    1.40 +			_ 'Any installation can not be done without %s.' 'tazinst')"
    1.41 +			p "$(_ 'Reinstall the %s package, or use %s in CLI mode.' \
    1.42 +			'slitaz-installer' 'tazinst')"
    1.43  			} >> $buffer
    1.44  			errorcode=1
    1.45  		fi
    1.46 @@ -883,11 +882,11 @@
    1.47  				'{v=$v+0}{ if (v > r) exit 1}') ; then
    1.48  			{
    1.49  			h4 $(_ 'Tazinst Error')
    1.50 -			p $(_ "%s, the %s backend, is at a higher version than the maximum authorized \
    1.51 +			p "$(_ "%s, the %s backend, is at a higher version than the maximum authorized \
    1.52  by the %s." '<strong>tazinst</strong>' 'slitaz-installer' 'slitaz-installer';
    1.53 -			_ 'Any installation cannot be done.')
    1.54 -			p $(_ 'Reinstall the %s package, or use %s in CLI mode.' \
    1.55 -			'slitaz-installer' 'tazinst')
    1.56 +			_ 'Any installation cannot be done.')"
    1.57 +			p "$(_ 'Reinstall the %s package, or use %s in CLI mode.' \
    1.58 +			'slitaz-installer' 'tazinst')"
    1.59  			} >> $buffer
    1.60  			errorcode=1
    1.61  		fi

     2.1 --- a/tazinst	Sat Aug 08 17:52:08 2020 +0000
     2.2 +++ b/tazinst	Sun Aug 09 18:31:30 2020 +0000
     2.3 @@ -938,7 +938,7 @@
     2.4  # list Windows partitions
     2.5  list_winboot()
     2.6  {
     2.7 -	/usr/sbin/parted -lms 2>&1 | /bin/busybox awk '
     2.8 +	/usr/sbin/parted -lms 2>&1 | sed '/zram/,$d' | /bin/busybox awk '
     2.9  	BEGIN{
    2.10  		FS=":"
    2.11  		disknum=-1
    2.12 @@ -1108,7 +1108,7 @@
    2.13  	local uuid="$1" removable=1
    2.14  	local disk="$(uuid2disk $uuid | /bin/busybox awk '{print substr($0,6,3)}')"
    2.15  	if [ "$(printf "%s" $disk | wc -w)" -eq "1" ]; then
    2.16 -		[ "$(cat /sys/block/"$disk"/removable)" -gt "0" ] \
    2.17 +		[ "$(cat /sys/block/"$disk"/removable 2> /dev/null)" -gt "0" ] \
    2.18  			&& removable=0
    2.19  	fi
    2.20  	return "$removable"
    2.21 @@ -2217,6 +2217,7 @@
    2.22  	new)
    2.23  		new_file "$2" ;;
    2.24  	set)
    2.25 +		[ -s "$4" ] || new_file "$4"
    2.26  		read_file "$4"
    2.27  		change "$2" "$3" "$4" ;;
    2.28  	unset)