You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by ja...@apache.org on 2014/01/23 16:54:35 UTC

[2/2] git commit: KARAF-2727 - fix script for Solaris

KARAF-2727 - fix script for Solaris


Project: http://git-wip-us.apache.org/repos/asf/karaf/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/441090d4
Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/441090d4
Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/441090d4

Branch: refs/heads/master
Commit: 441090d40e6e0ba7c61cb383d2a77305479952c4
Parents: a1efeaa
Author: Jonathan Anstey <ja...@gmail.com>
Authored: Thu Jan 23 12:24:04 2014 -0330
Committer: Jonathan Anstey <ja...@gmail.com>
Committed: Thu Jan 23 12:24:04 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/441090d4/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 0491b9b..0debb38 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/441090d4/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 c8e2605..052d338 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/441090d4/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 ad8bfc5..b590981 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`