info/pure-bash-bible
1
0
Fork 0
mirror of https://github.com/dylanaraps/pure-bash-bible.git synced 2025-09-09 14:40:44 +02:00
Code Issues Releases Wiki Activity

dirname: fix another case

Browse Source
This commit is contained in:
Dylan Araps
2019-09-19 17:38:33 +03:00
parent 49bd538c26
commit a2c0d36e19
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@@ -1067,10 +1067,9 @@ Alternative to the `dirname` command.
dirname() { dirname() {
# Usage: dirname "path" # Usage: dirname "path"
dir=${1%%/} dir=${1%%/}
[[ "${dir##*/*}" ]] && dir=.
dir=${dir%/*} dir=${dir%/*}
[[ $1 == */* ]] || dir=.
printf '%s\n' "${dir:-/}" printf '%s\n' "${dir:-/}"
} }
``` ```

3
manuscript/chapter5.txt
View File

@@ -10,10 +10,9 @@ Alternative to the `dirname` command.
dirname() { dirname() {
# Usage: dirname "path" # Usage: dirname "path"
dir=${1%%/} dir=${1%%/}
[[ "${dir##*/*}" ]] && dir=.
dir=${dir%/*} dir=${dir%/*}
[[ $1 == */* ]] || dir=.
printf '%s\n' "${dir:-/}" printf '%s\n' "${dir:-/}"
} }
``` ```

3
test.sh
View File

@@ -129,6 +129,9 @@ test_dirname() {
result="$(dirname "/foo/foo")" result="$(dirname "/foo/foo")"
assert_equals "$result" "/foo" assert_equals "$result" "/foo"
result="$(dirname "something/")"
assert_equals "$result" "."
} }
test_basename() { test_basename() {