improved debugging functions

[confetti] / index.cgi

diff --git a/index.cgi b/index.cgi
index a7edbb1186378b7584e1e23e6b39a8f0aa906b19..c908d7bde8b3e5e4f97345d76e14212118520c84 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -1,36 +1,63 @@
 #!/bin/zsh
 
-# basic functions
-die() {
-  echo "$*" >/dev/stderr
-  exit 1
-}
-debug() { #change to false to disable debugging
-  #true && echo "$*" >>debug
-  true && [ -n "$*" ] && echo -E "$*" >>/dev/stderr
-  true && [ -z "$*" ] && tee /dev/stderr
-}
+# Copyright 2014 Paul Hänsch
+#
+# This file is part of Confetti.
+# 
+# Confetti is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# Confetti is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+# 
+# You should have received a copy of the GNU Affero General Public License
+# along with Confetti.  If not, see <http://www.gnu.org/licenses/>. 
+
+export LC_ALL=de_DE.UTF-8
+DBG_ENABLED=false
+DBG_FILE=/dev/stderr
 
 # this program is supposed to be symlinked into a http root directory
 # we will use the http root as object storage (data directory) and call sub
 # programs from the directory in which the real executable resides
 # therefore we need to identify the code and data directories _EXEC and _DATA
-call=$0
-real=$call
-while [ -L "$real" ]; do
-  real="$(stat -c %N "$real" |sed -r "s:..*. -> .(.*).$:\1:")"
-done
-
+call="$0"
+real="$(readlink -f $call)"
 _EXEC="$(dirname "$real")"  #execution directory
 _DATA="$(dirname "$call")"  #storage directory
 
-[ -w "$_DATA" ] && [ -d "$_DATA" ] || die "storage directory must be writable"
+# put debug options in the local.opts file
+[ -r "$_DATA/local.opts" ] && . "$_DATA/local.opts"
+
+# basic functions
+debug() { #change to false to disable debugging
+  if [ "$DBG_ENABLED" = true -a -n "$*" ]; then
+    echo -E "$*" >>"$DBG_FILE"
+  elif [ "$DBG_ENABLED" = true -a -z "$*" ]; then
+    tee -a "$DBG_FILE"
+  elif [ -z "$*" ]; then
+    cat
+  fi
+}
+
+die() {
+  debug "$*"
+  echo -E "$*" >>/dev/stderr
+  exit 1
+}
 
 # create directories for object storage
-for each in "$_DATA"/{vcard,mappings,courses,cache,temp}; do
+[ -w "$_DATA" ] && [ -d "$_DATA" ] || die "storage directory must be writable"
+
+for each in "$_DATA"/{vcard,ical,cache,temp,mappings}; do
   [ ! -e "$each" ] && mkdir "$each"
   [ -w "$each" ] && [ -d "$each" ] || die "storage $each must be a writable directory"
 done
+touch "$_DATA/mappings/attendance"
 
 # create htaccess file
 [ -f .htaccess ] || cat >.htaccess <<EOF
@@ -41,7 +68,6 @@ EOF
 [ -f .htaccess ] || die "no htaccess file present and unable to create one"
 
 . "$_EXEC/cgi.sh"
-
 cgi_get
 
 . "$_EXEC/constants.sh"