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
-FAILUREMESSAGE="$(spamassassin -C $TMPDIR/spamassassin_config/$USERCONF --lint)"
-if [ "$?" != "0" ]; then
- FAILUREMESSAGE="$(echo -e 'spamassassin -C $TMPDIR/spamassassin_config/$USERCONF --lint\nfailed with\n')$FAILUREMESSAGE";
+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)";
report_failure
fi;
mv "$SACONFIG" "$BAKDIR/spamassassin_config_r$ORIGREV"
mv "$TMPDIR/spamassassin_config" "$SACONFIG"
trap ERR
+remove_pidfile
rm -rf "$TMPDIR"
if [ "$HOSTNAME" == "rietz" ]; then
fi;
-exit 0;
\ No newline at end of file
+exit 0;