Re: svn commit: r1292891 - /tomcat/trunk/bin/daemon.sh
2012/2/23 ma...@apache.org:
Author: markt
Date: Thu Feb 23 18:44:02 2012
New Revision: 1292891
URL: http://svn.apache.org/viewvc?rev=1292891view=rev
Log:
Fix BZ52750. Correctly parse command options
Port of r1292878 from 7.0.x
Modified:
tomcat/trunk/bin/daemon.sh (contents, props changed)
Modified: tomcat/trunk/bin/daemon.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/daemon.sh?rev=1292891r1=1292890r2=1292891view=diff
==
--- tomcat/trunk/bin/daemon.sh (original)
+++ tomcat/trunk/bin/daemon.sh Thu Feb 23 18:44:02 2012
@@ -34,9 +34,9 @@ while [ -h $ARG0 ]; do
done
DIRNAME=`dirname $ARG0`
PROGRAM=`basename $ARG0`
-for o
+while [ .$1 != . ]
Maybe:
while [ -n $1 ]
(though both variants should work work)
do
- case $o in
+ case $o=1 in
What the above line is about?
Was it supposed to be:
case $1 in
--java-home )
JAVA_HOME=$2
shift; shift;
Propchange: tomcat/trunk/bin/daemon.sh
('svn:executable' removed)
231 echo Unkown command: \`$1'
Unknown
232 echo Usage: $PROGRAM ( commands ... )
$PROGRAM [--options] ( commands ... )
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1292891 - /tomcat/trunk/bin/daemon.sh
On 23 February 2012 19:00, Konstantin Kolinko knst.koli...@gmail.com wrote:
2012/2/23 ma...@apache.org:
Author: markt
Date: Thu Feb 23 18:44:02 2012
New Revision: 1292891
URL: http://svn.apache.org/viewvc?rev=1292891view=rev
Log:
Fix BZ52750. Correctly parse command options
Port of r1292878 from 7.0.x
Modified:
tomcat/trunk/bin/daemon.sh (contents, props changed)
Modified: tomcat/trunk/bin/daemon.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/daemon.sh?rev=1292891r1=1292890r2=1292891view=diff
==
--- tomcat/trunk/bin/daemon.sh (original)
+++ tomcat/trunk/bin/daemon.sh Thu Feb 23 18:44:02 2012
@@ -34,9 +34,9 @@ while [ -h $ARG0 ]; do
done
DIRNAME=`dirname $ARG0`
PROGRAM=`basename $ARG0`
-for o
+while [ .$1 != . ]
Maybe:
while [ -n $1 ]
(though both variants should work work)
do
- case $o in
+ case $o=1 in
What the above line is about?
I wondered the same myself;
it so happens that the = key is next to the Backspace key, so I
suspect the intention was to delete the o ...
Was it supposed to be:
case $1 in
--java-home )
JAVA_HOME=$2
shift; shift;
Propchange: tomcat/trunk/bin/daemon.sh
('svn:executable' removed)
231 echo Unkown command: \`$1'
Unknown
232 echo Usage: $PROGRAM ( commands ... )
$PROGRAM [--options] ( commands ... )
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1292891 - /tomcat/trunk/bin/daemon.sh
2012/2/23 sebb seb...@gmail.com:
On 23 February 2012 19:00, Konstantin Kolinko knst.koli...@gmail.com wrote:
2012/2/23 ma...@apache.org:
Author: markt
Date: Thu Feb 23 18:44:02 2012
New Revision: 1292891
URL: http://svn.apache.org/viewvc?rev=1292891view=rev
Log:
Fix BZ52750. Correctly parse command options
Port of r1292878 from 7.0.x
Modified:
tomcat/trunk/bin/daemon.sh (contents, props changed)
Modified: tomcat/trunk/bin/daemon.sh
URL:
http://svn.apache.org/viewvc/tomcat/trunk/bin/daemon.sh?rev=1292891r1=1292890r2=1292891view=diff
==
--- tomcat/trunk/bin/daemon.sh (original)
+++ tomcat/trunk/bin/daemon.sh Thu Feb 23 18:44:02 2012
@@ -34,9 +34,9 @@ while [ -h $ARG0 ]; do
done
DIRNAME=`dirname $ARG0`
PROGRAM=`basename $ARG0`
-for o
+while [ .$1 != . ]
Maybe:
while [ -n $1 ]
(though both variants should work work)
do
- case $o in
+ case $o=1 in
What the above line is about?
I wondered the same myself;
it so happens that the = key is next to the Backspace key, so I
suspect the intention was to delete the o ...
It is just a typo.
Mark was porting Mladen's r1292878 from tc7.0.x and that revision
contains $1 in this place.
Was it supposed to be:
case $1 in
--java-home )
JAVA_HOME=$2
shift; shift;
Propchange: tomcat/trunk/bin/daemon.sh
('svn:executable' removed)
231 echo Unkown command: \`$1'
Unknown
232 echo Usage: $PROGRAM ( commands ... )
$PROGRAM [--options] ( commands ... )
Best regards,
Konstantin Kolinko
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1292891 - /tomcat/trunk/bin/daemon.sh
On 02/23/2012 08:00 PM, Konstantin Kolinko wrote: 2012/2/23ma...@apache.org: Maybe: while [ -n $1 ] (though both variants should work work) Some solaris shells misbehave on -n. do - case $o in + case $o=1 in What the above line is about? Was it supposed to be: case $1 in Right, Mark probably made a typo while copying the code form 7.0.x Fixed that (hope mark won't mind :) Regards -- ^TM - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1292891 - /tomcat/trunk/bin/daemon.sh
On 23/02/2012 19:07, sebb wrote: On 23 February 2012 19:00, Konstantin Kolinko knst.koli...@gmail.com wrote: 2012/2/23 ma...@apache.org: - case $o in + case $o=1 in What the above line is about? I wondered the same myself; it so happens that the = key is next to the Backspace key, so I suspect the intention was to delete the o ... Yep. Fixed. Tx. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1292891 - /tomcat/trunk/bin/daemon.sh
On 23/02/2012 19:33, Mladen Turk wrote: On 02/23/2012 08:00 PM, Konstantin Kolinko wrote: 2012/2/23ma...@apache.org: Maybe: while [ -n $1 ] (though both variants should work work) Some solaris shells misbehave on -n. do - case $o in + case $o=1 in What the above line is about? Was it supposed to be: case $1 in Right, Mark probably made a typo while copying the code form 7.0.x Fixed that (hope mark won't mind :) No at all :) Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
