Browse Source

check_submodules try harder when fetching to work around various issues

sbg
Daniel Agar 7 years ago
parent
commit
1886c8d983
  1. 11
      Tools/check_submodules.sh

11
Tools/check_submodules.sh

@ -35,6 +35,7 @@ then
elif [ "$user_cmd" == "u" ] elif [ "$user_cmd" == "u" ]
then then
git submodule sync --recursive -- $1 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
echo "Submodule fixed, continuing build.." echo "Submodule fixed, continuing build.."
else else
@ -43,9 +44,9 @@ then
fi fi
fi fi
else else
echo "REINITIALIZING GIT SUBMODULE $1" git submodule sync --recursive -- $1
git submodule sync --recursive -- $1; git submodule update --init --recursive -- $1 || true
git submodule update --init --recursive -- $1; git submodule update --init --recursive -- $1
fi fi
} }
@ -60,7 +61,7 @@ then
exit 0 exit 0
} }
git submodule update --init --recursive -- $1 check_git_submodule $1
else else
@ -70,7 +71,7 @@ else
exit 0 exit 0
} }
submodules=$(git submodule status --recursive | awk '{ print $2 }') submodules=$(git submodule status | awk '{ print $2 }')
for i in $submodules; for i in $submodules;
do do
check_git_submodule $i check_git_submodule $i

Loading…
Cancel
Save