From 2036ee1c6edf5dbe6bfe041b477b27f4aa311db9 Mon Sep 17 00:00:00 2001
From: David Beniamine <david.beniamine@tetras-libre.fr>
Date: Thu, 25 Aug 2022 09:23:23 +0200
Subject: [PATCH] Force switch to eole-amon-ecole-2.8 branch on containers post
 installs

---
 postinstall_partage.sh | 7 ++++---
 postinstall_reseau.sh  | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/postinstall_partage.sh b/postinstall_partage.sh
index b2c7b63..668c312 100755
--- a/postinstall_partage.sh
+++ b/postinstall_partage.sh
@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 cd /opt
+branch=eole-amon-ecole-2.8
 
 if [ "$(dpkg -l | grep git)" ]
 then
@@ -29,13 +30,13 @@ then
 fi
 if [ ! -e "eole-wol" ]
 then
-    git clone https://gitecoles.grenoble.fr/grenoble/eole-wol
+    git clone -b $branch https://gitecoles.grenoble.fr/grenoble/eole-wol
     cd eole-wol
 else
     cd eole-wol
     git stash
-    git checkout master
-    git pull origin master
+    git switch $branch
+    git pull origin $branch
 fi
 
 DIR=$PWD
diff --git a/postinstall_reseau.sh b/postinstall_reseau.sh
index f818a34..2a526a9 100755
--- a/postinstall_reseau.sh
+++ b/postinstall_reseau.sh
@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 cd /var/www
+branch=eole-amon-ecole-2.8
 
 if [ "$(dpkg -l | grep git)" ]
 then
@@ -27,12 +28,12 @@ then
 fi
 if [ ! -e "eole-wol" ]
 then
-    git clone https://gitecoles.grenoble.fr/grenoble/eole-wol
+    git clone -b $branch https://gitecoles.grenoble.fr/grenoble/eole-wol
 else
     cd eole-wol
     git stash
-    git checkout master
-    git pull origin master
+    git switch $branch
+    git pull origin $branch
     cd -
 fi
 
-- 
GitLab