Skip to content

Commit

Permalink
avoid erroneous messages, skip clink if injection fails fatally
Browse files Browse the repository at this point in the history
  • Loading branch information
DRSDavidSoft committed Jul 4, 2023
1 parent 59e14a1 commit e9750ab
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions vendor/init.bat
Expand Up @@ -153,7 +153,8 @@ if not "%CMDER_SHELL%" == "cmd" (
set CMDER_ALIASES=0
)

:: Pick right version of Clink
:: Pick the right version of Clink
:: TODO: Support for ARM
if "%PROCESSOR_ARCHITECTURE%"=="x86" (
set clink_architecture=x86
set architecture_bits=32
Expand All @@ -166,7 +167,7 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" (
)

if "%CMDER_CLINK%" == "1" (
REM TODO: If clink is already injected, goto :CLINK_FINISH
REM TODO: Detect if clink is already injected, if so goto :CLINK_FINISH
goto :INJECT_CLINK
)

Expand Down Expand Up @@ -205,8 +206,10 @@ goto :SKIP_CLINK

"%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" inject --quiet --profile "%CMDER_CONFIG_DIR%" --scripts "%CMDER_ROOT%\vendor"

if errorlevel 1 (
%print_error% "Clink initialization has failed with error code: %errorlevel%"
:: Check if a fatal error occurred when trying to inject Clink
if errorlevel 2 (
REM %print_error% "Clink injection has failed with error code: %errorlevel%"
goto :SKIP_CLINK
)

goto :CLINK_FINISH
Expand Down Expand Up @@ -237,8 +240,8 @@ if "%CMDER_CONFIGURED%" GTR "1" (
:: Prepare for git-for-windows

:: Detect which git.exe version to use
:: * if the users points as to a specific git, use that
:: * test if a git is in path and if yes, use that
:: * if the user points to a specific git, use that
:: * test if git is in path and if yes, use that
:: * last, use our vendored git
:: also check that we have a recent enough version of git by examining the version string
if defined GIT_INSTALL_ROOT (
Expand Down

0 comments on commit e9750ab

Please sign in to comment.