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

Merge pull request #43 from mudge/patch-1

Browse source 
Solaris doesn't support readlink so use greadlink if available instead.
This commit is contained in:
Sam Stephenson 2011-08-16 14:43:08 -07:00
commit 09291712ed
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libexec/rbenv
View file

@ -1,6 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -e set -e
resolve_link() {
$(type -p greadlink readlink | head -1) $1
}
abs_dirname() { abs_dirname() {
local cwd="$(pwd)" local cwd="$(pwd)"
local path="$1" local path="$1"
@ -8,7 +12,7 @@ abs_dirname() {
while [ -n "$path" ]; do while [ -n "$path" ]; do
cd "${path%/*}" cd "${path%/*}"
local name="${path##*/}" local name="${path##*/}"
path="$(readlink "$name" || true)" path="$(resolve_link "$name" || true)"
done done
pwd pwd

6
libexec/rbenv-init
View file

@ -12,6 +12,10 @@ if [ -z "$shell" ]; then
shell="$(basename "$SHELL")" shell="$(basename "$SHELL")"
fi fi
resolve_link() {
$(type -p greadlink readlink | head -1) $1
}
abs_dirname() { abs_dirname() {
local cwd="$(pwd)" local cwd="$(pwd)"
local path="$1" local path="$1"
@ -19,7 +23,7 @@ abs_dirname() {
while [ -n "$path" ]; do while [ -n "$path" ]; do
cd "${path%/*}" cd "${path%/*}"
local name="${path##*/}" local name="${path##*/}"
path="$(readlink "$name" || true)" path="$(resolve_link "$name" || true)"
done done
pwd pwd