dustinswan/dotfiles
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Better conditionals for executables existng in zshrc

Browse Source
This commit is contained in:
Dustin Swan
2016-11-16 13:24:54 -05:00
parent c2a3865518
commit cba7110acd
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
zshrc
View File

@@ -20,18 +20,18 @@ alias e='emacsclient -a "" -t -nw'
alias weather='curl http://wttr.in' alias weather='curl http://wttr.in'
# nvim # nvim
if [ -f "$(which nvim)" ]; then if [ -x "$(command -v nvim)" ]; then
alias vi=nvim alias vi=nvim
alias vim=nvim alias vim=nvim
export EDITOR=nvim export EDITOR=nvim
fi fi
# Mac only # Mac only
[ -f "$(which open)" ] && export BROWSER=open [ -x "$(command -v open)" ] && export BROWSER=open
# IOCOM stuff # IOCOM stuff
alias er='rm -rf logs; unzip -o' alias er='rm -rf logs; unzip -o'
if [ -f "$(which p4)" ]; then if [ -x "$(command -v p4)" ]; then
export P4USER=dswan export P4USER=dswan
export P4PORT="humu.iocom.com:1666" export P4PORT="humu.iocom.com:1666"
export P4CONFIG=p4.cfg export P4CONFIG=p4.cfg
@@ -48,13 +48,13 @@ fi
[ -f $HOME/.nix-profile/etc/profile.d/nix.sh ] && . $HOME/.nix-profile/etc/profile.d/nix.sh [ -f $HOME/.nix-profile/etc/profile.d/nix.sh ] && . $HOME/.nix-profile/etc/profile.d/nix.sh
# Keychain # Keychain
if [ -f "$(which keychain)" ]; then if [ -x "$(command -v keychain)" ]; then
export GPG_AGENT_INFO="~/.gnupg/S.gpg-agent:$(pgrep gpg-agent):1" # Take this out when keychain fixes this bug export GPG_AGENT_INFO="~/.gnupg/S.gpg-agent:$(pgrep gpg-agent):1" # Take this out when keychain fixes this bug
eval `keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377` eval `keychain --eval --inherit any --agents gpg,ssh --quiet id_rsa 2B3A6377`
fi fi
# Homebrew Github Token # Homebrew Github Token
[ -f "$(which brew)" ] && alias brew='[[ $HOMEBREW_GITHUB_API_TOKEN ]] || export HOMEBREW_GITHUB_API_TOKEN=`gpg -d ~/.homebrew@github-password.gpg`; brew' [ -x "$(command -v brew)" ] && alias brew='[[ $HOMEBREW_GITHUB_API_TOKEN ]] || export HOMEBREW_GITHUB_API_TOKEN=`gpg -d ~/.homebrew@github-password.gpg`; brew'
# #
# FZF # FZF
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
@@ -63,8 +63,8 @@ fi
[ -f ~/.iterm2_shell_integration.zsh ] && source ~/.iterm2_shell_integration.zsh [ -f ~/.iterm2_shell_integration.zsh ] && source ~/.iterm2_shell_integration.zsh
# Chruby # Chruby
[ -e /usr/local/opt/chruby/share/chruby/chruby.sh ] && source /usr/local/opt/chruby/share/chruby/chruby.sh [ -f /usr/local/opt/chruby/share/chruby/chruby.sh ] && source /usr/local/opt/chruby/share/chruby/chruby.sh
[ -e /usr/local/opt/chruby/share/chruby/auto.sh ] && source /usr/local/opt/chruby/share/chruby/auto.sh [ -f /usr/local/opt/chruby/share/chruby/auto.sh ] && source /usr/local/opt/chruby/share/chruby/auto.sh
# Colored Man Pages # Colored Man Pages
man() { man() {