small formatting tweaks to add_certifier function

diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index 60a4f9d408d07b528020007a71a81a5f77d36944..e9731cc8da17740da7d73d4287286ccb2c5d73b3 100644 (file)
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -27,19 +27,15 @@
 
 add_certifier() {
 
-local domain
-local trust
-local depth
+local domain=
+local trust=full
+local depth=1
 local keyID
+local importinfo
 local fingerprint
 local ltsignCommand
 local trustval
 
-# set default values for trust depth and domain
-domain=
-trust=full
-depth=1
-
 # get options
 while true ; do
     case "$1" in
@@ -90,7 +86,7 @@ if [ -f "$keyID" ] ; then
 
     keyID=$(echo "$importinfo" | grep '^gpg: key ' | cut -f2 -d: | cut -f3 -d\ )
     if [ -z "$keyID" ] || [ $(echo "$keyID" | wc -l) -ne 1 ] ; then
-       failure "Expected there to be a single gpg key in the file."
+       failure "There was not exactly one gpg key in the file."
     fi
 else
     # get the key from the key server
@@ -132,8 +128,7 @@ case "$trust" in
        ;;
 esac
 
-# this is the gpg "script" that gpg --edit-key will execute for the
-# core to sign certifier.
+# edit-key script to ltsign key
 # NOTE: *all* user IDs will be ltsigned
 ltsignCommand=$(cat <<EOF
 ltsign