Guard Docker init scripts with existence checks
Prevents errors when Docker Desktop is not installed. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -1 +1 @@
|
|||||||
source "$HOME/.docker/init-bash.sh" || true # Added by Docker Desktop
|
[[ -f "$HOME/.docker/init-bash.sh" ]] && source "$HOME/.docker/init-bash.sh"
|
||||||
|
|||||||
2
bashrc
2
bashrc
@@ -3,7 +3,7 @@ export NVM_DIR="$HOME/.nvm"
|
|||||||
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
|
||||||
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
|
||||||
|
|
||||||
source "$HOME/.docker/init-bash.sh" || true # Added by Docker Desktop
|
[[ -f "$HOME/.docker/init-bash.sh" ]] && source "$HOME/.docker/init-bash.sh"
|
||||||
|
|
||||||
# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
|
# Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
|
||||||
# export PATH="$PATH:$HOME/.rvm/bin"
|
# export PATH="$PATH:$HOME/.rvm/bin"
|
||||||
|
|||||||
9
zshrc
9
zshrc
@@ -130,7 +130,7 @@ export NVM_QUIET=1
|
|||||||
typeset -g POWERLEVEL9K_INSTANT_PROMPT=quiet
|
typeset -g POWERLEVEL9K_INSTANT_PROMPT=quiet
|
||||||
|
|
||||||
# Docker
|
# Docker
|
||||||
source $HOME/.docker/init-zsh.sh || true
|
[[ -f "$HOME/.docker/init-zsh.sh" ]] && source "$HOME/.docker/init-zsh.sh"
|
||||||
|
|
||||||
# iTerm2 integration
|
# iTerm2 integration
|
||||||
test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
|
test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
|
||||||
@@ -157,8 +157,9 @@ alias nowdate='date +"%d-%m-%Y"'
|
|||||||
|
|
||||||
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
|
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
|
||||||
|
|
||||||
# The following lines have been added by Docker Desktop to enable Docker CLI completions.
|
# Docker CLI completions
|
||||||
fpath=($HOME/.docker/completions $fpath)
|
if [[ -d "$HOME/.docker/completions" ]]; then
|
||||||
|
fpath=($HOME/.docker/completions $fpath)
|
||||||
|
fi
|
||||||
autoload -Uz compinit
|
autoload -Uz compinit
|
||||||
compinit
|
compinit
|
||||||
# End of Docker CLI completions
|
|
||||||
|
|||||||
Reference in New Issue
Block a user