X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=tools.sh;h=c5545fb92e0cecc8975627514b7d80b32ea16aff;hb=4bb6a2be511e608fa87fbb7b54d8ed275b844b30;hp=926c7e4e3bdf51ed763aa55b862dd25d53bdabfb;hpb=e83851d3bdcb41a24687a1579e35dcfa39db4722;p=shellwiki

diff --git a/tools.sh b/tools.sh
old mode 100644
new mode 100755
index 926c7e4..c5545fb
--- a/tools.sh
+++ b/tools.sh
@@ -1,5 +1,28 @@
 #!/bin/sh
 
+[ "$include_tools" ] && return 0
+include_tools="$0"
+
+if [ "$(which awk)" ]; then
+  md() { awk -f "$_EXEC/md_macros.awk" -f "$_EXEC/cgilite/markdown.awk"; }
+elif [ "$(which busybox)" ]; then
+  md() { busybox awk -f "$_EXEC/md_macros.awk" -f "$_EXEC/cgilite/markdown.awk"; }
+else
+  md() { cat; }
+fi
+
+mdfile(){
+  local page="$(PATH "$1")"
+
+  if   [ -f "$_DATA/pages/$page/#page.md" ]; then
+    printf %s\\n "$_DATA/pages/$page/#page.md"
+  elif [ -f "$_EXEC/pages/$page/#page.md" ]; then
+    printf %s\\n "$_EXEC/pages/$page/#page.md"
+  else
+    return 1
+  fi
+}
+
 size_human(){
   local size="$1"
 
@@ -21,7 +44,7 @@ size_human(){
 }
 
 page_glob(){
-  local pattern="$1" IFS=''
+  local pattern="${1%/}/" IFS=''
   local glob page pagedir
 
   case $pattern in
@@ -38,8 +61,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"
@@ -47,16 +69,16 @@ page_glob(){
 }
 
 page_children(){
-  local page="${1%/}/" depth="${2:--1}"
+  local page="${1:-${PATH_INFO}}" depth="${2:-1}"
   local glob pagedir IFS=''
+  page="${page%/}/"
 
   [ "$depth" -eq 0 ] && return 0
-  printf %s\\n "$page"
 
   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
@@ -67,10 +89,18 @@ page_children(){
   | 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" ] \
-    && page_children "$page" "$((depth - 1))"
+    if [ -d "$_DATA/pages/$pagedir" -o -d "$_EXEC/pages/$pagedir" ]; then
+      printf %s\\n "$page"
+      page_children "$page" "$((depth - 1))"
+    fi
   done
 }
+
+page_abs(){
+  case $1 in
+    /*) PATH "${1%/}/";;
+    *)  PATH "${PATH_INFO%/*}/${1%/}/";;
+  esac
+}