Author: keith
Date: Tue Mar 14 13:04:40 2006
New Revision: 385888
URL: http://svn.apache.org/viewcvs?rev=385888&view=rev
Log:
[38761] relative symlinks to the shell scripts were not
handled correctly. Both ant and (reportedly) maven are
using the suggested fix already.
Contributed by Adam Murray.
Modified:
tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
tomcat/container/tc5.5.x/catalina/src/bin/digest.sh
tomcat/container/tc5.5.x/catalina/src/bin/shutdown.sh
tomcat/container/tc5.5.x/catalina/src/bin/startup.sh
tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.sh
tomcat/container/tc5.5.x/catalina/src/bin/version.sh
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
Modified: tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh?rev=385888&r1=385887&r2=385888&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/catalina.sh Tue Mar 14 13:04:40
2006
@@ -58,7 +58,7 @@
while [ -h "$PRG" ]; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
+ if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`/"$link"
Modified: tomcat/container/tc5.5.x/catalina/src/bin/digest.sh
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/bin/digest.sh?rev=385888&r1=385887&r2=385888&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/digest.sh (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/digest.sh Tue Mar 14 13:04:40 2006
@@ -11,7 +11,7 @@
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
+ if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`/"$link"
Modified: tomcat/container/tc5.5.x/catalina/src/bin/shutdown.sh
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/bin/shutdown.sh?rev=385888&r1=385887&r2=385888&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/shutdown.sh (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/shutdown.sh Tue Mar 14 13:04:40
2006
@@ -11,7 +11,7 @@
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
+ if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`/"$link"
Modified: tomcat/container/tc5.5.x/catalina/src/bin/startup.sh
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/bin/startup.sh?rev=385888&r1=385887&r2=385888&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/startup.sh (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/startup.sh Tue Mar 14 13:04:40
2006
@@ -20,7 +20,7 @@
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
+ if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`/"$link"
Modified: tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.sh
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.sh?rev=385888&r1=385887&r2=385888&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.sh (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/tool-wrapper.sh Tue Mar 14
13:04:40 2006
@@ -29,7 +29,7 @@
while [ -h "$PRG" ]; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
+ if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`/"$link"
Modified: tomcat/container/tc5.5.x/catalina/src/bin/version.sh
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/catalina/src/bin/version.sh?rev=385888&r1=385887&r2=385888&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/catalina/src/bin/version.sh (original)
+++ tomcat/container/tc5.5.x/catalina/src/bin/version.sh Tue Mar 14 13:04:40
2006
@@ -11,7 +11,7 @@
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
+ if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`/"$link"
Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewcvs/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?rev=385888&r1=385887&r2=385888&view=diff
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Tue Mar 14 13:04:40 2006
@@ -29,6 +29,9 @@
<fix>
<bug>27617</bug>: Sync existing mime types with httpd. (keith)
</fix>
+ <fix>
+ <bug>38761</bug>: Handle relative symlinks to shell scripts as
suggested by Adam Murray (keith)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
