X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=index.cgi;h=277f7ae0517f4c7eeb01edc08c67fb4fbb236ba3;hp=4d050e8700c19407fc2c85a8082109077a958d7a;hb=737e7f91162ec98b99dd2796ca26dd95e8c21f49;hpb=9d7c6eae1ee756c1ba53d80e7b134fa1f3a1f0b4

diff --git a/index.cgi b/index.cgi
index 4d050e8..277f7ae 100755
--- a/index.cgi
+++ b/index.cgi
@@ -6,13 +6,15 @@ die() {
   exit 1
 }
 debug() { #change to false to disable debugging
-  true && echo "$*" >>debug
+  #true && echo "$*" >>debug
+  true && [ -n "$*" ] && echo -E "$*" >>/dev/stderr
+  true && [ -z "$*" ] && tee /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 _STOR
+# therefore we need to identify the code and data directories _EXEC and _DATA
 call=$0
 real=$call
 while [ -L "$real" ]; do
@@ -20,15 +22,15 @@ while [ -L "$real" ]; do
 done
 
 _EXEC="$(dirname "$real")"  #execution directory
-_STOR="$(dirname "$call")"  #storage directory
+_DATA="$(dirname "$call")"  #storage directory
 
 debug "Execution dir: $_EXEC"
-debug "Storage dir: $_STOR"
+debug "Storage dir: $_DATA"
 
-[ -w "$_EXEC" ] && [ -d "$_EXEC" ] || die "storage directory must be writable"
+[ -w "$_DATA" ] && [ -d "$_DATA" ] || die "storage directory must be writable"
 
 # create directories for object storage
-for each in "$_STOR"/{vcard,mappings,courses}; do
+for each in "$_DATA"/{vcard,mappings,courses,cache}; do
   [ ! -e "$each" ] && mkdir "$each"
   [ -w "$each" ] && [ -d "$each" ] || die "storage $each must be a writable directory"
 done
@@ -46,4 +48,4 @@ EOF
 cgi_get
 debug "$_GET"
 
-. "$_EXEC/page.sh"
+[ -n "$_GET[\"action\"]" ] && . "$_EXEC/action.sh" || . "$_EXEC/page.sh"