r436 - trunk/scripts

[DONOTREPLY at icculus.org]

Author: icculus
Date: 2008-01-17 05:33:22 -0500 (Thu, 17 Jan 2008)
New Revision: 436

Modified:
   trunk/scripts/mojosetup_mainline.lua
Log:
Bunch of fixes for last few checkins.


Modified: trunk/scripts/mojosetup_mainline.lua
===================================================================
--- trunk/scripts/mojosetup_mainline.lua	2008-01-17 10:19:16 UTC (rev 435)
+++ trunk/scripts/mojosetup_mainline.lua	2008-01-17 10:33:22 UTC (rev 436)
@@ -307,7 +307,7 @@
 
 local function install_file_from_string(dest, string, perms, desc, manifestkey)
     local fn = function(callback)
-        return MojoSetup.stringtofile(string, dest, perms, callback)
+        return MojoSetup.stringtofile(string, dest, perms, nil, callback)
     end
     return install_file(dest, perms, fn, desc, manifestkey)
 end
@@ -791,7 +791,6 @@
     dst = MojoSetup.controldir .. "/mojosetup"
     src = MojoSetup.info.binarypath
     if src == MojoSetup.info.basearchivepath then
-        local base = MojoSetup.archive.base
         maxbytes = MojoSetup.archive.offsetofstart(base)
         if maxbytes <= 0 then
             MojoSetup.fatal(_("BUG: Unexpected value"))
@@ -807,7 +806,7 @@
         MojoSetup.fatal(_("Couldn't enumerate archive"))
     end
 
-    local needdirs = { "scripts", "gui", "meta" }
+    local needdirs = { "scripts", "guis", "meta" }
 
     local ent = MojoSetup.archive.enumnext(base)
     while ent ~= nil do
@@ -829,7 +828,7 @@
         end
 
         -- and check the next entry in the archive...
-        ent = MojoSetup.archive.enumnext(archive)
+        ent = MojoSetup.archive.enumnext(base)
     end
 
     -- okay, we're written out.
@@ -1186,7 +1185,7 @@
                 end
 
                 MojoSetup.loginfo("Download '" .. url .. "' to '" .. f .. "'")
-                local downloaded, sums = MojoSetup.download(url, f, callback)
+                local downloaded, sums = MojoSetup.download(url, f, nil, nil, callback)
                 if not downloaded then
                     MojoSetup.fatal(_("File download failed!"))
                 end