You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/03/25 05:11:12 UTC
[karaf] branch karaf-4.2.x updated: [KARAF-6197] Fix default PATH in wrapper

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

jbonofre pushed a commit to branch karaf-4.2.x
in repository https://gitbox.apache.org/repos/asf/karaf.git


The following commit(s) were added to refs/heads/karaf-4.2.x by this push:
     new f18fb57  [KARAF-6197] Fix default PATH in wrapper
f18fb57 is described below

commit f18fb570375d6927885bd7c02013146323a239ef
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Sun Mar 24 17:15:35 2019 +0100

    [KARAF-6197] Fix default PATH in wrapper
---
 .../org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf    | 2 +-
 .../org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java8.conf     | 2 +-
 .../org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf | 2 +-
 .../org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java8.conf  | 2 +-
 .../apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf   | 2 +-
 .../apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf
index 63d8fa6..dcb0db2 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java11.conf
@@ -25,7 +25,7 @@ set.default.KARAF_DATA=${karaf.data}
 set.default.KARAF_ETC=${karaf.etc}
 set.default.KARAF_LOG=${karaf.log}
 set.default.KARAF_VERSION=${karaf.version}
-set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_SEPARATOR%%PATH%.
+set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_SEPARATOR%%PATH%%WRAPPER_PATH_SEPARATOR%.
 
 # Include JAVA_HOME/bin in the default PATH variable
 set.PATH=%PATH_WITH_JAVA%
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java8.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java8.conf
index dfb2847..349a2ed 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java8.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/unix/karaf-wrapper-java8.conf
@@ -24,7 +24,7 @@ set.default.KARAF_BASE=${karaf.base}
 set.default.KARAF_DATA=${karaf.data}
 set.default.KARAF_ETC=${karaf.etc}
 set.default.KARAF_LOG=${karaf.log}
-set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_SEPARATOR%%PATH%.
+set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_SEPARATOR%%PATH%%WRAPPER_PATH_SEPARATOR%.
 
 # Include JAVA_HOME/bin in the default PATH variable
 set.PATH=%PATH_WITH_JAVA%
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
index 2d7b4f4..1c77072 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java11.conf
@@ -25,7 +25,7 @@ set.default.KARAF_DATA=${karaf.data}
 set.default.KARAF_ETC=${karaf.etc}
 set.default.KARAF_LOG=${karaf.log}
 set.default.KARAF_VERSION=${karaf.version}
-set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_SEPARATOR%%PATH%.
+set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_SEPARATOR%%PATH%%WRAPPER_FILE_SEPARATOR%.
 
 # Include JAVA_HOME/bin in the default PATH variable
 set.PATH=%PATH_WITH_JAVA%
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java8.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java8.conf
index cd15b40..fdfd7db 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java8.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows/karaf-wrapper-java8.conf
@@ -24,7 +24,7 @@ set.default.KARAF_BASE=${karaf.base}
 set.default.KARAF_DATA=${karaf.data}
 set.default.KARAF_ETC=${karaf.etc}
 set.default.KARAF_LOG=${karaf.log}
-set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_SEPARATOR%%PATH%.
+set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_SEPARATOR%%PATH%%WRAPPER_FILE_SEPARATOR%.
 
 # Include JAVA_HOME/bin in the default PATH variable
 set.PATH=%PATH_WITH_JAVA%
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
index 0065bfa..79c4581 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java11.conf
@@ -25,7 +25,7 @@ set.default.KARAF_DATA=${karaf.data}
 set.default.KARAF_ETC=${karaf.etc}
 set.default.KARAF_LOG=${karaf.log}
 set.default.KARAF_VERSION=${karaf.version}
-set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_SEPARATOR%%PATH%.
+set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_SEPARATOR%%PATH%%WRAPPER_FILE_SEPARATOR%.
 
 # Include JAVA_HOME/bin in the default PATH variable
 set.PATH=%PATH_WITH_JAVA%
diff --git a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf
index 86d2e2d..b1dabcb 100644
--- a/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf
+++ b/wrapper/src/main/resources/org/apache/karaf/wrapper/internal/windows64/karaf-wrapper-java8.conf
@@ -24,7 +24,7 @@ set.default.KARAF_BASE=${karaf.base}
 set.default.KARAF_DATA=${karaf.data}
 set.default.KARAF_ETC=${karaf.etc}
 set.default.KARAF_LOG=${karaf.log}
-set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_SEPARATOR%%PATH%.
+set.default.PATH_WITH_JAVA=%JAVA_HOME%%WRAPPER_FILE_SEPARATOR%bin%WRAPPER_PATH_SEPARATOR%%PATH%%WRAPPER_FILE_SEPARATOR%.
 
 # Include JAVA_HOME/bin in the default PATH variable
 set.PATH=%PATH_WITH_JAVA%