Oprava ssh agenta ve WSL

This commit is contained in:
lachtan
2025-09-03 20:19:22 +02:00
parent 6b963ee277
commit 726e6098b2
4 changed files with 24 additions and 7 deletions

View File

@@ -134,3 +134,7 @@ function true_false() {
# [[ "${1,,}" =~ ^(1|true|yes)$ ]]
[[ "${1@L}" =~ ^(1|true|yes)$ ]]
}
function is_wsl() {
grep -q -i wsl /proc/version
}

View File

@@ -1 +1,2 @@
prepend_path_try "$HOME/.local/bin"
prepend_path_try "$HOME/bin"

View File

@@ -2,8 +2,25 @@
for key in id_ecdsa id_rsa; do
key_filename="$HOME/.ssh/$key"
if [ -f $key_filename ]; then
eval $(keychain --eval --quiet --agents ssh $key)
if [ -f "$key_filename" ]; then
if is_wsl; then
if [ -z "$SSH_AUTH_SOCK" ]; then
export SSH_AUTH_SOCK=$HOME/.ssh/ssh-agent.sock
fi
if [ ! -S "$SSH_AUTH_SOCK" ]; then
eval "$(ssh-agent -s -a "$SSH_AUTH_SOCK")"
fi
if ! ssh-add -L > /dev/null; then
ssh-add "$key_filename"
fi
else
eval "$(keychain --eval --quiet --agents ssh $key)"
fi
break
fi
done

View File

@@ -1,8 +1,3 @@
function is_wsl()
{
grep -q -i wsl /proc/version
}
if is_wsl; then
prepend_path_try "$HOME/.local/bin"
append_path_try "$HOME/.arkade/bin"