github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-12-12 08:05:10 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix resolving rbenv symlink to its final location (#1482)

Browse source 
1. On systems with `readlink -f`, use that to canonicalize the path to libexec directory;
2. Otherwise, resolve symlinks recursively rather than just once.
This commit is contained in:
Mislav Marohnić 2023-02-15 17:09:20 +01:00 committed by GitHub
parent 8644fb5519
commit 0704e65781
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
libexec/rbenv
View file

@ -39,30 +39,37 @@ export RBENV_DIR
[ -n "$RBENV_ORIG_PATH" ] || export RBENV_ORIG_PATH="$PATH" [ -n "$RBENV_ORIG_PATH" ] || export RBENV_ORIG_PATH="$PATH"
canonicalize() {
local readlink resolved_path
if readlink="$(type -P greadlink)" || readlink="$(type -P readlink)"; then
# happy path: GNU & BSD readlink, macOS 12.3+
if resolved_path="$("$readlink" -f "$1" 2>/dev/null)"; then
printf "%s\n" "$resolved_path"
return 0
fi
# likely macOS < 12.3 with old readlink
local path="$1"
while [ -L "$path" ]; do
resolved_path="$("$readlink" "$path" 2>/dev/null)"
[[ $resolved_path == /* ]] || resolved_path="$(cd "${path%/*}/${resolved_path%/*}" && pwd)/${resolved_path##*/}"
path="$resolved_path"
done
printf "%s\n" "$path"
return 0
fi
# fail if the argument is a symlink and was not canonicalized
[ ! -L "$1" ] || return 1
}
shopt -s nullglob shopt -s nullglob
# all this trouble just to find out where rbenv's executables live
rbenv_bin="${BASH_SOURCE:-$0}" rbenv_bin="${BASH_SOURCE:-$0}"
if [ -L "$rbenv_bin" ]; then if libexec_dir="$(canonicalize "$rbenv_bin")"; then
# resolve rbenv symlink to find out where the actual libexec directory is libexec_dir="${libexec_dir%/*}"
if readlink="$(type -P greadlink)" || readlink="$(type -P readlink)"; then
resolved="$("$readlink" "$rbenv_bin" 2>/dev/null)"
if [[ $resolved == /* ]]; then
libexec_dir="${resolved%/*}"
else
libexec_dir="$(cd "${rbenv_bin%/*}/${resolved%/*}" && pwd)"
fi
else
# no readlink available; assume rbenv project layout
libexec_dir="${rbenv_bin%/*}"
if [[ $libexec_dir == */* ]]; then
libexec_dir="${libexec_dir%/*}/libexec"
else
libexec_dir="${PWD}/libexec"
fi
fi
else else
libexec_dir="${rbenv_bin%/*}" libexec_dir="${rbenv_bin%/*}"
[[ $libexec_dir != "." ]] || libexec_dir="$PWD" [ "$libexec_dir" != "." ] || libexec_dir="$PWD"
fi fi
for plugin_bin in "${RBENV_ROOT}/plugins/"*/bin; do for plugin_bin in "${RBENV_ROOT}/plugins/"*/bin; do

6
test/rbenv.bats
View file

@ -48,7 +48,7 @@ load test_helper
@test "adds its own libexec to PATH" { @test "adds its own libexec to PATH" {
run rbenv echo "PATH" run rbenv echo "PATH"
assert_success "${BATS_TEST_DIRNAME}/../libexec:$PATH" assert_success "${BATS_TEST_DIRNAME%/*}/libexec:$PATH"
} }
@test "adds plugin bin dirs to PATH" { @test "adds plugin bin dirs to PATH" {
@ -56,7 +56,7 @@ load test_helper
mkdir -p "$RBENV_ROOT"/plugins/rbenv-each/bin mkdir -p "$RBENV_ROOT"/plugins/rbenv-each/bin
run rbenv echo -F: "PATH" run rbenv echo -F: "PATH"
assert_success assert_success
assert_line 0 "${BATS_TEST_DIRNAME}/../libexec" assert_line 0 "${BATS_TEST_DIRNAME%/*}/libexec"
assert_line 1 "${RBENV_ROOT}/plugins/ruby-build/bin" assert_line 1 "${RBENV_ROOT}/plugins/ruby-build/bin"
assert_line 2 "${RBENV_ROOT}/plugins/rbenv-each/bin" assert_line 2 "${RBENV_ROOT}/plugins/rbenv-each/bin"
} }
@ -72,5 +72,5 @@ load test_helper
@test "RBENV_HOOK_PATH includes rbenv built-in plugins" { @test "RBENV_HOOK_PATH includes rbenv built-in plugins" {
unset RBENV_HOOK_PATH unset RBENV_HOOK_PATH
run rbenv echo "RBENV_HOOK_PATH" 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" assert_success "${RBENV_ROOT}/rbenv.d:${BATS_TEST_DIRNAME%/*}/rbenv.d:/usr/local/etc/rbenv.d:/etc/rbenv.d:/usr/lib/rbenv/hooks"
} }