karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jans...@apache.org
Subject [1/2] git commit: KARAF-2727 - fix script for Solaris
Date Thu, 23 Jan 2014 15:54:34 GMT
Updated Branches:
  refs/heads/karaf-2.3.x 1574ed282 -> 16f998315
  refs/heads/master a1efeaa23 -> 441090d40


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

Branch: refs/heads/karaf-2.3.x
Commit: 16f9983156cb5fc594871f289f1bc3a9c54f017e
Parents: 1574ed2
Author: Jonathan Anstey <janstey@gmail.com>
Authored: Thu Jan 23 12:22:10 2014 -0330
Committer: Jonathan Anstey <janstey@gmail.com>
Committed: Thu Jan 23 12:22:36 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/16f99831/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 cfceed6..3f8b765 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/16f99831/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 83ae7fb..ddd9b52 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/16f99831/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 b0ae603..5fbfc81 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/16f99831/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 3fba518..90e75a7 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`


Mime
View raw message