diff --git a/README.md b/README.md index 46d8dfd..3a91106 100644 --- a/README.md +++ b/README.md @@ -149,6 +149,7 @@ You may find some Monokai color schemes for mintty to match Cmder [here](https:/ | `/git_install_root [file path]` | User specified Git installation root path. | `%CMDER_ROOT%\vendor\Git-for-Windows` | | `/home [home folder]` | User specified folder path to set `%HOME%` environment variable. | `%userprofile%` | | `/max_depth [1-5]` | Define max recurse depth when adding to the path for `%cmder_root%\bin` and `%cmder_user_bin%` | 1 | +| `/nix_tools [0-2]` | Define how `*nix` tools are added to the path. Prefer Windows Tools: 1, Prefer *nix Tools: 2, No `/usr/bin` in `%PATH%`: 0 | 1 | | `/svn_ssh [path to ssh.exe]` | Define `%SVN_SSH%` so we can use git svn with ssh svn repositories. | `%GIT_INSTALL_ROOT%\bin\ssh.exe` | | `/user_aliases [file path]` | File path pointing to user aliases. | `%CMDER_ROOT%\config\user-aliases.cmd` | | `/v` | Enables verbose output. | not set | diff --git a/vendor/init.bat b/vendor/init.bat index 04f7900..d670e84 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -90,6 +90,10 @@ call "%cmder_root%\vendor\lib\lib_profile" REM Add *nix tools to end of path set nix_tools=1 shift + ) else if "%2" equ "2" ( + REM Add *nix tools to front of path + set nix_tools=2 + shift ) ) else if /i "%1" == "/home" ( if exist "%~2" ( @@ -245,14 +249,23 @@ goto :CONFIGURE_GIT :: Add git to the path if defined GIT_INSTALL_ROOT ( rem add the unix commands at the end to not shadow windows commands like more - if exist "!GIT_INSTALL_ROOT!\cmd\git.exe" %lib_path% enhance_path "!GIT_INSTALL_ROOT!\cmd" append - if exist "!GIT_INSTALL_ROOT!\mingw32" ( - %lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw32\bin" append - ) else if exist "!GIT_INSTALL_ROOT!\mingw64" ( - %lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw64\bin" append - ) if %nix_tools% equ 1 ( - %lib_path% enhance_path "!GIT_INSTALL_ROOT!\usr\bin" append + %lib_console% debug_output init.bat "Preferring Windows commands" + set "path_position=append" + ) else ( + %lib_console% debug_output init.bat "Preferring *nix commands" + set "path_position=" + ) + + 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 ( + %lib_path% enhance_path "!GIT_INSTALL_ROOT!\usr\bin" !path_position! ) :: define SVN_SSH so we can use git svn with ssh svn repositories