From 906259dd2bd9661bfac6b47a7308d9e44bb30034 Mon Sep 17 00:00:00 2001
From: Basti <mail@sebastian-sellmeier.de>
Date: Wed, 30 Jun 2021 18:45:12 +0200
Subject: [PATCH] Fixes --lock not working with autodetection when started from
 zsh, avoids autodetect because of stability issues (#254)

---
 betterlockscreen            | 14 ++++----------
 examples/betterlockscreenrc |  1 +
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/betterlockscreen b/betterlockscreen
index 7458573..e8c0c57 100755
--- a/betterlockscreen
+++ b/betterlockscreen
@@ -6,16 +6,6 @@
 
 init_config () {
 
-    # resolve i3lock-color binary
-    i3lockcolor_bin="$(command -v i3lock-color)"
-
-    if [[ (! -e "$i3lockcolor_bin") && (-e "$(command -v i3lock)") ]]; then
-        i3lockcolor_bin="$(command -v i3lock)"
-    else
-        echo "Can not find locker-binary as 'i3lock' or 'i3lock-color', please make sure it is in your \$PATH!"
-        exit 1
-    fi
-
     # default options
     display_on=0
     span_image=false
@@ -57,6 +47,10 @@ init_config () {
         source "$USER_CONF"
     fi
 
+    if [[ ! -v $i3lockcolor_bin ]]; then
+        i3lockcolor_bin="i3lock-color"
+    fi
+
     # Please make sure to adjust this before release!
     VERSION="@VERSION@"
 
diff --git a/examples/betterlockscreenrc b/examples/betterlockscreenrc
index fedde94..cf62114 100644
--- a/examples/betterlockscreenrc
+++ b/examples/betterlockscreenrc
@@ -9,6 +9,7 @@ dim_level=40
 blur_level=1
 pixel_scale=10,1000
 solid_color=333333
+# i3lockcolor_bin="" # (manually set full path to i3lock-color)
 
 # default theme
 loginbox=00000066