This commit is contained in:
Dax T. Games 2023-02-18 05:56:09 -08:00
parent 3a2e747d22
commit 9cbc1845fb
2 changed files with 120 additions and 117 deletions

41
vendor/init.bat vendored
View File

@ -561,25 +561,28 @@ if defined CMDER_USER_CONFIG (
:CMDER_CONFIGURED :CMDER_CONFIGURED
if not defined CMDER_CONFIGURED set CMDER_CONFIGURED=1 if not defined CMDER_CONFIGURED set CMDER_CONFIGURED=1
set CMDER_INIT_END=%time% set CMDER_INIT_END=%time%
call "%cmder_root%\vendor\bin\timer.cmd" "%CMDER_INIT_START%" "%CMDER_INIT_END%"
:: Cleanup if "%CMDER_INIT_END%" neq "" if "%CMDER_INIT_START%" neq "" (
set architecture_bits= call "%cmder_root%\vendor\bin\timer.cmd" "%CMDER_INIT_START%" "%CMDER_INIT_END%"
set CMDER_ALIASES= )
set CMDER_INIT_END=
set CMDER_INIT_START= :CLEANUP
set CMDER_USER_FLAGS= set architecture_bits=
set debug_output= set CMDER_ALIASES=
set fast_init= set CMDER_INIT_END=
set max_depth= set CMDER_INIT_START=
set nix_tools= set CMDER_USER_FLAGS=
set path_position= set debug_output=
set print_debug= set fast_init=
set print_error= set max_depth=
set print_verbose= set nix_tools=
set print_warning= set path_position=
set time_init= set print_debug=
set verbose_output= set print_error=
set user_aliases= set print_verbose=
set print_warning=
set time_init=
set verbose_output=
set user_aliases=
exit /b exit /b

View File

@ -58,28 +58,28 @@ goto :SKIP_CLINK
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 :CLINK_FINISH
if not defined GIT_INSTALL_ROOT set "GIT_INSTALL_ROOT=$env:GIT_INSTALL_ROOT"
if not defined SVN_SSH set "SVN_SSH=$env:SVN_SSH"
if not defined git_locale set git_locale=$env:git_locale
if not defined LANG set LANG=$env:lang
if not defined user_aliases set "user_aliases=$env:user_aliases"
if not defined aliases set "aliases=%user_aliases%"
if not defined HOME set "HOME=%USERPROFILE%"
if not defined GIT_INSTALL_ROOT set "GIT_INSTALL_ROOT=$env:GIT_INSTALL_ROOT" set PLINK_PROTOCOL=$env:PLINK_PROTOCOL
if not defined SVN_SSH set "SVN_SSH=$env:SVN_SSH"
if not defined git_locale set git_locale=$env:git_locale
if not defined LANG set LANG=$env:lang
if not defined user_aliases set "user_aliases=$env:user_aliases"
if not defined aliases set "aliases=%user_aliases%"
if not defined HOME set "HOME=%USERPROFILE%"
set PLINK_PROTOCOL=$env:PLINK_PROTOCOL set "path=%GIT_INSTALL_ROOT%\cmd;%path%"
set "path=%GIT_INSTALL_ROOT%\cmd;%path%" set path_position=append
if %nix_tools% equ 1 (
set path_position=append
if %nix_tools% equ 1 (
set "path_position=append" set "path_position=append"
) else ( ) else (
set "path_position=" set "path_position="
) )
if %nix_tools% geq 1 ( if %nix_tools% geq 1 (
if exist "%GIT_INSTALL_ROOT%\mingw32" ( if exist "%GIT_INSTALL_ROOT%\mingw32" (
if "%path_position%" == "append" ( if "%path_position%" == "append" (
set "path=%path%;%GIT_INSTALL_ROOT%\mingw32\bin" set "path=%path%;%GIT_INSTALL_ROOT%\mingw32\bin"
@ -100,72 +100,72 @@ if %nix_tools% geq 1 (
set "path=%GIT_INSTALL_ROOT%\usr\bin;%path%" set "path=%GIT_INSTALL_ROOT%\usr\bin;%path%"
) )
) )
) )
set "path=%CMDER_ROOT%\vendor\bin;%path%" set "path=%CMDER_ROOT%\vendor\bin;%path%"
:USER_CONFIG_START :USER_CONFIG_START
if %max_depth% gtr 1 ( if %max_depth% gtr 1 (
%lib_path% enhance_path_recursive "%CMDER_ROOT%\bin" 0 %max_depth% %lib_path% enhance_path_recursive "%CMDER_ROOT%\bin" 0 %max_depth%
) else ( ) else (
set "path=%CMDER_ROOT%\bin;%path%" set "path=%CMDER_ROOT%\bin;%path%"
) )
setlocal enabledelayedexpansion setlocal enabledelayedexpansion
if defined CMDER_USER_BIN ( if defined CMDER_USER_BIN (
if %max_depth% gtr 1 ( if %max_depth% gtr 1 (
%lib_path% enhance_path_recursive "%CMDER_USER_BIN%" 0 %max_depth% %lib_path% enhance_path_recursive "%CMDER_USER_BIN%" 0 %max_depth%
) else ( ) else (
set "path=%CMDER_USER_ROOT%\bin;%path%" set "path=%CMDER_USER_ROOT%\bin;%path%"
) )
) )
endlocal && set "path=%path%" endlocal && set "path=%path%"
set "path=%path%;%CMDER_ROOT%" set "path=%path%;%CMDER_ROOT%"
call "%user_aliases%" call "%user_aliases%"
%lib_profile% run_profile_d "%CMDER_ROOT%\config\profile.d" %lib_profile% run_profile_d "%CMDER_ROOT%\config\profile.d"
if defined CMDER_USER_CONFIG ( if defined CMDER_USER_CONFIG (
%lib_profile% run_profile_d "%CMDER_USER_CONFIG%\profile.d" %lib_profile% run_profile_d "%CMDER_USER_CONFIG%\profile.d"
) )
call "%CMDER_ROOT%\config\user_profile.cmd" call "%CMDER_ROOT%\config\user_profile.cmd"
if defined CMDER_USER_CONFIG ( if defined CMDER_USER_CONFIG (
if exist "%CMDER_USER_CONFIG%\user_profile.cmd" ( if exist "%CMDER_USER_CONFIG%\user_profile.cmd" (
call "%CMDER_USER_CONFIG%\user_profile.cmd" call "%CMDER_USER_CONFIG%\user_profile.cmd"
) )
) )
set "path=%path:;;=;% set "path=%path:;;=;%
:CMDER_CONFIGURED :CMDER_CONFIGURED
if not defined CMDER_CONFIGURED set CMDER_CONFIGURED=1 if not defined CMDER_CONFIGURED set CMDER_CONFIGURED=1
set CMDER_INIT_END=%time% set CMDER_INIT_END=%time%
if "%CMDER_INIT_END%" neq "" if "%CMDER_INIT_START%" neq "" ( if "%CMDER_INIT_END%" neq "" if "%CMDER_INIT_START%" neq "" (
call "%cmder_root%\vendor\bin\timer.cmd" "%CMDER_INIT_START%" "%CMDER_INIT_END%" call "%cmder_root%\vendor\bin\timer.cmd" "%CMDER_INIT_START%" "%CMDER_INIT_END%"
) )
:: Cleanup :CLEANUP
set architecture_bits= set architecture_bits=
set CMDER_ALIASES= set CMDER_ALIASES=
set CMDER_INIT_END= set CMDER_INIT_END=
set CMDER_INIT_START= set CMDER_INIT_START=
set CMDER_USER_FLAGS= set CMDER_USER_FLAGS=
set debug_output= set debug_output=
set fast_init= set fast_init=
set max_depth= set max_depth=
set nix_tools= set nix_tools=
set path_position= set path_position=
set print_debug= set print_debug=
set print_error= set print_error=
set print_verbose= set print_verbose=
set print_warning= set print_warning=
set time_init= set time_init=
set verbose_output= set verbose_output=
set user_aliases= set user_aliases=
exit /b exit /b