# Set environment variables, eg EMAIL, LANG
eval "$(cat 2> /dev/null /etc/default/locale /etc/locale.conf ~/.config/environment.d/*.conf | awk -F= '/^[^# ]/ {print $0 ";export " $1}')"
-# Pick up SSH agent socket
-if [ -z "$SSH_AUTH_SOCK" ]; then
- if [ -r ~/.ssh-agent.env ]; then
- source ~/.ssh-agent.env
- else
- SSH_AUTH_SOCK="/run/user/$(id -u)/keyring/ssh"
- export SSH_AUTH_SOCK
- fi
-fi
-
# Look for XDG_RUNTIME_DIR
if [ -z "$XDG_RUNTIME_DIR" ] && [ -d "/run/user/$(id -u)" ]; then
XDG_RUNTIME_DIR="/run/user/$(id -u)"
export XDG_RUNTIME_DIR
fi
+# Pick up SSH agent socket
+if [ -z "$SSH_AUTH_SOCK" ]; then
+ for p in keyring/ssh gcr/ssh openssh_agent; do
+ SSH_AUTH_SOCK="${XDG_RUNTIME_DIR}/$p"
+ if [ -S "$SSH_AUTH_SOCK" ]; then
+ export SSH_AUTH_SOCK
+ break
+ fi
+ done
+fi
+
# Look for DBUS
if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && [ -S "/run/user/$(id -u)/bus" ]; then
DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/$(id -u)/bus"