docs: update

dylanaraps · Sep 19, 2019 · 27c4d36 · 27c4d36
1 parent 968a1bd
commit 27c4d36
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -1072,8 +1072,11 @@ dirname() {
     # Usage: dirname "path"
     dir=${1:-.}
     dir=${dir%%${dir##*[!/]}}
+
     [[ "${dir##*/*}" ]] && dir=.
+
     dir=${dir%/*}
+    dir=${dir%%${dir##*[!/]}}
 
     printf '%s\n' "${dir:-/}"
 }

diff --git a/manuscript/chapter5.txt b/manuscript/chapter5.txt
@@ -11,8 +11,11 @@ dirname() {
     # Usage: dirname "path"
     dir=${1:-.}
     dir=${dir%%${dir##*[!/]}}
+
     [[ "${dir##*/*}" ]] && dir=.
+
     dir=${dir%/*}
+    dir=${dir%%${dir##*[!/]}}
 
     printf '%s\n' "${dir:-/}"
 }

diff --git a/test.sh b/test.sh
@@ -144,6 +144,12 @@ test_dirname() {
 
     result="$(dirname "something/////////////////////")"
     assert_equals "$result" "."
+
+    result="$(dirname "something/////////////////////a")"
+    assert_equals "$result" "something"
+
+    result="$(dirname "something//////////.///////////")"
+    assert_equals "$result" "something"
 }
 
 test_basename() {