X-Git-Url: http://git.plutz.net/?p=shcgi;a=blobdiff_plain;f=index.cgi;h=89be69c6b39eaca9bcefcfff035634fd274a1de7;hp=b407fc17ea0dcf6d556dba7b5ad5df5eb91189b2;hb=3ff1de1d7bf98b5ee3c30a21737a31196bcb6ec3;hpb=75f025e157fe5861e77db4ec8fdd860c7feec1cf

diff --git a/index.cgi b/index.cgi
index b407fc1..89be69c 100755
--- a/index.cgi
+++ b/index.cgi
@@ -18,8 +18,16 @@
 # along with shcgi.  If not, see <http://www.gnu.org/licenses/>. 
 
 export LC_ALL=C LANG=C
-DBG_ENABLED=false
-DBG_FILE=/dev/stderr
+
+data_dirs(){
+  # create directories for object storage
+
+  [ -d "$_DATA" -a -w "$_DATA" ] || die "storage directory must be writable"
+  for each in "$@"; do
+    [ ! -e "$_DATA/$each" ] && mkdir "$_DATA/$each"
+    [ -d "$_DATA/$each" -a -w "$_DATA/$each" ] || die "storage \"$_DATA/$each\" must be a writable directory"
+  done
+}
 
 # 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
@@ -31,48 +39,13 @@ _DATA="$(dirname "$call")"  #storage directory
 _EXEC="${real%/shcgi/index.cgi}"  #execution directory
 
 # put debug options in the local.opts file
+. "$_EXEC/shcgi/debug.sh"
 [ -r "$_DATA/local.opts" ] && . "$_DATA/local.opts"
 
-# basic functions
-debug() { #change to false to disable debugging
-  if [ "$DBG_ENABLED" = true -a -n "$*" ]; then
-    printf '%s\n' "$*" >>"$DBG_FILE"
-  elif [ "$DBG_ENABLED" = true -a -z "$*" ]; then
-    tee -a "$DBG_FILE"
-  elif [ -z "$*" ]; then
-    cat
-  fi
-}
-
-die() {
-  debug FATAL: "$*"
-  printf '%s\n' "$*" >&2
-  exit 1
-}
-
-data_dirs(){
-  # create directories for object storage
-
-  [ -d "$_DATA" -a -w "$_DATA" ] || die "storage directory must be writable"
-  for each in "$@"; do
-    [ ! -e "$_DATA/$each" ] && mkdir "$_DATA/$each"
-    [ -d "$_DATA/$each" -a -w "$_DATA/$each" ] || die "storage \"$_DATA/$each\" must be a writable directory"
-  done
-}
-
-# create htaccess file
-[ -f "$_DATA/.htaccess" ] || cat >"$_DATA/.htaccess" <<EOF
-Options		+ExecCGI
-AddHandler	cgi-script .cgi
-DirectoryIndex	index.cgi
-EOF
-[ -f "$_DATA/.htaccess" ] || die "no htaccess file present and unable to create one"
-
 . "$_EXEC/shcgi/cgi.sh"
-
 cgi_get
 
-[ -x "$_EXEC/constants.sh" ] && . "$_EXEC/constants.sh"
+[ -x "$_EXEC/globals.sh" ] && . "$_EXEC/globals.sh"
 
 if [ -n "${_GET[action]}" ]; then
   . "$_EXEC/shcgi/action.sh"