canonicalize prompting to prompt if MONKEYSPHERE_PROMPT != 'false'

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

diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index 6f85ecfb904321906409af414b6c7503ce611e1c..bd3819006ef27b72a6e4b74417877ef176cc728c 100644 (file)
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -108,7 +108,7 @@ if [ -f "$keyID" -o "$keyID" = '-' ] ; then
     fi
 
     # load the key
-    gpg_sphere "--import" <"$keyID" \
+    gpg_sphere "--import" <"$keyID" 2>/dev/null \
        || failure "could not read key from '$keyID'"
 
 # else, get the key from the keyserver
@@ -135,9 +135,9 @@ EOF
     log info "key found:"
     gpg_sphere "--fingerprint 0x${fingerprint}!"
 
-    if [ "$PROMPT" = "true" ] ; then
-       echo "Are you sure you want to add the above key as a certifier"
-       read -p "of users on this system? (Y/n) " OK; OK=${OK:-Y}
+    if [ "$PROMPT" != "false" ] ; then
+       printf "Are you sure you want to add the above key as a certifier\nof users on this system? (Y/n) " >&2
+       read OK; OK=${OK:-Y}
        if [ "${OK/y/Y}" != 'Y' ] ; then
            failure "Identity certifier not added."
        fi
@@ -153,16 +153,14 @@ gpg_sphere "--export 0x${fingerprint}!" | gpg_core --import
 
 # edit-key script to ltsign key
 # NOTE: *all* user IDs will be ltsigned
-ltsignCommand=$(cat <<EOF
-ltsign
+ltsignCommand="ltsign
 y
 $trustval
 $depth
 $domain
 y
-save
-EOF
-    )
+save"
+# end script
 
 # core ltsigns the newly imported certifier key
 log debug "executing core ltsign script..."