Add /git_no_unix switch to init.bat to prevent adding !GIT_INSTALL_RO…

…OT!\usr\bin to PATH
cmderdev · Dec 3, 2018 · 654d928 · 654d928
1 parent 3163d6d
commit 654d928
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/vendor/init.bat b/vendor/init.bat
@@ -14,6 +14,7 @@ set debug_output=0
 set time_init=0
 set fast_init=0
 set max_depth=1
+set git_unix_path=1
 set "CMDER_USER_FLAGS= "
 
 :: Find root dir
@@ -79,6 +80,8 @@ call "%cmder_root%\vendor\lib\lib_profile"
             %lib_console% show_error "The Git install root folder "%~2", you specified does not exist!"
             exit /b
         )
+    ) else if /i "%1"=="/git_no_unix" (
+        set git_unix_path=0
     ) else if /i "%1" == "/home" (
         if exist "%~2" (
             set "HOME=%~2"
@@ -239,7 +242,9 @@ if defined GIT_INSTALL_ROOT (
     ) else if exist "!GIT_INSTALL_ROOT!\mingw64" (
         %lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw64\bin" append
     )
-    %lib_path% enhance_path "!GIT_INSTALL_ROOT!\usr\bin" append
+    if %git_unix_path% gtr 0 (
+        %lib_path% enhance_path "!GIT_INSTALL_ROOT!\usr\bin" append
+    )
 
     :: define SVN_SSH so we can use git svn with ssh svn repositories
     if not defined SVN_SSH set "SVN_SSH=%GIT_INSTALL_ROOT:\=\\%\\bin\\ssh.exe"