From 2d81e03847feee1950edbf2214eab58b2e1c5cb2 Mon Sep 17 00:00:00 2001 From: ChaiMind Date: Tue, 25 Aug 2020 10:44:32 +0800 Subject: [PATCH] fix(git): make git version check work --- third_party/prepare.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/third_party/prepare.sh b/third_party/prepare.sh index a893ad13..2975fe2c 100755 --- a/third_party/prepare.sh +++ b/third_party/prepare.sh @@ -1,15 +1,14 @@ #!/bin/bash -e -git_version=$(git --version) -if [ >= "1.8.4" ]; then - echo "Since git 1.8.4 (August 2013), you don't have to be at top-level to run git submodule update." -else - echo "You have to update your git version to 1.8.4 or later." +cd $(dirname $0) + +requiredGitVersion="1.8.4" +currentGitVersion="$(git --version | awk '{print $3}')" +if [ "$(printf '%s\n' "$requiredGitVersion" "$currentGitVersion" | sort -V | head -n1)" = "$currentGitVersion" ]; then + echo "Please update your Git version. (foud version $currentGitVersion, required version >= $requiredGitVersion)" exit -1 fi -cd $(dirname $0) - git submodule sync git submodule foreach --recursive git reset --hard