From ea2fced6ad18fdc3ce7e0c63e69e92863780b982 Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Tue, 3 Nov 2020 23:40:12 -0500 Subject: [PATCH] Tools/check_submodules.sh: always update if within vscode cmake configure - the interactive portion of check_git_submodule with hang waiting for user input --- Tools/check_submodules.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh index be1ce97372..4304070e58 100755 --- a/Tools/check_submodules.sh +++ b/Tools/check_submodules.sh @@ -5,8 +5,8 @@ function check_git_submodule { # The .git exists in a submodule if init and update have been done. if [[ -f $1"/.git" || -d $1"/.git" ]]; then - # CI environment always update - if [ "$CI" == "true" ]; then + # always update within CI environment or configuring withing VSCode CMake where you can't interact + if [ "$CI" == "true" ] || [ -n "${VSCODE_PID+set}" ]; then git submodule --quiet sync --recursive -- $1 git submodule --quiet update --init --recursive --jobs=8 -- $1 || true git submodule --quiet update --init --recursive --jobs=8 -- $1