X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;f=tools.sh;h=c5545fb92e0cecc8975627514b7d80b32ea16aff;hb=8a93d4ef20815df18bfc1a580d3cffb8c6a31ea2;hp=c88cc55c12bfdeaedf482d4dddcfed51941e7281;hpb=277d06327a184eb1fb72ba46fd8a3194c9c37362;p=shellwiki

diff --git a/tools.sh b/tools.sh
old mode 100644
new mode 100755
index c88cc55..c5545fb
--- a/tools.sh
+++ b/tools.sh
@@ -1,5 +1,8 @@
 #!/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
@@ -58,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"
@@ -75,8 +77,8 @@ page_children(){
 
   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
@@ -87,8 +89,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 +97,10 @@ page_children(){
     fi
   done
 }
+
+page_abs(){
+  case $1 in
+    /*) PATH "${1%/}/";;
+    *)  PATH "${PATH_INFO%/*}/${1%/}/";;
+  esac
+}