renaming m-h update_gpg_pub_file to update_pgp_pub_file

diff --git a/src/share/mh/add_name b/src/share/mh/add_name
index b5922db412c2a8c2f1f701bed4a65d4290c8c7cb..0eeefb79404ab89c873a48fd10f5b2feda3f9034 100644 (file)
--- a/src/share/mh/add_name
+++ b/src/share/mh/add_name
@@ -54,7 +54,7 @@ if PEM2OPENPGP_USAGE_FLAGS=authenticate \
 
     gpg_host --check-trustdb
 
 
     gpg_host --check-trustdb
 

-    update_gpg_pub_file
+    update_pgp_pub_file

 
     show_key "$keyID"
 
 
     show_key "$keyID"
 

diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker
index 264c2556766d3b77f1ab604ea82b8b35b773c75c..41cf0905f78b5f33e3e41f1ba20ea94b20f737f0 100644 (file)
--- a/src/share/mh/add_revoker
+++ b/src/share/mh/add_revoker
@@ -120,7 +120,7 @@ save
 log debug "executing add revoker script..."
 if echo "$addrevokerCommand" | gpg_host_edit "0x${keyID}!" ; then
 
 log debug "executing add revoker script..."
 if echo "$addrevokerCommand" | gpg_host_edit "0x${keyID}!" ; then
 

-    update_gpg_pub_file
+    update_pgp_pub_file

 
     log info "Revoker added."
 else
 
     log info "Revoker added."
 else

diff --git a/src/share/mh/diagnostics b/src/share/mh/diagnostics
index b92d729989cc8738d2b72c9719b546fff8ad497d..8e83cc5ab0a62fb9dc249a7ebf452550671fb122 100644 (file)
--- a/src/share/mh/diagnostics
+++ b/src/share/mh/diagnostics
@@ -33,7 +33,7 @@ if ! [ -d "$SYSDATADIR" ] ; then
 fi
 
 if ! [ -f "$HOST_KEY_FILE" ] ; then
 fi
 
 if ! [ -f "$HOST_KEY_FILE" ] ; then

-    echo "No host key gpg pub file found!"
+    echo "No host key OpenPGP pub file found!"

     echo " - Recommendation: run 'monkeysphere-host import-key'"
     exit
 fi
     echo " - Recommendation: run 'monkeysphere-host import-key'"
     exit
 fi

diff --git a/src/share/mh/import_key b/src/share/mh/import_key
index fea3d277094479b95b2c570a70cd85aa59d44175..1b6f267b1e15c5c7c8e5a46775533661efc29cb3 100644 (file)
--- a/src/share/mh/import_key
+++ b/src/share/mh/import_key
@@ -50,8 +50,8 @@ else
        | gpg_host --import
 fi
 
        | gpg_host --import
 fi
 

-# export to gpg public key to file
-update_gpg_pub_file
+# export to OpenPGP public key to file
+update_pgp_pub_file

 
 log info "host key imported:"
 
 
 log info "host key imported:"
 

diff --git a/src/share/mh/revoke_name b/src/share/mh/revoke_name
index d080704b75b9f7e3410bc732a19566548ab492bd..7788327ad879c960ec48cbc4778531bbc8c15057 100644 (file)
--- a/src/share/mh/revoke_name
+++ b/src/share/mh/revoke_name
@@ -58,7 +58,7 @@ if (cat "$GNUPGHOME_HOST/secring.gpg" && gpg_host --export "$keyID") \
 
     gpg_host --check-trustdb
 
 
     gpg_host --check-trustdb
 

-    update_gpg_pub_file
+    update_pgp_pub_file

 
     show_key "$keyID"
 
 
     show_key "$keyID"
 

diff --git a/src/share/mh/set_expire b/src/share/mh/set_expire
index 049c2c52611b20d38ce187fafa07cb1ce26683da..be3f6bb4b8cdc61ff8b28b046464b64ad3db640e 100644 (file)
--- a/src/share/mh/set_expire
+++ b/src/share/mh/set_expire
@@ -53,7 +53,7 @@ $extendBy
 save
 EOF
 
 save
 EOF
 

-update_gpg_pub_file
+update_pgp_pub_file

 
 log info <<EOF
 NOTE: Key expiration date adjusted, but not yet published.
 
 log info <<EOF
 NOTE: Key expiration date adjusted, but not yet published.