fix reference to MONKEYSPHER_USER in ma/setup

[monkeysphere.git] / src / share / ma / setup

diff --git a/src/share/ma/setup b/src/share/ma/setup
index 034f0471bbc980f5985e676ee4cbbcdd4dbd84e5..0cd92e0d8bc87134df43ec1d84dc5247805eebe2 100644 (file)
--- 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: )
@@ -85,7 +85,10 @@ EOF
     # our preferences are reasonable (i.e. 3 marginal OR 1 fully
     # trusted certifications are sufficient to grant full validity.
     log debug "check trust level of core key..."
-    if [ "1:3:1" != $(gpg_sphere --with-colons --fixed-list-mode --list-keys | head -n1 | grep ^tru: cut -f3,6,7 -d:) ] ; then
+    local TRUST_LEVEL=$(gpg_sphere --with-colons --fixed-list-mode --list-keys \
+       | head -n1 | grep "^tru:" | cut -d: -f3,6,7)
+    log debug "trust level: $TRUST_LEVEL"
+    if [ "$TRUST_LEVEL" != '1:3:1' ] ; then
        failure "monkeysphere-authentication does not have the expected trust model settings."
     fi
 }