Merge remote branch 'greg/2459'

diff --git a/Changelog b/Changelog
index fdfc10b0b113154c2142ed725ef0d88819d42c8d..27a5328ad730aedfaa2e2610bf439503043ab17f 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -3,6 +3,8 @@ monkeysphere (0.32~pre) unstable; urgency=low
   [ Jameson Rollins ]
   * Fix specification of install paths in all scripts and man pages
     (closes MS #2491)
+  * Fix need for single argument to gpg_sphere (thanks Clint)
+    (closes MS #442)
 
   [ Micah Anderson ]
   * fix monkeysphere-host revoke-key, which never worked properly :(
@@ -15,8 +17,7 @@ monkeysphere (0.32~pre) unstable; urgency=low
     whitespace-prefixed lines immediately following that User ID. 
     (closes MS #440)
 
- -- Jameson Rollins <jrollins@finestructure.net>  Sun, 03 Oct 2010 00:23:08 -0400
-
+ -- Jameson Rollins <jrollins@finestructure.net>  Mon, 04 Oct 2010 00:36:08 -0400
 
 monkeysphere (0.31) unstable; urgency=low
 

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')

diff --git a/src/share/common b/src/share/common
index 50c9f61a3bc6e907cb06649c7427ea034e1139bc..34ac52da7f5dcfcdd2e893be3234ac400002b18c 100644 (file)
--- a/src/share/common
+++ b/src/share/common
@@ -103,12 +103,12 @@ su_monkeysphere_user() {
     case $(id -un) in
        # if monkeysphere user, run the command under bash
        "$MONKEYSPHERE_USER")
-           bash -c "$@"
+           bash -c "$*"
            ;;
 
          # if root, su command as monkeysphere user
        'root')
-           su "$MONKEYSPHERE_USER" -c "$@"
+           su "$MONKEYSPHERE_USER" -c "$*"
            ;;
 
        # otherwise, fail