diff options
author | EuAndreh <eu@euandre.org> | 2018-04-22 19:32:09 -0300 |
---|---|---|
committer | EuAndreh <eu@euandre.org> | 2018-04-22 19:32:09 -0300 |
commit | affb735a4913b30a58b114640a385596a20c7b08 (patch) | |
tree | 876d7412d5dbb2a80253e6d0377693ebcedfac4a /bash/agents.sh | |
parent | Try to fix Gnome keyring startup config (diff) | |
download | dotfiles-affb735a4913b30a58b114640a385596a20c7b08.tar.gz dotfiles-affb735a4913b30a58b114640a385596a20c7b08.tar.xz |
Move back to old ssh agent config
Diffstat (limited to '')
-rw-r--r-- | bash/agents.sh | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/bash/agents.sh b/bash/agents.sh index 8d7f397..0fd307a 100644 --- a/bash/agents.sh +++ b/bash/agents.sh @@ -4,8 +4,19 @@ eval "$(thefuck --alias f)" export GPG_TTY=$(tty) -if [ -n "$DESKTOP_SESSION" ];then - eval $(gnome-keyring-daemon) - eval $(gnome-keyring-daemon --start) - export SSH_AUTH_SOCK -fi +export SSH_ENV="$HOME/.ssh/environment" +start_agent() { + echo "Initialising new SSH agent..." + ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}" + echo succeeded + chmod 600 "${SSH_ENV}" + . "${SSH_ENV}" > /dev/null + ssh-add +} + +[ -f "${SSH_ENV}" ] && { + . "${SSH_ENV}" > /dev/null + ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || { + start_agent + } +} || start_agent |