From 0de04593dca4642dc6ed0a08d4d8811469c95368 Mon Sep 17 00:00:00 2001 From: Phil Weir Date: Sat, 18 Nov 2023 18:24:53 +0000 Subject: [PATCH] workaround for toolkit check being done before docker rule --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e18f27d..efb763a 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,7 @@ ifneq ("$(shell grep container-toolkit .gitmodules 2>/dev/null)","") @echo "Submodule present so updating it" git submodule update --init endif -ifeq ("$(shell which git && git rev-parse --is-inside-work-tree 2>/dev/null)", "true") +ifeq ("$(shell (which git > /dev/null) && git rev-parse --is-inside-work-tree 2>/dev/null)", "true") @echo Fetching as a git submodule git submodule add --force $(TOOLKIT_REPO) $(TOOLKIT_FOLDER) else