From: Maximilian Friedersdorff <max@friedersdorff.com>
Date: Thu, 9 Jan 2020 10:34:59 +0000 (+0000)
Subject: Simplify lock script
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;ds=sidebyside;h=2730332e7cfff3c3ededb15e41d32684008bfaf6;p=max%2Fsaltfiles.git

Simplify lock script
---

diff --git a/states/sway/files/lock b/states/sway/files/lock
index 936b955..230369e 100644
--- a/states/sway/files/lock
+++ b/states/sway/files/lock
@@ -4,28 +4,22 @@ NAG_MSG="Smartcard is still plugged in, not locking! \
 Remove now to lock."
 NOLOCK_MSG="Smartcard was not removed, did not lock!"
 
-LOCK_CMD="systemctl suspend"
+gpg --card-status > /dev/null
+if [ $? -ne 2 ]; then
+	swaynag -m "$NAG_MSG" --type warning&
 
-if [ $(pgrep -c lock.magnesium) -gt 1 ]; then
-	exit
-else
-	gpg --card-status > /dev/null
-	if [ $? -ne 2 ]; then
-		swaynag -m "$NAG_MSG" --type warning&
+	counter=0
+	while [ $? -ne 2 ]; do
+		if [ $counter -gt 20 ]; then
+			pkill -f "$NAG_MSG"
+			swaynag -m "$NOLOCK_MSG" --type error&
+			exit
+		fi
 
-		counter=0
-		while [ $? -ne 2 ]; do
-			if [ $counter -gt 20 ]; then
-				pkill -f "$NAG_MSG"
-				swaynag -m "$NOLOCK_MSG" --type error&
-				exit
-			fi
-
-			sleep 1
-			counter=$(bc <<<"${counter}+1")
-			gpg --card-status > /dev/null
-		done
-		pkill -f "$NAG_MSG"
-	fi
-	$LOCK_CMD
+		sleep 1
+		counter=$(bc <<<"${counter}+1")
+		gpg --card-status > /dev/null
+	done
+	pkill -f "$NAG_MSG"
 fi
+pkill -u ${UID} swayidle --signal USR1