From 219e37bd9e18b3649df73550451c24e93c19dcdc Mon Sep 17 00:00:00 2001
From: Mooneer Salem <mooneer@gmail.com>
Date: Sun, 10 Jul 2022 01:47:51 -0700
Subject: [PATCH] Rearrange ordering of git commands to make GitHub CI happy.

---
 build_linux.sh   | 4 ++--
 build_osx.sh     | 4 ++--
 build_windows.sh | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/build_linux.sh b/build_linux.sh
index 887be5ee..3ec15b5e 100755
--- a/build_linux.sh
+++ b/build_linux.sh
@@ -29,7 +29,7 @@ cd $FREEDVGUIDIR
 if [ ! -d codec2 ]; then
     git clone https://github.com/drowe67/codec2.git
 fi
-cd codec2 && git checkout $CODEC2_BRANCH && git pull
+cd codec2 && git switch - && git pull && git checkout $CODEC2_BRANCH
 mkdir -p build_linux && cd build_linux && rm -Rf * && cmake .. && make
 
 # OK, build and test LPCNet
@@ -37,7 +37,7 @@ cd $FREEDVGUIDIR
 if [ ! -d LPCNet ]; then
     git clone https://github.com/drowe67/LPCNet.git
 fi
-cd $LPCNETDIR && git checkout $LPCNET_BRANCH && git pull
+cd $LPCNETDIR && git switch - && git pull && git checkout $LPCNET_BRANCH
 mkdir  -p build_linux && cd build_linux && rm -Rf *
 cmake -DCODEC2_BUILD_DIR=$CODEC2DIR/build_linux ..
 make
diff --git a/build_osx.sh b/build_osx.sh
index 8d33fdd1..c1ed7eff 100755
--- a/build_osx.sh
+++ b/build_osx.sh
@@ -35,7 +35,7 @@ cd $FREEDVGUIDIR
 if [ ! -d codec2 ]; then
     git clone https://github.com/drowe67/codec2.git
 fi
-cd codec2 && git checkout $CODEC2_BRANCH && git pull
+cd codec2 && git switch - && git pull && git checkout $CODEC2_BRANCH
 mkdir -p build_osx && cd build_osx && rm -Rf * && cmake -DBUILD_OSX_UNIVERSAL=1 .. && make -j4
 
 # OK, build and test LPCNet
@@ -43,7 +43,7 @@ cd $FREEDVGUIDIR
 if [ ! -d LPCNet ]; then
     git clone https://github.com/drowe67/LPCNet.git
 fi
-cd $LPCNETDIR && git checkout $LPCNET_BRANCH && git pull
+cd $LPCNETDIR && git switch - && git pull && git checkout $LPCNET_BRANCH
 mkdir  -p build_osx && cd build_osx && rm -Rf *
 cmake -DCODEC2_BUILD_DIR=$CODEC2DIR/build_osx -DBUILD_OSX_UNIVERSAL=1 ..
 make -j4
diff --git a/build_windows.sh b/build_windows.sh
index 3fdd1f11..60cfe2e1 100755
--- a/build_windows.sh
+++ b/build_windows.sh
@@ -26,14 +26,14 @@ LPCNET_BRANCH=v0.2
 # First build and install vanilla codec2 as we need -lcodec2 to build LPCNet
 cd $FREEDVGUIDIR
 git clone https://github.com/drowe67/codec2.git
-cd codec2 && git checkout $CODEC2_BRANCH && git pull
+cd codec2 && git switch - && git pull && git checkout $CODEC2_BRANCH
 mkdir -p $BUILD_DIR && cd $BUILD_DIR && rm -Rf *
 $CMAKE .. && make
 
 # OK, build and test LPCNet
 cd $FREEDVGUIDIR
 git clone https://github.com/drowe67/LPCNet.git
-cd $LPCNETDIR && git checkout $LPCNET_BRANCH && git pull
+cd $LPCNETDIR && git switch - && git pull && git checkout $LPCNET_BRANCH
 mkdir -p $BUILD_DIR && cd $BUILD_DIR && rm -Rf *
 $CMAKE -DCODEC2_BUILD_DIR=$CODEC2DIR/$BUILD_DIR ..
 make