On 24.02.2012 13:09, mt...@apache.org wrote:
Author: mturk
Date: Fri Feb 24 12:09:43 2012
New Revision: 1293202
URL: http://svn.apache.org/viewvc?rev=1293202&view=rev
Log:
Simpplify release script. Get url from svn info
Modified:
tomcat/native/branches/1.1.x/jnirelease.sh
Modified: tomcat/native/branches/1.1.x/jnirelease.sh
URL:
http://svn.apache.org/viewvc/tomcat/native/branches/1.1.x/jnirelease.sh?rev=1293202&r1=1293201&r2=1293202&view=diff
==============================================================================
--- tomcat/native/branches/1.1.x/jnirelease.sh (original)
+++ tomcat/native/branches/1.1.x/jnirelease.sh Fri Feb 24 12:09:43 2012
@@ -70,7 +70,7 @@ if [ "x$JKJNIEXT" = "x" ]; then
echo ""
echo "Unknown SVN version"
echo "Use:"
- echo " --ver=<version>|<branch>|trunk"
+ echo " --ver=<tagged-version>|trunk"
echo ""
exit 1
fi
@@ -117,20 +117,12 @@ else
echo ""
exit 1
fi
-echo $JKJNIEXT | egrep -e 'x$'> /dev/null 2>&1
-if [ $? -eq 0 ]; then
- USE_BRANCH=1
-else
- USE_BRANCH=0
-fi
JKJNISVN=$SVNBASE/${JKJNIEXT}
if [ "x$JKJNIEXT" = "xtrunk" ]; then
- JKJNIVER=`svn info ${JKJNISVN} | awk '$1 == "Revision:" {print $2}'`
-elif [ $USE_BRANCH -eq 1 ]; then
- JKJNIBRANCH=${JKJNIEXT}
- JKJNISVN=$SVNBASE/branches/${JKJNIBRANCH}
- JKJNIVER=${JKJNIBRANCH}-`svn info ${JKJNISVN} | awk '$1 == "Revision:"
{print $2}'`
+ i="`svn info`"
+ JKJNIVER=`echo "$i" | awk '$1 == "Revision:" {print $2}'`
+ JKJNISVN=`echo "$i" | awk '$1 == "URL:" {print $2}'`
Just in case you didn't notice: before you could run the script without
having a workspace checked out. Now this needs a local workspace to run
"svn info" on it. Before it ran the info on the URL computed.
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
