X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=b433a3f15691f542adc06bd8c6378976495aa6ca;hb=b3b150d910400bc4421f431d525ebc793be74bfe;hp=0f32482e01fd451b21774911b4717cb5c1779c82;hpb=1cd38c8dac0b5a26375788bb7ffe5e7a18945fa2;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index 0f32482..b433a3f 100755
--- a/xinitrc
+++ b/xinitrc
@@ -24,12 +24,6 @@
 # LANG set (for Python's decode() function). Therefore load my general shell
 # environment which also includes $LANG.
 if test -f "$HOME/.shell/env"; then
-    # Debug function used in ~/.shell/env.
-    source_debug() {
-        # Do nothing.
-        :
-    }
-
     . "$HOME/.shell/env"
 fi
 
@@ -109,7 +103,7 @@ xmodmap -e 'keycode 94 = grave asciitilde'
 xset b off
 
 # Load settings for programs. Xdefaults is deprecated.
-xrdb ~/.Xresources
+xrdb "$HOME/.Xresources"
 
 # Change the background if available.
 if test -f "$HOME/.background" && test -n "$set_background"; then
@@ -157,14 +151,14 @@ elif installed xcompmgr; then
 fi
 
 
-# My window managers doesn't start a terminal emulator on its own, start one
+# My window manager doesn't start a terminal emulator on its own, start one
 # when I login.
 (urxvt || rxvt || xterm) &
 
 # Start window manager.
 failed=
 if installed herbstluftwm; then
-    herbstluftwm --locked >~/.config/herbstluftwm/log 2>&1 || failed=1
+    herbstluftwm --locked >"$HOME/.config/herbstluftwm/log" 2>&1 || failed=1
 elif installed xmonad; then
     xmonad || failed=1
 elif installed stumpwm; then
@@ -191,4 +185,6 @@ if test -x /usr/bin/ssh-agent; then
     # No `eval` necessary, we terminate anyway.
 fi
 # Kill remaining background processes.
-kill $background_pids
+if test -n "$background_pids"; then
+    kill $background_pids
+fi