From f86a76e2cf2b84c63adb258b1aecad10bb11bb49 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 4 Jan 2025 17:27:49 -0300
Subject: Fix: check: non-zero exit status when there's a warning

---
 lib/keyringer/actions/check | 5 +++++
 lib/keyringer/functions     | 2 ++
 2 files changed, 7 insertions(+)

(limited to 'lib')

diff --git a/lib/keyringer/actions/check b/lib/keyringer/actions/check
index 8722381..58adaf5 100755
--- a/lib/keyringer/actions/check
+++ b/lib/keyringer/actions/check
@@ -27,3 +27,8 @@ source "$LIB" maintenance $* || exit 1
 
 # This should be done here:
 # TODO: Check canaries' timestamps, warning by mail if configured by user preferences.
+
+# Since this is the check action, it should exit whenever there's a warning
+if [ "$KEYRINGER_HAS_EXPIRING_KEYS" == "1" ]; then
+  exit 1
+fi
diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 308d0ea..0a5ad57 100755
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -766,6 +766,8 @@ function keyringer_check_expiration {
 
       if [[ "$ahead" -gt "$expiry" ]] && [ "$BASENAME" == "check" ]; then
         echo "Warning: subkey from $recipient will expire soon, on `date --date="@$expiry"`"
+
+        KEYRINGER_HAS_EXPIRING_KEYS="1"
       fi
     fi
   done
-- 
cgit v1.2.3


From 7b4ee962c58b873df2013834cc1aac9b57bfce81 Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Sat, 4 Jan 2025 17:29:15 -0300
Subject: Fix: completion: remove shebang from the bash completion file (#9)

---
 lib/keyringer/completions/bash/keyringer | 1 -
 1 file changed, 1 deletion(-)

(limited to 'lib')

diff --git a/lib/keyringer/completions/bash/keyringer b/lib/keyringer/completions/bash/keyringer
index 10b852e..4aa4b75 100644
--- a/lib/keyringer/completions/bash/keyringer
+++ b/lib/keyringer/completions/bash/keyringer
@@ -1,4 +1,3 @@
-#!bash
 #
 # Keyringer bash completion
 #
-- 
cgit v1.2.3