wok-current rev 18802

syslinux/iso2exe.sh: fix clear_custom_config
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Jan 12 15:40:40 2016 +0100 (2016-01-12)
parents 8ebcb0ded385
children dfc51ce7954a
files libwebkit-video/receipt syslinux/stuff/iso2exe/iso2exe.sh
line diff
     1.1 --- a/libwebkit-video/receipt	Mon Jan 11 17:54:50 2016 +0100
     1.2 +++ b/libwebkit-video/receipt	Tue Jan 12 15:40:40 2016 +0100
     1.3 @@ -10,6 +10,7 @@
     1.4  TARBALL="$SOURCE-$VERSION.tar.xz"
     1.5  WEB_SITE="http://webkitgtk.org"
     1.6  WGET_URL="$WEB_SITE/releases/$TARBALL"
     1.7 +PROVIDE="libwebkit"
     1.8  
     1.9  DEPENDS="gtk+ enchant libxslt expat gtk+ jpeg libpng libxml2 sqlite \
    1.10  xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXcomposite \
     2.1 --- a/syslinux/stuff/iso2exe/iso2exe.sh	Mon Jan 11 17:54:50 2016 +0100
     2.2 +++ b/syslinux/stuff/iso2exe/iso2exe.sh	Tue Jan 12 15:40:40 2016 +0100
     2.3 @@ -292,7 +292,7 @@
     2.4  
     2.5  main()
     2.6  {
     2.7 -	[ $(id -u) -ne 0 ] && exec su -c "$0 $@" < /dev/tty
     2.8 +	[ $(id -u) -ne 0 ] && cmd="$0 $@" && exec su -c "$cmd" < /dev/tty
     2.9  	append=
    2.10  	initrd=
    2.11  	while [ "$1" ]; do
    2.12 @@ -325,11 +325,11 @@
    2.13  		ddq if=/dev/zero bs=1 seek=$n count=$((0x8000 - $n)) of=$1 conv=notrunc ;;
    2.14  	    *)  ddq if=/dev/zero bs=1k count=32 of=$1 conv=notrunc ;;
    2.15  	    esac
    2.16 -	    clear_custom_config
    2.17 +	    clear_custom_config $1
    2.18  	    exit 0 ;;
    2.19  	-f*)
    2.20  	    ddq if=/dev/zero bs=1k count=32 of=$1 conv=notrunc
    2.21 -	    [ "$append$initrd" ] && clear_custom_config
    2.22 +	    [ "$append$initrd" ] && clear_custom_config $1
    2.23  	esac
    2.24  	case "$(get 0 $1)" in
    2.25  	23117)	echo "The file $1 is already an EXE file." 1>&2 && exit 1;;