From accdc1bf548a4c0e2e29301084d23f2341f29ef0 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@devalot.com>
Date: Thu, 3 Jan 2019 14:32:11 -0700
Subject: [PATCH] When decrypting secrets, pass unencrypted files straight
 through

---
 bin/secrets.sh | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/bin/secrets.sh b/bin/secrets.sh
index 6f08357..48becf3 100755
--- a/bin/secrets.sh
+++ b/bin/secrets.sh
@@ -114,21 +114,29 @@ decrypt_file() {
   mkdir -p "$(dirname "$dest_file")"
   echo "==> $dest_file"
 
-  if [ -n "$symmetric_key" ]; then
-    gpg --batch \
-        --quiet \
-        --decrypt \
-        --passphrase-fd 0 \
-        --pinentry-mode loopback \
-        "$file" > "$dest_file" \
-        <<<"$symmetric_key"
-  else
-    gpg --use-agent \
-        --quiet \
-        --decrypt \
-        --quiet \
-        "$file" > "$dest_file"
-  fi
+  case "$file" in
+    *.gpg) # File is encrypted, use gpg:
+      if [ -n "$symmetric_key" ]; then
+        gpg --batch \
+            --quiet \
+            --decrypt \
+            --passphrase-fd 0 \
+            --pinentry-mode loopback \
+            "$file" > "$dest_file" \
+            <<<"$symmetric_key"
+      else
+        gpg --use-agent \
+            --quiet \
+            --decrypt \
+            --quiet \
+            "$file" > "$dest_file"
+      fi
+      ;;
+
+    *) # Just copy the file as-is:
+      cp "$file" "$dest_file"
+      ;;
+  esac
 }
 
 ################################################################################