From be5ec648c488547926682f2f9cc81f8f2709c64d Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 6 Apr 2020 10:15:00 -0400 Subject: [PATCH] Fix Cmder issue #2290 --- vendor/init.bat | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/vendor/init.bat b/vendor/init.bat index 3ad00c8b..6c3acdb0 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -124,10 +124,10 @@ if defined CMDER_USER_CONFIG ( :: Pick right version of clink if "%PROCESSOR_ARCHITECTURE%"=="x86" ( - set architecture=86 + set clink_architecture=x86 set architecture_bits=32 ) else ( - set architecture=64 + set clink_architecture=x64 set architecture_bits=64 ) @@ -141,14 +141,14 @@ if "%CMDER_CLINK%" == "1" ( copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_USER_CONFIG%\settings" echo Additional *.lua files in "%CMDER_USER_CONFIG%" are loaded on startup.\ ) - "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_USER_CONFIG%" --scripts "%CMDER_ROOT%\vendor" + "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" inject --quiet --profile "%CMDER_USER_CONFIG%" --scripts "%CMDER_ROOT%\vendor" ) else ( if not exist "%CMDER_ROOT%\config\settings" ( echo Generating clink initial settings in "%CMDER_ROOT%\config\settings" copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_ROOT%\config\settings" echo Additional *.lua files in "%CMDER_ROOT%\config" are loaded on startup. ) - "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor" + "%CMDER_ROOT%\vendor\clink\clink_%clink_architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor" ) ) else ( %lib_console% verbose_output "WARNING: Incompatible 'ComSpec/Shell' Detetected Skipping Clink Injection!" @@ -374,4 +374,4 @@ set CMDER_INIT_END=%time% if %time_init% gtr 0 ( "%cmder_root%\vendor\bin\timer.cmd" %CMDER_INIT_START% %CMDER_INIT_END% ) -exit /b \ No newline at end of file +exit /b