add multiple #-files, added support to only render templates of some type

1 files changed, 16 insertions, 3 deletions

diff --git a/webgen b/webgen
index f4cb620..f4a4ec4 100755
--- a/webgen
+++ b/webgen
@@ -13,6 +13,19 @@ DEFAULT_MENU='-menu-none'
 
 [ "$TEMPLATES" = '' ] && TEMPLATES="*"
 
+if [ "$TEMPLATES" = '+' ]
+then
+ TEMPLATES_PAGE="*"
+ TEMPLATES_DYN="NO-TEMPLATES"
+elif [ "$TEMPLATES" = '~' ]
+then
+ TEMPLATES_PAGE="NO-TEMPLATES"
+ TEMPLATES_DYN="*"
+else
+ TEMPLATES_PAGE="$TEMPLATES"
+ TEMPLATES_DYN="$TEMPLATES"
+fi
+
 # CODE:
 cd $TPLS
 
@@ -62,9 +75,9 @@ proc_page() {
  CLEANTPLNAME=$(echo "$_i" | sed 's/^[\-\+\~]//')
  OF="$OUT"/"$CLEANTPLNAME""$PAGE_SUFFIX"
  echo "Compiling $CLEANTPLNAME -> $OF"
- SECTIONS=`for _sec in $(grep -- "^$_i[^a-zA-Z0-9]" '#section-index' | sed 's/^[^ \t]*[ \t]*[ \t]//'); do O=''; for i in $(tr . ' ' <<<"$_sec"); do O="$O.$_i"; echo $O; done; done`
+ SECTIONS=`for _sec in $(grep --no-filename -- "^$_i[^a-zA-Z0-9]" '#section-index'* | sed 's/^[^ \t]*[ \t]*[ \t]//'); do O=''; for i in $(tr . ' ' <<<"$_sec"); do O="$O.$_i"; echo $O; done; done`
  SECTIONS_REGEX=$(for _sec in $SECTIONS; do echo "s/(section==$_sec:\([^)]*\):)/\1/g;"; done; echo "s/(section==.*:.*:)//g")
- MENU=$(grep -- "^$_i[^a-zA-Z0-9]" '#menu-index' | sed 's/^[^ \t]*[ \t]*[ \t]//');
+ MENU=$(grep --no-filename -- "^$_i[^a-zA-Z0-9]" '#menu-index'* | sed 's/^[^ \t]*[ \t]*[ \t]//');
  [ "$MENU" = '' ] && MENU="$DEFAULT_MENU"
  {
   cat -- -$HEADER
@@ -79,7 +92,7 @@ proc_page() {
  perl -pe's#href="\+(.+?)"#href="$1'"$PAGE_SUFFIX"'"#g' > $OF
 }
 
-for i in +$TEMPLATES \~$TEMPLATES
+for i in +$TEMPLATES_PAGE \~$TEMPLATES_DYN
 do
  [ -f "./$i" ] && proc_page "$i"
 done