From 62374dd1c16a2719202955ad3fe878be5cc14dba Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Wed, 18 Feb 2009 20:56:14 -0500
Subject: new msmktempdir function, to simplify making temporary directories. 
 remove MHTMPDIR, since it's not needed.

---
 src/share/mh/add_revoker | 2 +-
 src/share/mh/import_key  | 1 -
 src/share/mh/publish_key | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/share/mh')

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
-- 
cgit v1.2.3