From 4789500812610cadbb2d2cab766aa74d404fd034 Mon Sep 17 00:00:00 2001 From: mathieu Date: Sun, 1 May 2016 08:30:51 +0200 Subject: [PATCH] Fix .init --- .gitignore | 2 +- app/.init | 0 app/scripts/app.sh | 10 ++++------ 3 files changed, 5 insertions(+), 7 deletions(-) delete mode 100644 app/.init diff --git a/.gitignore b/.gitignore index 466524d1..ffba4045 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ sdist develop-eggs .installed.cfg *.directory -.init +app/.init # Installer logs pip-log.txt diff --git a/app/.init b/app/.init deleted file mode 100644 index e69de29b..00000000 diff --git a/app/scripts/app.sh b/app/scripts/app.sh index a14c9e55..46288981 100644 --- a/app/scripts/app.sh +++ b/app/scripts/app.sh @@ -24,7 +24,8 @@ patterns='*.js;*.css;*.jpg;*.jpeg;*.gif;*.png;*.svg;*.ttf;*.eot;*.woff;*.woff2' sh $app/scripts/wait.sh #fix contains haystack elasticsearch -cd /opt/miniconda/lib/python2.7/site-packages/haystack/backends && sed -i "s/'contains': u'%s'/'contains': u'*%s*'/g" elasticsearch_backend.py && cd $app +sed -i "s/'contains': u'%s'/'contains': u'*%s*'/g" /opt/miniconda/lib/python2.7/site-packages/haystack/backends/elasticsearch_backend.py && cd $app +cat /opt/miniconda/lib/python2.7/site-packages/haystack/backends | grep contains # django setup python $manage wait-for-db @@ -33,16 +34,13 @@ python $manage migrate --noinput python $manage bower_install -- --allow-root python $manage collectstatic --noinput -if [ $REINDEX = "True" ] -then -python $manage rebuild_index --noinput -fi - if [ ! -f .init ]; then chown -R www-data:www-data $media python $manage telemeta-create-admin-user python $manage telemeta-create-boilerplate touch .init +elif [ $REINDEX = "True" ]; then + python $manage rebuild_index --noinput fi if [ $DEBUG = "False" ]; then -- 2.39.5