From 868ff42f47b44a44ee668a228c5b6b8706df12a2 Mon Sep 17 00:00:00 2001
From: Daniel Agar <daniel@agar.ca>
Date: Fri, 15 Dec 2017 09:54:03 -0500
Subject: [PATCH] check_submodules.sh handle CI forced update only if directory
 exists

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

diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh
index 19ee52c071..82a857964b 100755
--- a/Tools/check_submodules.sh
+++ b/Tools/check_submodules.sh
@@ -3,8 +3,17 @@
 function check_git_submodule {
 
 # The .git exists in a submodule if init and update have been done.
-if [ "$CI" != "true" ] && [[ -f $1"/.git" || -d $1"/.git" ]];
+if [[ -f $1"/.git" || -d $1"/.git" ]];
 then
+
+	if [ "$CI" == "true" ];
+	then
+		git submodule sync --recursive -- $1
+		git submodule update --init --recursive --force -- $1  || true
+		git submodule update --init --recursive --force -- $1
+		exit 0
+	fi
+
 	SUBMODULE_STATUS=$(git submodule summary "$1")
 	STATUSRETVAL=$(echo $SUBMODULE_STATUS | grep -A20 -i "$1")
 	if ! [[ -z "$STATUSRETVAL" ]];
@@ -35,8 +44,8 @@ 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
+			git submodule update --init --recursive -- $1 || true
+			git submodule update --init --recursive --force -- $1
 			echo "Submodule fixed, continuing build.."
 		else
 			echo "Build aborted."
@@ -44,9 +53,9 @@ then
 		fi
 	fi
 else
-	git submodule sync --recursive -- $1
-	git submodule update --init --recursive --force -- $1  || true
-	git submodule update --init --recursive --force -- $1
+	git submodule sync --recursive --quiet -- $1
+	git submodule update --init --recursive -- $1  || true
+	git submodule update --init --recursive -- $1
 fi
 
 }