From 2cd2c6bc59a90624f94c9c1b9fb621cc9b27ef60 Mon Sep 17 00:00:00 2001
From: mespeche <michael-espeche@Micks-iMac.local>
Date: Wed, 4 Sep 2013 15:52:16 +0200
Subject: [PATCH] Working : Fix script reset

---
 reset_install.sh | 45 ++++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/reset_install.sh b/reset_install.sh
index 5c51ac60c..4663e3130 100755
--- a/reset_install.sh
+++ b/reset_install.sh
@@ -4,35 +4,30 @@
 
 echo -e "\033[47m\033[1;31m\n[WARN] This script will reset this Thelia2 install\n\033[0m"
 
-if [ ! -f local/config/database.yml ]; then
-    cp local/config/database.yml.sample local/config/database.yml
-    echo "[FAILED] Please add your database informations in local/config/database.yml and start this script again."
-else
-    echo -e "\n\e[01;34m[INFO] Downloading vendors\e[00m\n"
-    composer install
+echo -e "\n\e[01;34m[INFO] Downloading vendors\e[00m\n"
+composer install --prefer-dist
 
-    cd local/config/
+cd local/config/
 
-    echo -e "\n\e[01;34m[INFO] Building Models file\e[00m\n"
-    ../../bin/propel build -v --output-dir=../../core/lib/
+echo -e "\n\e[01;34m[INFO] Building Models file\e[00m\n"
+../../bin/propel build -v --output-dir=../../core/lib/
 
-    echo -e "\n\e[01;34m[INFO] Building SQL CREATE file\e[00m\n"
-    ../../bin/propel sql:build -v --output-dir=../../install/
+echo -e "\n\e[01;34m[INFO] Building SQL CREATE file\e[00m\n"
+../../bin/propel sql:build -v --output-dir=../../install/
 
-    # Not working : insert manually
-    # echo -e "\n\e[01;34m[INFO] Inserting SQL\e[00m\n"
-    # ../../bin/propel insert-sql -v --output-dir=../../install/
-    # install/thelia.sql
-    # install/insert.sql
-    echo -e "\n\e[01;34m[INFO] Reinstalling Thelia2\e[00m\n"
-    cd ../..
-    php Thelia thelia:install
+# Not working : insert manually
+# echo -e "\n\e[01;34m[INFO] Inserting SQL\e[00m\n"
+# ../../bin/propel insert-sql -v --output-dir=../../install/
+# install/thelia.sql
+# install/insert.sql
+echo -e "\n\e[01;34m[INFO] Reinstalling Thelia2\e[00m\n"
+cd ../..
+php Thelia thelia:install --db_host localhost --db_username thelia2 --db_password thelia2 --db_name thelia2
 
-    echo -e "\n\e[01;34m[INFO] Installing fixtures\e[00m\n"
-    php install/faker.php
+echo -e "\n\e[01;34m[INFO] Installing fixtures\e[00m\n"
+php install/faker.php
 
-    echo -e "\n\e[01;34m[INFO] Adding admin\e[00m\n"
-    php Thelia thelia:create-admin
+echo -e "\n\e[01;34m[INFO] Adding admin\e[00m\n"
+php Thelia thelia:create-admin
 
-    echo -e "\n\e[00;32m[SUCCESS] Reset done\e[00m\n"
-fi
+echo -e "\n\e[00;32m[SUCCESS] Reset done\e[00m\n"