From 1886c8d98307a27c31669c4ad59df56df4b98843 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Sun, 10 Dec 2017 17:43:09 -0500
Subject: [PATCH] check_submodules try harder when fetching to work around
 various issues

---
 Tools/check_submodules.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh
index 6301c4f3e8..2b0e75971d 100755
--- a/Tools/check_submodules.sh
+++ b/Tools/check_submodules.sh
@@ -35,6 +35,7 @@ then
 		elif [ "$user_cmd" == "u" ]
 		then
 			git submodule sync --recursive -- $1
+			git submodule update --init --recursive --force --quiet -- $1 || true
 			git submodule update --init --recursive -- $1
 			echo "Submodule fixed, continuing build.."
 		else
@@ -43,9 +44,9 @@ then
 		fi
 	fi
 else
-	echo "REINITIALIZING GIT SUBMODULE $1"
-	git submodule sync --recursive -- $1;
-	git submodule update --init --recursive -- $1;
+	git submodule sync --recursive -- $1
+	git submodule update --init --recursive -- $1  || true
+	git submodule update --init --recursive -- $1
 fi
 
 }
@@ -60,7 +61,7 @@ then
 		exit 0
 	}
 
-	git submodule update --init --recursive -- $1
+	check_git_submodule $1
 
 else
 
@@ -70,7 +71,7 @@ else
 		exit 0
 	}
 
-	submodules=$(git submodule status --recursive | awk '{ print $2 }')
+	submodules=$(git submodule status | awk '{ print $2 }')
 	for i in $submodules;
 	do
 		check_git_submodule $i