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 17:11:25 UTC
[1/3] git commit: KARAF-2727 - additional fix for script on Solaris
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 <ja...@gmail.com>
Authored: Thu Jan 23 12:39:33 2014 -0330
Committer: Jonathan Anstey <ja...@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`
[2/3] git commit: KARAF-2727 - additional fix for script on Solaris
Posted by ja...@apache.org.
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 <ja...@gmail.com>
Authored: Thu Jan 23 12:39:33 2014 -0330
Committer: Jonathan Anstey <ja...@gmail.com>
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`
[3/3] git commit: KARAF-2727 - additional fix for script on Solaris
Posted by ja...@apache.org.
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 <ja...@gmail.com>
Authored: Thu Jan 23 12:41:13 2014 -0330
Committer: Jonathan Anstey <ja...@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`