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

Fix errors

Browse Source
This commit is contained in:
Kyle McInnes
2020-12-10 13:35:40 +00:00
parent 2a9a4d2860
commit 11a78a8d64
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor/init.bat vendored
View File

@@ -268,7 +268,7 @@ if not defined git_locale for /F "tokens=* delims=" %%F in ('where env.exe 2^>nu
setlocal enabledelayedexpansion setlocal enabledelayedexpansion
if defined git_locale ( if defined git_locale (
REM !print_debug! init.bat "Env Var - git_locale=!git_locale!" REM %print_debug% 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"

6
vendor/lib/lib_console.cmd vendored
View File

@@ -4,9 +4,9 @@ call "%~dp0lib_base.cmd"
set lib_console=call "%~dp0lib_console.cmd" set lib_console=call "%~dp0lib_console.cmd"
:: Much faster than using "%lib_console% debug_output ..." etc. :: Much faster than using "%lib_console% debug_output ..." etc.
set print_debug=if %debug_output% gtr 0 %lib_console% debug_output %* set print_debug=if %debug_output% gtr 0 %lib_console% debug_output
set print_verbose=if %verbose_output% gtr 0 %lib_console% verbose_output %* set print_verbose=if %verbose_output% gtr 0 %lib_console% verbose_output
set print_error=%lib_console% show_error %* set print_error=%lib_console% show_error
if "%fast_init%" == "1" exit /b if "%fast_init%" == "1" exit /b

4
vendor/lib/lib_git.cmd vendored
View File

@@ -244,13 +244,13 @@ exit /b
set "GIT_INSTALL_ROOT=!test_dir!" set "GIT_INSTALL_ROOT=!test_dir!"
) )
) else ( ) else (
!print_verbose! "Found old !GIT_VERSION_USER! in !test_dir!, but not using..." %print_verbose% "Found old !GIT_VERSION_USER! in !test_dir!, but not using..."
) )
) 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
IF ERRORLEVEL -255 IF NOT ERRORLEVEL -254 ( IF ERRORLEVEL -255 IF NOT ERRORLEVEL -254 (
!print_verbose! "No git at "!git_executable!" found." %print_verbose% "No git at "!git_executable!" found."
set test_dir= set test_dir=
) )
) )

6
vendor/lib/lib_path.cmd vendored
View File

@@ -81,20 +81,20 @@ exit /b
echo "!path!"|!WINDIR!\System32\findstr >nul /I /R /C:";!find_query!;" echo "!path!"|!WINDIR!\System32\findstr >nul /I /R /C:";!find_query!;"
call :set_found call :set_found
) )
!print_debug! :enhance_path "Env Var INSIDE PATH !find_query! - found=!found!" %print_debug% :enhance_path "Env Var INSIDE PATH !find_query! - found=!found!"
if /i "!position!" == "append" ( if /i "!position!" == "append" (
if "!found!" == "0" ( if "!found!" == "0" (
echo "!path!"|!WINDIR!\System32\findstr >nul /I /R /C:";!find_query!\"$" echo "!path!"|!WINDIR!\System32\findstr >nul /I /R /C:";!find_query!\"$"
call :set_found call :set_found
) )
!print_debug! :enhance_path "Env Var END PATH !find_query! - found=!found!" %print_debug% :enhance_path "Env Var END PATH !find_query! - found=!found!"
) else ( ) else (
if "!found!" == "0" ( if "!found!" == "0" (
echo "!path!"|!WINDIR!\System32\findstr >nul /I /R /C:"^\"!find_query!;" echo "!path!"|!WINDIR!\System32\findstr >nul /I /R /C:"^\"!find_query!;"
call :set_found call :set_found
) )
!print_debug! :enhance_path "Env Var BEGIN PATH !find_query! - found=!found!" %print_debug% :enhance_path "Env Var BEGIN PATH !find_query! - found=!found!"
) )
endlocal & set found=%found% endlocal & set found=%found%