n
/
dotfiles
mirror of https://github.com/nirenjan/dotfiles.git
1
0
Fork 0
Code Releases Activity

Compare commits

base: n:9da5e26220c1c6a315f1e230309aafb332b090db
Branches Tags
n:master
n:vimbundler
..
compare: n:4497e4e3b119e188c7567a38ee8e401f2834a7c6
Branches Tags
n:master
n:vimbundler

2 Commits
9da5e26220 ... 4497e4e3b1

Author SHA1 Message Date
nirenjan 4497e4e3b1 Use command -v to check for presence of a command 
With a fresh install of zsh on OSX Catalina, the which command returns
text in stdout even if there is no corresponding command. Replacing it
with `command -v` ensures that the test does not give a false positive.
 2020-09-09 07:50:13 -07:00
nirenjan a866ab7d4e Wrap gpg snippet to ensure that the command is available 2020-09-09 07:49:26 -07:00
2 changed files with 13 additions and 10 deletions
Show Stats Expand all files Collapse all files

19
zsh/gpg.zsh
View File

@ -1,10 +1,13 @@
gpgconf --launch gpg-agent if command -v gpgconf >/dev/null
export SSH_AUTH_SOCK="$HOME/.gnupg/S.gpg-agent.ssh"
TSOCK=$(gpgconf --list-dirs agent-ssh-socket || true)
if [[ -n "$TSOCK" ]]
then then
export SSH_AUTH_SOCK="$TSOCK" gpgconf --launch gpg-agent
unset TSOCK
export SSH_AUTH_SOCK="$HOME/.gnupg/S.gpg-agent.ssh"
TSOCK=$(gpgconf --list-dirs agent-ssh-socket || true)
if [[ -n "$TSOCK" ]]
then
export SSH_AUTH_SOCK="$TSOCK"
unset TSOCK
fi
fi fi

4
zsh/lscolors.zsh
View File

@ -44,10 +44,10 @@ DCFILE="$HOME/.dircolors"
# a system which has the GNU coreutils installed # a system which has the GNU coreutils installed
if [[ -f $DCFILE ]] && [[ -s $DCFILE ]] if [[ -f $DCFILE ]] && [[ -s $DCFILE ]]
then then
if [[ ! -z `which dircolors` ]] if command -v dircolors >/dev/null
then then
eval `dircolors $DCFILE` eval `dircolors $DCFILE`
elif [[ ! -z `which gdircolors` ]] elif command -v gdircolors >/dev/null
then then
# OS X with coreutils installed from MacPorts will have # OS X with coreutils installed from MacPorts will have
# dircolors installed by default as gdircolors. # dircolors installed by default as gdircolors.