summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Schafft <lion@lion.leolix.org>2015-10-04 09:06:35 +0000
committerPhilipp Schafft <lion@lion.leolix.org>2017-03-27 02:11:19 +0000
commit96e06d4fb8f685a8ecc5390f8eb8bc32ceab1be6 (patch)
tree618b1f10d78ada1b6dea391ada32378e998bc95b
parent2c0bd81f418e490e61715635effac12b3f47f4a5 (diff)
use a function on it's own to output files, updated docs
-rwxr-xr-xwebgen18
1 files changed, 12 insertions, 6 deletions
diff --git a/webgen b/webgen
index 40958a5..c2649fc 100755
--- a/webgen
+++ b/webgen
@@ -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