X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=f262caeb25e969f30054ba64f5dab1457326b369;hb=00b1df174cf33da23c6084c38a607b5371d19355;hp=d3b62b4cbd48d5d70ef8a54950fb3501818b659e;hpb=67bdeb0a3abdd2ebd51e68b5d157e26f90b84849;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index d3b62b4..f262cae 100755
--- 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
@@ -67,9 +74,11 @@ if test -f "$HOME/.xinitrc.local"; then
 fi
 
 
-# Start ssh-agent if we have private keys, thanks to
+# Start ssh-agent if no agent is running and we have private keys, thanks to
 # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19).
-if test -x /usr/bin/ssh-agent && test -f "$HOME/.ssh/id_rsa"; then
+if test -z "$SSH_AGENT_PID" \
+        && test -x /usr/bin/ssh-agent \
+        && test -f "$HOME/.ssh/id_rsa"; then
     # -s to force bourne shell output. This file is a bourne shell script even
     # if the environment might suggest otherwise.
     eval `/usr/bin/ssh-agent -s` >/dev/null
@@ -118,6 +127,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