X-Git-Url: https://git.plutz.net/?p=confetti;a=blobdiff_plain;f=index.cgi;h=1721280daf81b51c4b3f05f758fed17f299f620b;hp=92310fd95cb10b877f25fe2b4a5a56e7588f7449;hb=25a24a7d834757e006b46b863453d5f79780a63f;hpb=9917259ba7ae33000a3aeb892f392ed71ad0377d diff --git a/index.cgi b/index.cgi index 92310fd..1721280 100755 --- a/index.cgi +++ b/index.cgi @@ -15,18 +15,11 @@ debug() { #change to false to disable debugging # 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 -debug "Execution dir: $_EXEC" -debug "Storage dir: $_DATA" - [ -w "$_DATA" ] && [ -d "$_DATA" ] || die "storage directory must be writable" # create directories for object storage @@ -46,6 +39,13 @@ EOF . "$_EXEC/cgi.sh" cgi_get -debug "$_GET" -[ -n "$_GET[\"action\"]" ] && . "$_EXEC/action.sh" || . "$_EXEC/page.sh" +. "$_EXEC/constants.sh" + +if [ -n "$_GET[\"action\"]" ]; then + . "$_EXEC/action.sh" +elif [ -n "$_GET[\"export\"]" ]; then + . "$_EXEC/export.sh" +else + . "$_EXEC/page.sh" +fi