Work around lack of scikits.audiolab support on Python 3.

[mediagoblin.git] / lazystarter.sh

diff --git a/lazystarter.sh b/lazystarter.sh
index f8da8aefe2325e9fb13f013aac6e4a957e5dfe2d..b531b068cdab5f5ec9206d8380d93ba03e297eb0 100755 (executable)
--- a/lazystarter.sh
+++ b/lazystarter.sh
@@ -19,38 +19,13 @@
 selfname=$(basename "$0")
 local_bin="./bin"
 
-# Test whether or not gunicorn is installed
-# -----------------------------------------
-if [ -f "${local_bin}/python" ]; then
-    our_python="${local_bin}/python";
-else
-    our_python="python";
-fi
-
-if $our_python -c "import sys
-try:
-    import gunicorn
-    sys.exit(0)
-except ImportError:
-    sys.exit(1)
-"; then
-    use_gunicorn=true;
-else
-    use_gunicorn=false;
-fi
-# -----------------------------------------
-
 case "$selfname" in
     lazyserver.sh)
-        if $use_gunicorn; then
-            starter_cmd=gunicorn;
-        else
-            starter_cmd=paster;
-        fi
+        starter_cmd=paster;
         ini_prefix=paste
         ;;
     lazycelery.sh)
-        starter_cmd=celeryd
+        starter_cmd=celery
         ini_prefix=mediagoblin
         ;;
     *)
@@ -62,8 +37,9 @@ esac
 if [ "$1" = "-h" ]; then
     echo "$0 [-h] [-c filename.ini] [ARGS_to_${starter_cmd} ...]"
     echo ""
-    echo "   For Gunicorn settings, see at:"
-    echo "      http://docs.gunicorn.org/en/19.0/settings.html"
+    echo "   For example:"
+    echo "         $0 -c fcgi.ini port_number=23371"
+    echo "     or: $0 --server-name=fcgi --log-file=paste.log"
     echo ""
     echo "   The configfile defaults to ${ini_prefix}_local.ini,"
     echo "   if that is readable, otherwise ${ini_prefix}.ini."
@@ -92,20 +68,26 @@ else
     exit 1
 fi
 
+# If the user somehow doesn't have a mediagoblin.ini
+# (maybe they aren't using make) give them one
+#   ... this doesn't fulfill all conditions maybe, but is a stopgap
+#   that doesn't have noticable race conditions
+if [ -f mediagoblin.example.ini ] && \
+    [ ! -f mediagoblin.ini ]; then
+    echo "No mediagoblin.ini found, making one";
+    cp --no-clobber mediagoblin.example.ini mediagoblin.ini;
+fi
+
 set -x
 export CELERY_ALWAYS_EAGER=true
 case "$selfname" in
     lazyserver.sh)
-        if $use_gunicorn; then
-            $starter --paste "$ini_file" --log-file=- $@;
-        else
-            $starter serve "$ini_file" "$@" --reload;
-        fi
+        $starter serve "$ini_file" "$@" --reload;
         ;;
     lazycelery.sh)
         MEDIAGOBLIN_CONFIG="${ini_file}" \
             CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery \
-            $starter -B "$@"
+            $starter worker -B "$@"
         ;;
     *) exit 1 ;;
 esac