You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by js...@apache.org on 2006/05/21 03:30:07 UTC
svn commit: r408119 - in /geronimo/branches/1.1/modules/scripts/src/resources/bin: deploy.sh geronimo.sh shutdown.sh startup.sh

Author: jsisson
Date: Sat May 20 18:30:06 2006
New Revision: 408119

URL: http://svn.apache.org/viewvc?rev=408119&view=rev
Log:
GERONIMO-2020 Relative symlinks to the shell scripts were not handled correctly

Modified:
    geronimo/branches/1.1/modules/scripts/src/resources/bin/deploy.sh
    geronimo/branches/1.1/modules/scripts/src/resources/bin/geronimo.sh
    geronimo/branches/1.1/modules/scripts/src/resources/bin/shutdown.sh
    geronimo/branches/1.1/modules/scripts/src/resources/bin/startup.sh

Modified: geronimo/branches/1.1/modules/scripts/src/resources/bin/deploy.sh
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/scripts/src/resources/bin/deploy.sh?rev=408119&r1=408118&r2=408119&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/scripts/src/resources/bin/deploy.sh (original)
+++ geronimo/branches/1.1/modules/scripts/src/resources/bin/deploy.sh Sat May 20 18:30:06 2006
@@ -102,7 +102,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: geronimo/branches/1.1/modules/scripts/src/resources/bin/geronimo.sh
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/scripts/src/resources/bin/geronimo.sh?rev=408119&r1=408118&r2=408119&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/scripts/src/resources/bin/geronimo.sh (original)
+++ geronimo/branches/1.1/modules/scripts/src/resources/bin/geronimo.sh Sat May 20 18:30:06 2006
@@ -146,7 +146,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: geronimo/branches/1.1/modules/scripts/src/resources/bin/shutdown.sh
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/scripts/src/resources/bin/shutdown.sh?rev=408119&r1=408118&r2=408119&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/scripts/src/resources/bin/shutdown.sh (original)
+++ geronimo/branches/1.1/modules/scripts/src/resources/bin/shutdown.sh Sat May 20 18:30:06 2006
@@ -51,7 +51,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: geronimo/branches/1.1/modules/scripts/src/resources/bin/startup.sh
URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/scripts/src/resources/bin/startup.sh?rev=408119&r1=408118&r2=408119&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/scripts/src/resources/bin/startup.sh (original)
+++ geronimo/branches/1.1/modules/scripts/src/resources/bin/startup.sh Sat May 20 18:30:06 2006
@@ -53,7 +53,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"