# HG changeset patch # User Pascal Bellard # Date 1452609640 -3600 # Node ID 4294075018641ac55df3f27cf73b21889bbcc333 # Parent 8ebcb0ded38556d4ff3d305fe5655f3797d6e97a syslinux/iso2exe.sh: fix clear_custom_config diff -r 8ebcb0ded385 -r 429407501864 libwebkit-video/receipt --- a/libwebkit-video/receipt Mon Jan 11 17:54:50 2016 +0100 +++ b/libwebkit-video/receipt Tue Jan 12 15:40:40 2016 +0100 @@ -10,6 +10,7 @@ TARBALL="$SOURCE-$VERSION.tar.xz" WEB_SITE="http://webkitgtk.org" WGET_URL="$WEB_SITE/releases/$TARBALL" +PROVIDE="libwebkit" DEPENDS="gtk+ enchant libxslt expat gtk+ jpeg libpng libxml2 sqlite \ xorg-libICE xorg-libSM xorg-libX11 xorg-libXau xorg-libXcomposite \ diff -r 8ebcb0ded385 -r 429407501864 syslinux/stuff/iso2exe/iso2exe.sh --- a/syslinux/stuff/iso2exe/iso2exe.sh Mon Jan 11 17:54:50 2016 +0100 +++ b/syslinux/stuff/iso2exe/iso2exe.sh Tue Jan 12 15:40:40 2016 +0100 @@ -292,7 +292,7 @@ main() { - [ $(id -u) -ne 0 ] && exec su -c "$0 $@" < /dev/tty + [ $(id -u) -ne 0 ] && cmd="$0 $@" && exec su -c "$cmd" < /dev/tty append= initrd= while [ "$1" ]; do @@ -325,11 +325,11 @@ ddq if=/dev/zero bs=1 seek=$n count=$((0x8000 - $n)) of=$1 conv=notrunc ;; *) ddq if=/dev/zero bs=1k count=32 of=$1 conv=notrunc ;; esac - clear_custom_config + clear_custom_config $1 exit 0 ;; -f*) ddq if=/dev/zero bs=1k count=32 of=$1 conv=notrunc - [ "$append$initrd" ] && clear_custom_config + [ "$append$initrd" ] && clear_custom_config $1 esac case "$(get 0 $1)" in 23117) echo "The file $1 is already an EXE file." 1>&2 && exit 1;;