Fixes #85 - Improve Windows batch file %BASEDIR% path generation

mojohaus · May 9, 2019 · 6f34c3d · 6f34c3d
1 parent 5b98dbb
commit 6f34c3d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/...plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/windowsBinTemplate b/...plugin/src/main/resources/org/codehaus/mojo/appassembler/daemon/script/windowsBinTemplate
@@ -44,7 +44,7 @@ set SAVE_DIR=
 goto repoSetup
 
 :WinNTGetScriptDir
-set BASEDIR=%~dp0\..
+for %%i in ("%~dp0..") do set "BASEDIR=%%~fi"
 
 :repoSetup
 set REPO=

diff --git a/...urces/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-basedir-test.bat b/...urces/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-basedir-test.bat
@@ -62,7 +62,7 @@ set SAVE_DIR=
 goto repoSetup
 
 :WinNTGetScriptDir
-set BASEDIR=%~dp0\..
+for %%i in ("%~dp0..") do set "BASEDIR=%%~fi"
 
 :repoSetup
 set REPO=

diff --git a/...esources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-repo-test.bat b/...esources/org/codehaus/mojo/appassembler/daemon/script-basedir-repo/expected-repo-test.bat
@@ -62,7 +62,7 @@ set SAVE_DIR=
 goto repoSetup
 
 :WinNTGetScriptDir
-set BASEDIR=%~dp0\..
+for %%i in ("%~dp0..") do set "BASEDIR=%%~fi"
 
 :repoSetup
 set REPO=

diff --git a/...haus/mojo/appassembler/daemon/script/background/expected-false-showConsoleWindow-test.bat b/...haus/mojo/appassembler/daemon/script/background/expected-false-showConsoleWindow-test.bat
@@ -62,7 +62,7 @@ set SAVE_DIR=
 goto repoSetup
 
 :WinNTGetScriptDir
-set BASEDIR=%~dp0\..
+for %%i in ("%~dp0..") do set "BASEDIR=%%~fi"
 
 :repoSetup
 set REPO=

diff --git a/...est/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test-endorsed-lib.bat b/...est/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test-endorsed-lib.bat
@@ -62,7 +62,7 @@ set SAVE_DIR=
 goto repoSetup
 
 :WinNTGetScriptDir
-set BASEDIR=%~dp0\..
+for %%i in ("%~dp0..") do set "BASEDIR=%%~fi"
 
 :repoSetup
 set REPO=

diff --git a/...-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test.bat b/...-plugin/src/test/resources/org/codehaus/mojo/appassembler/daemon/script/expected-test.bat
@@ -62,7 +62,7 @@ set SAVE_DIR=
 goto repoSetup
 
 :WinNTGetScriptDir
-set BASEDIR=%~dp0\..
+for %%i in ("%~dp0..") do set "BASEDIR=%%~fi"
 
 :repoSetup
 set REPO=