From a827807a1330d5ad619faa103bc7f12d89fc8bee Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 22 Jan 2017 20:22:34 +0300 Subject: [PATCH] Fix shebang for termux. Termux doesn't have a /bin/sh. So we needto use $SHELL. Keep /bin/sh as much as possible. --- configure.ac | 10 ++++++++++ grub-core/genmod.sh.in | 2 +- grub-core/gensyminfo.sh.in | 2 +- grub-core/modinfo.sh.in | 2 +- tests/ahci_test.in | 2 +- tests/btrfs_test.in | 2 +- tests/cdboot_test.in | 2 +- tests/core_compress_test.in | 2 +- tests/cpio_test.in | 2 +- tests/ehci_test.in | 2 +- tests/example_scripted_test.in | 2 +- tests/exfat_test.in | 2 +- tests/ext234_test.in | 2 +- tests/fat_test.in | 2 +- tests/fddboot_test.in | 2 +- tests/file_filter_test.in | 2 +- tests/gettext_strings_test.in | 2 +- tests/grub_cmd_date.in | 2 +- tests/grub_cmd_regexp.in | 2 +- tests/grub_cmd_set_date.in | 2 +- tests/grub_cmd_sleep.in | 2 +- tests/grub_cmd_test.in | 2 +- tests/grub_cmd_tr.in | 2 +- tests/grub_func_test.in | 2 +- tests/grub_script_blanklines.in | 2 +- tests/grub_script_blockarg.in | 2 +- tests/grub_script_dollar.in | 2 +- tests/grub_script_expansion.in | 2 +- tests/grub_script_final_semicolon.in | 2 +- tests/grub_script_no_commands.in | 2 +- tests/gzcompress_test.in | 2 +- tests/hddboot_test.in | 2 +- tests/help_test.in | 2 +- tests/hfs_test.in | 2 +- tests/hfsplus_test.in | 2 +- tests/iso9660_test.in | 2 +- tests/jfs_test.in | 2 +- tests/lzocompress_test.in | 2 +- tests/minixfs_test.in | 2 +- tests/netboot_test.in | 2 +- tests/nilfs2_test.in | 2 +- tests/ntfs_test.in | 2 +- tests/ohci_test.in | 2 +- tests/partmap_test.in | 2 +- tests/pata_test.in | 2 +- tests/pseries_test.in | 2 +- tests/reiserfs_test.in | 2 +- tests/romfs_test.in | 2 +- tests/squashfs_test.in | 2 +- tests/syslinux_test.in | 2 +- tests/tar_test.in | 2 +- tests/test_sha512sum.in | 2 +- tests/udf_test.in | 2 +- tests/uhci_test.in | 2 +- tests/util/grub-fs-tester.in | 2 +- tests/util/grub-shell-tester.in | 2 +- tests/util/grub-shell.in | 2 +- tests/xfs_test.in | 2 +- tests/xzcompress_test.in | 2 +- tests/zfs_test.in | 2 +- 60 files changed, 69 insertions(+), 59 deletions(-) diff --git a/configure.ac b/configure.ac index e0262e159..ee2c86537 100644 --- a/configure.ac +++ b/configure.ac @@ -459,6 +459,16 @@ case "$build_os" in esac AC_SUBST(BUILD_EXEEXT) +# In some build environments like termux /bin/sh is not a valid +# shebang. Use $SHELL instead if it's executable and /bin/sh isn't +BUILD_SHEBANG=/bin/sh +for she in /bin/sh "$SHELL"; do + if test -x "$she" ; then + BUILD_SHEBANG="$she" + fi +done +AC_SUBST(BUILD_SHEBANG) + # For gnulib. gl_INIT diff --git a/grub-core/genmod.sh.in b/grub-core/genmod.sh.in index 03cc3b7f6..3de06ee01 100644 --- a/grub-core/genmod.sh.in +++ b/grub-core/genmod.sh.in @@ -1,4 +1,4 @@ -#! /bin/sh +#! @BUILD_SHEBANG@ set -e # Copyright (C) 2010 Free Software Foundation, Inc. diff --git a/grub-core/gensyminfo.sh.in b/grub-core/gensyminfo.sh.in index 2e8716b42..9bc767532 100644 --- a/grub-core/gensyminfo.sh.in +++ b/grub-core/gensyminfo.sh.in @@ -1,4 +1,4 @@ -#! /bin/sh +#! @BUILD_SHEBANG@ set -e # Copyright (C) 2010 Free Software Foundation, Inc. diff --git a/grub-core/modinfo.sh.in b/grub-core/modinfo.sh.in index faf0ad30e..f6cd657ce 100644 --- a/grub-core/modinfo.sh.in +++ b/grub-core/modinfo.sh.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@BUILD_SHEBANG@ # User-controllable options grub_modinfo_target_cpu=@target_cpu@ diff --git a/tests/ahci_test.in b/tests/ahci_test.in index 1d01d1f59..7df560462 100644 --- a/tests/ahci_test.in +++ b/tests/ahci_test.in @@ -1,4 +1,4 @@ -#! /bin/sh +#! @BUILD_SHEBANG@ # Copyright (C) 2013 Free Software Foundation, Inc. # # GRUB is free software: you can redistribute it and/or modify diff --git a/tests/btrfs_test.in b/tests/btrfs_test.in index c55d9477f..2b37ddd33 100644 --- a/tests/btrfs_test.in +++ b/tests/btrfs_test.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@BUILD_SHEBANG@ set -e diff --git a/tests/cdboot_test.in b/tests/cdboot_test.in index 1cc901977..75acdfedb 100644 --- a/tests/cdboot_test.in +++ b/tests/cdboot_test.in @@ -1,4 +1,4 @@ -#! /bin/sh +#! @BUILD_SHEBANG@ # Copyright (C) 2013 Free Software Foundation, Inc. # # GRUB is free software: you can redistribute it and/or modify diff --git a/tests/core_compress_test.in b/tests/core_compress_test.in index 1003587cc..9d216ebcf 100644 --- a/tests/core_compress_test.in +++ b/tests/core_compress_test.in @@ -1,4 +1,4 @@ -#! /bin/sh +#! @BUILD_SHEBANG@ # Copyright (C) 2013 Free Software Foundation, Inc. # # GRUB is free software: you can redistribute it and/or modify diff --git a/tests/cpio_test.in b/tests/cpio_test.in index 0b09db549..5742cf17b 100644 --- a/tests/cpio_test.in +++ b/tests/cpio_test.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@BUILD_SHEBANG@ set -e diff --git a/tests/ehci_test.in b/tests/ehci_test.in index 7dd8d3e8f..b197f8cdc 100644 --- a/tests/ehci_test.in +++ b/tests/ehci_test.in @@ -1,4 +1,4 @@ -#! /bin/sh +#! @BUILD_SHEBANG@ # Copyright (C) 2013 Free Software Foundation, Inc. # # GRUB is free software: you can redistribute it and/or modify diff --git a/tests/example_scripted_test.in b/tests/example_scripted_test.in index 09633e893..783b7f138 100644 --- a/tests/example_scripted_test.in +++ b/tests/example_scripted_test.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@BUILD_SHEBANG@ set -e true diff --git a/tests/exfat_test.in b/tests/exfat_test.in index fc1a0fe5e..cd3cd4cb2 100644 --- a/tests/exfat_test.in +++ b/tests/exfat_test.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@BUILD_SHEBANG@ set -e diff --git a/tests/ext234_test.in b/tests/ext234_test.in index c986960a8..892b99cbd 100644 --- a/tests/ext234_test.in +++ b/tests/ext234_test.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@BUILD_SHEBANG@ set -e diff --git a/tests/fat_test.in b/tests/fat_test.in index 1d132b517..b6b4748ca 100644 --- a/tests/fat_test.in +++ b/tests/fat_test.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@BUILD_SHEBANG@ set -e diff --git a/tests/fddboot_test.in b/tests/fddboot_test.in index a59645b7f..2d7dfc889 100644 --- a/tests/fddboot_test.in +++ b/tests/fddboot_test.in @@ -1,4 +1,4 @@ -#! /bin/sh +#! @BUILD_SHEBANG@ # Copyright (C) 2013 Free Software Foundation, Inc. # # GRUB is free software: you can redistribute it and/or modify diff --git a/tests/file_filter_test.in b/tests/file_filter_test.in index 8909e4021..bfb638227 100644 --- a/tests/file_filter_test.in +++ b/tests/file_filter_test.in @@ -1,4 +1,4 @@ -#! /bin/sh +#! @BUILD_SHEBANG@ # Copyright (C) 2014 Free Software Foundation, Inc. # # GRUB is free software: you can redistribute it and/or modify diff --git a/tests/gettext_strings_test.in b/tests/gettext_strings_test.in index 5c305e75b..813999ebe 100644 --- a/tests/gettext_strings_test.in +++ b/tests/gettext_strings_test.in @@ -1,4 +1,4 @@ -#!/bin/sh +#!@BUILD_SHEBANG@ cd '@srcdir@' diff --git a/tests/grub_cmd_date.in b/tests/grub_cmd_date.in index 60f039ebc..f7c9ca004 100644 --- a/tests/grub_cmd_date.in +++ b/tests/grub_cmd_date.in @@ -1,4 +1,4 @@ -#! /bin/sh +#! @BUILD_SHEBANG@ set -e . "@builddir@/grub-core/modinfo.sh" diff --git a/tests/grub_cmd_regexp.in b/tests/grub_cmd_regexp.in index 7e9ab86aa..6520bd6d7 100644 --- a/tests/grub_cmd_regexp.in +++ b/tests/grub_cmd_regexp.in @@ -1,4 +1,4 @@ -#! /bin/sh +#! @BUILD_SHEBANG@ set -e # Run GRUB script in a Qemu instance diff --git a/tests/grub_cmd_set_date.in b/tests/grub_cmd_set_date.in index 2f518dd9e..aac120a6c 100644 --- a/tests/grub_cmd_set_date.in +++ b/tests/grub_cmd_set_date.in @@ -1,4 +1,4 @@ -#! /bin/sh +#! @BUILD_SHEBANG@ set -e . "@builddir@/grub-core/modinfo.sh" diff --git a/tests/grub_cmd_sleep.in b/tests/grub_cmd_sleep.in index ac51d4209..8797f6632 100644 --- a/tests/grub_cmd_sleep.in +++ b/tests/grub_cmd_sleep.in @@ -1,4 +1,4 @@ -#! /bin/sh +#! @BUILD_SHEBANG@ set -e . "@builddir@/grub-core/modinfo.sh" diff --git a/tests/grub_cmd_test.in b/tests/grub_cmd_test.in index 49ae8a9c8..3399eb292 100644 --- a/tests/grub_cmd_test.in +++ b/tests/grub_cmd_test.in @@ -1,4 +1,4 @@ -#! /bin/sh +#! @BUILD_SHEBANG@ # create a randome file empty="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1 diff --git a/tests/grub_cmd_tr.in b/tests/grub_cmd_tr.in index 0e8d645eb..bed469c03 100644 --- a/tests/grub_cmd_tr.in +++ b/tests/grub_cmd_tr.in @@ -1,4 +1,4 @@ -#! /bin/sh -e +#! @BUILD_SHEBANG@ -e # Run GRUB script in a Qemu instance # Copyright (C) 2010 Free Software Foundation, Inc. diff --git a/tests/grub_func_test.in b/tests/grub_func_test.in index b32f24466..c67f9e422 100644 --- a/tests/grub_func_test.in +++ b/tests/grub_func_test.in @@ -1,4 +1,4 @@ -#! /bin/sh +#! @BUILD_SHEBANG@ set -e . "@builddir@/grub-core/modinfo.sh" diff --git a/tests/grub_script_blanklines.in b/tests/grub_script_blanklines.in index 89ed763d3..bd8735491 100644 --- a/tests/grub_script_blanklines.in +++ b/tests/grub_script_blanklines.in @@ -1,4 +1,4 @@ -#! /bin/sh +#! @BUILD_SHEBANG@ set -e @builddir@/grub-script-check <