summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-25 12:25:04 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-08-25 12:25:04 +0200
commitb34ca9ce2136a6b241403078a4041f143b361927 (patch)
treebecbebd2eb1da5e50e370fdad3a90de533d3a8c1
parent445b1febb40ff426f029cc69136737536ed3bbeb (diff)
downloadIshtar-b34ca9ce2136a6b241403078a4041f143b361927.tar.bz2
Ishtar-b34ca9ce2136a6b241403078a4041f143b361927.zip
CI - ishtar-prepare-instance: collect static and compile messages after defining local_settings
-rwxr-xr-xishtar-prepare-instance26
1 files changed, 13 insertions, 13 deletions
diff --git a/ishtar-prepare-instance b/ishtar-prepare-instance
index 7a4cea27e..d27847395 100755
--- a/ishtar-prepare-instance
+++ b/ishtar-prepare-instance
@@ -43,19 +43,6 @@ cp -ra example_project $INSTANCE
rm $INSTANCE/settings.py
ln -s $DEST/example_project/settings.py $DEST/$INSTANCE/settings.py
-# Collect static data:
-cd $INSTANCE
-./manage.py collectstatic --noinput
-cd -
-
-# Only language available:
-LOCALE=fr
-for d in archaeological_* ishtar_common; do
- cd $d
- ../$INSTANCE/manage.py compilemessages -l $LOCALE
- cd -
-done
-
# Preparing DB:
PG_VERSION=9.1
DB_HOST=${DB_HOST-127.0.0.1}
@@ -126,6 +113,19 @@ sed -s "s|#APP_NAME#|$INSTANCE|g;\
"install/local_settings.py.sample" > \
"$INSTANCE/local_settings.py"
+# Collect static data:
+cd $INSTANCE
+./manage.py collectstatic --noinput
+cd -
+
+# Only language available:
+LOCALE=fr
+for d in archaeological_* ishtar_common; do
+ cd $d
+ ../$INSTANCE/manage.py compilemessages -l $LOCALE
+ cd -
+done
+
### DB feeding
cd $INSTANCE
./manage.py syncdb --noinput