dot/bash_profile: Use the `gnome-keyring-daemon' if there's a session bus.

[profile] / dot / bash_profile

diff --git a/dot/bash_profile b/dot/bash_profile
index d61a7c3..b557bc0 100644 (file)
--- a/dot/bash_profile
+++ b/dot/bash_profile
@@ -56,7 +56,7 @@ __mdw_programp () { type -t >/dev/null "$1"; }
 ## changes directory and displays the name of the directory in a subshell to
 ## avoid changing the current state.
 HOME=`(set -P; cd $HOME; pwd)`
-cd $HOME
+[ -n "$SCHROOT_SESSION_ID" ] || cd $HOME
 
 ## CDE's session structure is demented and doesn't leave us with a proper
 ## logout hook, so synthesize one here.
@@ -113,6 +113,8 @@ export QMAILINJECT=c
 export MDW_EDITOR=ed
 emacs_startup_args="--no-site-file --mdw-fast-startup -nw"
 for ed in \
+       "emacs23 $emacs_startup_args" \
+       "emacs24 $emacs_startup_args" \
        "emacs22 $emacs_startup_args" \
        "emacs21 $emacs_startup_args" \
        zile mg \
@@ -149,7 +151,7 @@ export LC_COLLATE=POSIX LANG
 
 ## Pager configuration.
 export MDW_PAGER=`type -p less` PAGER=mdw-pager METAMAIL_PAGER=mdw-pager
-export LESS="-iqgRh1FSX"
+export LESS="-iqgRh1j.3FSX"
 export LESSOPEN="|lesspipe.sh %s"
 case "${LC_CTYPE-$LANG}" in
   *utf8 | *utf-8 | *UTF8 | *UTF-8) LESSCHARSET=utf-8 ;;
@@ -185,7 +187,7 @@ __mdw_programp distcc && export CCACHE_PREFIX=distcc
 ## graphical one.
 browsers="elinks w3m lynx"
 case "${DISPLAY+t}" in
-  t) browsers="mdw-chrome iceweasel firefox $browsers" ;;
+  t) browsers="mdw-iceweasel mdw-chrome iceweasel firefox $browsers" ;;
 esac
 for i in $browsers; do
   if __mdw_programp $i; then
@@ -237,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.