canonicalize prompting to prompt if MONKEYSPHERE_PROMPT != 'false'

diff --git a/src/monkeysphere b/src/monkeysphere
index e84ee63c24254041bd05becd0d0d4b2ce4712099..1dee3bab81411bf6c03441a0dfa6fc3cf1c089ae 100755 (executable)
--- a/src/monkeysphere
+++ b/src/monkeysphere
@@ -146,7 +146,7 @@ check_gpg_authentication_subkey() {
        # if authentication key is valid, prompt to continue
        if [ "$validity" = 'u' ] ; then
            echo "A valid authentication key already exists for primary key '$keyID'." 1>&2
-           if [ "$PROMPT" = "true" ] ; then
+           if [ "$PROMPT" != "false" ] ; then
                printf "Are you sure you would like to generate another one? (y/N) " >&2
                read OK; OK=${OK:N}
                if [ "${OK/y/Y}" != 'Y' ] ; then

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 4f536e2365a784addde542c4407d073c3c9d7a06..fab3ef70e96ad5d22a23e2abcd4d69dc709d82fa 100755 (executable)
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -163,7 +163,7 @@ prompt_userid_exists() {
 
     if gpgOut=$(gpg_host_list_keys "=${userID}" 2>/dev/null) ; then
        fingerprint=$(echo "$gpgOut" | grep '^fpr:' | cut -d: -f10)
-       if [ "$PROMPT" = "true" ] ; then
+       if [ "$PROMPT" != "false" ] ; then
            printf "Service name '%s' is already being used by key '%s'.\nAre you sure you want to use it again? (y/N) " "$fingerprint" "$userID" >&2
            read OK; OK=${OK:=N}
            if [ "${OK/y/Y}" != 'Y' ] ; then

diff --git a/src/share/common b/src/share/common
index 914fffa5e9536d69365deab301aba75899812b71..97f001a1075786066911f7e11b23ac00688f6ee6 100644 (file)
--- a/src/share/common
+++ b/src/share/common
@@ -281,7 +281,7 @@ get_gpg_expiration() {
 
     keyExpire="$1"
 
-    if [ -z "$keyExpire" -a "$PROMPT" = 'true' ]; then
+    if [ -z "$keyExpire" -a "$PROMPT" != 'false' ]; then
        cat >&2 <<EOF
 Please specify how long the key should be valid.
          0 = key does not expire

diff --git a/src/share/ma/add_certifier b/src/share/ma/add_certifier
index 16019976c4a084e376bbd0caa35aacecb3a9e435..bd3819006ef27b72a6e4b74417877ef176cc728c 100644 (file)
--- a/src/share/ma/add_certifier
+++ b/src/share/ma/add_certifier
@@ -135,7 +135,7 @@ EOF
     log info "key found:"
     gpg_sphere "--fingerprint 0x${fingerprint}!"
 
-    if [ "$PROMPT" = "true" ] ; then
+    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

diff --git a/src/share/ma/remove_certifier b/src/share/ma/remove_certifier
index 79f1cdac8b7ff866f9ab739467977039b2266859..51c7ee7a2ebf9edfb68acc1c74f7734759858bae 100644 (file)
--- a/src/share/ma/remove_certifier
+++ b/src/share/ma/remove_certifier
@@ -26,7 +26,7 @@ fi
 # FIXME: should we be doing a fancier list_certifier output here?
 gpg_core --list-key --fingerprint "0x${keyID}!" || failure
 
-if [ "$PROMPT" = "true" ] ; then
+if [ "$PROMPT" != "false" ] ; then
     printf "Really remove the above listed identity certifier? (Y/n) " >&2 
     read OK; OK=${OK:-Y}
     if [ "${OK/y/Y}" != 'Y' ] ; then

diff --git a/src/share/mh/add_name b/src/share/mh/add_name
index 754ced45f47774c9e18414a4467fc6e8c7ebf307..39ebaceeb0dfe684b8713b547cc08af31f61efa5 100644 (file)
--- a/src/share/mh/add_name
+++ b/src/share/mh/add_name
@@ -39,7 +39,7 @@ prompt_userid_exists "$serviceName"
 
 check_service_name "$serviceName"
 
-if [ "$PROMPT" = "true" ] ; then
+if [ "$PROMPT" != "false" ] ; then
     printf "The following service name will be added to key '$keyID':\n  %s\nAre you sure you would like to add this service name? (Y/n) " "$serviceName" >&2
     read OK; OK=${OK:=Y}
     if [ "${OK/y/Y}" != 'Y' ] ; then

diff --git a/src/share/mh/publish_key b/src/share/mh/publish_key
index 553cd7257ccdd4969f7bb6ced3dcfb75841f5003..f1c17234f819477b74e272bb1c37fac493b4e6b7 100644 (file)
--- a/src/share/mh/publish_key
+++ b/src/share/mh/publish_key
@@ -18,7 +18,7 @@ publish_key() {
 local keyID="$1"
 local GNUPGHOME
 
-if [ "$PROMPT" = "true" ] ; then
+if [ "$PROMPT" != "false" ] ; then
     printf "Really publish key '$keyID' to $KEYSERVER? (Y/n) " >&2
     read OK; OK=${OK:=Y}
     if [ "${OK/y/Y}" != 'Y' ] ; then

diff --git a/src/share/mh/revoke_name b/src/share/mh/revoke_name
index 7788327ad879c960ec48cbc4778531bbc8c15057..532cb3001898ba4b9fd94b42088c81ad03207bf8 100644 (file)
--- a/src/share/mh/revoke_name
+++ b/src/share/mh/revoke_name
@@ -35,7 +35,7 @@ keyID=$(check_key_input "$@")
 check_key_userid "$keyID" "$serviceName" || \
     failure "No non-revoked service name found matching '$serviceName'."
 
-if [ "$PROMPT" = "true" ] ; then
+if [ "$PROMPT" != "false" ] ; then
     printf "The following service name on key '$keyID' will be revoked:\n  %s\nAre you sure you would like to revoke this service name? (Y/n) " "$serviceName" >&2
     read OK; OK=${OK:=Y}
     if [ "${OK/y/Y}" != 'Y' ] ; then

diff --git a/src/share/mh/set_expire b/src/share/mh/set_expire
index be3f6bb4b8cdc61ff8b28b046464b64ad3db640e..68a8dfd010754a76f251220eeb4da45729b55992 100644 (file)
--- a/src/share/mh/set_expire
+++ b/src/share/mh/set_expire
@@ -35,7 +35,7 @@ shift
 
 keyID=$(check_key_input "$@")
 
-if [ "$PROMPT" = "true" ] ; then
+if [ "$PROMPT" != "false" ] ; then
     printf "Are you sure you want to change the expiration on key '$keyID' by '%s'? (Y/n) " "$extendBy" >&2
     read OK; OK=${OK:-Y}
     if [ "${OK/y/Y}" != 'Y' ] ; then