summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2015-08-26 01:54:33 -0400
committerJesse Luehrs <doy@tozt.net>2015-11-06 23:38:25 -0500
commitf9e6c8c6d840044f69c4106fd5029c81cb89d941 (patch)
treee4dcf5acf86f989fb8eab79d240534ee2ba782aa /bin
parente51ab749a499f3c36fa0f644ef3d94ff1c47697a (diff)
downloadconf-f9e6c8c6d840044f69c4106fd5029c81cb89d941.tar.gz
conf-f9e6c8c6d840044f69c4106fd5029c81cb89d941.zip
don't run keychain for `ssh -V`
since new keychain itself calls `ssh -V`, which would result in a recursive call
Diffstat (limited to 'bin')
-rwxr-xr-xbin/ssh4
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/ssh b/bin/ssh
index 559b83f..453bb11 100755
--- a/bin/ssh
+++ b/bin/ssh
@@ -2,5 +2,7 @@
SSH=/usr/bin/$(basename $0)
-. ssh-key-unlock
+if [[ $1 != '-V' ]]; then
+ . ssh-key-unlock
+fi
exec $SSH $*