geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject cvs commit: incubator-geronimo/modules/twiddle/src/bin twiddle twiddle.bat
Date Tue, 26 Aug 2003 10:38:26 GMT
jdillon     2003/08/26 03:38:26

  Modified:    modules/core/src/bin start start.bat
               modules/twiddle/src/bin twiddle twiddle.bat
  Log:
   o Better handling for spaces in path names
  
  Revision  Changes    Path
  1.3       +3 -3      incubator-geronimo/modules/core/src/bin/start
  
  Index: start
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/bin/start,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- start	25 Aug 2003 15:44:54 -0000	1.2
  +++ start	26 Aug 2003 10:38:26 -0000	1.3
  @@ -9,7 +9,7 @@
   ## $Revision$ $Date$
   ##
   
  -DIRNAME=`dirname $0`
  +DIRNAME=`dirname "$0"`
   COMMAND_PATH="geronimo/start"
   
  -exec $DIRNAME/twiddle $TWIDDLE_OPTS $COMMAND_PATH -- "$@"
  +exec "$DIRNAME/twiddle" $TWIDDLE_OPTS "$COMMAND_PATH" -- "$@"
  
  
  
  1.2       +4 -4      incubator-geronimo/modules/core/src/bin/start.bat
  
  Index: start.bat
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/core/src/bin/start.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- start.bat	25 Aug 2003 15:44:54 -0000	1.1
  +++ start.bat	26 Aug 2003 10:38:26 -0000	1.2
  @@ -13,7 +13,7 @@
   if "%OS%"=="Windows_NT" setlocal
   
   @rem The path of the command to execute
  -set COMMAND_PATH="geronimo/start"
  +set COMMAND_PATH=geronimo/start
   
   :begin
   @rem Determine what directory it is in.
  @@ -45,10 +45,10 @@
   
   :execute
   @rem Setup the command line
  -set TWIDDLE_CMD="%DIRNAME%/twiddle.bat"
  +set TWIDDLE_CMD=%DIRNAME%twiddle.bat
   
   @rem Execute Twiddle
  -call %TWIDDLE_CMD% %TWIDDLE_OPTS% geronimo/start -- %CMD_LINE_ARGS%
  +call "%TWIDDLE_CMD%" %TWIDDLE_OPTS% "%COMMAND_PATH%" -- %CMD_LINE_ARGS%
   
   :end
   @rem End local scope for the variables with windows NT shell
  
  
  
  1.3       +4 -4      incubator-geronimo/modules/twiddle/src/bin/twiddle
  
  Index: twiddle
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/twiddle/src/bin/twiddle,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- twiddle	25 Aug 2003 15:44:54 -0000	1.2
  +++ twiddle	26 Aug 2003 10:38:26 -0000	1.3
  @@ -9,8 +9,8 @@
   ## $Revision$ $Date$
   ##
   
  -PROGNAME=`basename $0`
  -DIRNAME=`dirname $0`
  +PROGNAME=`basename "$0"`
  +DIRNAME=`dirname "$0"`
   
   # Use the maximum available, or set MAX_FD != -1 to use that
   MAX_FD="maximum"
  @@ -52,7 +52,7 @@
   
   # Locate TWIDDLE_HOME if not it is not set
   if [ "x$TWIDDLE_HOME" = "x" ]; then
  -    TWIDDLE_HOME=`cd $DIRNAME/..; pwd`
  +    TWIDDLE_HOME=`cd "$DIRNAME/.."; pwd`
   fi
   
   # Use default classworlds config
  
  
  
  1.2       +13 -13    incubator-geronimo/modules/twiddle/src/bin/twiddle.bat
  
  Index: twiddle.bat
  ===================================================================
  RCS file: /home/cvs/incubator-geronimo/modules/twiddle/src/bin/twiddle.bat,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- twiddle.bat	25 Aug 2003 15:44:54 -0000	1.1
  +++ twiddle.bat	26 Aug 2003 10:38:26 -0000	1.2
  @@ -13,7 +13,7 @@
   if "%OS%"=="Windows_NT" setlocal
   
   @rem The version of classworlds to boot with
  -set CLASSWORLDS_VERSION="SNAPSHOT"
  +set CLASSWORLDS_VERSION=SNAPSHOT
   
   :begin
   @rem Determine what directory it is in.
  @@ -84,21 +84,21 @@
   
   :execute
   @rem Setup the command line
  -set CLASSWORLDS_CLASSPATH="%TWIDDLE_HOME%\lib\classworlds-%CLASSWORLDS_VERSION%.jar"
  -set CLASSWORLDS_MAIN_CLASS="com.werken.classworlds.Launcher"
  -set CLASSWORLDS_CONF="%TWIDDLE_HOME%\etc\classworlds.conf"
  +set CLASSWORLDS_CLASSPATH=%TWIDDLE_HOME%\lib\classworlds-%CLASSWORLDS_VERSION%.jar
  +set CLASSWORLDS_MAIN_CLASS=com.werken.classworlds.Launcher
  +set CLASSWORLDS_CONF=%TWIDDLE_HOME%\etc\classworlds.conf
   
  -if "%JAVA_OPTS%" == "" set JAVA_OPTS="-Xmx128m"
  -set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%
  -set JAVA_OPTS=%JAVA_OPTS% -Dtwiddle.home=%TWIDDLE_HOME%
  -set JAVA_OPTS=%JAVA_OPTS% -Dtools.jar=%TOOLS_JAR%
  -set JAVA_OPTS=%JAVA_OPTS% -Dclassworlds.conf=%CLASSWORLDS_CONF%
  +set JAVA_EXE=%JAVA_HOME%\bin\java.exe
  +set TOOLS_JAR=%JAVA_HOME%\lib\tools.jar
   
  -set JAVA_EXE="%JAVA_HOME%\bin\java.exe"
  -set TOOLS_JAR="%JAVA_HOME%\lib\tools.jar"
  +if "%JAVA_OPTS%" == "" set JAVA_OPTS="-Xmx128m"
  +set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name="%PROGNAME%"
  +set JAVA_OPTS=%JAVA_OPTS% -Dtwiddle.home="%TWIDDLE_HOME%"
  +set JAVA_OPTS=%JAVA_OPTS% -Dtools.jar="%TOOLS_JAR%"
  +set JAVA_OPTS=%JAVA_OPTS% -Dclassworlds.conf="%CLASSWORLDS_CONF%"
   
   @rem Execute Twiddle
  -%JAVA_EXE% %JAVA_OPTS% -classpath %CLASSWORLDS_CLASSPATH% %CLASSWORLDS_MAIN_CLASS% %CMD_LINE_ARGS%
  +"%JAVA_EXE%" %JAVA_OPTS% -classpath "%CLASSWORLDS_CLASSPATH%" %CLASSWORLDS_MAIN_CLASS%
%CMD_LINE_ARGS%
   
   :end
   @rem End local scope for the variables with windows NT shell
  
  
  

Mime
View raw message