X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=update_spamassassin;h=7ffe4406df2594be6b2ca2a69dccce598c8fab91;hp=00c540f48d05306f3b822b387d545415187c9c62;hb=1d2e21926a683f56e5d58b4f588baf00386e61fc;hpb=05eda589302202d16da09d6ec493c8d09cfbd2aa

diff --git a/update_spamassassin b/update_spamassassin
index 00c540f..7ffe440 100755
--- a/update_spamassassin
+++ b/update_spamassassin
@@ -14,7 +14,7 @@ if [ "$HOSTNAME" == "rietz" ]; then
     USERCONF="bugs/user_prefs";
 elif [ "$HOSTNAME" == "murphy" ]; then
     BASEDIR="/var/list/.etc";
-    USERCONF="bugs/user_prefs";
+    USERCONF="lists/user_prefs";
 else
     echo "Unknown hostname '$HOSTNAME'";
     exit 1;
@@ -32,7 +32,7 @@ if [ $ORIGREV -ge $NEWREV ]; then
     exit 0;
 fi;
 
-if [ -e "$SACONFIG/.update_spamassassin" ] && kill -0 $(cat "$SACONFIG/.update_spamassassin"); then
+if [ -e "$SACONFIG/.update_spamassassin" ] && kill -0 $(cat "$SACONFIG/.update_spamassassin") >/dev/null 2>&1; then
     echo "Another update_spamassassin appears to be running"
     exit 1;
 else
@@ -81,7 +81,7 @@ 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 - ERR
 remove_pidfile
 rm -rf "$TMPDIR"