From ecbe8fb41cee9f1b47d436549a6a87acd1105253 Mon Sep 17 00:00:00 2001
From: Tykayn <contact@cipherbliss.com>
Date: Fri, 12 Feb 2021 16:45:32 +0100
Subject: [PATCH] clean local funky before update

---
 update.sh | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/update.sh b/update.sh
index 587217c..26db18d 100755
--- a/update.sh
+++ b/update.sh
@@ -1,14 +1,7 @@
 #!/bin/bash
-echo "######################"
-echo " time to update the framadate setup"
-echo "######################"
+# script d'update de framadate api, fait pour fonctionner avec le sous module git funky framadate
 
-COMMAND_BUILD="build:prod:demobliss"
-# git reset --hard
-git pull origin master
 
-composer install
-php bin/console doctrine:schema:update --force
 # bash colors
 cecho() {
   local code="\033["
@@ -27,6 +20,17 @@ cecho() {
   echo -e "$text"
 }
 
+cecho g "######################"
+cecho g " time to update the framadate setup"
+cecho g "######################"
+
+COMMAND_BUILD="build:prod:demobliss"
+# git reset --hard
+git pull origin master
+
+composer install
+php bin/console doctrine:schema:update --force
+
 cecho g "######################"
 cecho g " update the funky frontend submodule "
 cecho g "############################################"
@@ -87,14 +91,18 @@ cd funky-framadate-front
 cecho g "######################"
 cecho g " debug info : version of programs"
 cecho g " "
-cecho g " git current branch "
+cecho b " git current branch "
 git show-branch
-cecho g " node version "
+cecho b " node version "
 node -v
-cecho g " yarn version "
+cecho b " yarn version "
 yarn -v
 cecho g " "
-cecho g "######################"
+cecho b "##############################################"
+cecho b " update of the funky part, clean of local repo"
+cecho g " "
+git reset --hard
+git remote -v
 git fetch
 git pull
 yarn