am fb1d9461: Merge "dx.bat: Don\'t change directory."

* commit 'fb1d9461a57c67a7fcf1f8667d9fa65b609d2f61':
  dx.bat: Don't change directory.

1 files changed, 11 insertions, 13 deletions

diff --git a/dx/etc/dx.bat b/dx/etc/dx.bat
index 6f588c44c..654588617 100755
--- a/dx/etc/dx.bat
+++ b/dx/etc/dx.bat
@@ -22,28 +22,26 @@ REM Set up prog to be the path of this script, including following symlinks,
 REM and set up progdir to be the fully-qualified pathname of its directory.

 set prog=%~f0

 

-REM Change current directory to where dx is, to avoid issues with directories

-REM containing whitespaces.

-cd /d %~dp0

-

 rem Check we have a valid Java.exe in the path.

 set java_exe=

-if exist    ..\tools\lib\find_java.bat call    ..\tools\lib\find_java.bat

-if exist ..\..\tools\lib\find_java.bat call ..\..\tools\lib\find_java.bat

+if exist    "%~dp0..\tools\lib\find_java.bat" call    "%~dp0..\tools\lib\find_java.bat"

+if exist "%~dp0..\..\tools\lib\find_java.bat" call "%~dp0..\..\tools\lib\find_java.bat"

 if not defined java_exe goto :EOF

 

 set jarfile=dx.jar

-set frameworkdir=

+set "frameworkdir=%~dp0"

+rem frameworkdir must not end with a dir sep.

+set "frameworkdir=%frameworkdir:~0,-1%"

 

-if exist %frameworkdir%%jarfile% goto JarFileOk

-    set frameworkdir=lib\

+if exist "%frameworkdir%\%jarfile%" goto JarFileOk

+    set "frameworkdir=%~dp0lib"

 

-if exist %frameworkdir%%jarfile% goto JarFileOk

-    set frameworkdir=..\framework\

+if exist "%frameworkdir%\%jarfile%" goto JarFileOk

+    set "frameworkdir=%~dp0..\framework"

 

 :JarFileOk

 

-set jarpath=%frameworkdir%%jarfile%

+set "jarpath=%frameworkdir%\%jarfile%"

 

 set javaOpts=

 set args=

@@ -86,5 +84,5 @@ set a=%~1
 :endArgs

 

 set javaOpts=%javaOpts% %defaultXmx% %defaultXss%

+call "%java_exe%" %javaOpts% -Djava.ext.dirs="%frameworkdir%" -jar "%jarpath%" %params%

 

-call %java_exe% %javaOpts% -Djava.ext.dirs=%frameworkdir% -jar %jarpath% %params%