git commit: [KARAF-3288] Support unset JAVA_HOME on Solaris

[jbonofre]

Repository: karaf
Updated Branches:
  refs/heads/karaf-3.0.x 920477402 -> 3874468c4


[KARAF-3288] Support unset JAVA_HOME on Solaris

    This closes #49

----
commit 72af704dc0ffa5c3540153df9c599b66551c93bf
Author: Kevin Earls <ke...@kevinearls.com>
Date:   2014-10-15T11:56:35Z

    KARAF-3288 Update script to correctly set 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/3874468c
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/3874468c
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/3874468c

Branch: refs/heads/karaf-3.0.x
Commit: 3874468c43607327a0cd5374f14e33a7f0f79c00
Parents: 9204774
Author: Jean-Baptiste Onofré <jbono...@apache.org>
Authored: Thu Oct 16 12:53:53 2014 +0200
Committer: Jean-Baptiste Onofré <jbono...@apache.org>
Committed: Thu Oct 16 12:56:23 2014 +0200

----------------------------------------------------------------------
 .../framework/src/main/filtered-resources/resources/bin/client     | 2 +-
 .../framework/src/main/filtered-resources/resources/bin/instance   | 2 +-
 .../framework/src/main/filtered-resources/resources/bin/shell      | 2 +-
 .../features/framework/src/main/resources/resources/bin/karaf      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/3874468c/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
----------------------------------------------------------------------
diff --git 
a/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
 
b/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
index d004a13..7cf3d04 100755
--- 
a/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
+++ 
b/assemblies/features/framework/src/main/filtered-resources/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/3874468c/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
----------------------------------------------------------------------
diff --git 
a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
 
b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
index 2d19cca..69b10d2 100755
--- 
a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
+++ 
b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
@@ -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/3874468c/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
----------------------------------------------------------------------
diff --git 
a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell 
b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
index 26f3243..05b68a5 100755
--- 
a/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
+++ 
b/assemblies/features/framework/src/main/filtered-resources/resources/bin/shell
@@ -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/3874468c/assemblies/features/framework/src/main/resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git 
a/assemblies/features/framework/src/main/resources/resources/bin/karaf 
b/assemblies/features/framework/src/main/resources/resources/bin/karaf
index e5a8961..15b2d28 100755
--- a/assemblies/features/framework/src/main/resources/resources/bin/karaf
+++ b/assemblies/features/framework/src/main/resources/resources/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