X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=update_spamassassin;h=f699d890daad592ea700ef491570eb35625dd813;hp=3ffa065e8afa39deb1eca7560dff10794904dd3f;hb=699ce11edd6ca7c2aae3cb070aad58a921de984e;hpb=6e4f0a7707f8291ebfed167598b86f68f9d8e9e5 diff --git a/update_spamassassin b/update_spamassassin index 3ffa065..f699d89 100755 --- a/update_spamassassin +++ b/update_spamassassin @@ -9,7 +9,7 @@ SVN=$(which svn) TMPDIR=$(mktemp -d); -if [ "$HOSTNAME" = "rietz" ]; then +if [ "$HOSTNAME" = "rietz" ] || [ "$HOSTNAME" = "busoni" ]; then BASEDIR="/org/bugs.debian.org" USERCONF="bugs/user_prefs"; elif [ "$HOSTNAME" = "liszt" ]; then @@ -69,6 +69,7 @@ EOF } cp -ar $SACONFIG $TMPDIR/. +OLDDIR="$(pwd)" cd $TMPDIR/spamassassin_config; svn update -q --non-interactive; if svn status |grep -q '^C'; then @@ -76,7 +77,7 @@ if svn status |grep -q '^C'; then FAILUREMESSAGE="$FAILUREMESSAGE$(svn status|grep ^C)"; report_failure fi; -cd - >/dev/null 2>&1 +cd "$(pwd)" 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)";