Repository: karaf Updated Branches: refs/heads/master 5f7cfaf28 -> 0e85f7bea
[KARAF-3461] Be able to use a custom KARAF_HOME Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0e85f7be Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0e85f7be Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0e85f7be Branch: refs/heads/master Commit: 0e85f7bea762dc47ce4acae4d1cd51309de074a2 Parents: 5f7cfaf Author: Jean-Baptiste Onofré <[email protected]> Authored: Tue Apr 21 21:54:25 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue Apr 21 21:54:25 2015 +0200 ---------------------------------------------------------------------- .../base/src/main/filtered-resources/resources/bin/karaf | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/0e85f7be/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf ---------------------------------------------------------------------- diff --git a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf index 08b19cb..30fd878 100755 --- a/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf +++ b/assemblies/features/base/src/main/filtered-resources/resources/bin/karaf @@ -112,14 +112,13 @@ unlimitFD() { } locateHome() { - if [ "x$KARAF_HOME" != "x" ]; then - warn "Ignoring predefined value for KARAF_HOME" + if [ "x$KARAF_HOME" = "x" ]; then + # In POSIX shells, CDPATH may cause cd to write to stdout + (unset CDPATH) >/dev/null 2>&1 && unset CDPATH + # KARAF_HOME is not provided, fall back to default + KARAF_HOME=`cd "$DIRNAME/.."; pwd` fi - # In POSIX shells, CDPATH may cause cd to write to stdout - (unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - KARAF_HOME=`cd "$DIRNAME/.."; pwd` if [ ! -d "$KARAF_HOME" ]; then die "KARAF_HOME is not valid: $KARAF_HOME" fi
