karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject [1/3] git commit: KARAF-2727 - additional fix for script on Solaris
Date Thu, 23 Jan 2014 16:11:25 GMT
Updated Branches:
  refs/heads/karaf-2.3.x 16f998315 -> d4fad1628
  refs/heads/karaf-2.x 6f68f11dc -> 24c8b590d
  refs/heads/master 441090d40 -> e0d9c215d


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

Branch: refs/heads/karaf-2.x
Commit: 24c8b590dab49a99839fb4784dc34a2a8380cbbb
Parents: 6f68f11
Author: Jonathan Anstey <janstey@gmail.com>
Authored: Thu Jan 23 12:39:33 2014 -0330
Committer: Jonathan Anstey <janstey@gmail.com>
Committed: Thu Jan 23 12:39:33 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/24c8b590/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 c9beb95..9b8a307 100755
--- a/assemblies/apache-karaf/src/main/distribution/unix-shell/bin/karaf
+++ b/assemblies/apache-karaf/src/main/distribution/unix-shell/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`

http://git-wip-us.apache.org/repos/asf/karaf/blob/24c8b590/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 7f6c807..b8696fa 100644
--- a/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
+++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/admin
@@ -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/24c8b590/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 ba369d3..8294553 100644
--- a/assemblies/apache-karaf/src/main/filtered-resources/bin/client
+++ b/assemblies/apache-karaf/src/main/filtered-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/24c8b590/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 a93121e..eb14ab0 100644
--- a/assemblies/apache-karaf/src/main/filtered-resources/bin/shell
+++ b/assemblies/apache-karaf/src/main/filtered-resources/bin/shell
@@ -187,7 +187,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