shithub: werc

Info  •  Files  •  Log  •  Branches

Rename $baseuri to $base_url

--- a/bin/werc.rc

+++ b/bin/werc.rc

@@ -157,7 +157,7 @@

         uri=`{echo $uri | sed 's/index.(rss|atom)$//'}

         if(~ $#blogDirs 0)

             blogDirs=$sitedir^'/'$uri

-        uri=$baseuri$"uri

+        uri=$base_url$"uri

         if(~ $REQUEST_URI */index.rss)

             master_template=feeds/rss20.tpl

@@ -170,7 +170,7 @@

         if(~ $#blogDirs 0)

             blogDirs=`{basename -d $body}

-        u=`{cleanname $baseuri^`{basename -d '/'^$uri}|sed 's,:/,://,'} # Sed recovers '/' in 'http:/' stripped by cleanname

+        u=`{cleanname $base_url^`{basename -d '/'^$uri}|sed 's,:/,://,'} # Sed recovers '/' in 'http:/' stripped by cleanname

         extraHeaders=$"extraHeaders ^ \

     	'<link rel="alternate" type="application/rss+xml" title="RSS" href="'$"u'/index.rss" />

 <link rel="alternate" type="application/atom+xml" title="ATOM" href="'$"u'/index.atom" />'

@@ -210,7 +210,7 @@

 headers=lib/headers.tpl

 master_template=default_master.tpl

 sidebar=sidebar

-baseuri=http://$site/

+base_url=http://$site/

 current_date_time=`{date}

 for(i in siteTitle siteSubTitle pageTitle extraHeaders)

     $i = ''

--- a/lib/sitemap.tpl

+++ b/lib/sitemap.tpl

@@ -47,7 +47,7 @@

             desc=' - '$"desc

         tit=`{echo /$i|sed 's/_/ /g; s,.*/([^/]+)/?$,\1,'}

         echo '<li><a href="/'$i'">'^$"tit^'</a>' $"desc '</li>' 

-        echo -n $baseuri^$i >> $tmpfile

+        echo -n $base_url^$i >> $tmpfile

         if(test -d $i) {

             echo / >> $tmpfile	

             @{ listDir $i }