svn commit: r903276 - /spamassassin/branches/3.3/build/mkupdates/update-rules

[jm...@apache.org]

Author: jm
Date: Tue Jan 26 15:36:30 2010
New Revision: 903276

URL: http://svn.apache.org/viewvc?rev=903276&view=rev
Log:
backport fixes from trunk to update-rules script made during release

Modified:
    spamassassin/branches/3.3/build/mkupdates/update-rules

Modified: spamassassin/branches/3.3/build/mkupdates/update-rules
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.3/build/mkupdates/update-rules?rev=903276&r1=903275&r2=903276&view=diff
==============================================================================
--- spamassassin/branches/3.3/build/mkupdates/update-rules (original)
+++ spamassassin/branches/3.3/build/mkupdates/update-rules Tue Jan 26 15:36:30 2010
@@ -20,15 +20,19 @@
 export HOME
 
 VERS=$1
-if [ -z "$VERS" -o \( "$VERS" != "3.1" -a "$VERS" != "3.2" \) ]; then
-  echo "Usage: $0 <VERSION (3.1, 3.2)>" >&2
+if [ -z "$VERS" ]; then
+  echo "Usage: $0 <VERSION (3.1, 3.2, 3.3, ...)>" >&2
   exit 1
 fi
 
 DIR=/tmp/upd-$$
 rm -rf $DIR || exit 1
 
-SOURCE=svn.apache.org/repos/asf/spamassassin/rules/branches/$VERS
+if [ "$VERS" = "3.1" -o "$VERS" = "3.2" ] ; then
+  SOURCE=svn.apache.org/repos/asf/spamassassin/branches/rules/$VERS
+else
+  SOURCE=svn.apache.org/repos/asf/spamassassin/branches/$VERS/rules
+fi
 
 tagstamp=`date "+%Y%m%d%H%M%S"`
 DEST=svn.apache.org/repos/asf/spamassassin/tags/sa-update_${VERS}_${tagstamp}