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

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

Author: mladen.turk at jboss.com
Date: 2006-11-27 11:51:25 -0500 (Mon, 27 Nov 2006)
New Revision: 58687

Modified:
   trunk/system/src/bin/run.bat
Log:
Instead DIRNAME use the JBOS_HOME as basis

Modified: trunk/system/src/bin/run.bat
===================================================================
--- trunk/system/src/bin/run.bat	2006-11-27 15:29:26 UTC (rev 58686)
+++ trunk/system/src/bin/run.bat	2006-11-27 16:51:25 UTC (rev 58687)
@@ -13,11 +13,15 @@
 set PROGNAME=run.bat
 if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
 
+pushd %DIRNAME%..
+set JBOSS_HOME=%CD%
+popd
+
 REM
 REM Add bin/native to the PATH if present
 REM
-if exist %DIRNAME%native set PATH=%DIRNAME%native;%PATH%
-if exist %DIRNAME%native set JAVA_OPTS=%JAVA_OPTS% -Djava.library.path=%DIRNAME%native
+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
 
 rem Read all command line arguments
 
@@ -35,7 +39,7 @@
 
 rem Find run.jar, or we can't continue
 
-set RUNJAR=%DIRNAME%run.jar
+set RUNJAR=%JBOSS_HOME%\bin\run.jar
 if exist "%RUNJAR%" goto FOUND_RUN_JAR
 echo Could not locate %RUNJAR%. Please check that you are in the
 echo bin directory when running this script.
@@ -77,9 +81,6 @@
 
 rem Setup JBoss specific properties
 set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%
-pushd %DIRNAME%..
-set JBOSS_HOME=%CD%
-popd
 
 rem Add -server to the JVM options, if supported
 "%JAVA%" -version 2>&1 | findstr /I hotspot > nul