canonicalize prompting to prompt if MONKEYSPHERE_PROMPT != 'false'

[monkeysphere.git] / src / share / mh / set_expire

diff --git a/src/share/mh/set_expire b/src/share/mh/set_expire
index 049c2c52611b20d38ce187fafa07cb1ce26683da..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
@@ -53,7 +53,7 @@ $extendBy
 save
 EOF
 
-update_gpg_pub_file
+update_pgp_pub_file
 
 log info <<EOF
 NOTE: Key expiration date adjusted, but not yet published.