keygen.sh

1 files changed, 21 insertions, 14 deletions

diff --git a/src/keygen.sh b/src/keygen.sh
index 5b48512..90237af 100755
--- a/src/keygen.sh
+++ b/src/keygen.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-
 gpg_set_ultimate_trust()
 {
           local keygrip
@@ -28,8 +27,8 @@ init()
     fi
 
     kiki init   ${root:+--chroot "$root"}
-    add encrypt ${root:+"$root/root/.gnupg"}
-    add sign    ${root:+"$root/root/.gnupg"}
+    # add encrypt ${root:+"$root/root/.gnupg"}
+    # add sign    ${root:+"$root/root/.gnupg"}
 
     (
         [ "$root" ] && export GNUPGHOME="$root/root/.gnupg/"
@@ -54,8 +53,8 @@ sync()
 doublecheck()
 {
     local o='--ignore-time-conflict'
-    gpg2 $o --clearsign </dev/null | gpg2 $o --homedir "$1"/root/.gnupg --verify
-    gpg2 $o --clearsign --homedir "$1"/root/.gnupg </dev/null | gpg2 $o --verify
+    gpg2 $o --clearsign --homedir "$2"/root/.gnupg </dev/null | gpg2 $o --homedir "$1"/root/.gnupg --verify
+    gpg2 $o --clearsign --homedir "$1"/root/.gnupg </dev/null | gpg2 $o --homedir "$2"/root/.gnupg --verify
 }
 
 silent()
@@ -77,18 +76,19 @@ noisy()
 
 new_child()
 {
-    local root="$1"
-    init "$root"
+    local child_root="$1" parent_root="$2"
+    init "$child_root"
 
-    sync "$root" ''
-    sync '' "$root"
+    sync "$child_root" "$parent_root"
+    sync "$parent_root" "$child_root"
 
-    gpg2 --check-trustdb
-    gpg2 --check-trustdb --homedir "$root"/root/.gnupg
+    gpg2 --check-trustdb --homedir "$parent_root"/root/.gnupg
+    gpg2 --check-trustdb --homedir "$child_root"/root/.gnupg
 
-    doublecheck "$root"
+    doublecheck "$child_root" "$parent_root"
 }
 
+ls -lL "$(which kiki)"
 
 child_dir=$1
 
@@ -102,9 +102,16 @@ mkdir "$child_dir"
 trap -- 'umount "$child_dir"; rmdir "$child_dir"' EXIT
 mount -t tmpfs -o mode=0700 tmpfs "$child_dir"
 
+if [ "$PARENT_ROOT" ]
+then
+    parent_root=$PARENT_ROOT
+else
+    parent_root=
+fi
+
 silent
-init
-new_child "$child_dir"
+init "$parent_root"
+new_child "$child_dir" "$parent_root"
 noisy
 
 trap EXIT