leyoda/cosmic-session
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: preserve configured SSH_AUTH_SOCK

Browse source
This commit is contained in:
Jim Witte 2026-09-20 21:08:52 -05:00 • committed by Michael Murphy
parent 1e4f10b582
commit 70f9b96ca6
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
data/start-cosmic
View file

@ -66,13 +66,14 @@ if [ -d "$XDG_RUNTIME_DIR/keyring" ]; then
echo "gnome-keyring-daemon not found in PATH" >&2
fi
# Only set SSH_AUTH_SOCK if the socket actually exists. Either
# set the correct one, or don't set one at all. Don't set the
# wrong value.
if [ -S "$XDG_RUNTIME_DIR/gcr/ssh" ]; then
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
elif [ -S "$XDG_RUNTIME_DIR/keyring/ssh" ]; then
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/keyring/ssh"
# Preserve an SSH agent configured by the user. Otherwise, use a
# Gnome Keyring SSH socket if one exists.
if [ -z "$SSH_AUTH_SOCK" ]; then
if [ -S "$XDG_RUNTIME_DIR/gcr/ssh" ]; then
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/gcr/ssh"
elif [ -S "$XDG_RUNTIME_DIR/keyring/ssh" ]; then
export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/keyring/ssh"
fi
fi
fi