Fix abs_dirname

install.sh

@@ -6,17 +6,21 @@ resolve_link() {
 }
 
 abs_dirname() {
-  local cwd="$(pwd)"
   local path="$1"
+  local save_cwd="$PWD"
+  local cd_path name
 
   while [ -n "$path" ]; do
-    cd "${path%/*}"
-    local name="${path##*/}"
+    cd_path="${path%/*}"
+    if [[ "$cd_path" != "$path" ]]; then
+      cd "$cd_path"
+    fi
+    name="${path##*/}"
     path="$(resolve_link "$name" || true)"
   done
 
-  pwd
-  cd "$cwd"
+  echo "$PWD"
+  cd "$save_cwd"
 }
 
 PREFIX="$1"

libexec/bats

@@ -31,17 +31,21 @@ resolve_link() {
 }
 
 abs_dirname() {
-  local cwd="$(pwd)"
   local path="$1"
+  local save_cwd="$PWD"
+  local cd_path name
 
   while [ -n "$path" ]; do
-    cd "${path%/*}"
-    local name="${path##*/}"
+    cd_path="${path%/*}"
+    if [[ "$cd_path" != "$path" ]]; then
+      cd "$cd_path"
+    fi
+    name="${path##*/}"
     path="$(resolve_link "$name" || true)"
   done
 
-  pwd
-  cd "$cwd"
+  echo "$PWD"
+  cd "$save_cwd"
 }
 
 expand_path() {

test/bats.bats

@@ -262,3 +262,13 @@ fixtures bats
   [ $status -eq 0 ]
   [ "${lines[1]}" = "ok 1 loop_func" ]
 }
+
+@test "abs_dirname with symlink to same current directory" {
+  cd "$TMP"
+  ln -s $(which bats) bats
+  ln -s bats bats-linked
+  run ./bats-linked "$FIXTURE_ROOT/loop_keep_IFS.bats"
+  [ $status -eq 0 ]
+  expected_lines=("1..1" "ok 1 loop_func")
+  [ "${lines}" = "${expected_lines}" ]
+}