Repository: accumulo Updated Branches: refs/heads/1.5.2-SNAPSHOT 75d62a462 -> e3e03be8d refs/heads/1.6.0-SNAPSHOT b3f6e0f8f -> 696057025 refs/heads/master 4e3696f13 -> e176aa6a1
ACCUMULO-2617 Fix the locationByProgram to account for the extra 'bin' directory Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e3e03be8 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e3e03be8 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e3e03be8 Branch: refs/heads/1.5.2-SNAPSHOT Commit: e3e03be8d1c90d54d58e11c8ea30e479c624d23c Parents: 75d62a4 Author: Josh Elser <els...@apache.org> Authored: Wed Apr 2 16:49:52 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Fri Apr 4 12:25:25 2014 -0400 ---------------------------------------------------------------------- bin/accumulo | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e3e03be8/bin/accumulo ---------------------------------------------------------------------- diff --git a/bin/accumulo b/bin/accumulo index 2ad8720..75ba63f 100755 --- a/bin/accumulo +++ b/bin/accumulo @@ -45,8 +45,8 @@ locationByProgram() RESULT="$(readlink "${RESULT}")" [[ "${RESULT}" != /* ]] && RESULT="${DIR}/${RESULT}" # if $RESULT was a relative symlink, we need to resolve it relative to the path where the symlink file was located done - # find the relative home directory - RESULT=$(dirname "${RESULT}") + # find the relative home directory, accounting for an extra bin directory + RESULT=$(dirname $(dirname "${RESULT}") ) echo "Auto-set ${2} to '${RESULT}'. To suppress this message, set ${2} in conf/accumulo-env.sh" eval "${2}=${RESULT}" }
