KARAF-2727 - additional fix for script on Solaris
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/d4fad162 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/d4fad162 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/d4fad162 Branch: refs/heads/karaf-2.3.x Commit: d4fad1628100f1cf790483aee9d305e43383b418 Parents: 16f9983 Author: Jonathan Anstey <[email protected]> Authored: Thu Jan 23 12:39:33 2014 -0330 Committer: Jonathan Anstey <[email protected]> Committed: Thu Jan 23 12:39:57 2014 -0330 ---------------------------------------------------------------------- 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/d4fad162/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 3f8b765..5e88b08 100755 --- a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf +++ b/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf @@ -185,7 +185,7 @@ locateJava() { fi if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then - JAVA_HOME=`/usr/libexec/java_home` + JAVA_HOME="$(/usr/libexec/java_home)" fi if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then JAVA_HOME=`java-config --jre-home` http://git-wip-us.apache.org/repos/asf/karaf/blob/d4fad162/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 ddd9b52..7027422 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin @@ -178,7 +178,7 @@ locateJava() { fi if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then - JAVA_HOME=`/usr/libexec/java_home` + JAVA_HOME="$(/usr/libexec/java_home)" fi if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then JAVA_HOME=`java-config --jre-home` http://git-wip-us.apache.org/repos/asf/karaf/blob/d4fad162/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 5fbfc81..8cc9f7f 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/client +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/client @@ -178,7 +178,7 @@ locateJava() { fi if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then - JAVA_HOME=`/usr/libexec/java_home` + JAVA_HOME="$(/usr/libexec/java_home)" fi if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then JAVA_HOME=`java-config --jre-home` http://git-wip-us.apache.org/repos/asf/karaf/blob/d4fad162/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 90e75a7..39893b2 100644 --- a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell +++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell @@ -177,7 +177,7 @@ locateJava() { fi if [ "x$JAVA_HOME" = "x" ] && [ "$darwin" = "true" ]; then - JAVA_HOME=`/usr/libexec/java_home` + JAVA_HOME="$(/usr/libexec/java_home)" fi if [ "x$JAVA" = "x" ] && [ -r /etc/gentoo-release ] ; then JAVA_HOME=`java-config --jre-home`
