You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mt...@apache.org on 2012/03/07 13:25:27 UTC
svn commit: r1297952 - /tomcat/jk/trunk/tools/jkrelease.sh
Author: mturk
Date: Wed Mar 7 12:25:27 2012
New Revision: 1297952
URL: http://svn.apache.org/viewvc?rev=1297952&view=rev
Log:
Add option for owner and group. Also cleanup working dirs on exit
Modified:
tomcat/jk/trunk/tools/jkrelease.sh
Modified: tomcat/jk/trunk/tools/jkrelease.sh
URL: http://svn.apache.org/viewvc/tomcat/jk/trunk/tools/jkrelease.sh?rev=1297952&r1=1297951&r2=1297952&view=diff
==============================================================================
--- tomcat/jk/trunk/tools/jkrelease.sh (original)
+++ tomcat/jk/trunk/tools/jkrelease.sh Wed Mar 7 12:25:27 2012
@@ -74,7 +74,7 @@ copy_files() {
txtgen=n
conflict=0
-while getopts :v:t:r:b:d:p:k:Tf c
+while getopts :v:t:r:b:d:p:k:T:o:gfd c
do
case $c in
v) version=$OPTARG;;
@@ -83,6 +83,8 @@ do
r) revision=$OPTARG;;
k) SIGN_OPTS="--default-key=$OPTARG $SIGN_OPTS";;
p) SIGN_OPTS="--passphrase=$OPTARG $SIGN_OPTS";;
+ o) JK_OWNER=$OPTARG;;
+ g) JK_GROUP=$OPTARG;;
b) branch=$OPTARG
conflict=$(($conflict+1));;
T) trunk=trunk
@@ -202,8 +204,8 @@ sleep 2
umask 022
-rm -rf ${JK_DIST}
-rm -rf ${JK_DIST}.tmp
+rm -rf ${JK_DIST} 2>/dev/null || true
+rm -rf ${JK_DIST}.tmp 2>/dev/null || true
mkdir -p ${JK_DIST}.tmp
svn export $revision "${JK_SVN_URL}" ${JK_DIST}.tmp/jk
@@ -233,10 +235,10 @@ copy_files ${JK_DIST}.tmp/jk/conf $JK_DI
# Remove extra directories and files
targetdir=${JK_DIST}
rm -rf ${targetdir}/xdocs/jk2
-rm -rf ${targetdir}/native/CHANGES.txt
-rm -rf ${targetdir}/native/build.xml
-rm -rf ${targetdir}/native/NOTICE
-rm -rf ${targetdir}/native/LICENSE
+rm -f ${targetdir}/native/CHANGES.txt
+rm -f ${targetdir}/native/build.xml
+rm -f ${targetdir}/native/NOTICE
+rm -f ${targetdir}/native/LICENSE
find ${JK_DIST} -name .cvsignore -exec rm -rf \{\} \;
find ${JK_DIST} -name CVS -exec rm -rf \{\} \;
find ${JK_DIST} -name .svn -exec rm -rf \{\} \;
@@ -327,4 +329,6 @@ archive=${JK_DIST}.tar.gz
. ${JK_TOOLS}/signfile.sh ${SIGN_OPTS} $archive
archive=${JK_DIST}.zip
. ${JK_TOOLS}/signfile.sh ${SIGN_OPTS} $archive
-
+# Cleanup working dirs
+rm -rf ${JK_DIST}.tmp
+rm -rf ${JK_DIST}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org