dot/emacs, el/Makefile: Random fixes from vampire.

[profile] / dot / bash_profile

diff --git a/dot/bash_profile b/dot/bash_profile
index abd3463..12f5f52 100644 (file)
--- a/dot/bash_profile
+++ b/dot/bash_profile
@@ -49,7 +49,7 @@ __mdw_addto () {
     l) val=${new#:}:$val;;
     r) val=$val$new;;
   esac
-  case $change in t) export $var=$val ;; esac
+  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" ] ||