X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=update_spamassassin;h=609e8f88f54ed8b3849133f396cfec784df49664;hp=219a537cb386f00e7fc4f329c954f65e450bec38;hb=93b67f23751074630b463f587518047e64b181fd;hpb=8cef733f4d4bf5622a6fe85ee899d9e02a231ad8

diff --git a/update_spamassassin b/update_spamassassin
index 219a537..609e8f8 100755
--- a/update_spamassassin
+++ b/update_spamassassin
@@ -35,7 +35,7 @@ remove_pidfile() {
 
 OLDDIR="$(pwd)";
 cd "$SACONFIG";
-git fetch --all >/dev/null || exit 0;
+git fetch --quiet --all >/dev/null 2>&1 || exit 0;
 REMOTE_BRANCH="$(git status --porcelain --branch|grep '^##'|sed 's/.*\.\.\.//;s/ \[.*$//;')";
 CURRENT_HEAD="$(git rev-parse HEAD)"
 REMOTE_BRANCH_HEAD="$(git rev-parse "$REMOTE_BRANCH")"
@@ -84,7 +84,7 @@ if ! spamassassin -p $TMPDIR/spamassassin_config/$USERCONF --lint > $TMPDIR/sa_l
     FAILUREMESSAGE="$(echo -e 'spamassassin -p $TMPDIR/spamassassin_config/$USERCONF --lint\nfailed with\n'| cat - $TMPDIR/sa_lint)";
     report_failure
 fi;
-cd "$SACONFIG":
+cd "$SACONFIG";
 git merge --ff-only  --quiet $REMOTE_BRANCH --;
 trap - 0
 remove_pidfile