X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=update_spamassassin;h=2610c9ede227861876f383d0c11f5e8796541084;hp=59ab92e4d858f1a2f623b05993dbac6454259a7a;hb=8a891be9a2f81b9020557a1e43d33e7024f31426;hpb=11ce2b1ce79fb3fde1e9b1a5b2388e4fcd3cac4b

diff --git a/update_spamassassin b/update_spamassassin
index 59ab92e..2610c9e 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
@@ -75,8 +75,8 @@ if svn status |grep -q '^C'; then
 fi;
 cd - >/dev/null 2>&1
 
-if ! spamassassin -C $TMPDIR/spamassassin_config/$USERCONF --lint > $TMPDIR/sa_lint 2>&1; then
-    FAILUREMESSAGE="$(echo -e 'spamassassin -C $TMPDIR/spamassassin_config/$USERCONF --lint\nfailed with\n'| cat - $TMPDIR/sa_lint)";
+if ! spamassassin -p $TMPDIR/spamassassin_config/$USERCONF --lint > $TMPDIR/sa_lint 2>&1; then
+    FAILUREMESSAGE="$(echo -e 'spamassassin -p $TMPDIR/spamassassin_config/$USERCONF --lint\nfailed with\n'| cat - $TMPDIR/sa_lint)";
     report_failure
 fi;
 mv "$SACONFIG" "$BAKDIR/spamassassin_config_r$ORIGREV"
@@ -89,6 +89,7 @@ if [ "$HOSTNAME" == "rietz" ]; then
     touch /home/debbugs/.spamassassin/user_prefs
 elif [ "$HOSTNAME" == "murphy" ]; then
     # do nothing
+    true;
 else
     echo "Unknown hostname '$HOSTNAME'";
     exit 1;