You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2024/03/18 05:25:10 UTC
(camel) branch camel-4.4.x updated: [CAMEL-20512] Add full path for camel jbang process if using Windows (#13494)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.4.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.4.x by this push:
new 286995e9004 [CAMEL-20512] Add full path for camel jbang process if using Windows (#13494)
286995e9004 is described below
commit 286995e900414e6148b4a520481ef9cf52033c24
Author: Adriano Machado <60...@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 221259ad051..94166757233 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
@@ -977,7 +977,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);
@@ -1542,4 +1542,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");
+ }
+ }
}