installed() {
type "$1" >/dev/null 2>&1
}
+# Save PID of the most recently started background process. Used to terminate
+# them when logging out to prevent unused background processes. On some
+# systems this is only necessary for some programs (like ssh-agent), haven't
+# yet figured out why.
+save_background_pid() {
+ background_pids="$background_pids $!"
+}
+background_pids=
+
+
+# Options, can be modified in ~/.xinitrc.local. To disable a boolean option
+# set it to an empty value.
+#
+# Default to use a background image.
+set_background=yes
+
+# Load settings for the local system.
+if test -f "$HOME/.xinitrc.local"; then
+ . "$HOME/.xinitrc.local"
+fi
# Start ssh-agent if we have private keys, thanks to
# Use my X11 key bindings.
xmodmap "$HOME/.xmodmaprc"
-# Default to use a background image. Can be disabled in .xinitrc.local.
-set_background=yes
-
-# Load settings for the local system.
-if test -f "$HOME/.xinitrc.local"; then
- . "$HOME/.xinitrc.local"
-fi
-
# Change the background if available.
if test -f "$HOME/.background" && test -n "$set_background"; then
if installed hsetroot; then
# Display timed reminders and recheck the file for changes every minute (-z1).
if installed remind && test -f "$HOME/.reminders"; then
remind -z1 -k'.shell/bin/notify.py %s &' "$HOME/.reminders" &
+ save_background_pid
fi
# Set color temperature of display according to time of day.
# Start window manager.
xmonad
+
+# Cleanup.
+#
+# Kill ssh-agent to prevent unused background processes.
+if test -x /usr/bin/ssh-agent; then
+ /usr/bin/ssh-agent -k >/dev/null
+ # No `eval` necessary, we terminate anyway.
+fi
+# Kill remaining background processes.
+kill $background_pids