X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/dc358a7aff5b8216f3f1f9fb4aabf2136baba01a..a1bf764e752244494ca373a396b43f5c028ac139:/dot/bash_profile

diff --git a/dot/bash_profile b/dot/bash_profile
index a6015e9..12f5f52 100644
--- a/dot/bash_profile
+++ b/dot/bash_profile
@@ -19,7 +19,7 @@ cd $HOME
 # --- Add elements to a path string ---
 
 __mdw_addto () {
-  local var=$1 val dir=$2 new=""
+  local var=$1 val dir=$2 new="" change=nil
   eval "val=\$$var"
   shift 2
   for i in "$@"; do
@@ -27,7 +27,7 @@ __mdw_addto () {
     [ -d $i ] || continue
     case "X$val" in
       X)
-	val=$i
+	val=$i change=t
 	continue
 	;;
       X$i)
@@ -43,13 +43,13 @@ __mdw_addto () {
 	val=${val%:$i}
 	;;
     esac
-    new=$new:$i
+    new=$new:$i change=t
   done
   case $dir in
     l) val=${new#:}:$val;;
     r) val=$val$new;;
   esac
-  export $var=$val
+  case $change in t) export $var="$val" ;; esac
 }
 
 # --- Set the path variable ---
@@ -198,6 +198,18 @@ ulimit -S -c 0
 
 # --- Start an ssh authentication agent ---
 
+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)
+then
+  eval "$stuff"
+  export SSH_AUTH_SOCK
+fi
+
 eval `start-ssh-agent -b`
 
 if [ -z "$__mdw_bashrc" ] && [ "$__mdw_force_secure_session" = "yes" ] ||