mirror of
https://github.com/cmderdev/cmder.git
synced 2025-01-10 16:29:08 +08:00
fix checking for clink injection
This commit is contained in:
parent
3b6e1cbf5f
commit
9e55c48200
16
vendor/init.bat
vendored
16
vendor/init.bat
vendored
@ -166,11 +166,19 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" (
|
|||||||
)
|
)
|
||||||
|
|
||||||
if "%CMDER_CLINK%" == "1" (
|
if "%CMDER_CLINK%" == "1" (
|
||||||
|
REM TODO: If clink is already injected, goto :CLINK_FINISH
|
||||||
|
goto :INJECT_CLINK
|
||||||
|
)
|
||||||
|
|
||||||
|
goto :SKIP_CLINK
|
||||||
|
|
||||||
|
:INJECT_CLINK
|
||||||
%print_verbose% "Injecting Clink!"
|
%print_verbose% "Injecting Clink!"
|
||||||
|
|
||||||
:: Check if Clink is not present
|
:: Check if Clink is not present
|
||||||
if not exist "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" (
|
if not exist "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" (
|
||||||
%print_error% "Clink executable is not present in 'vendor\clink\clink_%clink_architecture%.exe'"
|
%print_error% "Clink executable is not present in 'vendor\clink\clink_%clink_architecture%.exe'"
|
||||||
|
goto :SKIP_CLINK
|
||||||
)
|
)
|
||||||
|
|
||||||
:: Run Clink
|
:: Run Clink
|
||||||
@ -200,7 +208,10 @@ if "%CMDER_CLINK%" == "1" (
|
|||||||
if errorlevel 1 (
|
if errorlevel 1 (
|
||||||
%print_error% "Clink initilization has failed with error code: %errorlevel%"
|
%print_error% "Clink initilization has failed with error code: %errorlevel%"
|
||||||
)
|
)
|
||||||
) else (
|
|
||||||
|
goto :CLINK_FINISH
|
||||||
|
|
||||||
|
:SKIP_CLINK
|
||||||
%print_warning% "Skipping Clink Injection!"
|
%print_warning% "Skipping Clink Injection!"
|
||||||
|
|
||||||
for /f "tokens=2 delims=:." %%x in ('chcp') do set cp=%%x
|
for /f "tokens=2 delims=:." %%x in ('chcp') do set cp=%%x
|
||||||
@ -210,7 +221,8 @@ if "%CMDER_CLINK%" == "1" (
|
|||||||
prompt $E[1;32;49m$P$S$_$E[1;30;49mλ$S$E[0m
|
prompt $E[1;32;49m$P$S$_$E[1;30;49mλ$S$E[0m
|
||||||
|
|
||||||
chcp %cp%>nul
|
chcp %cp%>nul
|
||||||
)
|
|
||||||
|
:CLINK_FINISH
|
||||||
|
|
||||||
if "%CMDER_CONFIGURED%" GTR "1" (
|
if "%CMDER_CONFIGURED%" GTR "1" (
|
||||||
%print_verbose% "Cmder is already configured, skipping Cmder Init!"
|
%print_verbose% "Cmder is already configured, skipping Cmder Init!"
|
||||||
|
Loading…
Reference in New Issue
Block a user