From: Emilie <zawadzki@ircam.fr>
Date: Thu, 2 Nov 2017 11:00:50 +0000 (+0100)
Subject: pull/upgrade : use new script to sync submodules
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9eb6e7b182eead680c25c5f652b43720dfc7a5e3;p=docker-django-scripts.git

pull/upgrade : use new script to sync submodules
---

diff --git a/pull.sh b/pull.sh
index 1439544..78840fc 100755
--- a/pull.sh
+++ b/pull.sh
@@ -7,14 +7,8 @@ sudo chown -R $USER var/backup
 # Update main project
 git pull
 
-# Synchronizes submodules' remote URL configuration setting to the value specified in .gitmodules
-git submodule sync
-
-# Checkout all submodules on right branches specified in .gitmodules, by default the branch is master
-git submodule foreach --recursive 'git checkout $(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master)'
-
-# Pull all submodules on right branches specified in .gitmodules, by default the branch is master
-git submodule foreach --recursive 'git pull origin $(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master)'
+# Update submodules
+./bin/update_submodules.sh
 
 # Restore database
 if [ "$1" = "--restore-db" ];
diff --git a/upgrade.sh b/upgrade.sh
index 212b901..ffbf134 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -2,16 +2,16 @@
 
 # Update main project
 git pull
-# Synchronizes submodules' remote URL configuration setting to the value specified in .gitmodules
-git submodule sync
-# Checkout all submodules on right branches specified in .gitmodules, by default the branch is master
-git submodule foreach --recursive 'git checkout $(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master)'
-# Pull all submodules on right branches specified in .gitmodules, by default the branch is master
-git submodule foreach --recursive 'git pull origin $(git config -f $toplevel/.gitmodules submodule.$name.branch || echo master)'
+
+# Update submodules
+./bin/update_submodules.sh
+
 # Apply migrations
 docker-compose run app python /srv/app/manage.py migrate
+
 # Build front-end
 ./bin/build_front.sh
+
 # Build documentation
 docker-compose run app bash /srv/doc/build.sh