summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xsrc/keygen.sh6
-rwxr-xr-xtest-keygen.sh2
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()
86 do 86 do
87 gpg2 --import --homedir "$d" < "$d/pubring.gpg" 87 gpg2 --import --homedir "$d" < "$d/pubring.gpg"
88 gpg2 --import --homedir "$d" < "$d/secring.gpg" 88 gpg2 --import --homedir "$d" < "$d/secring.gpg"
89 # cat "$d/pubring.gpg" "$d/secring.gpg" | gpg2 --import --homedir "$d"
90 gpg2 --check-trustdb --homedir "$d" 89 gpg2 --check-trustdb --homedir "$d"
91 done 90 done
92 91
@@ -100,6 +99,11 @@ child_dir=$1
100set -e 99set -e
101 100
102[ "$(id -u)" = 0 ] 101[ "$(id -u)" = 0 ]
102
103# Hate. So much hate.
104# TODO: document the fail
105[ -d /run/user/0 ] || mkdir -p /run/user/0
106
103[ "$child_dir" ] 107[ "$child_dir" ]
104[ ! -d "$child_dir" ] 108[ ! -d "$child_dir" ]
105 109
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)
3log=${out}.log 3log=${out}.log
4[ ! -e "$out" ] || exit 4[ ! -e "$out" ] || exit
5exec >"$log" 2>&1 5exec >"$log" 2>&1
6apt-cache policy gnupg
7ps -C gpg-agent
6sudo ${PARENT_ROOT:+"PARENT_ROOT=$PARENT_ROOT"} bash -c 'time bash -x ./src/keygen.sh "$1"' bash "$out" 8sudo ${PARENT_ROOT:+"PARENT_ROOT=$PARENT_ROOT"} bash -c 'time bash -x ./src/keygen.sh "$1"' bash "$out"