diff options
| author | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-18 20:56:14 -0500 |
|---|---|---|
| committer | Jameson Graef Rollins <jrollins@finestructure.net> | 2009-02-18 20:56:14 -0500 |
| commit | 62374dd1c16a2719202955ad3fe878be5cc14dba (patch) | |
| tree | b2d4480ad337ee204719b180613c58e21c7ca392 /src/share/mh | |
| parent | 88b19565bced6d9ec9b035d1f9fe51ce6567923b (diff) | |
new msmktempdir function, to simplify making temporary directories. remove MHTMPDIR, since it's not needed.
Diffstat (limited to 'src/share/mh')
| -rw-r--r-- | src/share/mh/add_revoker | 2 | ||||
| -rw-r--r-- | src/share/mh/import_key | 1 | ||||
| -rw-r--r-- | src/share/mh/publish_key | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/src/share/mh/add_revoker b/src/share/mh/add_revoker index dfce4e1..bdcb749 100644 --- a/src/share/mh/add_revoker +++ b/src/share/mh/add_revoker @@ -53,7 +53,7 @@ if [ -f "$keyID" ] ; then fi else # create a temporary directory for storing the downloaded key - TMPLOC=$(mktemp -d "${MHTMPDIR}"/tmp.XXXXXXXXXX) || failure "Could not create temporary directory!" + TMPLOC=$(msmktempdir) || failure "Could not create temporary directory!" # download the key from the keyserver as the monkeysphere user su_monkeysphere_user \ diff --git a/src/share/mh/import_key b/src/share/mh/import_key index 266bf05..cca40fa 100644 --- a/src/share/mh/import_key +++ b/src/share/mh/import_key @@ -39,7 +39,6 @@ userID="ssh://${hostName}" # create host home mkdir -p "${MHDATADIR}" -mkdir -p "${MHTMPDIR}" mkdir -p "${GNUPGHOME_HOST}" chmod 700 "${GNUPGHOME_HOST}" diff --git a/src/share/mh/publish_key b/src/share/mh/publish_key index b433ad7..37b8a72 100644 --- a/src/share/mh/publish_key +++ b/src/share/mh/publish_key @@ -27,7 +27,7 @@ else fi # create a temporary gnupg directory from which to publish the key -export GNUPGHOME=$(mktemp -d) +export GNUPGHOME=$(msmktempdir) # trap to remove tmp dir if break trap "rm -rf $GNUPGHOME" EXIT |