try another keygen.sh fix

2 files changed, 7 insertions, 1 deletions

diff --git a/src/keygen.sh b/src/keygen.sh
index 70b896f..1259b64 100755
--- a/src/keygen.sh
+++ b/src/keygen.sh
@@ -86,7 +86,6 @@ new_child()
     do
         gpg2 --import --homedir "$d" < "$d/pubring.gpg"
         gpg2 --import --homedir "$d" < "$d/secring.gpg"
-        # cat "$d/pubring.gpg" "$d/secring.gpg" | gpg2 --import --homedir "$d"
         gpg2 --check-trustdb --homedir "$d"
     done
 
@@ -100,6 +99,11 @@ child_dir=$1
 set -e
 
 [ "$(id -u)" = 0 ]
+
+# Hate.  So much hate.
+# TODO: document the fail
+[ -d /run/user/0 ] || mkdir -p /run/user/0
+
 [ "$child_dir" ]
 [ ! -d "$child_dir" ]
 
diff --git a/test-keygen.sh b/test-keygen.sh
index 9f31e7b..0185e14 100755
--- a/test-keygen.sh
+++ b/test-keygen.sh
@@ -3,4 +3,6 @@ out=TEST_CHILD.$(date +%s)
 log=${out}.log
 [ ! -e "$out" ] || exit
 exec >"$log" 2>&1
+apt-cache policy gnupg
+ps -C gpg-agent
 sudo ${PARENT_ROOT:+"PARENT_ROOT=$PARENT_ROOT"} bash -c 'time bash -x ./src/keygen.sh "$1"' bash "$out"