From 225f773ae169977d32d5ae0130f32153c6f4be5f Mon Sep 17 00:00:00 2001
From: Alex Manning <alexander.manning@stfc.ac.uk>
Date: Tue, 3 Oct 2023 17:03:01 +0100
Subject: [PATCH] Fix kubie killing ssh agent.

---
 home/.vimrc.d/coc/coc-settings.json | 3 ++-
 home/scripts/ssh_agent_setup        | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/home/.vimrc.d/coc/coc-settings.json b/home/.vimrc.d/coc/coc-settings.json
index 9a5808d..866e5e2 100644
--- a/home/.vimrc.d/coc/coc-settings.json
+++ b/home/.vimrc.d/coc/coc-settings.json
@@ -1,4 +1,6 @@
 {
+    "coc.preferences.extensionUpdateCheck": "weekly",
+
     "rust-client.disableRustup": true,
 
     "javascript.format.enabled": false,
@@ -13,5 +15,4 @@
 
     "jedi.enable": true,
     "suggest.noselect": true,
-
 }
diff --git a/home/scripts/ssh_agent_setup b/home/scripts/ssh_agent_setup
index 82c3cdd..e1ad544 100755
--- a/home/scripts/ssh_agent_setup
+++ b/home/scripts/ssh_agent_setup
@@ -6,7 +6,6 @@ SSH_ENV=$HOME/.ssh/environment.`hostname`
 start_agent ()
 {
     # $1 Socket path to bind to.
-
         # If not running interactively, don't do anything else
         [[ $- != *i* ]] && return
 
@@ -31,6 +30,11 @@ load_keys ()
         fi
 }
 
+# If not running interactively, don't do anything else
+[[ $- != *i* ]] && return
+# If we are a subshell we should not do anything.
+[[ $0 != -* ]] && return
+
 # Source SSH settings, if applicable
 # If a ssh auth socket exists at this point, it must be from a forwarded agent.
 if [ -n "${SSH_AUTH_SOCK+set}" ] && [[ ${SSH_AUTH_SOCK} != *"com.apple.launchd"* ]]