diff options
| -rwxr-xr-x | webgen | 18 |
1 files changed, 12 insertions, 6 deletions
@@ -29,6 +29,7 @@ # -header Is included before all [+~] pages # -end Is included after all [+~] pages # -menu-mid Is included after after menu file (if exists) on all [+~] pages. +# -faq_eoh ??? # ?FAQ Will be rendered as FAQ. # ?NEWS Will be rendered as NEWS. # ?NO-TEMPLATES Must not exist. @@ -62,6 +63,11 @@ fi cd $TPLS +cat_file() { + _file="$1" + cat -- "$_file" +} + gen_news() { if [ ! -d NEWS/ ] @@ -106,7 +112,7 @@ gen_faq() done < "$OF.FAQCATS" echo "</ul>" - [ -f ./-faq_eoh ] && cat "./-faq_eoh" + [ -f ./-faq_eoh ] && cat_file "-faq_eoh" while read cat do @@ -137,13 +143,13 @@ proc_page() { MENU=$(grep --no-filename -- "^$_tpl[^a-zA-Z0-9-]" '#menu-index'* | sed 's/^[^ \t]*[ \t]*[ \t]//'); [ "$MENU" = '' ] && MENU="$DEFAULT_MENU" { - cat -- -$HEADER - [ -n "$MENU" ] && cat -- "$MENU" - [ -e -menu-mid ] && cat -- -menu-mid - cat -- $_tpl + cat_file -$HEADER + [ -n "$MENU" ] && cat_file "$MENU" + [ -e -menu-mid ] && cat_file -menu-mid + cat_file $_tpl [ "$CLEANTPLNAME" = 'FAQ' ] && gen_faq [ "$CLEANTPLNAME" = 'NEWS' ] && gen_news - cat -- -$END + cat_file -$END } | \ sed "$SECTIONS_REGEX" | \ sed 's#href="[+~]\([^"\#]*\)\(\#*[^"]*\)"#href="\1'"$PAGE_SUFFIX"'\2"#g' > $OF |