Merge remote-tracking branch 'gsoc2016/Subtitle-1'

[mediagoblin.git] / lazystarter.sh

diff --git a/lazystarter.sh b/lazystarter.sh
index d3770194cd33059eab1e28e950fd3d53dfd3c30b..b531b068cdab5f5ec9206d8380d93ba03e297eb0 100755 (executable)
--- a/lazystarter.sh
+++ b/lazystarter.sh
@@ -18,13 +18,14 @@
 
 selfname=$(basename "$0")
 local_bin="./bin"
+
 case "$selfname" in
     lazyserver.sh)
-        starter_cmd=paster
+        starter_cmd=paster;
         ini_prefix=paste
         ;;
     lazycelery.sh)
-        starter_cmd=celeryd
+        starter_cmd=celery
         ini_prefix=mediagoblin
         ;;
     *)
@@ -67,16 +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)
-        $starter serve "$ini_file" "$@" --reload
+        $starter serve "$ini_file" "$@" --reload;
         ;;
     lazycelery.sh)
         MEDIAGOBLIN_CONFIG="${ini_file}" \
             CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery \
-            $starter "$@"
+            $starter worker -B "$@"
         ;;
     *) exit 1 ;;
 esac