images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2025-10-31 17:32:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

hide possible file write conflict

Browse Source
This commit is contained in:
Dax T. Games
2020-09-13 08:27:10 -04:00
parent ea6e18c834
commit 467b4d4ad9
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/init.bat vendored
View File

@@ -199,7 +199,7 @@ if defined GIT_INSTALL_ROOT (
%lib_console% debug_output init.bat "Looking for Git install root..." %lib_console% debug_output init.bat "Looking for Git install root..."
:: get the version information for vendored git binary :: get the version information for vendored git binary
%lib_git% read_version VENDORED "%CMDER_ROOT%\vendor\git-for-windows\cmd" %lib_git% read_version VENDORED "%CMDER_ROOT%\vendor\git-for-windows\cmd" 2>nul
%lib_git% validate_version VENDORED %GIT_VERSION_VENDORED% %lib_git% validate_version VENDORED %GIT_VERSION_VENDORED%
:: check if git is in path... :: check if git is in path...

5
vendor/lib/lib_git.cmd vendored
View File

@@ -48,8 +48,7 @@ exit /b
) )
:: get the git version in the provided directory :: get the git version in the provided directory
"%git_executable%" --version > "%temp%\git_version.txt"
"%git_executable%" --version 2>nul > "%temp%\git_version.txt"
setlocal enabledelayedexpansion setlocal enabledelayedexpansion
for /F "tokens=1,2,3 usebackq" %%A in (`type "%temp%\git_version.txt" 2^>nul`) do ( for /F "tokens=1,2,3 usebackq" %%A in (`type "%temp%\git_version.txt" 2^>nul`) do (
if /i "%%A %%B" == "git version" ( if /i "%%A %%B" == "git version" (
@@ -272,7 +271,7 @@ exit /b
:get_user_git_version :get_user_git_version
:: get the version information for the user provided git binary :: get the version information for the user provided git binary
%lib_git% read_version USER "%test_dir%" %lib_git% read_version USER "%test_dir%" 2>nul
%lib_git% validate_version USER %GIT_VERSION_USER% %lib_git% validate_version USER %GIT_VERSION_USER%
exit /b exit /b