mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-06-05 05:03:16 +02:00
Use idiomatic zsh and fix general style
This commit is contained in:
parent
39c230e9d1
commit
61497a3dfd
1 changed files with 6 additions and 8 deletions
|
|
@ -1,16 +1,14 @@
|
||||||
# Enable gpg-agent if it is not running-
|
# Enable gpg-agent if it is not running-
|
||||||
# --use-standard-socket will work from version 2 upwards
|
# --use-standard-socket will work from version 2 upwards
|
||||||
AGENT_SOCK=`gpgconf --list-dirs | grep agent-socket | cut -d : -f 2`
|
AGENT_SOCK=$(gpgconf --list-dirs | grep agent-socket | cut -d : -f 2)
|
||||||
|
|
||||||
if [ ! -S ${AGENT_SOCK} ]; then
|
if [[ ! -S "$AGENT_SOCK" }]; then
|
||||||
gpg-agent --daemon --use-standard-socket >/dev/null 2>&1
|
gpg-agent --daemon --use-standard-socket &>/dev/null
|
||||||
fi
|
fi
|
||||||
export GPG_TTY=$(tty)
|
export GPG_TTY=$TTY
|
||||||
|
|
||||||
# Set SSH to use gpg-agent if it's enabled, and we're not using the ssh-agent plugin
|
# Set SSH to use gpg-agent if it's enabled, and we're not using the ssh-agent plugin
|
||||||
echo "$plugins" | fgrep -q "ssh-agent"
|
if [[ ${+plugins[(r)ssh-agent} -ne 0 && -S "$AGENT_SOCK.ssh" ]]; then
|
||||||
if [[ $? -eq 1 && -S "${AGENT_SOCK}.ssh" ]]; then
|
export SSH_AUTH_SOCK="$AGENT_SOCK.ssh"
|
||||||
export SSH_AUTH_SOCK="${AGENT_SOCK}.ssh"
|
|
||||||
unset SSH_AGENT_PID
|
unset SSH_AGENT_PID
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue