(camel) branch main updated: [CAMEL-20512] Add full path for camel jbang process if using Windows (#13494)

[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 9f6338b1ee4 [CAMEL-20512] Add full path for camel jbang process if 
using Windows (#13494)
9f6338b1ee4 is described below

commit 9f6338b1ee4cd8f174d483e21fa6d558672667cd
Author: Adriano Machado <60320+ammach...@users.noreply.github.com>
AuthorDate: Mon Mar 18 01:24:09 2024 -0400

    [CAMEL-20512] Add full path for camel jbang process if using Windows 
(#13494)
    
    * [CAMEL-20512] Add full path for camel jbang process if using Windows
    
    * [CAMEL-20512] Apply same fix to `camel debug`.
---
 .../java/org/apache/camel/dsl/jbang/core/commands/Debug.java  |  2 +-
 .../java/org/apache/camel/dsl/jbang/core/commands/Run.java    | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
index c0cb5f39fe4..b3ca7ab43b4 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Debug.java
@@ -251,7 +251,7 @@ public class Debug extends Run {
         cmds.add("--prop=camel.debug.loggingLevel=DEBUG");
         cmds.add("--prop=camel.debug.singleStepIncludeStartEnd=true");
 
-        cmds.add(0, "camel");
+        addCamelCommand(cmds);
 
         ProcessBuilder pb = new ProcessBuilder();
         pb.command(cmds);
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index a6b42b06273..cf9abe7cee4 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -1025,7 +1025,7 @@ public class Run extends CamelCommand {
         cmds.remove("--background=true");
         cmds.remove("--background");
 
-        cmds.add(0, "camel");
+        addCamelCommand(cmds);
 
         ProcessBuilder pb = new ProcessBuilder();
         pb.command(cmds);
@@ -1590,4 +1590,13 @@ public class Run extends CamelCommand {
             return false;
         }
     }
+
+    protected static void addCamelCommand(List<String> cmds) {
+        if (FileUtil.isWindows()) {
+            String jbangDir = System.getenv().getOrDefault("JBANG_DIR", 
System.getProperty("user.home") + "\\.jbang");
+            cmds.add(0, jbangDir + "\\bin\\camel.cmd");
+        } else {
+            cmds.add(0, "camel");
+        }
+    }
 }