Mikaela/shell-things
1
0
Fork 0
mirror of https://gitea.blesmrt.net/mikaela/shell-things.git synced 2026-01-24 20:17:53 +01:00
Code Issues Projects Releases Wiki Activity

{bash,zsh}rc: use user-specific runtime directory rather than /tmp for ssh-agent

Browse Source
This commit is contained in:
Aminda Suomalainen 2026-01-22 09:02:28 +02:00
parent f43e244d42
commit 064885e8b4
Signed by: Mikaela
GPG Key ID: 99392F62BAE30723
2 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rc/bashrc
View File

@ -250,9 +250,15 @@ if [ -f ~/.gnupg/sshcontrol ]; then
gpg-connect-agent updatestartuptty /bye > /dev/null 2>&1
# otherwise use the normal ssh-agent
else
# if the output is going to /dev/null, it's non/existence doesn't matter
(ssh-agent -a /tmp/$USER.sshagent > /dev/null 2>&1)
export SSH_AUTH_SOCK=/tmp/$USER.sshagent
if hash xdg-user-dir 2> /dev/null; then
# if the output is going to /dev/null, it's non/existence doesn't matter
(ssh-agent -a $(xdg-user-dir RUNTIME)/sshagent > /dev/null 2>&1)
export SSH_AUTH_SOCK=$(xdg-user-dir RUNTIME)/sshagent
else
# if the output is going to /dev/null, it's non/existence doesn't matter
(ssh-agent -a /tmp/$USER.sshagent > /dev/null 2>&1)
export SSH_AUTH_SOCK=/tmp/$USER.sshagent
fi
fi
# OS X ls colours (copied from https://apple.stackexchange.com/questions/33677/
@ -1027,9 +1033,9 @@ if [ -f ~/.bash_custom ]; then
source ~/.bash_custom
fi
# If $TMUX, then TERM is tmux-256color
#if [ -v TMUX ]; then
# TERM=tmux-256color
#fi
# Note if my xdg runtime dir setting is broken.
if ! hash xdg-user-dir 2> /dev/null; then
echo "WARNING! xdg-user-dir not found."
fi
# vim: filetype=bash

20
rc/zshrc
View File

@ -206,9 +206,15 @@ if [ -f ~/.gnupg/sshcontrol ]; then
gpg-connect-agent updatestartuptty /bye > /dev/null 2>&1
# otherwise use the normal ssh-agent
else
# if the output is going to /dev/null, it's non/existence doesn't matter
(ssh-agent -a /tmp/$USER.sshagent > /dev/null 2>&1)
export SSH_AUTH_SOCK=/tmp/$USER.sshagent
if hash xdg-user-dir 2> /dev/null; then
# if the output is going to /dev/null, it's non/existence doesn't matter
(ssh-agent -a $(xdg-user-dir RUNTIME)/sshagent > /dev/null 2>&1)
export SSH_AUTH_SOCK=$(xdg-user-dir RUNTIME)/sshagent
else
# if the output is going to /dev/null, it's non/existence doesn't matter
(ssh-agent -a /tmp/$USER.sshagent > /dev/null 2>&1)
export SSH_AUTH_SOCK=/tmp/$USER.sshagent
fi
fi
# If we are on Linux, enable apt progress bar and colours
@ -1019,9 +1025,9 @@ if [ -f ~/.warnings ]; then
source ~/.warnings
fi
# If $TMUX, then TERM is tmux-256color
#if [ -v TMUX ]; then
# TERM=tmux-256color
#fi
# Note if my xdg runtime dir setting is broken.
if ! hash xdg-user-dir 2> /dev/null; then
echo "WARNING! xdg-user-dir not found."
fi
# vim: filetype=zsh