Merge pull request #43 from mudge/patch-1

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

View file

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

View file

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