Use "set -e" command instead of "#! /bin/sh -e" magic.

Otherwise, running the script through an explicit shell invocation, such
as "sh -x <script>" for debugging, will fail to set -e and therefore the
script's behavior will change.

diff --git a/boot.sh b/boot.sh
index 0f48d43978745d0fb6d2c48ad4a001d782bda537..ae2b366594e3b5ef076695baaf01d429a0b42977 100755 (executable)
--- a/boot.sh
+++ b/boot.sh
@@ -1,4 +1,6 @@
-#! /bin/sh -e
+#! /bin/sh
+
+set -e
 
 have_ext=$(if test -e ext/automake.mk; then echo yes; else echo no; fi)
 for opt

diff --git a/secchan/commands/update b/secchan/commands/update
index 4d617fea0585f97b47f9c92624507ca35cf4b7ac..545e3c23364c6e99cb5d8bd4d315edc91a80914b 100755 (executable)
--- a/secchan/commands/update
+++ b/secchan/commands/update
@@ -1,3 +1,4 @@
-#! /bin/sh -e
+#! /bin/sh
+set -e
 apt-get update -qy
 apt-get upgrade -qy

diff --git a/utilities/ofp-pki.in b/utilities/ofp-pki.in
index 89a3dba0d1e096890a3f10104343b2a7a042be81..7d51469b4e0ec12d480cd1809fe2ee7d9e3ce5df 100755 (executable)
--- a/utilities/ofp-pki.in
+++ b/utilities/ofp-pki.in
@@ -1,4 +1,6 @@
-#! /bin/sh -e
+#! /bin/sh
+
+set -e
 
 pkidir='@PKIDIR@'
 command=