drop page_children() function and join it into page_glob(), hide [system] pages from...

[shellwiki] / macros / pagelist

diff --git a/macros/pagelist b/macros/pagelist
index 54d4a693f2f0d8d2d0fc76bb40b3bbe3b50d6077..f6828fda1e52e06afa0ffe01493ce10ae1e97bd3 100755 (executable)
--- a/macros/pagelist
+++ b/macros/pagelist
@@ -4,14 +4,25 @@
 . "$_EXEC/acl.sh"
 . "$_EXEC/tools.sh"
 
-dir="${1:-./}"
-depth="${2:-1}"
+while [ $# -gt 0 ]; do case $1 in
+  --system) glob_system_pages=true; shift 1;;
+  --depth)  depth="$2" shift 2;;
+  *) if [ ! "$dir" ]; then
+      dir="$1"
+    elif [ ! "$depth" ]; then
+      depth="$1"
+    fi
+    shift 1;;
+esac; done
+
+[ "$dir" ] || dir=./
+[ "$depth" -ge 0 -o "$depth" -le 0 ] 2>&0 || depth=0
+
 
 printf '<ul class="pagelist">\n'
-  page_glob "$dir" \
+  page_glob "$dir" "$depth" \
   | while read -r glob; do
     printf %s\\n "$glob"
-    page_children "$glob" "$((depth - 1))"
   done \
   | while read -r page; do
     pagedir="$(page_abs "$page")"