more if for build

hugoren · Oct 26, 2017 · 50de950 · 50de950
1 parent 74692c5
commit 50de950
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/build.sh b/build.sh
@@ -32,8 +32,15 @@ mv ${BIN_DIR}/curve/static/v1 ${BIN_DIR}/curve/web/
 sed -i -e "s%/static/v1/swagger.json%/web/v1/swagger.json%g" ${BIN_DIR}/curve/web/swagger-ui/index.html
 rm -rf ${BIN_DIR}/curve/static
 pip install -r ${BIN_DIR}/requirements.txt
+pip install uwsgi
 
 # package
-echo "build done, usage:"
-echo "1. cd ${BIN_DIR} && python -m curve"
-echo "2. pip install uWSGI && cd ${BIN_DIR} && uwsgi uwsgi.ini"
+if [ $? -ne 0 ]; then
+    echo "========================================"
+    echo "build uwsgi error, direct usage:"
+    echo "cd ${BIN_DIR} && python -m curve"
+else
+    echo "========================================"
+    echo "build done, usage:"
+    echo "./control.sh start"
+fi
diff --git a/control.sh b/control.sh
@@ -7,8 +7,6 @@ readonly G_SOURCEROOT="${G_HOME}/pysrc"
 
 # TODO: check if built before
 
-source ${G_VENV}
-
 help() {
     echo "${0} <start|stop|reload|terminate>"
     exit 1
@@ -17,6 +15,7 @@ help() {
 # TODO: check before operation
 
 start() {
+    [ -e "${G_SOURCEROOT}/curve/web" ] || build.sh
     cd ${G_SOURCEROOT}
     mkdir -p ${G_SOURCEROOT}/log
     source ${G_VENV}
@@ -30,6 +29,7 @@ stop() {
 }
 
 reload() {
+    [ -e "${G_SOURCEROOT}/curve/web" ] || build.sh
     cd ${G_SOURCEROOT}
     source ${G_VENV}
     uwsgi --reload uwsgi.pid