Fix shebang for termux.

Termux doesn't have a /bin/sh. So we needto use $SHELL.
Keep /bin/sh as much as possible.

diff --git a/configure.ac b/configure.ac
index e0262e1..ee2c865 100644 (file)
--- 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 03cc3b7..3de06ee 100644 (file)
--- 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 2e8716b..9bc7675 100644 (file)
--- 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 faf0ad3..f6cd657 100644 (file)
--- 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 1d01d1f..7df5604 100644 (file)
--- 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 c55d947..2b37ddd 100644 (file)
--- 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 1cc9019..75acdfe 100644 (file)
--- 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 1003587..9d216eb 100644 (file)
--- 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 0b09db5..5742cf1 100644 (file)
--- 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 7dd8d3e..b197f8c 100644 (file)
--- 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 09633e8..783b7f1 100644 (file)
--- 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 fc1a0fe..cd3cd4c 100644 (file)
--- 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 c986960..892b99c 100644 (file)
--- 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 1d132b5..b6b4748 100644 (file)
--- 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 a59645b..2d7dfc8 100644 (file)
--- 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 8909e40..bfb6382 100644 (file)
--- 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 5c305e7..813999e 100644 (file)
--- 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 60f039e..f7c9ca0 100644 (file)
--- 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 7e9ab86..6520bd6 100644 (file)
--- 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 2f518dd..aac120a 100644 (file)
--- 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 ac51d42..8797f66 100644 (file)
--- 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 49ae8a9..3399eb2 100644 (file)
--- 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 0e8d645..bed469c 100644 (file)
--- 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 b32f244..c67f9e4 100644 (file)
--- 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 89ed763..bd87354 100644 (file)
--- 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 <<EOF

diff --git a/tests/grub_script_blockarg.in b/tests/grub_script_blockarg.in
index 63b60a2..6ea9b8c 100644 (file)
--- a/tests/grub_script_blockarg.in
+++ b/tests/grub_script_blockarg.in
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! @BUILD_SHEBANG@
 
 # Run GRUB script in a Qemu instance
 # Copyright (C) 2010  Free Software Foundation, Inc.

diff --git a/tests/grub_script_dollar.in b/tests/grub_script_dollar.in
index 2e07642..392fe2e 100644 (file)
--- a/tests/grub_script_dollar.in
+++ b/tests/grub_script_dollar.in
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! @BUILD_SHEBANG@
 set -e
 
 @builddir@/grub-script-check << EOF

diff --git a/tests/grub_script_expansion.in b/tests/grub_script_expansion.in
index 2b78295..9d0dcdd 100644 (file)
--- a/tests/grub_script_expansion.in
+++ b/tests/grub_script_expansion.in
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! @BUILD_SHEBANG@
 set -e
 
 # Run GRUB script in a Qemu instance

diff --git a/tests/grub_script_final_semicolon.in b/tests/grub_script_final_semicolon.in
index 3ac2654..f17a9bf 100644 (file)
--- a/tests/grub_script_final_semicolon.in
+++ b/tests/grub_script_final_semicolon.in
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! @BUILD_SHEBANG@
 set -e
 
 @builddir@/grub-script-check <<EOF

diff --git a/tests/grub_script_no_commands.in b/tests/grub_script_no_commands.in
index c31d267..996bb18 100644 (file)
--- a/tests/grub_script_no_commands.in
+++ b/tests/grub_script_no_commands.in
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! @BUILD_SHEBANG@
 set -e
 
 # grub-script-check refuses to pass a file with no commands; this usually

diff --git a/tests/gzcompress_test.in b/tests/gzcompress_test.in
index 11b6bb2..42c8fe7 100644 (file)
--- a/tests/gzcompress_test.in
+++ b/tests/gzcompress_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/hddboot_test.in b/tests/hddboot_test.in
index c229716..6d70847 100644 (file)
--- a/tests/hddboot_test.in
+++ b/tests/hddboot_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/help_test.in b/tests/help_test.in
index aa96458..b08cf20 100644 (file)
--- a/tests/help_test.in
+++ b/tests/help_test.in
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! @BUILD_SHEBANG@
 set -e
 
 . "@builddir@/grub-core/modinfo.sh"

diff --git a/tests/hfs_test.in b/tests/hfs_test.in
index e3e88f1..d7ec56b 100644 (file)
--- a/tests/hfs_test.in
+++ b/tests/hfs_test.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e
 

diff --git a/tests/hfsplus_test.in b/tests/hfsplus_test.in
index f947c4a..85f1c37 100644 (file)
--- a/tests/hfsplus_test.in
+++ b/tests/hfsplus_test.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e
 

diff --git a/tests/iso9660_test.in b/tests/iso9660_test.in
index fdcc9e1..571b938 100644 (file)
--- a/tests/iso9660_test.in
+++ b/tests/iso9660_test.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e
 

diff --git a/tests/jfs_test.in b/tests/jfs_test.in
index c2e5ece..6cf7576 100644 (file)
--- a/tests/jfs_test.in
+++ b/tests/jfs_test.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e
 

diff --git a/tests/lzocompress_test.in b/tests/lzocompress_test.in
index 41984c2..4e5f7e0 100644 (file)
--- a/tests/lzocompress_test.in
+++ b/tests/lzocompress_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/minixfs_test.in b/tests/minixfs_test.in
index 1784b12..3b16a4d 100644 (file)
--- a/tests/minixfs_test.in
+++ b/tests/minixfs_test.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e
 

diff --git a/tests/netboot_test.in b/tests/netboot_test.in
index c757023..9f71e3d 100644 (file)
--- a/tests/netboot_test.in
+++ b/tests/netboot_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/nilfs2_test.in b/tests/nilfs2_test.in
index 780b60e..ad44d5b 100644 (file)
--- a/tests/nilfs2_test.in
+++ b/tests/nilfs2_test.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e
 

diff --git a/tests/ntfs_test.in b/tests/ntfs_test.in
index e25c638..9eb7b01 100644 (file)
--- a/tests/ntfs_test.in
+++ b/tests/ntfs_test.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e
 

diff --git a/tests/ohci_test.in b/tests/ohci_test.in
index 7fede6f..8693f8c 100644 (file)
--- a/tests/ohci_test.in
+++ b/tests/ohci_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/partmap_test.in b/tests/partmap_test.in
index f8dc456..6ef518b 100644 (file)
--- a/tests/partmap_test.in
+++ b/tests/partmap_test.in
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! @BUILD_SHEBANG@
 set -e
 
 # Copyright (C) 2010  Free Software Foundation, Inc.

diff --git a/tests/pata_test.in b/tests/pata_test.in
index c1d0f63..4b18fde 100644 (file)
--- a/tests/pata_test.in
+++ b/tests/pata_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/pseries_test.in b/tests/pseries_test.in
index 2264945..655eb4f 100644 (file)
--- a/tests/pseries_test.in
+++ b/tests/pseries_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/reiserfs_test.in b/tests/reiserfs_test.in
index 678efe7..b5fed76 100644 (file)
--- a/tests/reiserfs_test.in
+++ b/tests/reiserfs_test.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e
 

diff --git a/tests/romfs_test.in b/tests/romfs_test.in
index 83e0931..98bb50c 100644 (file)
--- a/tests/romfs_test.in
+++ b/tests/romfs_test.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e
 

diff --git a/tests/squashfs_test.in b/tests/squashfs_test.in
index ec34e01..2f044f9 100644 (file)
--- a/tests/squashfs_test.in
+++ b/tests/squashfs_test.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e
 

diff --git a/tests/syslinux_test.in b/tests/syslinux_test.in
index fc4edd8..4ea8639 100644 (file)
--- a/tests/syslinux_test.in
+++ b/tests/syslinux_test.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e
 

diff --git a/tests/tar_test.in b/tests/tar_test.in
index 46ba3bc..6e2f2de 100644 (file)
--- a/tests/tar_test.in
+++ b/tests/tar_test.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e
 

diff --git a/tests/test_sha512sum.in b/tests/test_sha512sum.in
index 80ebdc5..027092a 100644 (file)
--- a/tests/test_sha512sum.in
+++ b/tests/test_sha512sum.in
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! @BUILD_SHEBANG@
 
 # create a randome file
 file="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 1

diff --git a/tests/udf_test.in b/tests/udf_test.in
index fe244e2..fb92f01 100644 (file)
--- a/tests/udf_test.in
+++ b/tests/udf_test.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e
 

diff --git a/tests/uhci_test.in b/tests/uhci_test.in
index 89e2c18..4af72fd 100644 (file)
--- a/tests/uhci_test.in
+++ b/tests/uhci_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/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
index 468d9e7..88cbe73 100644 (file)
--- a/tests/util/grub-fs-tester.in
+++ b/tests/util/grub-fs-tester.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e
 

diff --git a/tests/util/grub-shell-tester.in b/tests/util/grub-shell-tester.in
index 5adce0a..8a87109 100644 (file)
--- a/tests/util/grub-shell-tester.in
+++ b/tests/util/grub-shell-tester.in
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! @BUILD_SHEBANG@
 set -e
 
 # Compares GRUB script output with BASH output.

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 814f36c..d690d67 100644 (file)
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! @BUILD_SHEBANG@
 set -e
 
 # Run GRUB script in a Qemu instance

diff --git a/tests/xfs_test.in b/tests/xfs_test.in
index 3807e2e..03a3513 100644 (file)
--- a/tests/xfs_test.in
+++ b/tests/xfs_test.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e
 

diff --git a/tests/xzcompress_test.in b/tests/xzcompress_test.in
index b2bd999..03bfb5e 100644 (file)
--- a/tests/xzcompress_test.in
+++ b/tests/xzcompress_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/zfs_test.in b/tests/zfs_test.in
index 047120e..eee62c1 100644 (file)
--- a/tests/zfs_test.in
+++ b/tests/zfs_test.in
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!@BUILD_SHEBANG@
 
 set -e