Merge commit 'b931bbd0c30907b9cc956d3707b26b449bf41f76'

[serve0] / index.cgi

diff --git a/index.cgi b/index.cgi
index d16e87482594dbfe05fec0f086926dabf3f2b8a9..79b9a87efda3acf8ac0e2084d29a0a67927b1378 100755 (executable)
--- a/index.cgi
+++ b/index.cgi
@@ -1,18 +1,9 @@
 #!/bin/sh
 
 exec 2>/dev/null
-for n in "$@"; do case ${n%%=*} in
-  data) _DATA="${n#data=}";;
-  exec) _exec="${n#exec=}";;
-  noerr) exec 2>&-;;
-esac; done
-
-[ -z "${_EXEC%/}" ] && _EXEC="$(realpath "${0%/*}")" || _EXEC="${_EXEC%/}"
-[ -z "${_DATA%/}" ] && _DATA=. || _DATA="${_DATA%/}"
-
 file_pattern='^.*\.(mov|ts|mpg|mpeg|mp4|m4v|avi|mkv|flv|sfv|wmv|ogm|ogv|webm|iso|rmvb)$'
 
-. "$_EXEC/cgilite/cgilite.sh"
+. "${_EXEC:-${0%/*}}/cgilite/cgilite.sh"
 
 FILTER="$(GET f)"
 SEARCH="$(GET s)"
@@ -90,22 +81,11 @@ case $ACTION in
   fi;;
 esac
 
-case $PATH_INFO in
-  /style.css)
-    . "$_EXEC/cgilite/file.sh"
-    [ -r "$_DATA/$PATH_INFO" ] \
-    && FILE "$_DATA/$PATH_INFO" \
-    || FILE "$_EXEC/style.css"
-    return 0
-  ;;
-  /stereoview.js)
-    . "$_EXEC/cgilite/file.sh"
-    FILE "$_EXEC/stereoview.js"
-    return 0
-  ;;
-esac
-
-if [ -f "$_DATA/$PATH_INFO" ]; then
+if [ -f "$_EXEC/$PATH_INFO" ]; then
+  . "$_EXEC/cgilite/file.sh"
+  FILE "$_EXEC/$PATH_INFO"
+  return 0
+elif [ -f "$_DATA/$PATH_INFO" ]; then
   . "$_EXEC/view.sh"
   return 0
 elif [ -d "$_DATA/$PATH_INFO" ]; then