From 86dd077b9d4fd9264551f53b5b3de43021054700 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 21 Mar 2016 14:35:48 -0500 Subject: [PATCH] fixed - not running user-aliases.cmd if aliases variable is overridden in profile.d --- vendor/init.bat | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/vendor/init.bat b/vendor/init.bat index 60cfb6a03..c792f94cc 100644 --- a/vendor/init.bat +++ b/vendor/init.bat @@ -29,7 +29,7 @@ if "%PROCESSOR_ARCHITECTURE%"=="x86" ( if not exist "%CMDER_ROOT%\config\settings" ( echo Generating clink initial settings in %CMDER_ROOT%\config\settings echo Additional *.lua files in %CMDER_ROOT%\config are loaded on startup. -) +) :: Run clink "%CMDER_ROOT%\vendor\clink\clink_x%architecture%.exe" inject --quiet --profile "%CMDER_ROOT%\config" --scripts "%CMDER_ROOT%\vendor" @@ -77,28 +77,26 @@ popd :: Allows user to override default aliases store using profile.d :: scripts run above. Note: If overriding default aliases file :: in profile.d the aliases must also be loaded in profile.d. +set user-aliases=%CMDER_ROOT%\config\user-aliases.cmd if not defined aliases ( - set aliases=%CMDER_ROOT%\config\user-aliases.cmd + set aliases=%user-aliases% +) + +:: make sure we have an example file +if not exist "%user-aliases%" ( + echo Creating intial user-aliases store in "%user-aliases%"... + copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%user-aliases%" ) -:: Using default cmder user-aliases.cmd store. -if "%aliases%" == "%CMDER_ROOT%\config\user-aliases.cmd" ( - :: make sure we have an example file - if not exist "%aliases%" ( - echo Creating intial aliases in "%aliases%"... - copy "%CMDER_ROOT%\vendor\user-aliases.cmd.example" "%aliases%" - ) - - :: Update old 'aliases' to new self executing 'user-aliases.cmd' - if exist "%CMDER_ROOT%\config\aliases" ( - echo Updating old "%CMDER_ROOT%\config\aliases" to new format... - type "%CMDER_ROOT%\config\aliases" >> "%aliases%" && del "%CMDER_ROOT%\config\aliases" - ) - - :: Add aliases to the environment - call "%aliases%" +:: Update old 'user-aliases' to new self executing 'user-aliases.cmd' +if exist "%CMDER_ROOT%\config\aliases" ( + echo Updating old "%CMDER_ROOT%\config\aliases" to new format... + type "%CMDER_ROOT%\config\aliases" >> "%user-aliases%" && del "%CMDER_ROOT%\config\aliases" ) +:: Add aliases to the environment +call "%user-aliases%" + :: See vendor\git-for-windows\README.portable for why we do this :: Basically we need to execute this post-install.bat because we are :: manually extracting the archive rather than executing the 7z sfx