karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [karaf] branch master updated: [KARAF-6189] Don't overwrite JAVA_HOME on gentoo system
Date Fri, 08 Mar 2019 14:39:23 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/master by this push:
     new 5629471  [KARAF-6189] Don't overwrite JAVA_HOME on gentoo system
     new e50043c  Merge pull request #776 from jbonofre/KARAF-6189
5629471 is described below

commit 5629471e170128823c9529aa2cfd34c977d95c4c
Author: Jean-Baptiste Onofré <jb@nanthrax.net>
AuthorDate: Fri Mar 8 13:37:32 2019 +0100

    [KARAF-6189] Don't overwrite JAVA_HOME on gentoo system
---
 assemblies/features/base/src/main/filtered-resources/resources/bin/inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
index c4cf29f..313e680 100644
--- a/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
+++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/inc
@@ -194,7 +194,7 @@ locateJava() {
     if [ "x${JAVA_HOME}" = "x" ] && [ "${darwin}" = "true" ]; then
         JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
     fi
-    if [ "x${JAVA}" = "x" ] && [ -r /etc/gentoo-release ] ; then
+    if [ "x${JAVA_HOME}" = "x" ] && [ -r /etc/gentoo-release ] ; then
         JAVA_HOME=$(java-config --jre-home)
     fi
     if [ "x${JAVA}" = "x" ]; then


Mime
View raw message