diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2016-08-27 12:37:44 +1200 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2016-08-27 12:37:55 +1200 |
commit | 1a08fd1a91b3d7d2b7403d95f6f3d6b39b81a7d6 (patch) | |
tree | 687d0a63ffa27c20216a5f9103bf2120a5ddc03b | |
parent | Use only system-path mkdir/grep for options setup (diff) | |
download | dotfiles-1a08fd1a91b3d7d2b7403d95f6f3d6b39b81a7d6.tar.gz dotfiles-1a08fd1a91b3d7d2b7403d95f6f3d6b39b81a7d6.zip |
Move SSH_ASKPASS setup to ~/.xinitrc
-rw-r--r-- | X/xinitrc | 6 | ||||
-rw-r--r-- | sh/profile.d/keychain.sh | 4 |
2 files changed, 6 insertions, 4 deletions
@@ -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 \ |