From be821148a957a4ae6ebe65f81663f7d0197d5893 Mon Sep 17 00:00:00 2001
From: Tom Mast <tom.mast@vodori.com>
Date: Thu, 25 Sep 2014 15:31:05 -0500
Subject: [PATCH] blackbox: Removed homedir and updated README to add step to
 import pubring

---
 README.md               | 1 +
 bin/_blackbox_common.sh | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 524acc0..c526ab5 100644
--- a/README.md
+++ b/README.md
@@ -496,6 +496,7 @@ git commit -m"Adding key for KEYNAME" pubring.gpg trustdb.gpg blackbox-admins.tx
 Regenerate all encrypted files with the new key:
 
 ```
+gpg --import keyrings/live/pubring.gpg
 blackbox_update_all_files
 git status
 git commit -m"updated encryption" -a
diff --git a/bin/_blackbox_common.sh b/bin/_blackbox_common.sh
index 824065a..af77c88 100755
--- a/bin/_blackbox_common.sh
+++ b/bin/_blackbox_common.sh
@@ -144,7 +144,7 @@ function encrypt_file() {
   encrypted="$2"
 
   echo "========== Encrypting: $unencrypted"
-  gpg --yes --trust-model=always --homedir keyrings/live/ --encrypt -o "$encrypted"  $(awk '{ print "-r" $1 }' < "$BB_ADMINS") "$unencrypted"
+  gpg --yes --trust-model=always --encrypt -o "$encrypted"  $(awk '{ print "-r" $1 }' < "$BB_ADMINS") "$unencrypted"
   echo '========== Encrypting: DONE'
 }