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

'fixes'

Browse Source
This commit is contained in:
Dax T. Games
2020-08-24 20:27:56 -04:00
parent cda883bc39
commit d1adf16fa8
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vendor/bin/cexec.cmd vendored
View File

@@ -1,5 +1,4 @@
@echo off @echo off
setlocal
if "%~1" equ "" goto :wrongSyntax if "%~1" equ "" goto :wrongSyntax
@@ -8,6 +7,7 @@ if not defined CMDER_USER_FLAGS (
set "CMDER_USER_FLAGS= " set "CMDER_USER_FLAGS= "
) )
set "feNot=false" set "feNot=false"
goto :parseArgument goto :parseArgument
@@ -17,10 +17,8 @@ goto :parseArgument
:parseArgument :parseArgument
set "currenArgu=%~1" set "currenArgu=%~1"
if /i "%currenArgu%" equ "/setPath" ( if /i "%currenArgu%" equ "/setPath" (
:: set %flag_exists% shortcut set ccall=call "%~dp0cexec.cmd"
endlocal set cexec="%~dp0cexec.cmd"
set "ccall=call ^"%~dp0cexec.cmd^""
set "cexec=^"%~dp0cexec.cmd^""
) else if /i "%currenArgu%" == "/?" ( ) else if /i "%currenArgu%" == "/?" (
goto :help goto :help
) else if /i "%currenArgu%" equ "/help" ( ) else if /i "%currenArgu%" equ "/help" (

7
vendor/init.bat vendored
View File

@@ -265,14 +265,17 @@ if not defined git_locale for /F "tokens=* delims=" %%F in ('where locale.exe 2^
if not defined git_locale if exist "%GIT_INSTALL_ROOT%\usr\bin\env.exe" set git_locale="%GIT_INSTALL_ROOT%\usr\bin\env.exe" /usr/bin/locale if not defined git_locale if exist "%GIT_INSTALL_ROOT%\usr\bin\env.exe" set git_locale="%GIT_INSTALL_ROOT%\usr\bin\env.exe" /usr/bin/locale
if not defined git_locale for /F "tokens=* delims=" %%F in ('where env.exe 2^>nul') do ( if not defined git_locale set git_locale="%%F" /usr/bin/locale ) if not defined git_locale for /F "tokens=* delims=" %%F in ('where env.exe 2^>nul') do ( if not defined git_locale set git_locale="%%F" /usr/bin/locale )
setlocal enabledelayedexpansion
if defined git_locale ( if defined git_locale (
%lib_console% debug_output init.bat "Env Var - git_locale=%git_locale%"
REM !lib_console! debug_output init.bat "Env Var - git_locale=!git_locale!"
if not defined LANG ( if not defined LANG (
for /F "delims=" %%F in ('%git_locale% -uU 2') do ( for /F "delims=" %%F in ('!git_locale! -uU 2') do (
set "LANG=%%F" set "LANG=%%F"
) )
) )
) )
endlocal && set LANG=%LANG%
%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%"
%lib_console% debug_output init.bat "Found Git in: '%GIT_INSTALL_ROOT%'" %lib_console% debug_output init.bat "Found Git in: '%GIT_INSTALL_ROOT%'"

4
vendor/lib/lib_git.cmd vendored
View File

@@ -231,8 +231,8 @@ exit /b
:::------------------------------------------------------------------------------- :::-------------------------------------------------------------------------------
:compare_git_versions :compare_git_versions
setlocal enabledelayedexpansion
if ERRORLEVEL 0 ( if ERRORLEVEL 0 (
setlocal enabledelayedexpansion
:: compare the user git version against the vendored version :: compare the user git version against the vendored version
!lib_git! compare_versions USER VENDORED !lib_git! compare_versions USER VENDORED
@@ -246,7 +246,6 @@ exit /b
) else ( ) else (
!lib_console! verbose_output "Found old !GIT_VERSION_USER! in !test_dir!, but not using..." !lib_console! verbose_output "Found old !GIT_VERSION_USER! in !test_dir!, but not using..."
) )
endlocal && set "GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT% & set test_dir=
) else ( ) else (
:: compare the user git version against the vendored version :: compare the user git version against the vendored version
:: if the user provided git executable is not found :: if the user provided git executable is not found
@@ -255,6 +254,7 @@ exit /b
set test_dir= set test_dir=
) )
) )
endlocal && set "GIT_INSTALL_ROOT=%GIT_INSTALL_ROOT%" && set test_dir=
exit /b exit /b