[dak/master] various shell scripts
make them set -E so they honor the errtrap even in functions
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
config/debian/cron.dinstall | 4 ++++
config/debian/cron.reboot | 4 ++++
config/debian/cron.unchecked | 4 ++++
config/debian/cron.weekly | 4 ++++
4 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 838955c..9a21ae8 100755
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -20,6 +20,10 @@
set -e
# make sure to only use defined variables
set -u
+# ERR traps should be inherited from functions too. (And command
+# substitutions and subshells and whatnot, but for us the functions is
+# the important part here)
+set -E
# import the general variable set.
export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
diff --git a/config/debian/cron.reboot b/config/debian/cron.reboot
index b3c0b09..865efcb 100755
--- a/config/debian/cron.reboot
+++ b/config/debian/cron.reboot
@@ -20,6 +20,10 @@
set -e
# make sure to only use defined variables
set -u
+# ERR traps should be inherited from functions too. (And command
+# substitutions and subshells and whatnot, but for us the functions is
+# the important part here)
+set -E
# import the general variable set.
export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index 166579d..b3c078e 100755
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -20,6 +20,10 @@
set -e
# make sure to only use defined variables
set -u
+# ERR traps should be inherited from functions too. (And command
+# substitutions and subshells and whatnot, but for us the functions is
+# the important part here)
+set -E
# import the general variable set.
export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly
index 4baaf46..5ab9d8b 100755
--- a/config/debian/cron.weekly
+++ b/config/debian/cron.weekly
@@ -4,6 +4,10 @@
set -e
set -u
+# ERR traps should be inherited from functions too. (And command
+# substitutions and subshells and whatnot, but for us the functions is
+# the important part here)
+set -E
export SCRIPTVARS=/srv/ftp.debian.org/dak/config/debian/vars
. $SCRIPTVARS
--
1.5.6.5
Reply to: