More aggressive shell string escaping.

Partially fixes Bugzilla #4074.
icculus · Jul 7, 2009 · 3eea083 · 3eea083
1 parent bd89c12
commit 3eea083
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/scripts/mojosetup_mainline.lua b/scripts/mojosetup_mainline.lua
@@ -1002,7 +1002,7 @@ local function install_unix_uninstaller(desc, key)
                   "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.
 
@@ -1114,6 +1114,9 @@ local function install_freedesktop_menuitem(pkg, idx, item)  -- only for Unix.
 
     local cmdline = MojoSetup.format(item.commandline, dest)
 
+    -- Try to escape some characters...
+    cmdline = '"' .. string.gsub(string.gsub(cmdline, "\"","\\\""), "%%", "%%%%") .. '"'
+
     local t = { "[Desktop Entry]\n" }
     local function addpair(key, val)
         t[#t+1] = key