X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=macros%2Fpagelist;h=54d4a693f2f0d8d2d0fc76bb40b3bbe3b50d6077;hb=d75f33f647280ada400fb51f740701cdb12dd4d3;hp=24252a920c6fc2f1e55dad4a666e4fff7cf3f836;hpb=9228c5d601c0ffe2b334dd13af02c7be7fa57f79;p=shellwiki

diff --git a/macros/pagelist b/macros/pagelist
index 24252a9..54d4a69 100755
--- a/macros/pagelist
+++ b/macros/pagelist
@@ -10,14 +10,14 @@ depth="${2:-1}"
 printf '<ul class="pagelist">\n'
   page_glob "$dir" \
   | while read -r glob; do
-    page_children "$glob" "$depth"
+    printf %s\\n "$glob"
+    page_children "$glob" "$((depth - 1))"
   done \
   | while read -r page; do
-    case $page in
-      /*) pagedir="$(PATH "$page")";;
-      *)  pagedir="$(PATH "$PATH_INFO/$page")";;
-    esac
-    acl_read "$pagedir" \
+    pagedir="$(page_abs "$page")"
+    [ -f "$_DATA/pages/${pagedir}/#page.md" -o \
+      -f "$_EXEC/pages/${pagedir}/#page.md" ] \
+    && acl_read "$pagedir" \
     && printf '<li><a href="%s">%s</a></li>' "$(HTML "$page")" "$(HTML "$page")"
   done
 printf '</ul>\n'