bugfix: prevent test errors from bleeding into http headers

[shellwiki] / index.cgi

diff --git a/index.cgi b/index.cgi
index 091254cf76795f1fdb0342edd47d59ebce923deb..a27a75dbdddd133b086b71b9a222434cf10a0811 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -6,7 +6,13 @@
 . "${_EXEC}/tools.sh"
 . "${_EXEC}/acl.sh"
 
-WIKI_THEME="${WIKI_THEME:-default}"
+export REV_PAGES=${REV_PAGES:-true}
+export REV_ATTACHMENTS=${REV_ATTACHMENTS:-false}
+export WIKI_THEME="${WIKI_THEME:-default}"
+
+which git >/dev/null || REV_PAGES=false
+[ "$REV_PAGES" != true ] && REV_ATTACHMENTS=false
+
 . "${_EXEC}/themes/${WIKI_THEME}.sh"
 
 # Renew session cookie, only if cookie already set
@@ -22,25 +28,31 @@ wiki_text() {
   cat -- "$mdfile"
 }
 
-if [ "$(which git)" -a ! -f "$_DATA/.gitignore" ]; then
+if [ "$REV_PAGES" = true -a ! -f "$_DATA/.gitignore" ]; then
   cat >"$_DATA/.gitignore" <<-EOF
        users.db
        serverkey
-       */#attachments/
-       */#cache/
-       */#page.lock
-       */#page.*.cache
-       */#page.*.cache.*
+       **/#cache/
+       **/#page.lock
+       **/#page.*.cache
+       **/#page.*.cache.*
+       **/#page:*.*.cache
+       **/#page:*.*.cache.*
        EOF
+  [ "$REV_ATTACHMENTS" != true ] \
+  && printf '**/#attachments/\n' >>"$_DATA/.gitignore"
   git init "$_DATA"
   git -C "$_DATA" add .gitignore
+  printf '%s\n' "" "[user]" \
+         "email = \"shellwiki@localhost\"" \
+         "name = \"Shellwiki\"" \
+         >>"$_DATA/.git/config"
   git -C "$_DATA" commit -m 'initialization' -- .gitignore
 fi 1>&2
 
 for handler in "$_EXEC"/handlers/*; do
   . "$handler" && break
 done
-
 if [ $? != 0 ]; then
   export ERROR_MSG="The presented URL schema cannot be handled"
   theme_error 400