aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBasti <mail@sebastian-sellmeier.de>2021-06-30 16:35:12 +0200
committerSebastian Sellmeier <mail@sebastian-sellmeier.de>2021-07-21 01:03:48 +0200
commit8ab40b5af2de162f8cad9b84d035a913f0aa7cfe (patch)
tree6d95a7d4c3453d931cc0608afda555a75deffb12
parent709933350c02f3f9e2956de26016aaf15adc091f (diff)
Determinate i3lock-color binary automatically with i3lock-color/i3lock or quit with error (#252)
-rwxr-xr-xbetterlockscreen16
1 files changed, 13 insertions, 3 deletions
diff --git a/betterlockscreen b/betterlockscreen
index 0fb0046..2f6a6b5 100755
--- a/betterlockscreen
+++ b/betterlockscreen
@@ -6,6 +6,16 @@
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
@@ -107,7 +117,7 @@ lock() {
local image="$1"
- i3lock \
+ $i3lockcolor_bin \
-i "$image" \
-c "$bgcolor" \
--screen "$display_on" \
@@ -135,7 +145,7 @@ failsafe() {
local text="ffffffff"
local error="ff0000"
- i3lock \
+ $i3lockcolor_bin \
-c "$bgcolor" \
--screen "$display_on" \
--time-pos="ix-170:iy-0" \
@@ -824,7 +834,7 @@ for arg in "$@"; do
-v | --version)
echo
echo "Version: $VERSION"
- i3lock-color --version
+ $i3lockcolor_bin --version
convert --version
if [[ -x "$(command -v dunstctl)" ]]; then