fix need for only single argument to gpg_sphere

[monkeysphere.git] / src / monkeysphere-authentication

diff --git a/src/monkeysphere-authentication b/src/monkeysphere-authentication
index c924034e8cfddfa475e399d289b7047fd74d648e..94642b6a4680f46e497448472999b728d1311fdf 100755 (executable)
--- a/src/monkeysphere-authentication
+++ b/src/monkeysphere-authentication
@@ -77,8 +77,6 @@ gpg_core() {
 }
 
 # function to interact with the gpg sphere keyring
-# FIXME: this function requires only a single argument because of
-# problems with quote expansion.  this needs to be fixed/improved.
 gpg_sphere() {
     GNUPGHOME="$GNUPGHOME_SPHERE"
     export GNUPGHOME
@@ -99,7 +97,7 @@ core_fingerprint() {
 gpg_core_sphere_sig_transfer() {
     log debug "exporting core local sigs to sphere..."
     gpg_core --export-options export-local-sigs --export | \
-       gpg_sphere "--import-options import-local-sigs --import" 2>&1 | log debug
+       gpg_sphere --import-options import-local-sigs --import 2>&1 | log debug
 }
 
 ########################################################################
@@ -172,7 +170,7 @@ case $COMMAND in
     'refresh-keys'|'refresh'|'r')
        source "${MASHAREDIR}/setup"
        setup
-       gpg_sphere "--keyserver $KEYSERVER --refresh-keys"
+       gpg_sphere --keyserver "$KEYSERVER" --refresh-keys
        ;;
 
     'keys-for-user')