Debian installer: fix fixtures import and DB_PORT attribute

1 files changed, 7 insertions, 3 deletions

diff --git a/ishtar-prepare-instance b/ishtar-prepare-instance
index bf130ae16..17bbac0f4 100755
--- a/ishtar-prepare-instance
+++ b/ishtar-prepare-instance
@@ -56,7 +56,7 @@ done
 # Preparing DB:
 PG_VERSION=9.1
 DB_HOST=${DB_HOST-127.0.0.1}
-DB_PORT='5432'
+DB_PORT=${DB_PORT-5432}
 DB_PASSWORD=${DB_PASSWORD-''}
 DB_NAME="ishtar-$INSTANCE"
 
@@ -128,9 +128,13 @@ cd $INSTANCE
 ./manage.py syncdb --noinput
 ./manage.py migrate
 ./manage.py flush --noinput
-for data in $(find ../ -name "initial_*-$LOCALE.json"); do
-    ./manage.py loaddata $data
+
+FIXTURES="$DEST/fixtures/initial_data-auth-fr.json $DEST/ishtar_common/fixtures/initial_data-fr.json $DEST/ishtar_common/fixtures/initial_importtypes-fr.json $DEST/archaeological_operations/fixtures/initial_data-fr.json $DEST/archaeological_context_records/fixtures/initial_data-fr.json $DEST/archaeological_files/fixtures/initial_data-fr.json $DEST/archaeological_finds/fixtures/initial_data-fr.json $DEST/archaeological_warehouse/fixtures/initial_data-fr.json"
+for data in $FIXTURES; do
+    echo $data;
+    ./manage.py loaddata $data;
 done
+
 ./manage.py createsuperuser
 ./manage.py migrate --fake
 cd -