summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyril Brulebois <cyril@debamax.com>2016-04-03 06:22:41 +0200
committerCyril Brulebois <cyril@debamax.com>2016-04-03 06:22:41 +0200
commitbf742d118a8c67114a170fd142e670c09f34920f (patch)
tree3c17620ee4974b432ee6e8b4098b3a7c2bb9585f
parent9a33bd76774f1b726792fd0581280823dc514613 (diff)
downloadIshtar-bf742d118a8c67114a170fd142e670c09f34920f.tar.bz2
Ishtar-bf742d118a8c67114a170fd142e670c09f34920f.zip
FIXME: Improve reporting and error detection.
set -e makes the shell error out whenever an unguarded command reports a failure, instead of blindly executing everything in turn. set -x ensures one knows which commands are being run/attempted. XXX: At least in v0.9, two commands are failing, hence the two occurrences of "|| true".
-rwxr-xr-xinstall/install.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/install/install.sh b/install/install.sh
index 42d337c0d..a1829940d 100755
--- a/install/install.sh
+++ b/install/install.sh
@@ -1,5 +1,8 @@
#!/bin/bash
+set -e
+set -x
+
######################################################################
# Minimum configuration #
######################################################################
@@ -201,8 +204,8 @@ echo "* sync database"
cd $APP_DIR
python ./manage.py syncdb --noinput 2> /dev/null > /dev/null
python ./manage.py migrate ishtar_common 2> /dev/null > /dev/null
-python ./manage.py migrate archaeological_files 0013 2> /dev/null > /dev/null
-python ./manage.py migrate archaeological_operations 2> /dev/null > /dev/null
+python ./manage.py migrate archaeological_files 0013 2> /dev/null > /dev/null || true
+python ./manage.py migrate archaeological_operations 2> /dev/null > /dev/null || true
python ./manage.py migrate archaeological_files 2> /dev/null > /dev/null
python ./manage.py migrate 2> /dev/null > /dev/null