swerc

commit 51c820ca851331ac1bfee1a37f6035e5154c95bf
parent 157a6338fcb3eb6e76b42c1774e5fed3cc311bd3
Author: uriel@engel.se.cat-v.org <unknown>
Date:   Fri, 23 Jan 2009 16:46:48 +0100

Fix and simplify config loading process.
Diffstat:
M
bin/werc.rc
 | 
13
+++++++------

1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/bin/werc.rc b/bin/werc.rc
@@ -13,8 +13,7 @@ fn get_lib_file {
         echo -n lib/$1
 }
 
-# Don't change var name or trailing ';', dirfilter might be changed from _werc/config!
-# ls -F style input of the form: $sitedir/path/to/files/
+# Expected input: ls -F style, $sitedir/path/to/files/
 #          <ls -F+x><symlink hack><Useless?><hiden files  >
 dirfilter='s/\*$//; s,/+\./+,/,g; s,^\./,,; /\/[._][^\/]/d; /'^$forbidden_uri_chars^'/d; /^\/(robots|sitemap)\.txt$|\/index\.(md|html|txt|tpl)$/d; /_werc\/?$/d; '
 dirclean=' s/\.(md|html|txt)$//; '
@@ -184,13 +183,15 @@ if not if(test -d $local_path)
     perm_redirect $req_path^'/'
 
 cd $sitedir
+req_paths_list='/' # Note: req_paths_list doesn't include 'stnythetic' dirs.
+conf_wd='/' # Used in config files to know where we are in the document tree.
 if(test -f _werc/config)
     . _werc/config
-conf_wd='' # This can be used inside config files to know where we are in the document tree.
-for(i in ('' $args)) {
-    config_wd=($"config_wd^/^$i)
-    req_paths_list=($req_paths_list $config_wd)
+for(i in $args) {
+    conf_wd=$conf_wd^$i
+    req_paths_list=($req_paths_list $conf_wd)
     if(test -d $i) {
+        conf_wd=$conf_wd^'/'
         cd $i
         if(test -f _werc/config)
             . _werc/config