images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2025-01-11 00:39:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix_git' into fix_global_vars_vscode_err

Browse Source
This commit is contained in:
Dax T. Games 2020-06-29 07:51:31 -04:00
commit 00bc5439fd
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vendor/init.bat vendored
View File

@ -151,6 +151,7 @@ if "%CMDER_CLINK%" == "1" (
if not exist "%CMDER_USER_CONFIG%\settings" ( if not exist "%CMDER_USER_CONFIG%\settings" (
echo Generating clink initial settings in "%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" copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_USER_CONFIG%\settings"
B
echo Additional *.lua files in "%CMDER_USER_CONFIG%" are loaded on startup.\ 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" "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" inject --quiet --profile "%CMDER_USER_CONFIG%" --scripts "%CMDER_ROOT%\vendor"
@ -200,15 +201,15 @@ if defined GIT_INSTALL_ROOT (
:: check if git is in path... :: check if git is in path...
for /F "delims=" %%F in ('where git.exe 2^>nul') do ( 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 :: get the absolute path to the user provided git binary
%lib_git% is_git_shim "%%~dpF" %lib_git% is_git_shim "%%~dpF"
%lib_git% get_user_git_version %lib_git% get_user_git_version
%lib_git% compare_git_versions %lib_git% compare_git_versions
)
if defined GIT_INSTALL_ROOT (
goto :FOUND_GIT goto :FOUND_GIT
) )
)
:: our last hope: our own git... :: our last hope: our own git...
:VENDORED_GIT :VENDORED_GIT