Fix escaping for the uninstall shell script.

icculus · Sep 16, 2010 · 75e0656 · 75e0656
1 parent 4f9180f
commit 75e0656
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/scripts/mojosetup_mainline.lua b/scripts/mojosetup_mainline.lua
@@ -997,23 +997,27 @@ local function install_control_app(desc, key)
     -- okay, we're written out.
 end
 
+local function shquote_string(str)
+    -- Quote the string so it can safely be passed to the shell
+    str = string.gsub(str, "\\", "\\\\")
+    str = string.gsub(str, "[$]", "\\$")
+    str = string.gsub(str, "\"", "\\\"")
+    str = string.gsub(str, "`", "\\`")
+    return "\"" ..str.. "\""
+end
 
 local function install_unix_uninstaller(desc, key)
     -- Write a script out that calls the uninstaller.
     local fname = MojoSetup.destination .. "/" ..
                   "uninstall-" .. MojoSetup.install.id .. ".sh"
 
     -- Man, I hate escaping shell strings...
-    local bin = "\"`dirname \"$0\"`\"'/" .. MojoSetup.metadatadirname .. "/" ..
-                MojoSetup.controlappname .. "'"
-    string.gsub(bin, "'", "'\\''")  -- !!! FIXME: no-op!-- Escape single quotes for shell.
-
-    local id = MojoSetup.install.id
-    string.gsub(id, "'", "'\\''")  -- !!! FIXME: no-op!
+    local bin = "\"`dirname \\\"$0\\\"`\"/" ..
+                shquote_string(MojoSetup.metadatadirname .. "/" .. MojoSetup.controlappname)
 
     local script =
         "#!/bin/sh\n" ..
-        "exec " .. bin .. " uninstall '" .. id .. "' \"$@\"\n\n"
+        "exec " .. bin .. " uninstall " .. shquote_string(MojoSetup.install.id) .. " \"$@\"\n"
 
     install_parent_dirs(fname, key)
     install_file_from_string(fname, script, "0755", desc, key)