diff --git a/CHANGELOG.md b/CHANGELOG.md index c30fdc3..0cbce87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * Cmder v1.3.13 init script fails. [#2218](https://github.com/cmderdev/cmder/issues/2218) * Git & env related error messages. [#2220](https://github.com/cmderdev/cmder/issues/2220) * Latest addition of "--nolog" clink breaks cmd prompts. [#2166](https://github.com/cmderdev/cmder/issues/2166) + * `/nix_tools 0` should prevent adding `%GIT_INSTALL_ROOT%\mingw64\bin` to PATH. [#2214](https://github.com/cmderdev/cmder/issues/2214) ### Changes diff --git a/vendor/init.bat b/vendor/init.bat index 3c97cb5..c6f519d 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -219,13 +219,13 @@ if %nix_tools% equ 1 ( ) if exist "%GIT_INSTALL_ROOT%\cmd\git.exe" %lib_path% enhance_path "%GIT_INSTALL_ROOT%\cmd" %path_position% -if exist "%GIT_INSTALL_ROOT%\mingw32" ( - %lib_path% enhance_path "%GIT_INSTALL_ROOT%\mingw32\bin" %path_position% -) else if exist "%GIT_INSTALL_ROOT%\mingw64" ( - %lib_path% enhance_path "%GIT_INSTALL_ROOT%\mingw64\bin" %path_position% -) - if %nix_tools% geq 1 ( + if exist "%GIT_INSTALL_ROOT%\mingw32" ( + %lib_path% enhance_path "%GIT_INSTALL_ROOT%\mingw32\bin" %path_position% + ) else if exist "%GIT_INSTALL_ROOT%\mingw64" ( + %lib_path% enhance_path "%GIT_INSTALL_ROOT%\mingw64\bin" %path_position% + ) + %lib_path% enhance_path "%GIT_INSTALL_ROOT%\usr\bin" %path_position% )