release 0.7.0

4 files changed, 30 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 64dc865c1e8f..209ca95f26dd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,24 @@
 pkgbase = circadian
 	pkgdesc = Linux auto-suspend/wake power management daemon
-	pkgver = 0.6.0
-	pkgrel = 2
+	pkgver = 0.7.0
+	pkgrel = 1
 	url = https://github.com/mrmekon/circadian
 	arch = x86_64
 	arch = aarch64
 	license = GPL3
 	makedepends = cargo
+	depends = awk
+	depends = coreutils
 	depends = gcc-libs
+	depends = grep
+	depends = sed
+	depends = sh
 	optdepends = xssstate: for monitoring x11 input
 	optdepends = xprintidle: for monitoring x11 input
-	optdepends = procps-ng: for monitoring tty input, uptime or processes
+	optdepends = procps: for monitoring tty input, uptime or processes
 	optdepends = net-tools: for monitoring ssh or smb
-	source = circadian-0.6.0.tar.gz::https://github.com/mrmekon/circadian/archive/refs/tags/0.6.0.tar.gz
-	source = w_arg.patch
-	sha512sums = 4c17d36f99dd39eace33d08b236df9ed1c4d19a5599b9b561fb000067ea829164053e056188b3f9f188ebaa9727ad784907e04f9226c137a1424e041d68364c9
-	sha512sums = 1a1a4be28692f606ed9f82d71218c498365fa12dfd63b61ad1412c293172b27f579567a42cd5e884604c01e02d8e12a5dedcb20bab483c3b5eca2e24d8044b82
+	backup = etc/circadian.conf
+	source = circadian-0.7.0.tar.gz::https://github.com/mrmekon/circadian/archive/refs/tags/v0.7.0.tar.gz
+	b2sums = 86615fb3e33353883821ffa0cbeabf6dba878c3199cc9b34f48a2157ffd156efc92cc54b8ebd98ca5be4d801679406886b9982a0bd2badbe77c6ba90726ea6dc
 
 pkgname = circadian
diff --git a/.gitignore b/.gitignore
index 145a15edafa4..31d27563afeb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 *
 !.gitignore
 !PKGBUILD
-!.SRCINFO
-!w_arg.patch
\ No newline at end of file
+!.SRCINFO
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 78009e8f9c46..c9c633220fb3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,40 +4,32 @@
 # shellcheck shell=bash disable=SC2034,SC2154,SC2164
 
 pkgname=circadian
-pkgver=0.6.0
-pkgrel=2
+pkgver=0.7.0
+pkgrel=1
 pkgdesc="Linux auto-suspend/wake power management daemon"
 arch=('x86_64' 'aarch64')
-url="https://github.com/mrmekon/$pkgname"
+url="https://github.com/mrmekon/${pkgname}"
 license=('GPL3')
-depends=('gcc-libs')
+depends=('awk' 'coreutils' 'gcc-libs' 'grep' 'sed' 'sh')
 makedepends=('cargo')
 optdepends=('xssstate: for monitoring x11 input'
             'xprintidle: for monitoring x11 input'
-            'procps-ng: for monitoring tty input, uptime or processes'
-            'net-tools: for monitoring ssh or smb'
-            )
-source=("$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/$pkgver.tar.gz"
-        "w_arg.patch")
-sha512sums=('4c17d36f99dd39eace33d08b236df9ed1c4d19a5599b9b561fb000067ea829164053e056188b3f9f188ebaa9727ad784907e04f9226c137a1424e041d68364c9'
-            '1a1a4be28692f606ed9f82d71218c498365fa12dfd63b61ad1412c293172b27f579567a42cd5e884604c01e02d8e12a5dedcb20bab483c3b5eca2e24d8044b82')
+            'procps: for monitoring tty input, uptime or processes'
+            'net-tools: for monitoring ssh or smb')
+source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz")
+b2sums=('86615fb3e33353883821ffa0cbeabf6dba878c3199cc9b34f48a2157ffd156efc92cc54b8ebd98ca5be4d801679406886b9982a0bd2badbe77c6ba90726ea6dc')
 backup=('etc/circadian.conf')
 
 prepare() {
-    cd "$pkgname-$pkgver"
+    cd "${pkgname}-${pkgver}"
     export RUSTUP_TOOLCHAIN=stable
     export CARGO_TARGET_DIR=target
 
-    # Arch does not enable the `-f` option for the `w` command per default
-    patch --forward --strip=1 --input="${srcdir}/w_arg.patch"
-
-    # The cargo.lock file is not consistent and needs to be updated.
-    cargo generate-lockfile
-    cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+    cargo fetch --locked --target "${CARCH}-unknown-linux-gnu"
 }
 
 build() {
-    cd "$pkgname-$pkgver"
+    cd "${pkgname}-${pkgver}"
     export RUSTUP_TOOLCHAIN=stable
     export CARGO_TARGET_DIR=target
 
@@ -45,18 +37,18 @@ build() {
 }
 
 check() {
-    cd "$pkgname-$pkgver"
+    cd "${pkgname}-${pkgver}"
     export RUSTUP_TOOLCHAIN=stable
 
     cargo test --frozen --all-features
 }
 
 package() {
-    cd "$pkgname-$pkgver"
+    cd "${pkgname}-${pkgver}"
 
-    install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"
-    install -Dm0644 -T "resources/circadian.conf.in" "$pkgdir/etc/circadian.conf" 
-    install -Dm0644 -t "$pkgdir/usr/lib/systemd/system/" "resources/circadian.service"
-    install -Dm0644 -t "$pkgdir/usr/share/doc/$pkgname/" "README.md"
-    install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" "LICENSE"
+    install -Dm0755 -t "${pkgdir}/usr/bin/" "target/release/${pkgname}"
+    install -Dm0644 -T "resources/circadian.conf.in" "${pkgdir}/etc/circadian.conf" 
+    install -Dm0644 -t "${pkgdir}/usr/lib/systemd/system/" "resources/circadian.service"
+    install -Dm0644 -t "${pkgdir}/usr/share/doc/${pkgname}/" "README.md"
+    install -Dm0644 -t "${pkgdir}/usr/share/licenses/${pkgname}/" "LICENSE"
 }
diff --git a/w_arg.patch b/w_arg.patch
deleted file mode 100644
index eee86e63a9d0..000000000000
--- a/w_arg.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/src/main.rs b/src/main.rs
-index 774fb5d..0e23f42 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -300,7 +300,7 @@ fn parse_w_time(time_str: &str) -> Result<u32, CircadianError> {
- fn idle_w() -> IdleResult {
-     let w_stdout = Stdio::piped();
-     let mut w_output = Command::new("w")
--        .arg("-hus")
-+        .arg("-husf")
-         .stdout(w_stdout).spawn()?;
-     let _ = w_output.wait()?;
-     let w_stdout = w_output.stdout
-@@ -334,7 +334,7 @@ fn idle_fn(cmd: &str, args: Vec<&str>) -> IdleResult {
-         };
-         let display = format!(":{}", device.chars().rev().next().unwrap_or('0'));
-         let mut output = Command::new("w")
--            .arg("-hus")
-+            .arg("-husf")
-             .stdout(Stdio::piped()).spawn()?;
-         let _ = output.wait()?;
-         let w_stdout = output.stdout