Make submodule check smarter

This commit is contained in:
Lorenz Meier 2016-04-17 21:30:38 +02:00
parent 51f94809d8
commit 66080b4b28
1 changed files with 4 additions and 2 deletions

View File

@ -12,8 +12,8 @@ GITSTATUS=$(git status)
function check_git_submodule { function check_git_submodule {
# The .git exists in a submodule if init and update have been done. # The .git exists in a submodule if init and update have been done.
if [ -f $1"/.git" ]; if [ -f $1"/.git" ] || [ -d $1"/.git" ];
then then
SUBMODULE_STATUS=$(git submodule summary "$1") SUBMODULE_STATUS=$(git submodule summary "$1")
STATUSRETVAL=$(echo $SUBMODULE_STATUS | grep -A20 -i "$1") STATUSRETVAL=$(echo $SUBMODULE_STATUS | grep -A20 -i "$1")
if ! [[ -z "$STATUSRETVAL" ]]; if ! [[ -z "$STATUSRETVAL" ]];
@ -54,6 +54,8 @@ if [ -f $1"/.git" ];
fi fi
fi fi
else else
echo "REINITIALIZING GIT SUBMODULES"
echo "no git repo found in $1/.git"
git submodule sync --recursive; git submodule sync --recursive;
git submodule update --init --recursive $1; git submodule update --init --recursive $1;
fi fi