From d7ed169b96f193da3211f6c5920fdb2ae6d1323c Mon Sep 17 00:00:00 2001 From: mitchell Date: Mon, 2 Nov 2020 00:11:42 -0500 Subject: [PATCH] Modify ssh-agent startup and sync script call in provision_linux --- .config/fish/functions/ssh_agent_startup.fish | 4 +++- provision_linux | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.config/fish/functions/ssh_agent_startup.fish b/.config/fish/functions/ssh_agent_startup.fish index 1a7db9c..0a60b02 100644 --- a/.config/fish/functions/ssh_agent_startup.fish +++ b/.config/fish/functions/ssh_agent_startup.fish @@ -1,3 +1,5 @@ function ssh_agent_startup -d 'Start ssh agent and set env vars' - eval (ssh-agent -c) >/dev/null 2>&1 + if test -z "$SSH_AUTH_SOCK"; or test -z "$SSH_AGENT_PID" + eval (ssh-agent -c) >/dev/null 2>&1 + end end diff --git a/provision_linux b/provision_linux index 809f208..f03c472 100755 --- a/provision_linux +++ b/provision_linux @@ -48,7 +48,7 @@ function provision_terminal_env -d 'Install base terminal utilities and sync con sudo chsh -s /usr/bin/fish m log 'Running sync script' - ./sync + ./sync --desktop log 'Installing asdf-vm' git clone https://github.com/asdf-vm/asdf.git ~/.asdf