X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fmonkeysphere-host;h=507b47f8f73eabfd6a62e7d9feaf4d53d12bca84;hb=b8c187a0803442fbf4d9c432cac90925791171aa;hp=9e4a8c4e4723ac891bc2e5cbbbe5b808b5e29f1c;hpb=620e3d1021993760ef7572ed9e5d6bf9f033b91e;p=monkeysphere.git

diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 9e4a8c4..507b47f 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -21,7 +21,8 @@ PGRM=$(basename $0)
 
 SYSSHAREDIR=${MONKEYSPHERE_SYSSHAREDIR:-"/usr/share/monkeysphere"}
 export SYSSHAREDIR
-. "${SYSSHAREDIR}/common" || exit 1
+. "${SYSSHAREDIR}/defaultenv"
+. "${SYSSHAREDIR}/common"
 
 SYSDATADIR=${MONKEYSPHERE_SYSDATADIR:-"/var/lib/monkeysphere"}
 export SYSDATADIR
@@ -57,7 +58,7 @@ subcommands:
  set-expire (e) [EXPIRE]             set host key expiration
  add-hostname (n+) NAME[:PORT]       add hostname user ID to host key
  revoke-hostname (n-) NAME[:PORT]    revoke hostname user ID
- add-revoker (r+) [KEYID|FILE]        add a revoker to the host key
+ add-revoker (r+) KEYID|FILE         add a revoker to the host key
  revoke-key                          generate and/or publish revocation
                                      certificate for host key
 
@@ -102,7 +103,7 @@ update_gpg_pub_file() {
 load_fingerprint() {
     if [ -f "$HOST_KEY_FILE" ] ; then
 	HOST_FINGERPRINT=$( \
-	    (FUBAR=$(mktemp -d) && export GNUPGHOME="$FUBAR" \
+	    (FUBAR=$(msmktempdir) && export GNUPGHOME="$FUBAR" \
 	    && gpg --quiet --import \
 	    && gpg --quiet --list-keys --with-colons --with-fingerprint \
 	    && rm -rf "$FUBAR") <"$HOST_KEY_FILE" \
@@ -229,6 +230,7 @@ PROMPT=${MONKEYSPHERE_PROMPT:=$PROMPT}
 
 # other variables
 GNUPGHOME_HOST=${MONKEYSPHERE_GNUPGHOME_HOST:="${MHDATADIR}"}
+LOG_PREFIX=${MONKEYSPHERE_LOG_PREFIX:='ms: '}
 
 # export variables needed in su invocation
 export DATE
@@ -240,6 +242,7 @@ export PROMPT
 export GNUPGHOME_HOST
 export GNUPGHOME
 export HOST_FINGERPRINT
+export LOG_PREFIX
 
 # get subcommand
 COMMAND="$1"