File tree Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Expand file tree Collapse file tree 1 file changed +6
-1
lines changed Original file line number Diff line number Diff line change @@ -32,16 +32,21 @@ HOMEBREW_PREFIX="${HOMEBREW_PREFIX:-/home/linuxbrew/.linuxbrew}"
3232ATUIN_INIT_FLAGS=${ATUIN_INIT_FLAGS:- " " }
3333
3434if [ " $( basename $( readlink /proc/$$ /exe) ) " = " bash" ]; then
35+ # Initialize direnv before bash-preexec to avoid PROMPT_COMMAND conflicts
36+ # See: https://github.com/rcaloras/bash-preexec/pull/143
37+ [ " $( command -v direnv) " ] && eval " $( direnv hook bash) "
3538 [ -f " /etc/profile.d/bash-preexec.sh" ] && . " /etc/profile.d/bash-preexec.sh"
3639 [ -f " /usr/share/bash-prexec" ] && . " /usr/share/bash-prexec"
3740 [ -f " /usr/share/bash-prexec.sh" ] && . " /usr/share/bash-prexec.sh"
3841 [ -f " ${HOMEBREW_PREFIX} /etc/profile.d/bash-preexec.sh" ] && . " ${HOMEBREW_PREFIX} /etc/profile.d/bash-preexec.sh"
3942 # Initialize atuin before starship to ensure proper command history capture
40- # See: https://github.com/atuinsh/atuin/issues/2804
43+ # See: https://github.com/atuinsh/atuin/issues/2804
4144 [ " $( command -v atuin) " ] && eval " $( atuin init bash ${ATUIN_INIT_FLAGS} ) "
4245 [ " $( command -v starship) " ] && eval " $( starship init bash) "
4346 [ " $( command -v zoxide) " ] && eval " $( zoxide init bash) "
4447elif [ " $( basename $( readlink /proc/$$ /exe) ) " = " zsh" ]; then
48+ # Initialize direnv before atuin to avoid PROMPT_COMMAND conflicts
49+ [ " $( command -v direnv) " ] && eval " $( direnv hook zsh) "
4550 # Initialize atuin before starship to ensure proper command history capture
4651 [ " $( command -v atuin) " ] && eval " $( atuin init zsh ${ATUIN_INIT_FLAGS} ) "
4752 [ " $( command -v starship) " ] && eval " $( starship init zsh) "
You can’t perform that action at this time.
0 commit comments