Improve startup scripts

This closes #636 * Properly name jump labels for jvm.config in cmd * Supply one arg per line
apache · Dec 20, 2021 · e6287b4 · e6287b4
1 parent 33aedfc
commit e6287b4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/apache-maven/src/assembly/shared/init.cmd b/apache-maven/src/assembly/shared/init.cmd
@@ -84,11 +84,11 @@ cd /d "%EXEC_DIR%"
 :endDetectBaseDir
 
 set "jvmConfig=\.mvn\jvm.config"
-if not exist "%MAVEN_PROJECTBASEDIR%%jvmConfig%" goto endReadAdditionalConfig
+if not exist "%MAVEN_PROJECTBASEDIR%%jvmConfig%" goto endReadJvmConfig
 
 @setlocal EnableExtensions EnableDelayedExpansion
 for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
 @endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
 
-:endReadAdditionalConfig
+:endReadJvmConfig
 
diff --git a/apache-maven/src/assembly/shared/run b/apache-maven/src/assembly/shared/run
@@ -16,4 +16,5 @@ exec "$JAVACMD" \
   "-Dmaven.home=$MAVEN_HOME" \
   "-Dlibrary.jansi.path=${MAVEN_HOME}/lib/jansi-native" \
   "-Dmaven.multiModuleProjectDirectory=$MAVEN_PROJECTBASEDIR" \
-  $LAUNCHER_CLASS "$@"
+  $LAUNCHER_CLASS \
+  "$@"
diff --git a/apache-maven/src/assembly/shared/run.cmd b/apache-maven/src/assembly/shared/run.cmd
@@ -7,7 +7,8 @@
   "-Dmaven.home=%MAVEN_HOME%" ^
   "-Dlibrary.jansi.path=%MAVEN_HOME%\lib\jansi-native" ^
   "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
-  %LAUNCHER_CLASS% %*
+  %LAUNCHER_CLASS% ^
+  %*
 if ERRORLEVEL 1 goto error
 goto end