github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-11-21 20:47:00 -05:00
Code Issues Projects Releases Packages Wiki Activity

Add rbenv's own rbenv.d directory to hook paths

Browse source 
This allows rbenv source code to ship with built-in hooks.
This commit is contained in:
Mislav Marohnić 2014-10-16 16:31:51 +02:00
parent bf39d88d11
commit 632263568e
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libexec/rbenv
View file

@ -71,15 +71,20 @@ shopt -s nullglob
bin_path="$(abs_dirname "$0")" bin_path="$(abs_dirname "$0")"
for plugin_bin in "${RBENV_ROOT}/plugins/"*/bin; do for plugin_bin in "${RBENV_ROOT}/plugins/"*/bin; do
bin_path="${bin_path}:${plugin_bin}" PATH="${plugin_bin}:${PATH}"
done done
export PATH="${bin_path}:${PATH}" export PATH="${bin_path}:${PATH}"
hook_path="${RBENV_HOOK_PATH}:${RBENV_ROOT}/rbenv.d:/usr/local/etc/rbenv.d:/etc/rbenv.d:/usr/lib/rbenv/hooks" RBENV_HOOK_PATH="${RBENV_HOOK_PATH}:${RBENV_ROOT}/rbenv.d"
if [ "${bin_path%/*}" != "$RBENV_ROOT" ]; then
# Add rbenv's own `rbenv.d` unless rbenv was cloned to RBENV_ROOT
RBENV_HOOK_PATH="${RBENV_HOOK_PATH}:${bin_path%/*}/rbenv.d"
fi
RBENV_HOOK_PATH="${RBENV_HOOK_PATH}:/usr/local/etc/rbenv.d:/etc/rbenv.d:/usr/lib/rbenv/hooks"
for plugin_hook in "${RBENV_ROOT}/plugins/"*/etc/rbenv.d; do for plugin_hook in "${RBENV_ROOT}/plugins/"*/etc/rbenv.d; do
hook_path="${hook_path}:${plugin_hook}" RBENV_HOOK_PATH="${RBENV_HOOK_PATH}:${plugin_hook}"
done done
export RBENV_HOOK_PATH="$hook_path" export RBENV_HOOK_PATH
shopt -u nullglob shopt -u nullglob

BIN
libexec/rbenv-realpath.dylib
View file

Binary file not shown.

5
test/rbenv.bats
View file

@ -68,3 +68,8 @@ load test_helper
assert_line 1 "/other/hooks" assert_line 1 "/other/hooks"
assert_line 2 "${RBENV_ROOT}/rbenv.d" assert_line 2 "${RBENV_ROOT}/rbenv.d"
} }
@test "RBENV_HOOK_PATH includes rbenv built-in plugins" {
run rbenv echo "RBENV_HOOK_PATH"
assert_success ":${RBENV_ROOT}/rbenv.d:${BATS_TEST_DIRNAME%/*}/rbenv.d:/usr/local/etc/rbenv.d:/etc/rbenv.d:/usr/lib/rbenv/hooks"
}