add ability to bypass prompting with a MONKEYSPHERE_PROMPT variable,

[monkeysphere.git] / src / share / ma / add_certifier

diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index 2e53455b144dc2f77e002b94038d33b8b2fca7d3..54ea67334fdb94fb749a6a106f41fbd454b9a19c 100644 (file)
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -36,8 +36,6 @@ local fingerprint
 local ltsignCommand
 local trustval
 
-PROMPT=true
-
 # get options
 while true ; do
     case "$1" in
@@ -53,10 +51,6 @@ while true ; do
            depth="$2"
            shift 2
            ;;
-       -y)
-           PROMPT=false
-           shift 1
-           ;;
        *)
            if [ "$(echo "$1" | cut -c 1)" = '-' ] ; then
                failure "Unknown option '$1'.
@@ -102,7 +96,7 @@ fi
 
 export keyID
 
-# get the full fingerprint of a key ID
+# get the full fingerprint of new certifier key
 log debug "getting fingerprint of certifier key..."
 fingerprint=$(gpg_sphere "--list-key --with-colons --with-fingerprint 0x${keyID}!" \
     | grep '^fpr:' | grep "$keyID" | cut -d: -f10)
@@ -114,7 +108,7 @@ fi
 log info "key found:"
 gpg_sphere "--fingerprint 0x${fingerprint}!"
 
-if [ "$PROMPT" = true ] ; then
+if [ "$PROMPT" = "true" ] ; then
     echo "Are you sure you want to add the above key as a"
     read -p "certifier of users on this system? (y/N) " OK; OK=${OK:-N}
     if [ "${OK/y/Y}" != 'Y' ] ; then
@@ -126,6 +120,7 @@ fi
 
 # export the key to the core keyring so that the core can sign the
 # new certifier key
+log debug "exporting retrieved certifier key to core keyring..."
 gpg_sphere "--export 0x${fingerprint}!" | gpg_core --import
 
 case "$trust" in
@@ -154,6 +149,7 @@ EOF
     )
 
 # core ltsigns the newly imported certifier key
+log debug "executing core ltsign script..."
 if echo "$ltsignCommand" | \
     gpg_core --quiet --command-fd 0 --edit-key "0x${fingerprint}!" ; then
 
@@ -161,6 +157,7 @@ if echo "$ltsignCommand" | \
     gpg_core_sphere_sig_transfer
 
     # update the sphere trustdb
+    log debug "updating sphere trustdb..."
     gpg_sphere "--check-trustdb"
 
     log info "Identity certifier added."