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

[jbonofre]

Repository: karaf
Updated Branches:
  refs/heads/master 7623268d6 -> 04fdd4ded


[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/81c56a74
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/81c56a74
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/81c56a74

Branch: refs/heads/master
Commit: 81c56a74912cf4ce8a6a627b4f090633a6fbc6da
Parents: ad559c0
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:53:53 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/karaf      | 2 +-
 .../framework/src/main/filtered-resources/resources/bin/shell      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/81c56a74/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/81c56a74/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 6727edf..eae018c 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/81c56a74/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
----------------------------------------------------------------------
diff --git 
a/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf 
b/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
index e5a8961..15b2d28 100755
--- 
a/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
+++ 
b/assemblies/features/framework/src/main/filtered-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

http://git-wip-us.apache.org/repos/asf/karaf/blob/81c56a74/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 1d8b8b0..d6c4965 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