* grub-core/genmod.sh.in: Use 'set -e' rather than '#! /bin/sh -e',

to avoid accidents when debugging with 'sh -x'.
* grub-core/gensyminfo.sh.in: Likewise.
* tests/example_scripted_test.in: Likewise.
* tests/grub_cmd_regexp.in: Likewise.
* tests/grub_script_blanklines.in: Likewise.
* tests/grub_script_dollar.in: Likewise.
* tests/grub_script_expansion.in: Likewise.
* tests/grub_script_final_semicolon.in: Likewise.
* tests/partmap_test.in: Likewise.
* tests/util/grub-shell-tester.in: Likewise.
* tests/util/grub-shell.in: Likewise.

diff --git a/ChangeLog b/ChangeLog
index 9ed12abbee9afa3509a78f06aa498f94858466c5..bac09e10194ee59b49d0a436300d6887be266353 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2011-05-18  Colin Watson  <cjwatson@ubuntu.com>
+
+       * grub-core/genmod.sh.in: Use 'set -e' rather than '#! /bin/sh -e',
+       to avoid accidents when debugging with 'sh -x'.
+       * grub-core/gensyminfo.sh.in: Likewise.
+       * tests/example_scripted_test.in: Likewise.
+       * tests/grub_cmd_regexp.in: Likewise.
+       * tests/grub_script_blanklines.in: Likewise.
+       * tests/grub_script_dollar.in: Likewise.
+       * tests/grub_script_expansion.in: Likewise.
+       * tests/grub_script_final_semicolon.in: Likewise.
+       * tests/partmap_test.in: Likewise.
+       * tests/util/grub-shell-tester.in: Likewise.
+       * tests/util/grub-shell.in: Likewise.
+
 2011-05-18  Colin Watson  <cjwatson@ubuntu.com>
 
        Move gfxmenu color handling to video, so that gfxterm can use it

diff --git a/grub-core/genmod.sh.in b/grub-core/genmod.sh.in
index 023cd10625a0209cdf87073d47799ad8e5182769..4cab8e50ec00cd885dc1984b7f501ca9601a9fc4 100644 (file)
--- a/grub-core/genmod.sh.in
+++ b/grub-core/genmod.sh.in
@@ -1,5 +1,6 @@
-#! /bin/sh -e
-#
+#! /bin/sh
+set -e
+
 # Copyright (C) 2010 Free Software Foundation, Inc.
 #
 # This gensymlist.sh is free software; the author

diff --git a/grub-core/gensyminfo.sh.in b/grub-core/gensyminfo.sh.in
index 4f5184913fce44b07a4cc2706706854ee4f65322..d383f2640e47018370fa88bb64347227710ed03f 100644 (file)
--- a/grub-core/gensyminfo.sh.in
+++ b/grub-core/gensyminfo.sh.in
@@ -1,5 +1,6 @@
-#! /bin/sh -e
-#
+#! /bin/sh
+set -e
+
 # Copyright (C) 2010 Free Software Foundation, Inc.
 #
 # This gensymlist.sh is free software; the author

diff --git a/tests/example_scripted_test.in b/tests/example_scripted_test.in
index 9ac0424c08ff18df6315d74ec50cefa630b40e91..09633e89341e079a05fda7461d867e1541df4287 100644 (file)
--- a/tests/example_scripted_test.in
+++ b/tests/example_scripted_test.in
@@ -1,3 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
+set -e
 
 true

diff --git a/tests/grub_cmd_regexp.in b/tests/grub_cmd_regexp.in
index 43b479fec8cc1203ee02ae0e7f35a662ebe5a6f5..e7e6257011525ee42ca6945485208155fe717d24 100644 (file)
--- a/tests/grub_cmd_regexp.in
+++ b/tests/grub_cmd_regexp.in
@@ -1,4 +1,5 @@
-#! /bin/bash -e
+#! /bin/bash
+set -e
 
 # Run GRUB script in a Qemu instance
 # Copyright (C) 2010  Free Software Foundation, Inc.

diff --git a/tests/grub_script_blanklines.in b/tests/grub_script_blanklines.in
index 71b869bd3f7811feba84e67d036825f7bba6de4a..89ed763d3f4e0bb2a3ac3a61de9e0ec49b2eaccf 100644 (file)
--- a/tests/grub_script_blanklines.in
+++ b/tests/grub_script_blanklines.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 @builddir@/grub-script-check <<EOF
 # comment 1

diff --git a/tests/grub_script_dollar.in b/tests/grub_script_dollar.in
index 3819b8bc988141fdafa90c5e2a86d4dcfdfddd03..2e076427afbc86e05260b58e9f22f7e3fe48ce4e 100644 (file)
--- a/tests/grub_script_dollar.in
+++ b/tests/grub_script_dollar.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 @builddir@/grub-script-check << EOF
 echo "\\\$"

diff --git a/tests/grub_script_expansion.in b/tests/grub_script_expansion.in
index d1e8d55c99541464662840170c58d59c778f6598..1575bff619542ec9ab868c542103cb4336a3ec67 100644 (file)
--- a/tests/grub_script_expansion.in
+++ b/tests/grub_script_expansion.in
@@ -1,4 +1,5 @@
-#! /bin/bash -e
+#! /bin/bash
+set -e
 
 # Run GRUB script in a Qemu instance
 # Copyright (C) 2010  Free Software Foundation, Inc.

diff --git a/tests/grub_script_final_semicolon.in b/tests/grub_script_final_semicolon.in
index 99e55e5458c153d734ee7081b3034cb846aba595..3ac26540bbd7cf4614dc199534417b139c2bb7f0 100644 (file)
--- a/tests/grub_script_final_semicolon.in
+++ b/tests/grub_script_final_semicolon.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 @builddir@/grub-script-check <<EOF
 echo one;

diff --git a/tests/partmap_test.in b/tests/partmap_test.in
index 7e9cef7c684abba76bdd9d383ab01844fa2ecd0b..d8cdf7175f44d795ce20ab736beeadd4428a7f65 100644 (file)
--- a/tests/partmap_test.in
+++ b/tests/partmap_test.in
@@ -1,5 +1,6 @@
-#! /bin/sh -e
-#
+#! /bin/sh
+set -e
+
 # Copyright (C) 2010  Free Software Foundation, Inc.
 #
 # GRUB is free software: you can redistribute it and/or modify

diff --git a/tests/util/grub-shell-tester.in b/tests/util/grub-shell-tester.in
index b839825f14c12f49ece9f70fea5c48cc33578d7e..04d0ad5d9c21130d0bab145292035867aa5d25bf 100644 (file)
--- a/tests/util/grub-shell-tester.in
+++ b/tests/util/grub-shell-tester.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # Compares GRUB script output with BASH output.
 # Copyright (C) 2009,2010  Free Software Foundation, Inc.

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 0213376d0d24bbfda4e68936b21adaba0056cdef..77853217f584c6fbf1a244e34bdfc807375e2290 100644 (file)
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -1,4 +1,5 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 
 # Run GRUB script in a Qemu instance
 # Copyright (C) 2009,2010  Free Software Foundation, Inc.