images/cmder
2
0
Fork 0
mirror of https://github.com/cmderdev/cmder.git synced 2024-09-20 12:54:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into more_speed_2

Browse Source
This commit is contained in:
Dax T. Games 2023-07-04 11:03:08 -04:00
commit 5311b25d9f
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vendor/init.bat vendored
View File

@ -153,7 +153,8 @@ if not "%CMDER_SHELL%" == "cmd" (
set CMDER_ALIASES=0 set CMDER_ALIASES=0
) )
:: Pick right version of Clink :: Pick the right version of Clink
:: TODO: Support for ARM
if "%PROCESSOR_ARCHITECTURE%"=="x86" ( if "%PROCESSOR_ARCHITECTURE%"=="x86" (
set clink_architecture=x86 set clink_architecture=x86
set architecture_bits=32 set architecture_bits=32
@ -179,6 +180,7 @@ if defined CMDER_USER_CONFIG (
) )
if "%CMDER_CLINK%" == "1" ( if "%CMDER_CLINK%" == "1" (
REM TODO: Detect if clink is already injected, if so goto :CLINK_FINISH
goto :INJECT_CLINK goto :INJECT_CLINK
) else if "%CMDER_CLINK%" == "2" ( ) else if "%CMDER_CLINK%" == "2" (
goto :CLINK_FINISH goto :CLINK_FINISH
@ -220,12 +222,11 @@ goto :SKIP_CLINK
"%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" inject --quiet --profile "%CMDER_CONFIG_DIR%" --scripts "%CMDER_ROOT%\vendor" "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" inject --quiet --profile "%CMDER_CONFIG_DIR%" --scripts "%CMDER_ROOT%\vendor"
set CMDER_CLINK=2 set CMDER_CLINK=2
REM if errorlevel 1 ( :: Check if a fatal error occurred when trying to inject Clink
REM %print_error% "Clink initialization has failed with error code: %errorlevel%" if errorlevel 2 (
REM goto :CLINK_FINISH REM %print_error% "Clink injection has failed with error code: %errorlevel%"
REM ) goto :SKIP_CLINK
)
set CMDER_CLINK=2
goto :CLINK_FINISH goto :CLINK_FINISH
@ -255,8 +256,8 @@ if "%CMDER_CONFIGURED%" GTR "1" (
:: Prepare for git-for-windows :: Prepare for git-for-windows
:: Detect which git.exe version to use :: Detect which git.exe version to use
:: * if the users points as to a specific git, use that :: * if the user points to a specific git, use that
:: * test if a git is in path and if yes, use that :: * test if git is in path and if yes, use that
:: * last, use our vendored git :: * last, use our vendored git
:: also check that we have a recent enough version of git by examining the version string :: also check that we have a recent enough version of git by examining the version string
if defined GIT_INSTALL_ROOT ( if defined GIT_INSTALL_ROOT (