factor 'trap ... EXIT' code into function atexit()

1 files changed, 11 insertions, 1 deletions

diff --git a/dot/local/bin/xvnc b/dot/local/bin/xvnc
index ffae919..375d13a 100755
--- a/dot/local/bin/xvnc
+++ b/dot/local/bin/xvnc
@@ -25,6 +25,16 @@ direct_connection()
     kill $pid
 }
 
+atexit()
+{
+    [ "$DEBUG" ] || exec 2>/dev/null || true
+    set +e
+    set -- "$X11VNC" "$SSH"
+    ps hu "$@"
+    kill "$@"
+    rm -rf "$OUR_TMP"
+}
+
 share_display()
 {
     if [ "$DEBUG" ]
@@ -39,7 +49,7 @@ share_display()
     # killall x11vnc
     x11vnc -noxrecord -q -nopw -ncache -ncache_cr -display "${local_display}" -unixsock "$socket_file" &
     X11VNC=$!
-    trap '[ "$DEBUG" ] || exec 2>/dev/null; set -- "$X11VNC" "$SSH"; ps hu "$@"; kill "$@"' EXIT
+    trap atexit EXIT
 
     # TODO: spin waiting for port 5500
     ssh -n \