From 07316c65eb5302a1d5385301876be7971e26fd1f Mon Sep 17 00:00:00 2001
From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Thu, 12 Feb 2009 16:17:00 -0500
Subject: fix reference to MONKEYSPHER_USER in ma/setup
---
src/monkeysphere-host | 3 +++
src/share/ma/setup | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
(limited to 'src')
diff --git a/src/monkeysphere-host b/src/monkeysphere-host
index 4aab995..f79c2bb 100755
--- a/src/monkeysphere-host
+++ b/src/monkeysphere-host
@@ -123,6 +123,9 @@ create_gpg_pub_file() {
# load the host fingerprint into the fingerprint variable, using the
# export gpg pub key file
+# FIXME: this seems much less than ideal, with all this temp keyring
+# stuff. is there a way we can do this without having to create temp
+# files?
load_fingerprint() {
if [ -f "$HOST_KEY_PUB_GPG" ] ; then
HOST_FINGERPRINT=$( \
diff --git a/src/share/ma/setup b/src/share/ma/setup
index 894db84..0cd92e0 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -40,10 +40,10 @@ primary-keyring ${GNUPGHOME_SPHERE}/pubring.gpg
list-options show-uid-validity
EOF
- # make sure the monkeysphere user owns everything in th sphere
+ # make sure the monkeysphere user owns everything in the sphere
# gnupghome
- chown -R "$MONKEYPSHER_USER" "${GNUPGHOME_SPHERE}"
- chgrp -R "$MONKEYPSHER_USER" "${GNUPGHOME_SPHERE}"
+ chown -R "$MONKEYPSHERE_USER" "${GNUPGHOME_SPHERE}"
+ chgrp -R "$MONKEYPSHERE_USER" "${GNUPGHOME_SPHERE}"
# get fingerprint of core key. this should be empty on unconfigured systems.
local CORE_FPR=$(gpg_core --with-colons --fixed-list-mode --fingerprint --list-secret-key | grep ^fpr: | cut -f10 -d: )
--
cgit v1.2.3