X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=tools.sh;h=2e98d674d764295b3e338fd3ca7a59c8c42ec0d9;hb=a88a2e833916c59ea6e99e9588543a58f02b9efe;hp=f0c153848bd29b8228970b36d0864e49abcc65d3;hpb=9228c5d601c0ffe2b334dd13af02c7be7fa57f79;p=shellwiki

diff --git a/tools.sh b/tools.sh
old mode 100644
new mode 100755
index f0c1538..2e98d67
--- a/tools.sh
+++ b/tools.sh
@@ -1,5 +1,39 @@
 #!/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(){
+  #  Check if page exists, if possible fall
+  #  back to default page from installation
+  local page="$(PATH "$1")"
+
+  # IMPORTANT: A Copy of this function exists
+  # in `handlers/10_translations.sh`
+  # Look into it now!
+  # Keep it synchronized, when changing anything
+
+  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 2>&-
+  #  ^^ suppress error messages produced
+  #     by printf when stdout was closed
+}
+
 size_human(){
   local size="$1"
 
@@ -21,7 +55,7 @@ size_human(){
 }
 
 page_glob(){
-  local pattern="$1" IFS=''
+  local pattern="${1%/}/" IFS=''
   local glob page pagedir
 
   case $pattern in
@@ -38,8 +72,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,33 +80,38 @@ page_glob(){
 }
 
 page_children(){
-  local page="${1%/}/" depth="${2:--1}"
+  local page="${1:-${PATH_INFO}}" depth="${2:-1}"
   local glob pagedir IFS=''
-
-  debug "CHILDREN $page $depth"
+  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
     for glob in "$_EXEC/pages/$PATH_INFO/${page}"*/; do printf '%s\n' "${glob#"$_EXEC/pages/$PATH_INFO/"}"; done
     ;;
   esac \
-  | debug \
   | sort -u \
   | 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
+}