r402 - trunk/scripts
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Jan 12 06:22:50 EST 2008
Author: icculus
Date: 2008-01-12 06:22:50 -0500 (Sat, 12 Jan 2008)
New Revision: 402
Modified:
trunk/scripts/loki_setup_compat.lua
trunk/scripts/mojosetup_init.lua
trunk/scripts/mojosetup_mainline.lua
Log:
Removed some errant semicolons from the Lua scripts...
Modified: trunk/scripts/loki_setup_compat.lua
===================================================================
--- trunk/scripts/loki_setup_compat.lua 2008-01-12 11:21:28 UTC (rev 401)
+++ trunk/scripts/loki_setup_compat.lua 2008-01-12 11:22:50 UTC (rev 402)
@@ -47,7 +47,7 @@
f:write('<?xml version="1.0" encoding="UTF-8"?>\n')
f:write('<product name="' .. install.id .. '" desc="' ..
install.description .. '" xmlversion="1.6" root="'
- .. MojoSetup.destination .. '" ' .. update_url .. '>\n');
+ .. MojoSetup.destination .. '" ' .. update_url .. '>\n')
f:write(' <component name="Default" version="' .. install.version ..
'" default="yes">\n')
Modified: trunk/scripts/mojosetup_init.lua
===================================================================
--- trunk/scripts/mojosetup_init.lua 2008-01-12 11:21:28 UTC (rev 401)
+++ trunk/scripts/mojosetup_init.lua 2008-01-12 11:22:50 UTC (rev 402)
@@ -29,7 +29,7 @@
MojoSetup.loginfo("ui: " .. MojoSetup.info.ui)
MojoSetup.loginfo("loglevel: " .. MojoSetup.info.loglevel)
-MojoSetup.loginfo("command line:");
+MojoSetup.loginfo("command line:")
for i,v in ipairs(MojoSetup.info.argv) do
MojoSetup.loginfo(" " .. i .. ": " .. v)
end
@@ -96,7 +96,7 @@
end
if MojoSetup.localization ~= nil then
- local at_least_one = false;
+ local at_least_one = false
local locale = MojoSetup.info.locale
local lang = string.gsub(locale, "_%w+", "", 1) -- make "en_US" into "en"
MojoSetup.translations = {}
@@ -146,15 +146,15 @@
end
local function mustBeString(fnname, elem, val)
- mustBeSomething(fnname, elem, val, "string");
+ mustBeSomething(fnname, elem, val, "string")
end
local function mustBeBool(fnname, elem, val)
- mustBeSomething(fnname, elem, val, "boolean");
+ mustBeSomething(fnname, elem, val, "boolean")
end
local function mustBeNumber(fnname, elem, val)
- mustBeSomething(fnname, elem, val, "number");
+ mustBeSomething(fnname, elem, val, "number")
end
local function mustBeFunction(fnname, elem, val)
@@ -218,7 +218,7 @@
local function sanitize(fnname, tab, elems)
mustBeTable(fnname, "", tab)
- tab._type_ = string.lower(fnname) .. "s"; -- "Eula" becomes "eulas".
+ tab._type_ = string.lower(fnname) .. "s" -- "Eula" becomes "eulas".
for i,elem in ipairs(elems) do
local child = elem[1]
local defval = elem[2]
@@ -228,7 +228,7 @@
end
local j = 3
while elem[j] do
- elem[j](fnname, child, tab[child]); -- will assert on problem.
+ elem[j](fnname, child, tab[child]) -- will assert on problem.
j = j + 1
end
end
@@ -270,7 +270,7 @@
table.insert(tab[typestr], v)
end
-- can't just set tab[k] to nil here, since it screws up pairs()...
- killlist[#killlist+1] = k;
+ killlist[#killlist+1] = k
elseif vtype == "table" then
tab[k] = reform_schema_table(v)
end
Modified: trunk/scripts/mojosetup_mainline.lua
===================================================================
--- trunk/scripts/mojosetup_mainline.lua 2008-01-12 11:21:28 UTC (rev 401)
+++ trunk/scripts/mojosetup_mainline.lua 2008-01-12 11:22:50 UTC (rev 402)
@@ -92,16 +92,16 @@
function MojoSetup.revertinstall()
-- !!! FIXME: language.
if MojoSetup.gui_started then
- MojoSetup.gui.final(_("Incomplete installation. We will revert any changes we made."));
+ MojoSetup.gui.final(_("Incomplete installation. We will revert any changes we made."))
end
- MojoSetup.loginfo("Cleaning up half-finished installation...");
+ MojoSetup.loginfo("Cleaning up half-finished installation...")
-- !!! FIXME: callbacks here.
delete_files(MojoSetup.downloads)
delete_files(MojoSetup.installed_files)
do_rollbacks()
- delete_scratchdirs();
+ delete_scratchdirs()
end
@@ -138,7 +138,7 @@
minsleft = string.sub("00" .. (minsleft - (hoursleft * 60)), -2)
if hoursleft < 10 then
- hoursleft = "0" .. hoursleft;
+ hoursleft = "0" .. hoursleft
else
hoursleft = tostring(hoursleft)
end
@@ -547,7 +547,7 @@
path = path .. "/" .. v
if not MojoSetup.platform.exists(path) then
if knowngood == "" then -- !!! FIXME: error message.
- MojoSetup.fatal(_("archive not found"))
+ MojoSetup.fatal(_("Archive not found"))
end
local archive = create_basepath_archive(knowngood)
local arclist = { archive }
More information about the mojosetup-commits
mailing list