From 1a08fd1a91b3d7d2b7403d95f6f3d6b39b81a7d6 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sat, 27 Aug 2016 12:37:44 +1200
Subject: Move SSH_ASKPASS setup to ~/.xinitrc

---
 X/xinitrc                | 6 ++++++
 sh/profile.d/keychain.sh | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/X/xinitrc b/X/xinitrc
index 5e3af7e1..3b9c13ea 100644
--- a/X/xinitrc
+++ b/X/xinitrc
@@ -2,6 +2,12 @@
 BROWSER=firefox
 export BROWSER
 
+# Set SSH_ASKPASS if we can find one
+if command -v ssh-askpass >/dev/null 2>&1 ; then
+    SSH_ASKPASS=$(command -v ssh-askpass)
+    export SSH_ASKPASS
+fi
+
 # Read X resources
 xrdb "${XRESOURCES:-$HOME/.Xresources}"
 
diff --git a/sh/profile.d/keychain.sh b/sh/profile.d/keychain.sh
index 542bd02e..9213de7f 100644
--- a/sh/profile.d/keychain.sh
+++ b/sh/profile.d/keychain.sh
@@ -1,7 +1,3 @@
-# ssh-askpass setup
-[ -n "${SSH_ASKPASS:="$(command -v ssh-askpass 2>/dev/null)"}" ] &&
-    export SSH_ASKPASS
-
 # keychain setup
 command -v keychain >/dev/null 2>&1 &&
     eval "$(TERM=${TERM:-ansi} keychain \
-- 
cgit v1.2.3