git.lirion.de

Of git, get, and gud

aboutsummaryrefslogtreecommitdiffstats
path: root/.bash
diff options
context:
space:
mode:
Diffstat (limited to '.bash')
-rw-r--r--.bash/aliases.bash1
-rw-r--r--.bash/exec.bash4
2 files changed, 3 insertions, 2 deletions
diff --git a/.bash/aliases.bash b/.bash/aliases.bash
index 760a3c4..eb83e6d 100644
--- a/.bash/aliases.bash
+++ b/.bash/aliases.bash
@@ -19,7 +19,6 @@ alias scredit='gimp "${SCRSHDIR}/$(ls -rt1 $SCRSHDIR/|tail -n1)"'
alias scrview='pqiv -i "${SCRSHDIR}/$(ls -rt1 $SCRSHDIR/|tail -n1)"'
alias fuck='sudo $(history -p \!\!)'
alias x509-out='openssl x509 -text -certopt no_version,no_pubkey,no_sigdump,no_aux,no_header -noout -in'
-alias psgrep='ps -fp "$(pgrep -d, -x ssh-agent)"'
# ----- CHOO CHOO ----- #
if command -v sl >/dev/null;then
alias sl='sl -e'
diff --git a/.bash/exec.bash b/.bash/exec.bash
index 24b3ee9..316d1c4 100644
--- a/.bash/exec.bash
+++ b/.bash/exec.bash
@@ -11,7 +11,9 @@ if echo "${SSHAGH[@]}" | grep -F --word-regexp "$(hostname -f)" > /dev/null;then
# do not launch from SSH session, conflicts with user logging on locally afterwards
if [ -z "$SSH_TTY" ];then
"$HOME/bin/ssh-agent-launcher" -q
- gpg-connect-agent --dirmngr /bye
+ if ! ps -fp "$(pgrep -d, -x dirmngr)" | grep "^$(whoami)" > /dev/null
+ gpg-connect-agent --dirmngr /bye 2>/dev/null
+ fi
fi
fi