From b34ca9ce2136a6b241403078a4041f143b361927 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 25 Aug 2016 12:25:04 +0200
Subject: CI - ishtar-prepare-instance: collect static and compile messages
 after defining local_settings

---
 ishtar-prepare-instance | 26 +++++++++++++-------------
 1 file 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
-- 
cgit v1.2.3