[camel] branch main updated: CAMEL-18425: camel-cli - Make regular Camel applications work with Camel CLI

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new f09b275b3f6 CAMEL-18425: camel-cli - Make regular Camel applications 
work with Camel CLI
f09b275b3f6 is described below

commit f09b275b3f62599eef53f75d6145849bead7c89a
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Aug 26 15:09:42 2022 +0200

    CAMEL-18425: camel-cli - Make regular Camel applications work with Camel CLI
---
 .../core/commands/process/ProcessBaseCommand.java  | 24 ++++++++++++++--------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessBaseCommand.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessBaseCommand.java
index 6194f97a1ea..d0582c12c00 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessBaseCommand.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ProcessBaseCommand.java
@@ -134,25 +134,31 @@ abstract class ProcessBaseCommand extends CamelCommand {
 
     private static String extractCamelName(String cl, String mvn) {
         if (cl != null) {
-            if (cl.contains("camel-spring-boot")) {
-                if (mvn != null) {
-                    return mvn;
-                } else {
-                    return "camel-spring-boot";
+            if (cl.contains("camel-spring-boot") && mvn != null) {
+                int pos = cl.lastIndexOf(" ");
+                if (pos != -1) {
+                    String after = cl.substring(pos);
+                    after = after.trim();
+                    if (after.matches("[\\w|.]+")) {
+                        return after;
+                    }
                 }
-            } else if (cl.contains("camel-quarkus") && mvn != null) {
                 return mvn;
-            } else if ((cl.contains("camel-main") || 
cl.contains("camel-core")) && mvn != null) {
+            } else if (cl.contains("camel-quarkus") && mvn != null) {
                 return mvn;
-            } else if (cl.contains("camel-core") && mvn == null) {
+            } else {
                 int pos = cl.lastIndexOf(" ");
                 if (pos != -1) {
                     String after = cl.substring(pos);
                     after = after.trim();
                     if (after.matches("[\\w|.]+")) {
-                        return cl.contains("camel-main") ? "camel-main" : 
"camel-core";
+                        return after;
                     }
                 }
+                if (mvn != null) {
+                    return mvn;
+                }
+                return cl.contains("camel-main") ? "camel-main" : "camel-core";
             }
         }