wok-6.x rev 19033

syslinux/taziso: typo
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Apr 10 12:35:57 2016 +0200 (2016-04-10)
parents fc1cfa92f62e
children 43ddd13ff6cf
files syslinux/stuff/iso2exe/iso2exe.sh syslinux/stuff/iso2exe/taziso
line diff
     1.1 --- a/syslinux/stuff/iso2exe/iso2exe.sh	Sat Apr 09 18:46:12 2016 +0200
     1.2 +++ b/syslinux/stuff/iso2exe/iso2exe.sh	Sun Apr 10 12:35:57 2016 +0200
     1.3 @@ -132,7 +132,7 @@
     1.4  		for (i = 2; i < 18; i++) if ($i != "00") break;
     1.5  		if (i == 18) {
     1.6  			for (i = 17; i > 1; i--) if ($i != "00") break;
     1.7 -			print "0x" $1 " + 2 - " (16 - i) 
     1.8 +			print "0x" $1 " + 7 - " (16 - i) 
     1.9  			exit
    1.10  		}
    1.11  	}')))
     2.1 --- a/syslinux/stuff/iso2exe/taziso	Sat Apr 09 18:46:12 2016 +0200
     2.2 +++ b/syslinux/stuff/iso2exe/taziso	Sun Apr 10 12:35:57 2016 +0200
     2.3 @@ -253,7 +253,7 @@
     2.4  		$mnt/slitaz/boot/README
     2.5  	[ -d $mnt/slitaz/usr/sbin -a ! -x $mnt/slitaz/usr/sbin/mount.posixovl ] &&
     2.6  	cp $(which mount.posixovl) $mnt/slitaz/usr/sbin
     2.7 -	if "$useposixovl" && grep -qs " $mnt " /proc/mounts &&
     2.8 +	if [ "$useposixovl" ] && grep -qs " $mnt " /proc/mounts &&
     2.9  	   [ ! -d $mnt/boot/grub ]; then
    2.10  		mkdir -p $mnt/boot/grub
    2.11  		echo -en "\nInstall grub in /boot/grub..."
    2.12 @@ -464,7 +464,9 @@
    2.13  EOT
    2.14  	( cd $mnt ; echo 'See \slitaz\boot\install.txt to launch SliTaz.' | \
    2.15  	  zip -zr9 $(basename "$ISO" .iso).zip slitaz )
    2.16 -	[ "$(which advzip)" ] && advzip -z4 $mnt/*.zip
    2.17 +	[ "$(which advzip)" ] &&
    2.18 +	echo "Recompressing $(basename "$ISO" .iso).zip ..." &&
    2.19 +	advzip -z4 $mnt/*.zip
    2.20  	mv $mnt/*.zip .
    2.21  	du -h $PWD/$(basename "$ISO" .iso).zip
    2.22  	umount $mnt