@@ -153,7 +153,8 @@ if not "%CMDER_SHELL%" == "cmd" (
153
153
set CMDER_ALIASES = 0
154
154
)
155
155
156
- :: Pick right version of Clink
156
+ :: Pick the right version of Clink
157
+ :: TODO: Support for ARM
157
158
if " %PROCESSOR_ARCHITECTURE% " == " x86" (
158
159
set clink_architecture = x86
159
160
set architecture_bits = 32
@@ -166,7 +167,7 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" (
166
167
)
167
168
168
169
if " %CMDER_CLINK% " == " 1" (
169
- REM TODO: If clink is already injected, goto :CLINK_FINISH
170
+ REM TODO: Detect if clink is already injected, if so goto :CLINK_FINISH
170
171
goto :INJECT_CLINK
171
172
)
172
173
@@ -205,8 +206,10 @@ goto :SKIP_CLINK
205
206
206
207
" %CMDER_ROOT% \vendor\clink\clink_%clink_architecture% .exe" inject --quiet --profile " %CMDER_CONFIG_DIR% " --scripts " %CMDER_ROOT% \vendor"
207
208
208
- if errorlevel 1 (
209
- %print_error% " Clink initialization has failed with error code: %errorlevel% "
209
+ :: Check if a fatal error occurred when trying to inject Clink
210
+ if errorlevel 2 (
211
+ REM %print_error% "Clink injection has failed with error code: %errorlevel%"
212
+ goto :SKIP_CLINK
210
213
)
211
214
212
215
goto :CLINK_FINISH
@@ -237,8 +240,8 @@ if "%CMDER_CONFIGURED%" GTR "1" (
237
240
:: Prepare for git-for-windows
238
241
239
242
:: Detect which git.exe version to use
240
- :: * if the users points as to a specific git, use that
241
- :: * test if a git is in path and if yes, use that
243
+ :: * if the user points to a specific git, use that
244
+ :: * test if git is in path and if yes, use that
242
245
:: * last, use our vendored git
243
246
:: also check that we have a recent enough version of git by examining the version string
244
247
if defined GIT_INSTALL_ROOT (
0 commit comments