karaf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jon Anstey <jans...@gmail.com>
Subject Re: git commit: KARAF-2727 - fix script for Solaris
Date Thu, 23 Jan 2014 16:12:20 GMT
This also works on Solaris:

JAVA_HOME="$(/usr/libexec/java_home)"

So I'm going with this change instead.


On Thu, Jan 23, 2014 at 12:26 PM, Achim Nierbeck <bcanhome@googlemail.com>wrote:

> Hmm, are you sure about that fix?
> cause for darwin (mac-os) we need this behaviour
> I suggest to add an extra part for solaris
>
>
> 2014/1/23 <janstey@apache.org>
>
> > Updated Branches:
> >   refs/heads/karaf-2.x 38a78b272 -> 6f68f11dc
> >
> >
> > 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/6f68f11d
> > Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6f68f11d
> > Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6f68f11d
> >
> > Branch: refs/heads/karaf-2.x
> > Commit: 6f68f11dc851fab2923276b841ebdda8927b58c4
> > Parents: 38a78b2
> > 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:24:46 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/6f68f11d/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 8c1eb39..c9beb95 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/6f68f11d/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 a866338..7f6c807 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/6f68f11d/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 8fa5497..ba369d3 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/6f68f11d/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 0df1d8f..a93121e 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`
> >
> >
>
>
> --
>
> Apache Karaf <http://karaf.apache.org/> Committer & PMC
> OPS4J Pax Web <http://wiki.ops4j.org/display/paxweb/Pax+Web/> Committer &
> Project Lead
> OPS4J Pax for Vaadin <http://team.ops4j.org/wiki/display/PAXVAADIN/Home>
> Commiter & Project Lead
> blog <http://notizblog.nierbeck.de/>
>



-- 
Cheers,
Jon
---------------
Red Hat, Inc.
Email: janstey@redhat.com
Web: http://redhat.com
Twitter: jon_anstey
Blog: http://janstey.blogspot.com
Author of Camel in Action: http://manning.com/ibsen

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message