scripts: Remove sessionclean
We don't need to kill Emacs daemon, emacsclient can recover a broken socket with the '-a ""' argument. Trapping kill-emacs is also a bad idea when used with broken login managers like LightDM: it may kill emacs unexpectedly.master
parent
3b464be913
commit
4f42076912
2
.profile
2
.profile
|
@ -100,7 +100,7 @@ export TIME_STYLE=+"|%Y-%m-%d %H:%M:%S|"
|
||||||
if command -v ssh-agent >/dev/null 2>&1 && [ -z "$SSH_AGENT_PID" ]; then
|
if command -v ssh-agent >/dev/null 2>&1 && [ -z "$SSH_AGENT_PID" ]; then
|
||||||
eval "$(ssh-agent)"
|
eval "$(ssh-agent)"
|
||||||
## Kill ssh-agent on session end. Console login only.
|
## Kill ssh-agent on session end. Console login only.
|
||||||
command -v sessionclean >/dev/null 2>&1 && trap 'sessionclean' 0
|
trap 'test -n "$SSH_AGENT_PID" && eval $(ssh-agent -k)' 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
## Linux specific
|
## Linux specific
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
if [ "$1" = "-h" ]; then
|
|
||||||
cat <<EOF>&2
|
|
||||||
Usage: ${0##*/}
|
|
||||||
|
|
||||||
Clean various running processes. Run it before exiting a session.
|
|
||||||
|
|
||||||
EOF
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
|
|
||||||
if command -v emacsclient >/dev/null 2>&1; then
|
|
||||||
if emacsclient -e '(kill-emacs)' >/dev/null 2>&1; then
|
|
||||||
echo >&2 "Emacs terminated."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if [ -S "$SSH_AUTH_SOCK" ]; then
|
|
||||||
eval "$(ssh-agent -k)"
|
|
||||||
echo >&2 "SSH agent terminated."
|
|
||||||
fi
|
|
3
.xinitrc
3
.xinitrc
|
@ -27,4 +27,5 @@ fi
|
||||||
## could be the place where to clean everything, but it will not be parsed by
|
## could be the place where to clean everything, but it will not be parsed by
|
||||||
## some login managers. Beside, systemd sessions may sigkill all user apps on
|
## some login managers. Beside, systemd sessions may sigkill all user apps on
|
||||||
## logoff, preventing a clean termination.
|
## logoff, preventing a clean termination.
|
||||||
# command -v sessionclean >/dev/null 2>&1 && sessionclean
|
# ssh-agent -k
|
||||||
|
## See if exec'ing "ssh-agent <WM>" is a better idea.
|
||||||
|
|
Loading…
Reference in New Issue