From 1900cd5b237f0cf31d1de75eca61350ebe73ea60 Mon Sep 17 00:00:00 2001
From: Timo Beckers <timo@incline.eu>
Date: Fri, 14 Jan 2022 14:39:00 +0100
Subject: Copyright year 2022, update repository URL

---
 betterlockscreen | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'betterlockscreen')

diff --git a/betterlockscreen b/betterlockscreen
index ffa9dfe..723c3e9 100755
--- a/betterlockscreen
+++ b/betterlockscreen
@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
 
-# Author : Copyright (c) 2017-2021 Pavan Jadhaw, and others (https://github.com/pavanjadhaw/betterlockscreen/graphs/contributors)
-# Github Profile : https://github.com/pavanjadhaw
-# Project Repository : https://github.com/pavanjadhaw/betterlockscreen
+# Author : Copyright (c) 2017-2022 Pavan Jadhaw, and others (https://github.com/betterlockscreen/betterlockscreen/graphs/contributors)
+# Project Repository : https://github.com/betterlockscreen/betterlockscreen
 
 cmd_exists () {
     command -v "$1" >/dev/null
-- 
cgit v1.2.3


From 1093ce51e69dcefb2da8f2cbca02f0f8fa11ad40 Mon Sep 17 00:00:00 2001
From: Timo Beckers <timo@incline.eu>
Date: Fri, 14 Jan 2022 14:43:32 +0100
Subject: Run prelock and postlock synchronously to avoid race condition

As reported in issue #285, running postlock in a subshell and immediately
returning from lockselect() has a high chance of hitting `exit 0` before
xset and dunstctl get a chance to execute.

Run both prelock and postlock synchronously within lockselect().
---
 betterlockscreen | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'betterlockscreen')

diff --git a/betterlockscreen b/betterlockscreen
index ffa9dfe..40d9589 100755
--- a/betterlockscreen
+++ b/betterlockscreen
@@ -278,7 +278,7 @@ postlock() {
 lockselect() {
 
     echof act "Running prelock..."
-    prelock &
+    prelock
 
     case "$1" in
         dim) if [ -f "$CUR_L_DIM" ]; then lock "$CUR_L_DIM"; else failsafe; fi ;;
@@ -291,7 +291,7 @@ lockselect() {
     esac
 
     echof act "Running postlock..."
-    postlock &
+    postlock
 }
 
 # calculate adjustments for hidpi displays
-- 
cgit v1.2.3


From 321b3ebcea3a8b4a5409ddde3c1256979fff1531 Mon Sep 17 00:00:00 2001
From: Sebastian Sellmeier <mail@sebastian-sellmeier.de>
Date: Tue, 22 Feb 2022 21:27:01 +0100
Subject: Fix Shellcheck by also quoting the inner variable  (reference:
 https://github-wiki-see.page/m/koalaman/shellcheck/wiki/SC2295)

---
 betterlockscreen | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'betterlockscreen')

diff --git a/betterlockscreen b/betterlockscreen
index 723c3e9..47bb3b5 100755
--- a/betterlockscreen
+++ b/betterlockscreen
@@ -606,8 +606,8 @@ update () {
         local geometry="${dinfo[2]}"
 
         read -r -a cols <<< "${geometry//[x+-]/ }"
-        local position="${geometry#*${cols[1]}}"
-        local resolution="${geometry%${position}*}"
+        local position="${geometry#*"${cols[1]}"}"
+        local resolution="${geometry%"${position}"*}"
 
         if [[ $id -eq "$display_on" ]] || [[ "$display_on" -eq 0 ]]; then
 
-- 
cgit v1.2.3


From 13f46dc1919610ab2dc886604b09eb5248669fc5 Mon Sep 17 00:00:00 2001
From: AVAtar Mod <respawner289@gmail.com>
Date: Sun, 27 Feb 2022 13:41:44 +0300
Subject: Fixes wrong help message for --off

---
 betterlockscreen | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'betterlockscreen')

diff --git a/betterlockscreen b/betterlockscreen
index 59e32c2..897fdd9 100755
--- a/betterlockscreen
+++ b/betterlockscreen
@@ -787,7 +787,7 @@ usage() {
     echo "      Scale image to span multiple displays"
     echo
     echo "  --off <N>"
-    echo "      Turn display off after N minutes"
+    echo "      Turn display off after N seconds"
     echo
     echo "  --fx <EFFECT,EFFECT,EFFECT>"
     echo "      List of effects to generate"
-- 
cgit v1.2.3