[mojosetup] [5/13] Always register the .mojosetup and manifest directories.

Francois Gouget fgouget at codeweavers.com
Mon May 21 14:03:06 EDT 2012


Otherwise they don't get uninstalled after an upgrade.
---
 scripts/mojosetup_mainline.lua |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/mojosetup_mainline.lua b/scripts/mojosetup_mainline.lua
index 37f0297..b51fa11 100644
--- a/scripts/mojosetup_mainline.lua
+++ b/scripts/mojosetup_mainline.lua
@@ -976,7 +976,7 @@ local function install_control_app(desc, key)
     -- don't overwrite preexisting stuff.
     if not MojoSetup.platform.exists(dst) then
         local perms = "0755"  -- !!! FIXME
-        install_parent_dirs(dst, key)
+        install_parent_dirs(MojoSetup.controldir, key)
         install_file_from_filesystem(dst, src, perms, desc, key, maxbytes)
     end
 
@@ -1095,7 +1095,8 @@ local function install_manifests(desc, key)
     }
 
     -- now build these things...
-    install_parent_dirs(lua_fname, key)
+    -- This assumes controldir has been created and registered already.
+    install_directory(MojoSetup.manifestdir, "0755", key)
     install_file_from_stringtable(lua_fname, build_lua_manifest(package), perms, desc, nil)
     install_file_from_stringtable(xml_fname, build_xml_manifest(package), perms, desc, nil)
     install_file_from_stringtable(txt_fname, build_txt_manifest(package), perms, desc, nil)
-- 
1.7.10


More information about the mojosetup mailing list