use set -eu

[config/dotfiles.git] / herbstluftwm / autostart

diff --git a/herbstluftwm/autostart b/herbstluftwm/autostart
index cf2247d5094897eeb2eadeb513a1a4b6b94b2a5d..963f958b02a1caca16736d0b0af0bc83dbe9d746 100755 (executable)
--- a/herbstluftwm/autostart
+++ b/herbstluftwm/autostart
@@ -18,7 +18,7 @@
 # along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
 
-set -e
+set -eu
 
 
 hc() {
@@ -30,7 +30,9 @@ installed() {
 # $1: timeout
 notify() {
     if installed dzen2; then
-        sed 's/\^/^^/g' | dzen2 -fg blue -bg yellow -y 15 -h 30 -p "$1"
+        read x
+        printf '%s\n' "$x" | sed 's/\^/^^/g' \
+            | dzen2 -fg blue -bg yellow -y 15 -h 30 -p "$1" &
     elif installed xmessage; then
         # Fallback solution, display first line of stdin.
         read x
@@ -72,7 +74,7 @@ for locker in xscreensaver xtrlock ''; do
     fi
 done
 if test -z "$locker"; then
-    echo 'No screen locker found!' | notify 60 &
+    echo 'No screen locker found!' | notify 60
 fi
 # Additional options.
 locker_pre=
@@ -81,10 +83,12 @@ if test x"$locker" = xxscreensaver; then
     # ensures xscreensaver is availble for the current X session.
     locker_pre='xscreensaver-command -time >/dev/null 2>&1 || xscreensaver &'
     locker='xscreensaver-command -lock'
+elif test x"$locker" = xxtrlock; then
+    # Sleep is necessary to allow xtrlock to grab the keyboard input.
+    locker_pre='sleep 1;'
 fi
-# Lock the screen. The sleep is necessary to allow xtrlock to grab the
-# keyboard input.
-hc keybind $mod-z spawn sh -c "$locker_pre sleep 1; exec $locker"
+# Lock the screen.
+hc keybind $mod-z spawn sh -c "$locker_pre exec $locker"
 
 # Tag key bindings. Create tags 1 to 9 with bindings to switch and move
 # windows to them.
@@ -191,6 +195,6 @@ hc rule instance=Navigator class=Iceweasel tag=2
 hc unlock
 
 
-# To notify me if set -e has terminated the script (then this part won't get
+# To notify me if set -eu has terminated the script (then this part won't get
 # executed).
 echo 'hlwm restarted' | notify 1