Update

1 files changed, 16 insertions, 6 deletions

diff --git a/refresh_keys.sh b/refresh_keys.sh
index 5beea89..a9dfd76 100755
--- a/refresh_keys.sh
+++ b/refresh_keys.sh
@@ -3,19 +3,29 @@
 set -e
 
 function main() {
-    echo "DC4323D1738F27358793D6E87BB52F7036FA7C18:6:" | gpg --import-ownertrust && gpg --update-trustdb
-
     cd /tmp
     rm -rf /tmp/keys || true
-    git clone https://code.liz.coffee/keys
+    git clone --quiet https://code.liz.coffee/keys.git/
     cd keys
-    gpg --status-fd 1 --verify authorized_keys.sig | grep -q "VALIDSIG DC4323D1738F27358793D6E87BB52F7036FA7C18" || exit 1
-    gpg --decrypt authorized_keys.sig
+    echo "+ Cloned keys"
+
+    echo "DC4323D1738F27358793D6E87BB52F7036FA7C18:6:" | gpg --quiet --import-ownertrust && gpg --update-trustdb --quiet
+    echo "+ Trusting key"
 
-    sed '/emprespresso/d' ~/.ssh/authorized_keys 
+    gpg --status-fd 1 --verify authorized_keys.sig 2>/dev/null | grep -q VALIDSIG | grep -q "DC4323D1738F27358793D6E87BB52F7036FA7C18"
+    echo "+ Validated"
+    gpg --output authorized_keys --decrypt authorized_keys.sig 2>/dev/null
+    echo "+ Decrypted"
+
+    sed -i '/emprespresso/d' ~/.ssh/authorized_keys 
+    grep -qv "emprespresso" ~/.ssh/authorized_keys # assert
+    echo "+ Removed emprespresso keys"
     cat authorized_keys >> ~/.ssh/authorized_keys
+    echo "+ Appended emprespresso keys"
+
     cd /tmp
     rm -rf keys
+    echo "+ Done"
 }
 
 function handle_error() {