xinitrc: Display a warning if xautolock is not available.

[config/dotfiles.git] / xinitrc

diff --git a/xinitrc b/xinitrc
index d3b62b4cbd48d5d70ef8a54950fb3501818b659e..e9d81ad3eee9d9465be76ac16af2660d66eeacf6 100755 (executable)
--- a/xinitrc
+++ b/xinitrc
@@ -38,7 +38,12 @@ installed() {
     type "$1" >/dev/null 2>&1
 }
 error() {
-    xmessage "$@" &
+    if installed xmessage; then
+        xmessage "$@" &
+    else
+        # Log message to a file which is displayed by my Zsh setup on startup.
+        echo "$@" >> "$HOME/.xinitrc.errors"
+    fi
 }
 # Save PID of the most recently started background process. Used to terminate
 # them when logging out to prevent unused background processes. On some
@@ -55,6 +60,8 @@ background_pids=
 #
 # Default to use a background image.
 set_background=yes
+# Default to display a warning if `xautolock` is not available.
+screen_lock_force=yes
 # Lock screen after x minutes of inactivity, requires `xautolock` to be
 # installed.
 screen_lock_time=3
@@ -118,6 +125,8 @@ if installed xautolock; then
     else
         error "Locker '$screen_locker' not installed. Auto lock won't work!"
     fi
+elif test -n "$screen_lock_force"; then
+    error "'xautolock' not found. Auto lock won't work!"
 fi