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:30:41 UTC
svn commit: r1297954 - /tomcat/jk/trunk/tools/jkrelease.sh
Author: mturk
Date: Wed Mar 7 12:30:40 2012
New Revision: 1297954
URL: http://svn.apache.org/viewvc?rev=1297954&view=rev
Log:
Option 'd' is already taken. Use h instead
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=1297954&r1=1297953&r2=1297954&view=diff
==============================================================================
--- tomcat/jk/trunk/tools/jkrelease.sh (original)
+++ tomcat/jk/trunk/tools/jkrelease.sh Wed Mar 7 12:30:40 2012
@@ -47,12 +47,14 @@ usage() {
echo "Usage:: $0 -v VERSION [-f] [-r revision] [-t tag | -b BRANCH | -T | -d DIR]"
echo " -v: version to package"
echo " -f: force, do not validate tag against version"
- echo " -d: create text documentation for html"
+ echo " -h: create text documentation for html"
echo " -t: tag to use if different from version"
echo " -r: revision to package"
echo " -b: package from branch BRANCH"
echo " -T: package from trunk"
echo " -d: package from local directory"
+ echo " -o: owner used for creating tar archive"
+ echo " -g: group used for creating tar archive"
echo " -p: GNU PG passphrrase used for signing"
echo " -k: ID of GNU PG key to use for signing"
}
@@ -74,7 +76,7 @@ copy_files() {
txtgen=n
conflict=0
-while getopts :v:t:r:b:d:p:k:T:o:gfd c
+while getopts :v:t:r:b:d:p:k:o:gTfh c
do
case $c in
v) version=$OPTARG;;
@@ -92,7 +94,7 @@ do
d) local_dir=$OPTARG
conflict=$(($conflict+1));;
f) force='y';;
- d) txtgen='y';;
+ h) txtgen='y';;
\:) usage
exit 2;;
\?) usage
@@ -205,7 +207,7 @@ sleep 2
umask 022
rm -rf ${JK_DIST} 2>/dev/null || true
-rm -rf ${JK_DIST}.tmp 2>/dev/null || true
+rm -rf ${JK_DIST}.* 2>/dev/null || true
mkdir -p ${JK_DIST}.tmp
svn export $revision "${JK_SVN_URL}" ${JK_DIST}.tmp/jk
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1297954 - /tomcat/jk/trunk/tools/jkrelease.sh
Posted by Konstantin Kolinko <kn...@gmail.com>.
2012/3/7 <mt...@apache.org>:
> Author: mturk
> Date: Wed Mar 7 12:30:40 2012
> New Revision: 1297954
>
> URL: http://svn.apache.org/viewvc?rev=1297954&view=rev
> Log:
> Option 'd' is already taken. Use h instead
>
> 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=1297954&r1=1297953&r2=1297954&view=diff
> ==============================================================================
> --- tomcat/jk/trunk/tools/jkrelease.sh (original)
> +++ tomcat/jk/trunk/tools/jkrelease.sh Wed Mar 7 12:30:40 2012
> @@ -47,12 +47,14 @@ usage() {
> echo "Usage:: $0 -v VERSION [-f] [-r revision] [-t tag | -b BRANCH | -T | -d DIR]"
> echo " -v: version to package"
> echo " -f: force, do not validate tag against version"
> - echo " -d: create text documentation for html"
> + echo " -h: create text documentation for html"
> echo " -t: tag to use if different from version"
> echo " -r: revision to package"
> echo " -b: package from branch BRANCH"
> echo " -T: package from trunk"
> echo " -d: package from local directory"
> + echo " -o: owner used for creating tar archive"
> + echo " -g: group used for creating tar archive"
> echo " -p: GNU PG passphrrase used for signing"
> echo " -k: ID of GNU PG key to use for signing"
> }
> @@ -74,7 +76,7 @@ copy_files() {
>
> txtgen=n
> conflict=0
> -while getopts :v:t:r:b:d:p:k:T:o:gfd c
> +while getopts :v:t:r:b:d:p:k:o:gTfh c
"g" expects an argument (group name), so it should be "g:" above.
The leading ':' in the optstring controls processing of unrecognized options.
> do
> case $c in
> v) version=$OPTARG;;
> @@ -92,7 +94,7 @@ do
> d) local_dir=$OPTARG
> conflict=$(($conflict+1));;
> f) force='y';;
> - d) txtgen='y';;
> + h) txtgen='y';;
> \:) usage
> exit 2;;
> \?) usage
> @@ -205,7 +207,7 @@ sleep 2
> umask 022
>
> rm -rf ${JK_DIST} 2>/dev/null || true
> -rm -rf ${JK_DIST}.tmp 2>/dev/null || true
> +rm -rf ${JK_DIST}.* 2>/dev/null || true
>
> mkdir -p ${JK_DIST}.tmp
> svn export $revision "${JK_SVN_URL}" ${JK_DIST}.tmp/jk
>
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org