X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=tools.sh;h=de055fe808049e2afbc3b925a1f19f1f06413d5f;hb=71152d935975fa673d7ad4398a1757228cab8b8c;hp=1b7e6773dac5cfe6c6bdf961e8df3ef74d980d2c;hpb=818bd92b936bf3c66a4be47481be3c1fdf244523;p=shellwiki diff --git a/tools.sh b/tools.sh index 1b7e677..de055fe 100755 --- a/tools.sh +++ b/tools.sh @@ -12,15 +12,21 @@ else fi mdfile(){ + # Check if page exists, if possible fall + # back to default page from installation local page="$(PATH "$1")" if [ -f "$_DATA/pages/$page/#page.md" ]; then printf %s\\n "$_DATA/pages/$page/#page.md" + return 0 elif [ -f "$_EXEC/pages/$page/#page.md" ]; then printf %s\\n "$_EXEC/pages/$page/#page.md" + return 0 else return 1 - fi + fi 2>&- + # ^^ suppress error messages produced + # by printf when stdout was closed } size_human(){ @@ -77,8 +83,8 @@ page_children(){ case $page in /*) - for glob in "$_DATA/pages/${page}"*/; do printf '%s\n' "${glob#"$_DATA/pages"}"; done - for glob in "$_EXEC/pages/${page}"*/; do printf '%s\n' "${glob#"$_EXEC/pages"}"; done + for glob in "$_DATA/pages/${page}"*/; do printf '%s\n' "${glob#"$_DATA/pages/"}"; done + for glob in "$_EXEC/pages/${page}"*/; do printf '%s\n' "${glob#"$_EXEC/pages/"}"; done ;; *) for glob in "$_DATA/pages/$PATH_INFO/${page}"*/; do printf '%s\n' "${glob#"$_DATA/pages/$PATH_INFO/"}"; done