--- mojosetup-1-manifest/scripts/mojosetup_mainline.lua	2009-06-02 04:00:58.000000000 +0200
+++ old/mojosetup-2-whitespace/scripts/mojosetup_mainline.lua	2009-06-05 04:07:33.000000000 +0200
@@ -1100,7 +1100,7 @@ local function install_unix_uninstaller(
                   "uninstall-" .. MojoSetup.install.id .. ".sh"
 
     -- Man, I hate escaping shell strings...
-    local bin = "\"`dirname $0`\"'/" .. MojoSetup.metadatadirname .. "/" ..
+    local bin = "\"`dirname \"$0\"`\"'/" .. MojoSetup.metadatadirname .. "/" ..
                 MojoSetup.controlappname .. "'"
     string.gsub(bin, "'", "'\\''")  -- !!! FIXME: no-op!-- Escape single quotes for shell.
 
@@ -1224,7 +1224,7 @@ local function install_freedesktop_menui
                 "GenericName=" .. item.genericname .. "\n" ..
                 "Comment=" .. item.tooltip .. "\n" ..
                 "Icon=" .. icon .. "\n" ..
-                "Exec=" .. cmdline .. "\n" ..
+                "Exec=\"" .. string.gsub(string.gsub(cmdline, "\"","\\\""), "%%", "%%%%") .. "\"" .. "\n" ..
                 "Categories=" .. flatten_list(item.category) .. "\n"
 
     if item.mimetype ~= nil then