From d2e9bd33dd19f987773726dc141122e2daa6fe07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <karel.koci@nic.cz>
Date: Mon, 3 Aug 2020 16:41:18 +0200
Subject: x11-misc/myi3lock: improve and remove nohup

Nohup might no longer be necessary as different approach is now chosen.
We can block execution now.
---
 x11-misc/myi3lock/files/myi3lock         |  9 ++++-----
 x11-misc/myi3lock/myi3lock-1.1-r1.ebuild | 20 --------------------
 x11-misc/myi3lock/myi3lock-1.2-r1.ebuild | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 25 deletions(-)
 delete mode 100644 x11-misc/myi3lock/myi3lock-1.1-r1.ebuild
 create mode 100644 x11-misc/myi3lock/myi3lock-1.2-r1.ebuild

diff --git a/x11-misc/myi3lock/files/myi3lock b/x11-misc/myi3lock/files/myi3lock
index f466def..b64abb2 100755
--- a/x11-misc/myi3lock/files/myi3lock
+++ b/x11-misc/myi3lock/files/myi3lock
@@ -3,10 +3,9 @@ BACKS="/usr/share/backgrounds"
 
 # Set pidgin to offline
 purple-remote 'setstatus?status=offline'
-# Run lock in background and when unlocked switch pidgin back to online
-nohup /bin/sh -ec "
-i3lock -n -c 000000 -i $(shuf -n1 -e "$BACKS"/*)
-purple-remote 'setstatus?status=available'
-" >/dev/null 2>&1 &
 # Power off screen
 xset dpms force off
+# Run lock
+i3lock -n -c 000000 -i "$(shuf -n1 -e "$BACKS"/*)"
+# Set pidgin to available
+purple-remote 'setstatus?status=available'
diff --git a/x11-misc/myi3lock/myi3lock-1.1-r1.ebuild b/x11-misc/myi3lock/myi3lock-1.1-r1.ebuild
deleted file mode 100644
index 9b8caa0..0000000
--- a/x11-misc/myi3lock/myi3lock-1.1-r1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-EAPI=7
-
-DESCRIPTION="Script calling i3lock used to automate some tasks on lock"
-HOMEPAGE="https://git.cynerd.cz"
-S="${WORKDIR}"
-
-LICENSE="GPL-3.0+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	x11-misc/i3lock
-	x11-themes/background-lnxpcs
-	x11-misc/xss-lock
-	x11-wm/i3"
-BDEPEND=""
-
-src_install() {
-	dobin "${FILESDIR}/myi3lock"
-}
diff --git a/x11-misc/myi3lock/myi3lock-1.2-r1.ebuild b/x11-misc/myi3lock/myi3lock-1.2-r1.ebuild
new file mode 100644
index 0000000..9b8caa0
--- /dev/null
+++ b/x11-misc/myi3lock/myi3lock-1.2-r1.ebuild
@@ -0,0 +1,20 @@
+EAPI=7
+
+DESCRIPTION="Script calling i3lock used to automate some tasks on lock"
+HOMEPAGE="https://git.cynerd.cz"
+S="${WORKDIR}"
+
+LICENSE="GPL-3.0+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	x11-misc/i3lock
+	x11-themes/background-lnxpcs
+	x11-misc/xss-lock
+	x11-wm/i3"
+BDEPEND=""
+
+src_install() {
+	dobin "${FILESDIR}/myi3lock"
+}
-- 
cgit v1.2.3