tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Konstantin Kolinko <knst.koli...@gmail.com>
Subject Re: svn commit: r1292891 - /tomcat/trunk/bin/daemon.sh
Date Thu, 23 Feb 2012 19:16:51 GMT
2012/2/23 sebb <sebbaz@gmail.com>:
> On 23 February 2012 19:00, Konstantin Kolinko <knst.kolinko@gmail.com> wrote:
>> 2012/2/23  <markt@apache.org>:
>>> Author: markt
>>> Date: Thu Feb 23 18:44:02 2012
>>> New Revision: 1292891
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1292891&view=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=1292891&r1=1292890&r2=1292891&view=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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message