diff --git a/vendor/init.bat b/vendor/init.bat index 9c43b65..d6eb099 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -151,7 +151,6 @@ 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" @@ -168,11 +167,11 @@ if "%CMDER_CLINK%" == "1" ( ) if "%CMDER_CONFIGURED%" == "2" ( - echo Cmder is already configured, skipping Cmder Init! + %lib_console% verbose_output "Cmder is already configured, skipping Cmder Init!" goto CMDER_CONFIGURED ) else if "%CMDER_CONFIGURED%" == "1" ( - echo Cmder is already configured, skipping to Cmder User Init! + %lib_console% verbose_output "Cmder is already configured, skipping to Cmder User Init!" goto USER_CONFIG_START ) @@ -205,15 +204,13 @@ if defined GIT_INSTALL_ROOT ( :: check if git is in path... for /F "delims=" %%F in ('where git.exe 2^>nul') do ( - 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 + :: 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 - ) + if defined GIT_INSTALL_ROOT ( + goto :FOUND_GIT ) )