Repository: karaf Updated Branches: refs/heads/karaf-3.0.x 2c53ac555 -> a7f789a72
[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/a7f789a7 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/a7f789a7 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/a7f789a7 Branch: refs/heads/karaf-3.0.x Commit: a7f789a72fd8191ef9ae8ecf8e53fee1ac4642d4 Parents: 2c53ac5 Author: Jean-Baptiste Onofré <[email protected]> Authored: Tue Apr 21 22:06:37 2015 +0200 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Tue Apr 21 22:06:37 2015 +0200 ---------------------------------------------------------------------- .../framework/src/main/resources/resources/bin/karaf | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/a7f789a7/assemblies/features/framework/src/main/resources/resources/bin/karaf ---------------------------------------------------------------------- diff --git a/assemblies/features/framework/src/main/resources/resources/bin/karaf b/assemblies/features/framework/src/main/resources/resources/bin/karaf index 8d53ee1..9bc1b7c 100755 --- a/assemblies/features/framework/src/main/resources/resources/bin/karaf +++ b/assemblies/features/framework/src/main/resources/resources/bin/karaf @@ -112,14 +112,12 @@ 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=`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
