[jboss-cvs] JBossAS SVN: r62358 - trunk/system/src/bin.

[jboss-cvs-commits at lists.jboss.org]

Author: mladen.turk at jboss.com
Date: 2007-04-16 00:59:58 -0400 (Mon, 16 Apr 2007)
New Revision: 62358

Modified:
   trunk/system/src/bin/run.bat
Log:
Enclose set FOO=BAR with quotes so they can be used within if blocks containing braces. Without quotes the entire if block can fail if the variable contains braces himself

Modified: trunk/system/src/bin/run.bat
===================================================================
--- trunk/system/src/bin/run.bat	2007-04-15 18:15:14 UTC (rev 62357)
+++ trunk/system/src/bin/run.bat	2007-04-16 04:59:58 UTC (rev 62358)
@@ -8,18 +8,24 @@
 @if not "%ECHO%" == ""  echo %ECHO%
 @if "%OS%" == "Windows_NT"  setlocal
 
+if "%OS%" == "Windows_NT" (
+set "DIRNAME=%~dp0%"
+set "PROGNAME=%~nx0%"
+) else (
 set DIRNAME=.\
-if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
 set PROGNAME=run.bat
-if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
+)
 
+
 pushd %DIRNAME%..
 set JBOSS_HOME=%CD%
 popd
 
 REM Add bin/native to the PATH if present
-if exist "%JBOSS_HOME%\bin\native" set PATH=%JBOSS_HOME%\bin\native;%PATH%
-if exist "%JBOSS_HOME%\bin\native" set JAVA_OPTS=%JAVA_OPTS% -Djava.library.path=%JBOSS_HOME%\bin\native
+if exist "%JBOSS_HOME%\bin\native" (
+set "PATH=%JBOSS_HOME%\bin\native;%PATH%"
+set "JAVA_OPTS=%JAVA_OPTS% -Djava.library.path=%JBOSS_HOME%\bin\native"
+)
 
 rem Read all command line arguments
 
@@ -71,11 +77,12 @@
 rem result in including the local directory in the classpath, which makes
 rem error tracking harder.
 if not "%JAVAC_JAR%" == "" set RUNJAR=%JAVAC_JAR%;%RUNJAR%
-if "%JBOSS_CLASSPATH%" == "" set RUN_CLASSPATH=%RUNJAR%
-if "%RUN_CLASSPATH%" == "" set RUN_CLASSPATH=%JBOSS_CLASSPATH%;%RUNJAR%
+if "%JBOSS_CLASSPATH%" == "" (
+set "JBOSS_CLASSPATH=%RUNJAR%"
+) else (
+set "JBOSS_CLASSPATH=%JBOSS_CLASSPATH%;%RUNJAR%"
+)
 
-set JBOSS_CLASSPATH=%RUN_CLASSPATH%
-
 rem Setup JBoss specific properties
 set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%