X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fma%2Fadd_certifier;h=bd3819006ef27b72a6e4b74417877ef176cc728c;hb=7dbd6806e538ff8732dd87fcf20bfd8271464552;hp=a48db6481909a070d7e73c9defc9bbe25538c63b;hpb=cd4c36070c85283086ed914d8fd6ac77884173bb;p=monkeysphere.git

diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index a48db64..bd38190 100644
--- 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
@@ -120,14 +120,24 @@ else
     # 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)
+	| grep '^fpr:' | cut -d: -f10)
+
+    # test that there is only a single fingerprint
+    if (( $(echo "$fingerprint" | wc -l) != 1 )) ; then
+	cat <<EOF
+More than one fingerprint found:
+$fingerprint
+Please use a more specific key ID.
+EOF
+	failure
+    fi
 
     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
@@ -143,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..."