From 5626056ffb35ed0320fed4bceac9768ebc8c31d2 Mon Sep 17 00:00:00 2001
From: Colin Watson <cjwatson@ubuntu.com>
Date: Wed, 18 May 2011 12:53:07 +0100
Subject: [PATCH] * 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.

---
 ChangeLog                            | 15 +++++++++++++++
 grub-core/genmod.sh.in               |  5 +++--
 grub-core/gensyminfo.sh.in           |  5 +++--
 tests/example_scripted_test.in       |  3 ++-
 tests/grub_cmd_regexp.in             |  3 ++-
 tests/grub_script_blanklines.in      |  3 ++-
 tests/grub_script_dollar.in          |  3 ++-
 tests/grub_script_expansion.in       |  3 ++-
 tests/grub_script_final_semicolon.in |  3 ++-
 tests/partmap_test.in                |  5 +++--
 tests/util/grub-shell-tester.in      |  3 ++-
 tests/util/grub-shell.in             |  3 ++-
 12 files changed, 40 insertions(+), 14 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9ed12abbe..bac09e101 100644
--- 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 023cd1062..4cab8e50e 100644
--- 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 4f5184913..d383f2640 100644
--- 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 9ac0424c0..09633e893 100644
--- 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 43b479fec..e7e625701 100644
--- 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 71b869bd3..89ed763d3 100644
--- 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 3819b8bc9..2e076427a 100644
--- 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 d1e8d55c9..1575bff61 100644
--- 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 99e55e545..3ac26540b 100644
--- 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 7e9cef7c6..d8cdf7175 100644
--- 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 b839825f1..04d0ad5d9 100644
--- 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 0213376d0..77853217f 100644
--- 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.