X-Git-Url: https://git.plutz.net/?a=blobdiff_plain;ds=inline;f=macros%2Finclude;h=5254a2609c91623d2edae92bc14361fc71219407;hb=68261c373aa3e692cff9988f9d021aa0fa1783b6;hp=97f35a4a2d27c84bdd171a7e089365e980971877;hpb=03faace5d5ef48267bfd0108edf65b29f285b2ac;p=shellwiki diff --git a/macros/include b/macros/include index 97f35a4..5254a26 100755 --- a/macros/include +++ b/macros/include @@ -4,11 +4,7 @@ . "$_EXEC/acl.sh" . "$_EXEC/tools.sh" -from=1 -to=\$ -rev='' -items=\$ -path_info="$PATH_INFO" +from='1'; to='$'; rev=''; items='$'; link='true' while [ $# -gt 0 ]; do case $1 in --from) from="$2"; shift 2;; @@ -18,6 +14,7 @@ while [ $# -gt 0 ]; do case $1 in --items) items="$2"; shift 2;; items=*) items="${1#*=}"; shift 1;; --rev|--reverse) rev="-r"; shift 1;; + --nolink) link=""; shift 1;; *) page="$1"; shift 1;; esac; done @@ -25,7 +22,7 @@ if ! printf %s\\n "$from" |grep -qEx '[0-9]+|/([^/\\]|\\/|\\.)*/'; then debug 'Include macro invalid argument: "from"' exit 1 fi -if ! printf %s\\n "$to" |grep -qEx '[0-9]+|/([^/\\]|\\/|\\.)*/'; then +if ! printf %s\\n "$to" |grep -qEx '\$|[0-9]+|/([^/\\]|\\/|\\.)*/'; then debug 'Include macro Invalid argument: "to"' exit 1 fi @@ -38,26 +35,29 @@ page_glob "$page" \ | sort $rev \ | sed "${items}q" \ | while read glob; do - case $glob in - /*) export PATH_INFO="$(PATH "$glob")";; - *) export PATH_INFO="$(PATH "$path_info/$glob")";; - esac - acl_read || continue - if [ -f "$_DATA/pages/$PATH_INFO/#page.md" ]; then - mdfile="$_DATA/pages/$PATH_INFO/#page.md" - elif [ -f "$_EXEC/pages/$PATH_INFO/#page.md" ]; then - mdfile="$_EXEC/pages/$PATH_INFO/#page.md" - else - continue - fi - printf '