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

Update init.bat

Browse Source
This commit is contained in:
Dax T Games 2020-07-02 07:00:25 -04:00 committed by GitHub
parent c332ab1a34
commit 0f12de345b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vendor/init.bat vendored
View File

@ -151,7 +151,6 @@ if "%CMDER_CLINK%" == "1" (
if not exist "%CMDER_USER_CONFIG%\settings" ( if not exist "%CMDER_USER_CONFIG%\settings" (
echo Generating clink initial settings in "%CMDER_USER_CONFIG%\settings" echo Generating clink initial settings in "%CMDER_USER_CONFIG%\settings"
copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_USER_CONFIG%\settings" copy "%CMDER_ROOT%\vendor\clink_settings.default" "%CMDER_USER_CONFIG%\settings"
B
echo Additional *.lua files in "%CMDER_USER_CONFIG%" are loaded on startup.\ echo Additional *.lua files in "%CMDER_USER_CONFIG%" are loaded on startup.\
) )
"%CMDER_ROOT%\vendor\clink\clink_%clink_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"
@ -168,11 +167,11 @@ if "%CMDER_CLINK%" == "1" (
) )
if "%CMDER_CONFIGURED%" == "2" ( if "%CMDER_CONFIGURED%" == "2" (
echo Cmder is already configured, skipping Cmder Init! %lib_console% verbose_output "Cmder is already configured, skipping Cmder Init!"
goto CMDER_CONFIGURED goto CMDER_CONFIGURED
) else if "%CMDER_CONFIGURED%" == "1" ( ) else if "%CMDER_CONFIGURED%" == "1" (
echo Cmder is already configured, skipping to Cmder User Init! %lib_console% verbose_output "Cmder is already configured, skipping to Cmder User Init!"
goto USER_CONFIG_START goto USER_CONFIG_START
) )
@ -205,15 +204,13 @@ if defined GIT_INSTALL_ROOT (
:: check if git is in path... :: check if git is in path...
for /F "delims=" %%F in ('where git.exe 2^>nul') do ( for /F "delims=" %%F in ('where git.exe 2^>nul') do (
if not defined GIT_INSTALL_ROOT ( :: get the absolute path to the user provided git binary
:: get the absolute path to the user provided git binary %lib_git% is_git_shim "%%~dpF"
%lib_git% is_git_shim "%%~dpF" %lib_git% get_user_git_version
%lib_git% get_user_git_version %lib_git% compare_git_versions
%lib_git% compare_git_versions
if defined GIT_INSTALL_ROOT ( if defined GIT_INSTALL_ROOT (
goto :FOUND_GIT goto :FOUND_GIT
)
) )
) )