Blars changes:

[spamassassin_config.git] / update_spamassassin

diff --git a/update_spamassassin b/update_spamassassin
index 3b25d6ae0470092ddfba31c5b985004d084b765f..2610c9ede227861876f383d0c11f5e8796541084 100755 (executable)
--- 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
@@ -69,14 +69,14 @@ cp -ar $SACONFIG $TMPDIR/.
 cd $TMPDIR/spamassassin_config;
 svn update -q --non-interactive; 
 if svn status |grep -q '^C'; then
-    FAILUREMESSAGE="$(echo -e 'The following conflicts were found\n')"
+    FAILUREMESSAGE=$'The following conflicts were found\n\n'
     FAILUREMESSAGE="$FAILUREMESSAGE$(svn status|grep ^C)";
     report_failure
 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;