Merge pull request #5 from ethauvin/main

Fixed RunOption args parsing
rife2 · Aug 20, 2023 · 8d707a7 · 8d707a7
2 parents ba28294 + c635b25
commit 8d707a7
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/src/main/java/rife/bld/operations/RunOperation.java b/src/main/java/rife/bld/operations/RunOperation.java
@@ -48,24 +48,22 @@ protected List<String> executeConstructProcessCommandList() {
      */
     public RunOperation fromProject(BaseProject project) {
         var operation = workDirectory(project.workDirectory())
-            .javaTool(project.javaTool())
-            .classpath(project.runClasspath())
-            .mainClass(project.mainClass());
+                .javaTool(project.javaTool())
+                .classpath(project.runClasspath())
+                .mainClass(project.mainClass());
         if (project.usesRife2Agent()) {
             operation.javaOptions().javaAgent(project.getRife2AgentFile());
         }
 
         // parse the run arguments if any
         var args = project.arguments();
-        while (!args.isEmpty()) {
+        if (!args.isEmpty()) {
             var arg = args.get(0);
-            if (arg.startsWith("-")) {
+            if (arg.startsWith(ARGS_OPTION)) {
                 args.remove(0);
-                if (arg.startsWith(ARGS_OPTION)) {
-                    var runArgs = arg.substring(ARGS_OPTION.length());
-                    if (!runArgs.isBlank()) {
-                        runOptions_.addAll(0, Arrays.asList(runArgs.split(" ")));
-                    }
+                var runArgs = arg.substring(ARGS_OPTION.length());
+                if (!runArgs.isBlank()) {
+                    runOptions_.addAll(0, Arrays.asList(runArgs.split(" ")));
                 }
             }
         }