The_Great_Archive/MineOS
1
0
Fork 0
mirror of https://github.com/IgorTimofeev/MineOS.git synced 2026-09-14 11:06:16 +05:00
Code Issues Actions Packages Projects Releases Wiki Activity

aefaef

Browse Source
This commit is contained in:
Igor Timofeev 2019-01-20 22:38:08 +03:00
parent 9b7dedf387
commit 5e2ef32bec
1 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Installer/Main.lua
View File

@ -115,28 +115,6 @@ local function download(url, path)
end
end
local function dofile(path, ...)
local handle, reason = selectedFilesystemProxy.open(path, "rb")
if handle then
local data, chunk = ""
while true do
chunk = selectedFilesystemProxy.read(handle, math.huge)
if chunk then
data = data .. chunk
else
break
end
end
selectedFilesystemProxy.close(handle)
return load(data, "=" .. path)(...)
end
error("File opening failed: " .. tostring(reason))
end
local function deserialize(text)
local result, reason = load("return " .. text, "=string")
if result then
@ -187,7 +165,22 @@ function require(module)
error("already loading " .. module .. ": " .. debug.traceback())
else
package.loading[module] = true
package.loaded[module] = dofile(installerPath .. "Libraries/" .. module .. ".lua")
local path = installerPath .. "Libraries/" .. module .. ".lua"
local handle, reason = temporaryFilesystemProxy.open(path, "rb")
if handle then
local data, chunk = ""
repeat
chunk = temporaryFilesystemProxy.read(handle, math.huge)
data = data .. (chunk or "")
until not chunk
temporaryFilesystemProxy.close(handle)
package.loaded[module] = load(data, "=" .. path)() or true
else
error("File opening failed: " .. tostring(reason))
end
package.loading[module] = nil
return package.loaded[module]
@ -530,7 +523,6 @@ addStage(function()
-- Switching back to temporary fileystem proxy
filesystem.setProxy(temporaryFilesystemProxy)
-- Flashing EEPROM
layout:removeChildren()
addImage(1, 1, "EEPROM")