From: Paul Hänsch <paul@plutz.net>
Date: Wed, 18 May 2022 20:00:34 +0000 (+0200)
Subject: new tool function page_abs
X-Git-Url: https://git.plutz.net/?a=commitdiff_plain;h=5cf6de21a08325c9952aa2ed16ff2c69979d0599;p=shellwiki

new tool function page_abs
---

diff --git a/macros/pagelist b/macros/pagelist
index e9f5a33..54d4a69 100755
--- a/macros/pagelist
+++ b/macros/pagelist
@@ -14,10 +14,7 @@ printf '<ul class="pagelist">\n'
     page_children "$glob" "$((depth - 1))"
   done \
   | while read -r page; do
-    case $page in
-      /*) pagedir="$(PATH "$page")";;
-      *)  pagedir="$(PATH "$PATH_INFO/$page")";;
-    esac
+    pagedir="$(page_abs "$page")"
     [ -f "$_DATA/pages/${pagedir}/#page.md" -o \
       -f "$_EXEC/pages/${pagedir}/#page.md" ] \
     && acl_read "$pagedir" \
diff --git a/tools.sh b/tools.sh
index c88cc55..2a851ab 100644
--- a/tools.sh
+++ b/tools.sh
@@ -58,8 +58,7 @@ page_glob(){
   | while read -r page; do
     case $page in
       \#*|*/\#*) continue;;
-      /*) pagedir="$(PATH "$page")";;
-      *)  pagedir="$(PATH "$PATH_INFO/$page")";;
+      *) pagedir="$(page_abs "$page")";;
     esac
     [ -d "$_DATA/pages/$pagedir" -o -d "$_EXEC/pages/$pagedir" ] \
     && printf '%s\n' "$page"
@@ -87,8 +86,7 @@ page_children(){
   | while read -r page; do
     case $page in
       \#*|*/\#*) continue;;
-      /*) pagedir="$(PATH "$page")";;
-      *)  pagedir="$(PATH "$PATH_INFO/$page")";;
+      *) pagedir="$(page_abs "$page")";;
     esac
     if [ -d "$_DATA/pages/$pagedir" -o -d "$_EXEC/pages/$pagedir" ]; then
       printf %s\\n "$page"
@@ -96,3 +94,10 @@ page_children(){
     fi
   done
 }
+
+page_abs(){
+  case $1 in
+    /*) PATH "${1%/}/";;
+    *)  PATH "${PATH_INFO%/*}/${1%/}/";;
+  esac
+}