Skip to content

Commit b17e958

Browse files
committed
[gh-11363] Add quotes back for paths with spaces
Need quotes around paths in case they contain spaces.
1 parent db1fe7e commit b17e958

File tree

1 file changed

+9
-9
lines changed
  • apache-maven/src/assembly/maven/bin

1 file changed

+9
-9
lines changed

apache-maven/src/assembly/maven/bin/mvn.cmd

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -182,20 +182,20 @@ if not exist "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadJvmConfig
182182
rem Use Java to parse jvm.config to avoid batch script parsing issues with special characters
183183
rem This handles pipes, quotes, and other special characters correctly
184184
rem Compile the parser if not already compiled
185-
if not exist %MAVEN_HOME%\bin\JvmConfigParser.class (
186-
%JAVACMD:java.exe=javac.exe% -d %MAVEN_HOME%\bin %MAVEN_HOME%\bin\JvmConfigParser.java >nul 2>&1
185+
if not exist "%MAVEN_HOME%\bin\JvmConfigParser.class" (
186+
"%JAVACMD:java.exe=javac.exe%" -d "%MAVEN_HOME%\bin" "%MAVEN_HOME%\bin\JvmConfigParser.java" >nul 2>&1
187187
)
188188
rem Run the parser and save output to temp file (one argument per line)
189-
set JVM_CONFIG_TEMP=%TEMP%\mvn-jvm-config-%RANDOM%.txt
190-
%JAVACMD% -cp %MAVEN_HOME%\bin JvmConfigParser %MAVEN_PROJECTBASEDIR%\.mvn\jvm.config %MAVEN_PROJECTBASEDIR% > %JVM_CONFIG_TEMP% 2>nul
189+
set "JVM_CONFIG_TEMP=%TEMP%\mvn-jvm-config-%RANDOM%.txt"
190+
"%JAVACMD%" -cp "%MAVEN_HOME%\bin" JvmConfigParser "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" "%MAVEN_PROJECTBASEDIR%" > "%JVM_CONFIG_TEMP%" 2>nul
191191
rem Read each line and append to JVM_CONFIG_MAVEN_OPTS with proper quoting
192192
@setlocal EnableDelayedExpansion
193-
set JVM_CONFIG_MAVEN_OPTS=
194-
for /f "usebackq delims=" %%a in (%JVM_CONFIG_TEMP%) do (
195-
set JVM_CONFIG_MAVEN_OPTS=!JVM_CONFIG_MAVEN_OPTS! "%%a"
193+
set "JVM_CONFIG_MAVEN_OPTS="
194+
for /f "usebackq delims=" %%a in ("%JVM_CONFIG_TEMP%") do (
195+
set "JVM_CONFIG_MAVEN_OPTS=!JVM_CONFIG_MAVEN_OPTS! "%%a""
196196
)
197-
@endlocal & set JVM_CONFIG_MAVEN_OPTS=%JVM_CONFIG_MAVEN_OPTS%
198-
del %JVM_CONFIG_TEMP% 2>nul
197+
@endlocal & set "JVM_CONFIG_MAVEN_OPTS=%JVM_CONFIG_MAVEN_OPTS%"
198+
del "%JVM_CONFIG_TEMP%" 2>nul
199199

200200
:endReadJvmConfig
201201

0 commit comments

Comments
 (0)