* fix trap and function dash incompatible calls

[spamassassin_config.git] / update_spamassassin

diff --git a/update_spamassassin b/update_spamassassin
index b9b29a07a8c7e6d430ca316570fb086573a7f332..3a15e883ca5d63070014862da8be58cd2f0b2d87 100755 (executable)
--- a/update_spamassassin
+++ b/update_spamassassin
@@ -9,6 +9,8 @@ SVN=$(which svn)
 
 TMPDIR=$(mktemp -d);
 
+HOSTNAME=$(hostname);
+
 if [ "$HOSTNAME" = "rietz" ] || [ "$HOSTNAME" = "busoni" ]; then
     BASEDIR="/org/bugs.debian.org"
     USERCONF="bugs/user_prefs";
@@ -25,7 +27,7 @@ BAKDIR="$BASEDIR/spamassassin_config_bak";
 
 # because alioth continuously fails, make sure that svn info will
 # succeed first before cluttering the log. Ideally we would report
-# this error, but it happens far to frequently, so we bail out here.
+# this error, but it happens far too frequently, so we bail out here.
 if ! svn info $(svn info $SACONFIG|awk '/^URL:/{print $2}') >/dev/null 2>&1; then
     exit 0;
 fi;
@@ -46,14 +48,14 @@ else
     echo $$ > "$SACONFIG/.update_spamassassin";
 fi;
 
-function remove_pidfile(){
+remove_pidfile () {
     rm "$SACONFIG/.update_spamassassin";
 }
 
-trap remove_pidfile ERR;
+trap remove_pidfile 0;
 
 FAILUREMESSAGE="";
-function report_failure(){
+report_failure () {
     # Hrm; a previous update failed; don't report again until the file
     # is removed or it's more than a day old
     if [ -e "$SACONFIG/failed_update" ] &&