From da5f1bc4db2966b3523e6778a3d7b8194877ab9b Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 29 Jun 2020 07:49:22 -0400 Subject: [PATCH] fix git detect --- vendor/init.bat | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/vendor/init.bat b/vendor/init.bat index a4fecf9..eacad85 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -151,6 +151,7 @@ if "%CMDER_CLINK%" == "1" ( if not exist "%CMDER_USER_CONFIG%\settings" ( echo Generating clink initial settings in "%CMDER_USER_CONFIG%\settings" copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_USER_CONFIG%\settings" + B echo Additional *.lua files in "%CMDER_USER_CONFIG%" are loaded on startup.\ ) "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" inject --quiet --profile "%CMDER_USER_CONFIG%" --scripts "%CMDER_ROOT%\vendor" @@ -200,14 +201,14 @@ if defined GIT_INSTALL_ROOT ( :: check if git is in path... for /F "delims=" %%F in ('where git.exe 2^>nul') do ( - :: get the absolute path to the user provided git binary - %lib_git% is_git_shim "%%~dpF" - %lib_git% get_user_git_version - %lib_git% compare_git_versions -) + if not defined GIT_INSTALL_ROOT ( + :: get the absolute path to the user provided git binary + %lib_git% is_git_shim "%%~dpF" + %lib_git% get_user_git_version + %lib_git% compare_git_versions -if defined GIT_INSTALL_ROOT ( - goto :FOUND_GIT + goto :FOUND_GIT + ) ) :: our last hope: our own git...