gnome-setup.sh

[dotfiles] / .bashrc

diff --git a/.bashrc b/.bashrc
index 89add425399f341f22d816842f741105408f9995..300ab1dd8795c0c21d1053b2dd5f1c7532ae14d2 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -20,22 +20,23 @@ done < <(find -L ~/bin -depth -maxdepth 1 -type d 2> /dev/null)
 # 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"
@@ -311,6 +312,7 @@ PROMPT_COMMAND=prompt_command
 # bashrc to avoid running the trap on commands in the bashrc
 function print_title_exec {
     [ "$BASH_COMMAND" = "$PROMPT_COMMAND" ] && return
+    [ "$BASH_COMMAND" = "__vte_osc7" ] && return
 
     printf '\e]0;%s (%s)\a' \
         "$(tr -cd '[:graph:] ' <<< "$BASH_COMMAND")" \