Fixes

2 files changed, 5 insertions, 6 deletions

diff --git a/authorized_keys.sig b/authorized_keys.sig
index 118c2c4..514fb7d 100644
--- a/authorized_keys.sig
+++ b/authorized_keys.sig
diff --git a/refresh_keys.sh b/refresh_keys.sh
index a9dfd76..41dc5b4 100755
--- a/refresh_keys.sh
+++ b/refresh_keys.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -xeo pipefail
 
 function main() {
     cd /tmp
@@ -9,16 +9,15 @@ function main() {
     cd keys
     echo "+ Cloned keys"
 
-    echo "DC4323D1738F27358793D6E87BB52F7036FA7C18:6:" | gpg --quiet --import-ownertrust && gpg --update-trustdb --quiet
+    echo "DC4323D1738F27358793D6E87BB52F7036FA7C18:6:" | gpg --quiet --import-ownertrust && gpg --update-trustdb --quiet || return 1
     echo "+ Trusting key"
 
-    gpg --status-fd 1 --verify authorized_keys.sig 2>/dev/null | grep -q VALIDSIG | grep -q "DC4323D1738F27358793D6E87BB52F7036FA7C18"
+    gpg --status-fd 1 --verify authorized_keys.sig 2>/dev/null | grep VALIDSIG | grep -q "DC4323D1738F27358793D6E87BB52F7036FA7C18" || return 1
     echo "+ Validated"
-    gpg --output authorized_keys --decrypt authorized_keys.sig 2>/dev/null
+    gpg --output authorized_keys --decrypt authorized_keys.sig 2>/dev/null || return 1
     echo "+ Decrypted"
 
-    sed -i '/emprespresso/d' ~/.ssh/authorized_keys 
-    grep -qv "emprespresso" ~/.ssh/authorized_keys # assert
+    sed -i '/emprespresso/d' ~/.ssh/authorized_keys && grep -qv "emprespresso" ~/.ssh/authorized_keys  || mkdir -p ~/.ssh && touch ~/.ssh/authorized_keys
     echo "+ Removed emprespresso keys"
     cat authorized_keys >> ~/.ssh/authorized_keys
     echo "+ Appended emprespresso keys"