X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=update_spamassassin;h=46b4952357d5838ebb75e37213b89911971909d2;hp=b9b29a07a8c7e6d430ca316570fb086573a7f332;hb=c5509c855221dc1f5aa057cdb0aa7901158e8ebc;hpb=b13127d56f0895a2da55a0fafdbb5fccdf34aeec

diff --git a/update_spamassassin b/update_spamassassin
index b9b29a0..46b4952 100755
--- a/update_spamassassin
+++ b/update_spamassassin
@@ -9,10 +9,12 @@ SVN=$(which svn)
 
 TMPDIR=$(mktemp -d);
 
-if [ "$HOSTNAME" = "rietz" ] || [ "$HOSTNAME" = "busoni" ]; then
+HOSTNAME=$(hostname);
+
+if [ "$HOSTNAME" = "buxtehude" ]; then
     BASEDIR="/org/bugs.debian.org"
     USERCONF="bugs/user_prefs";
-elif [ "$HOSTNAME" = "liszt" ]; then
+elif [ "$HOSTNAME" = "bendel" ]; then
     BASEDIR="/var/list/.etc";
     USERCONF="lists/user_prefs";
 else
@@ -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" ] &&
@@ -92,13 +94,13 @@ if ! spamassassin -p $TMPDIR/spamassassin_config/$USERCONF --lint > $TMPDIR/sa_l
 fi;
 mv "$SACONFIG" "$BAKDIR/spamassassin_config_r$ORIGREV"
 mv "$TMPDIR/spamassassin_config" "$SACONFIG"
-trap - ERR
+trap - 0
 remove_pidfile
 rm -rf "$TMPDIR"
 
-if [ "$HOSTNAME" == "rietz" ]; then
+if [ "$HOSTNAME" = "buxtehude" ]; then
     touch /home/debbugs/.spamassassin/user_prefs
-elif [ "$HOSTNAME" == "liszt" ]; then
+elif [ "$HOSTNAME" = "bendel" ]; then
     # do nothing
     true;
 else