[tor-commits] [ooni-probe/master] Issues with GPG homedir

[art at torproject.org]

commit b503292ccfedadd3b6b63bf3121edf99cb708469
Author: anadahz <anadahz>
Date:   Mon Dec 30 03:50:19 2013 +0100

    Issues with GPG homedir
    
    gpg: fatal: can't create directory `/home/root/.gnupg': No such file or
    directory
---
 setup-dependencies.sh |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/setup-dependencies.sh b/setup-dependencies.sh
index 87a71aa..f2dac3c 100755
--- a/setup-dependencies.sh
+++ b/setup-dependencies.sh
@@ -426,8 +426,8 @@ install_pip_securely() {
 
   echo "[+] Verifying PGP signature of pip"
   echo "${PIP_PUB_KEY}" > ${PIP_KEY_FILE}
-  DO "gpg --no-default-keyring --keyring $TMP_KEYRING --import $PIP_KEY_FILE" "0"
-  DO "gpg --no-default-keyring --keyring $TMP_KEYRING --verify $PKG_VERIFY" "0"
+  DO "gpg --homedir /root --no-default-keyring --keyring $TMP_KEYRING --import $PIP_KEY_FILE" "0"
+  DO "gpg --homedir /root --no-default-keyring --keyring $TMP_KEYRING --verify $PKG_VERIFY" "0"
 
   DO "tar xzf ${BUILD_DIR}/${PIP_PKG}" "0"
   DO "cd pip-*" "0"
@@ -462,8 +462,8 @@ case $DISTRO_VERSION in
   DO "chmod 700 ${BUILD_DIR}" "0"
 
   # Import the Tor public key
-  DO "gpg --no-default-keyring --keyring $TMP_KEYRING --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x886DDD89" "0"
-  gpg --no-default-keyring --keyring $TMP_KEYRING --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -
+  DO "gpg --homedir /root --no-default-keyring --keyring $TMP_KEYRING --keyserver x-hkp://pool.sks-keyservers.net --recv-keys 0x886DDD89" "0"
+  gpg --homedir /root --no-default-keyring --keyring $TMP_KEYRING --export A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89 | apt-key add -
     
   HAVE_TOR_REPO="`grep deb.torproject.org/torproject.org /etc/apt/sources.list /etc/apt/sources.list.d/* 2>&1|grep torproject|head -n 1`";
   if [ -z "$HAVE_TOR_REPO" ]; then