mirror of
https://github.com/cmderdev/cmder.git
synced 2024-11-10 17:59:11 +08:00
Merge pull request #1754 from cmderdev/daxgames-patch-2
Fix git install root
This commit is contained in:
commit
4f3fcae9d9
6
vendor/init.bat
vendored
6
vendor/init.bat
vendored
@ -197,15 +197,15 @@ if defined GIT_INSTALL_ROOT (
|
|||||||
) else if exist "!GIT_INSTALL_ROOT!\mingw64" (
|
) else if exist "!GIT_INSTALL_ROOT!\mingw64" (
|
||||||
%lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw64" append
|
%lib_path% enhance_path "!GIT_INSTALL_ROOT!\mingw64" append
|
||||||
)
|
)
|
||||||
%lib_path% enhance_path "%GIT_INSTALL_ROOT%\usr\bin" append
|
%lib_path% enhance_path "!GIT_INSTALL_ROOT!\usr\bin" append
|
||||||
|
|
||||||
:: define SVN_SSH so we can use git svn with ssh svn repositories
|
:: 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"
|
if not defined SVN_SSH set "SVN_SSH=%GIT_INSTALL_ROOT:\=\\%\\bin\\ssh.exe"
|
||||||
)
|
)
|
||||||
|
|
||||||
:NO_GIT
|
:NO_GIT
|
||||||
endlocal & set "PATH=%PATH%" & set "SVN_SSH=%SVN_SSH%" & set "GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%"
|
endlocal & set "PATH=%PATH%" & set "SVN_SSH=%SVN_SSH%" & set "GIT_INSTALL_ROOT=!GIT_INSTALL_ROOT!"
|
||||||
%lib_console% debug-output init.bat "Env Var - GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%"
|
%lib_console% debug-output init.bat "Env Var - GIT_INSTALL_ROOT=!GIT_INSTALL_ROOT!"
|
||||||
|
|
||||||
:: Enhance Path
|
:: Enhance Path
|
||||||
%lib_path% enhance_path_recursive "%CMDER_ROOT%\bin" %max_depth%
|
%lib_path% enhance_path_recursive "%CMDER_ROOT%\bin" %max_depth%
|
||||||
|
Loading…
Reference in New Issue
Block a user