karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject [3/3] git commit: KARAF-2727 - additional fix for script on Solaris
Date Thu, 23 Jan 2014 16:11:27 GMT
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/e0d9c215
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/e0d9c215
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/e0d9c215

Branch: refs/heads/master
Commit: e0d9c215d91cef6e3eefb9361ceeca9e2c4d1ba1
Parents: 441090d
Author: Jonathan Anstey <janstey@gmail.com>
Authored: Thu Jan 23 12:41:13 2014 -0330
Committer: Jonathan Anstey <janstey@gmail.com>
Committed: Thu Jan 23 12:41:13 2014 -0330

----------------------------------------------------------------------
 .../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 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf/blob/e0d9c215/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 0debb38..4530b08 100755
--- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/client
@@ -188,7 +188,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/e0d9c215/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 052d338..fe48c79 100755
--- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/instance
@@ -188,7 +188,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/e0d9c215/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 b590981..6076bde 100755
--- a/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
+++ b/assemblies/features/framework/src/main/filtered-resources/resources/bin/karaf
@@ -195,7 +195,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`


Mime
View raw message