Repository: karaf Updated Branches: refs/heads/karaf-2.x edb7b1bc4 -> 797ea5f3a
[KARAF-3288] Support unset JAVA_HOME on Solaris Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/797ea5f3 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/797ea5f3 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/797ea5f3 Branch: refs/heads/karaf-2.x Commit: 797ea5f3af1a14c24d0115a7a21e3370c77df1f2 Parents: edb7b1b Author: Jean-Baptiste Onofré <[email protected]> Authored: Thu Oct 16 14:52:13 2014 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Thu Oct 16 14:52:13 2014 +0200 ---------------------------------------------------------------------- assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf | 2 +- assemblies/apache-karaf/src/main/filtered-resources/bin/admin | 2 +- assemblies/apache-karaf/src/main/filtered-resources/bin/client | 2 +- assemblies/apache-karaf/src/main/filtered-resources/bin/shell | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/797ea5f3/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf index 0be8898..7d001ee 100755 --- a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf +++ b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf @@ -209,7 +209,7 @@ locateJava() { else warn "JAVA_HOME not set; results may vary" JAVA=`type java` - JAVA=`expr "$JAVA" : '.*is \(.*\)$'` + JAVA=`expr "$JAVA" : '.* \(/.*\)$'` if [ "x$JAVA" = "x" ]; then die "java command not found" fi http://git-wip-us.apache.org/repos/asf/karaf/blob/797ea5f3/assemblies/apache-karaf/src/main/filtered-resources/bin/admin ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin index 6786bc3..dc708a1 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin @@ -202,7 +202,7 @@ locateJava() { else warn "JAVA_HOME not set; results may vary" JAVA=`type java` - JAVA=`expr "$JAVA" : '.*is \(.*\)$'` + JAVA=`expr "$JAVA" : '.* \(/.*\)$'` if [ "x$JAVA" = "x" ]; then die "java command not found" fi http://git-wip-us.apache.org/repos/asf/karaf/blob/797ea5f3/assemblies/apache-karaf/src/main/filtered-resources/bin/client ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/client b/assemblies/apache-karaf/src/main/filtered-resources/bin/client index 067cd22..b0cc98d 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/client +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/client @@ -202,7 +202,7 @@ locateJava() { else warn "JAVA_HOME not set; results may vary" JAVA=`type java` - JAVA=`expr "$JAVA" : '.*is \(.*\)$'` + JAVA=`expr "$JAVA" : '.* \(/.*\)$'` if [ "x$JAVA" = "x" ]; then die "java command not found" fi http://git-wip-us.apache.org/repos/asf/karaf/blob/797ea5f3/assemblies/apache-karaf/src/main/filtered-resources/bin/shell ---------------------------------------------------------------------- diff --git a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell index 86b8560..179eabc 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell @@ -201,7 +201,7 @@ locateJava() { else warn "JAVA_HOME not set; results may vary" JAVA=`type java` - JAVA=`expr "$JAVA" : '.*is \(.*\)$'` + JAVA=`expr "$JAVA" : '.* \(/.*\)$'` if [ "x$JAVA" = "x" ]; then die "java command not found" fi
