* fix dscription of mymsnnameis

[spamassassin_config.git] / update_spamassassin

diff --git a/update_spamassassin b/update_spamassassin
index 7ffe4406df2594be6b2ca2a69dccce598c8fab91..1769913350bb46cdcedd7dd138cf55db5874e714 100755 (executable)
--- a/update_spamassassin
+++ b/update_spamassassin
@@ -9,10 +9,10 @@ SVN=$(which svn)
 
 TMPDIR=$(mktemp -d);
 
 
 TMPDIR=$(mktemp -d);
 

-if [ "$HOSTNAME" == "rietz" ]; then
+if [ "$HOSTNAME" = "rietz" ]; then

     BASEDIR="/org/bugs.debian.org"
     USERCONF="bugs/user_prefs";
     BASEDIR="/org/bugs.debian.org"
     USERCONF="bugs/user_prefs";

-elif [ "$HOSTNAME" == "murphy" ]; then
+elif [ "$HOSTNAME" = "liszt" ]; then

     BASEDIR="/var/list/.etc";
     USERCONF="lists/user_prefs";
 else
     BASEDIR="/var/list/.etc";
     USERCONF="lists/user_prefs";
 else


@@ -28,7 +28,7 @@ ORIGREV=$(svn info $SACONFIG |awk '/^Revision:/{print $2}')
 NEWREV=$(svn info $(svn info $SACONFIG|awk '/^URL:/{print $2}')|awk '/^Revision:/{print $2}')
 
 # no changes, bug out.
 NEWREV=$(svn info $(svn info $SACONFIG|awk '/^URL:/{print $2}')|awk '/^Revision:/{print $2}')
 
 # no changes, bug out.

-if [ $ORIGREV -ge $NEWREV ]; then
+if [ "0$ORIGREV" -ge "0$NEWREV" ]; then

     exit 0;
 fi;
 
     exit 0;
 fi;
 


@@ -50,6 +50,7 @@ function report_failure(){
     # Hrm; a previous update failed; don't report again until the file
     # is removed
     if [ -e "$SACONFIG/failed_update" ]; then
     # Hrm; a previous update failed; don't report again until the file
     # is removed
     if [ -e "$SACONFIG/failed_update" ]; then

+       rm -rf "$TMPDIR"

        exit 0;
     fi;
     echo "$FAILUREMESSAGE" >> "$SACONFIG/failed_update"
        exit 0;
     fi;
     echo "$FAILUREMESSAGE" >> "$SACONFIG/failed_update"


@@ -62,6 +63,7 @@ is fixed.
 Please fix the problem and then remove
 $SACONFIG/failed_update
 EOF
 Please fix the problem and then remove
 $SACONFIG/failed_update
 EOF

+    rm -rf "$TMPDIR"

     exit 1;
 }
 
     exit 1;
 }
 


@@ -87,7 +89,7 @@ rm -rf "$TMPDIR"
 
 if [ "$HOSTNAME" == "rietz" ]; then
     touch /home/debbugs/.spamassassin/user_prefs
 
 if [ "$HOSTNAME" == "rietz" ]; then
     touch /home/debbugs/.spamassassin/user_prefs

-elif [ "$HOSTNAME" == "murphy" ]; then
+elif [ "$HOSTNAME" == "liszt" ]; then

     # do nothing
     true;
 else
     # do nothing
     true;
 else