Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bunch of fixes for last few checkins.
  • Loading branch information
icculus committed Jan 17, 2008
1 parent 7a7543f commit 858bdd8
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions scripts/mojosetup_mainline.lua
Expand Up @@ -307,7 +307,7 @@ end

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
Expand Down Expand Up @@ -791,7 +791,6 @@ local function install_control_app(desc, key)
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"))
Expand All @@ -807,7 +806,7 @@ local function install_control_app(desc, key)
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
Expand All @@ -829,7 +828,7 @@ local function install_control_app(desc, key)
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.
Expand Down Expand Up @@ -1186,7 +1185,7 @@ local function do_install(install)
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
Expand Down

0 comments on commit 858bdd8

Please sign in to comment.