From e6f25b82d192a8683acfeecb366e4b0618026fce Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Thu, 14 Apr 2016 16:43:38 +0100 Subject: [PATCH] dot/bash_profile: Use the `gnome-keyring-daemon' if there's a session bus. Organization: Straylight/Edgeware From: Mark Wooding This might be a terrible idea, but I'm going to give it a go for a bit. --- dot/bash_profile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dot/bash_profile b/dot/bash_profile index 4ce6280..b557bc0 100644 --- a/dot/bash_profile +++ b/dot/bash_profile @@ -239,13 +239,11 @@ ulimit -S -c 0 if { { [ "$GNOME_KEYRING_CONTROL" ] && [ -s "$GNOME_KEYRING_CONTROL" ]; } || { [ "$DBUS_SESSION_BUS_ADDRESS" ] && - dbus-send --session --print-reply --dest=org.freedesktop.DBus \ - / org.freedesktop.DBus.GetNameOwner string:org.gnome.keyring \ - >/dev/null 2>/dev/null; }; } && - stuff=$(gnome-keyring-daemon -s -c ssh 2>/dev/null) + __mdw_programp gnome-keyring-daemon; }; } && + stuff=$(gnome-keyring-daemon -s -c ssh,gpg 2>/dev/null) then eval "$stuff" - export SSH_AUTH_SOCK + export SSH_AUTH_SOCK GPG_AGENT_INFO fi ## If we still don't have an agent then start one with a stable name. -- [mdw]