stupidcomputer
/
sx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sx: silence kill -0 diagnostics 

This condition will always be triggered even if the Xorg server
terminates promptly.  This will simply result in confusing diagnostics
being printed in the common case.  As kill has no quiet option, I will
have to unfortunately silence them instead.
This commit is contained in:
Earnestly 2017-12-08 11:35:31 +00:00
parent 24a0495086
commit 29953f64b7
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sx
View File

@ -18,9 +18,8 @@ cleanup() {
# Send SIGKILL after 10 seconds if the xserver is taking too long to # Send SIGKILL after 10 seconds if the xserver is taking too long to
# terminate. # terminate.
interval=10 interval=10
while kill -0 "$1"; do while kill -0 "$1" 2> /dev/null; do
if [ "$interval" -le 0 ]; then if [ "$interval" -le 0 ]; then
# Make sure the PID is still (probably) an Xorg process.
if [ "$(ps -o comm= "$1")" = Xorg ]; then if [ "$(ps -o comm= "$1")" = Xorg ]; then
kill -s KILL "$1" kill -s KILL "$1"
fi fi
@ -56,12 +55,11 @@ trap 'cleanup "$pid"' EXIT
xauth add :"$tty" MIT-MAGIC-COOKIE-1 "$(od -An -N16 -tx /dev/urandom | tr -d ' ')" xauth add :"$tty" MIT-MAGIC-COOKIE-1 "$(od -An -N16 -tx /dev/urandom | tr -d ' ')"
# Xorg will check if SIGUSR1 was set to SIG_IGN in its environment and issue # Xorg will check if its SIGUSR1 disposition is SIG_IGN and use this state to
# its own SIGUSR1 back to the parent process when it is ready to accept # reply back to the parent process with SIGUSR1 as an indication it is ready
# connections. See Xserver(1). # to accept connections.
# Taking advantage of this feature allows us to launch our client directly
# We take advantage of this feature to launch our client directly from the # from the SIGUSR1 handler and avoid the need to poll for server readiness.
# SIGUSR1 handler and avoid the need to poll for readiness.
trap 'DISPLAY=:$tty "${@:-$cfgdir/sxrc}"' USR1 trap 'DISPLAY=:$tty "${@:-$cfgdir/sxrc}"' USR1
( (
trap '' USR1 trap '' USR1