From 29b6c971e3786c2825d7843f64ee25ef1c9be094 Mon Sep 17 00:00:00 2001
From: ppaulis <ppaulis@gmail.com>
Date: Thu, 6 Oct 2016 17:07:20 +0200
Subject: [PATCH] working on setup

---
 build.xml                    |  3 ++-
 scripts/client-upgrade-db.sh |  4 ++--
 scripts/upgrade-db.sh        | 11 +++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/build.xml b/build.xml
index 253c9ee..901b16c 100644
--- a/build.xml
+++ b/build.xml
@@ -97,7 +97,8 @@
     </target>
 
     <target name="db-migration" description="Update the database version">
-        <exec command="${project.basedir}/scripts/client-upgrade-db.sh MonarcBO localhost preproddev preproddev master" passthru="true"/>
+        <exec command="${project.basedir}/scripts/client-upgrade-db.sh backoffice ${db.host} ${db.username} ${db.password} ${db.name}" passthru="true"/>
+        <exec command="${project.basedir}/scripts/client-upgrade-db.sh core ${db.host} ${db.username} ${db.password} ${db.name}" passthru="true"/>
     </target>
 
     <target name="reset-db"
diff --git a/scripts/client-upgrade-db.sh b/scripts/client-upgrade-db.sh
index dd1dab0..88d46f4 100755
--- a/scripts/client-upgrade-db.sh
+++ b/scripts/client-upgrade-db.sh
@@ -13,8 +13,8 @@ cat <<EOF >/tmp/conf.tmp.php
 <?php
 return array(
     'paths' => array(
-        'migrations' => 'vendor/monarc/backoffice/migrations/db',
-        'seeds' => 'vendor/monarc/backoffice/migrations/seeds',
+        'migrations' => 'vendor/monarc/$MODULE/migrations/db',
+        'seeds' => 'vendor/monarc/$MODULE/migrations/seeds',
     ),
     'environments' => array(
         'default_migration_table' => 'phinxlog',
diff --git a/scripts/upgrade-db.sh b/scripts/upgrade-db.sh
index 69943a1..90edf87 100755
--- a/scripts/upgrade-db.sh
+++ b/scripts/upgrade-db.sh
@@ -1,4 +1,11 @@
 #!/bin/bash
 
-php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./vendor/monarc/core/migrations/phinx.php
-php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./vendor/monarc/backoffice/migrations/phinx.php
\ No newline at end of file
+php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./module/MonarcCore/migrations/phinx.php
+
+if [ -d module/MonarcBO ]; then
+        php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./module/MonarcBO/migrations/phinx.php
+fi
+
+if [ -d module/MonarcFO ]; then
+        php ./vendor/robmorgan/phinx/bin/phinx migrate -c ./module/MonarcFO/migrations/phinx.php
+fi