Fix mvnd command line aliases, fixes #490

apache · Oct 6, 2021 · dff50ac · dff50ac
1 parent 08480db
commit dff50ac
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/client/src/main/java/org/mvndaemon/mvnd/client/DefaultClient.java b/client/src/main/java/org/mvndaemon/mvnd/client/DefaultClient.java
@@ -235,20 +235,23 @@ public ExecutionResult execute(ClientOutput output, List<String> argv) {
                 return DefaultResult.success(argv);
             }
 
-            if (!Environment.MVND_THREADS.hasCommandLineOption(args)) {
-                Environment.MVND_THREADS.addCommandLineOption(args, parameters.threads());
-            }
-            if (!Environment.MVND_BUILDER.hasCommandLineOption(args)) {
-                Environment.MVND_BUILDER.addCommandLineOption(args, parameters.builder());
-            }
+            Environment.MVND_THREADS.removeCommandLineOption(args);
+            Environment.MVND_THREADS.addCommandLineOption(args, parameters.threads());
+
+            Environment.MVND_BUILDER.removeCommandLineOption(args);
+            Environment.MVND_BUILDER.addCommandLineOption(args, parameters.builder());
+
             final Path settings = parameters.settings();
-            if (settings != null && !Environment.MAVEN_SETTINGS.hasCommandLineOption(args)) {
+            if (settings != null) {
+                Environment.MAVEN_SETTINGS.removeCommandLineOption(args);
                 Environment.MAVEN_SETTINGS.addCommandLineOption(args, settings.toString());
             }
+
             final Path localMavenRepository = parameters.mavenRepoLocal();
             if (localMavenRepository != null && !Environment.MAVEN_REPO_LOCAL.hasCommandLineOption(args)) {
                 Environment.MAVEN_REPO_LOCAL.addCommandLineOption(args, localMavenRepository.toString());
             }
+
             Environment.MVND_TERMINAL_WIDTH.addCommandLineOption(args, Integer.toString(output.getTerminalWidth()));
 
             Path dir;