various shell scripts

make them set -E so they honor the errtrap even in functions

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 838955c225f9abc3b68ce2a767d788b299b0af3f..9a21ae8bc52e85d5ed11984e36038ce9511c93b8 100755 (executable)
--- 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 b3c0b09a6e46fe9e100079764d20bd14c9468870..865efcbe382b259b1f2e338336d93987d5dfce43 100755 (executable)
--- 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 166579db582271a8a9e6a0eb2af1829ab5e78011..b3c078e30d3925ba565782627e34462e67656b5d 100755 (executable)
--- 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 4baaf46c3a7c9e482ecfce074b1d1298111784fd..5ab9d8b88a7efcb64f5db92f74ad72c33b3a3ff4 100755 (executable)
--- 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