1
0
mirror of https://github.com/Adorable-Catgirl/Zorya-NEO.git synced 2024-11-13 14:08:07 +11:00

Added a new utility.

This commit is contained in:
Jane Roxanne 2020-03-22 00:27:43 -05:00
parent 44b8229580
commit f5d18e6dbe
4 changed files with 150 additions and 3 deletions

3
.gitignore vendored
View File

@ -3,4 +3,5 @@ debug.lua
luapreproc.lua
zorya-neo-installer.lua
zorya-neo-utils-installer.lua
bsrc/**
bsrc/**
release/**

View File

@ -5,11 +5,13 @@ function status(s)
end
status("Cleaning last build...")
os.execute("rm -rf pkg")
os.execute("rm -rf release")
status("Making directories...")
os.execute("mkdir -p pkg/mods")
os.execute("mkdir -p pkg/lib")
os.execute("mkdir -p pkg/bios")
os.execute("mkdir -p release")
status("Building EEPROM...")
os.execute("luacomp src/loader.lua -O pkg/bios/managed.bios")
@ -36,8 +38,10 @@ status("Library build complete.\n\nBuilding installer...")
os.execute("cp utils/ser.lua pkg/init.lua")
os.execute("cp -r installer_dat pkg")
status("Packing installer...")
os.execute("cd pkg; find * -depth | lua ../utils/make_tsar.lua | lua ../utils/mkselfextract.lua > ../zorya-neo-installer.lua")
os.execute("cd pkg; find * -depth | lua ../utils/make_tsar.lua | lua ../utils/mkselfextract.lua > ../release/zorya-neo-installer.lua")
status("Making OpenOS util installer...")
os.execute("cd util; find * -depth | lua ../utils/make_tsar.lua | lua ../utils/mkselfextract.lua > ../zorya-neo-utils-installer.lua")
os.execute("cd util; find * -depth | lua ../utils/make_tsar.lua | lua ../utils/mkselfextract.lua > ../release/zorya-neo-utils-installer.lua")
print("Making update tsar...")
os.execute("cd pkg; find bios lib mods -depth | lua ../utils/make_tsar.lua > ../release/zorya-neo-update.tsar")
status("Build complete.")
status(string.format("Took %ds.", os.time()-start))

View File

@ -0,0 +1,140 @@
local inet = require("internet")
local json = require("json")
local fs = require("filesystem")
local comp = require("component")
local function dl(url)
local dat = ""
for chunk in internet.request(url) do
dat = dat .. chunk
end
end
local function writefile(p2, dat)
local f = io.open(p2, "wb")
f:write(dat)
f:close()
end
local magic = 0x5f7d
local magic_rev = 0x7d5f
local header_fmt = "I2I2I2I2I2I6I6"
local en = string.unpack("=I2", string.char(0x7d, 0x5f)) == magic -- true = LE, false = BE
local function get_end(e)
return (e and "<") or ">"
end
local function read_header(dat)
local e = get_end(en)
local m = string.unpack(e.."I2", dat)
if m ~= magic and m ~= magic_rev then return nil, "bad magic" end
if m ~= magic then
e = get_end(not en)
end
local ent = {}
ent.magic, ent.namesize, ent.mode, ent.uid, ent.gid, ent.filesize, ent.mtime = string.unpack(e..header_fmt, dat)
return ent
end
local arc = {}
function arc:fetch(path)
for i=1, #self.tbl do
if (self.tbl[i].name == path and self.tbl[i].mode & 32768 > 0) then
self.seek(self.tbl[i].pos-self.seek(0))
return self.read(self.tbl[i].filesize), self.tbl[i]
end
end
return nil, "file not found"
end
function arc:exists(path)
for i=1, #self.tbl do
if (self.tbl[i].name == path) then
return true
end
end
return false
end
function arc:list(path)
if path:sub(#path) ~= "/" then path = path .. "/" end
local ent = {}
for i=1, #self.tbl do
if (self.tbl[i].name:sub(1, #path) == path and not self.tbl[i].name:find("/", #path+1, false)) then
ent[#ent+1] = self.tbl[i].name
end
end
return ent
end
function arc:close()
self.close()
end
local tsar = {
read = function(read, seek, close)
local tbl = {}
local lname = ""
while lname ~= "TRAILER!!!" do
local dat = read(22)
local e = read_header(dat)
e.name = read(e.namesize)
e.pos = seek(e.namesize & 1)
seek(e.filesize + (e.filesize & 1))
lname = e.name
if lname ~= "TRAILER!!!" then
tbl[#tbl+1] = e
end
end
return setmetatable({tbl = tbl, read = read, seek = seek, close = close}, {__index=arc})
end
}
local arc = ""
local arc_p = 1
local function _r(a)
local dat = arc:sub(arc_p, arc_p+a-1)
arc_p = arc_p + a
return dat
end
local function _s(a)
arc_p = arc_p + a
return arc_p
end
local rdat = json.decode(dl("https://api.github.com/repos/Adorable-Catgirl/Zorya-NEO/releases"))[1]
print("Newest release: "..rdat.tag_name)
print("Downloading zorya-neo-update.tsar...")
for i=1, #rdat.assets do
if (rdat.assets[i].name == "zorya-neo-update.tsar") then
arc = dl(rdat.assets[i].browser_download_url)
goto arc_downloaded
end
end
io.stderr:write("ERROR: zorya-neo-update.tsar not found!\n")
return
::arc_downloaded::
local update = tsar.read(_r, _s, function() end)
for ent in fs.list("/etc/zorya-neo/mods") do
if (update:exists("mods/"..ent)) then
writefile("/etc/zorya-neo/mods/"..ent, update:fetch("mods/"..ent))
end
end
for ent in fs.list("/etc/zorya-neo/lib") do
if (update:exists("lib/"..ent)) then
writefile("/etc/zorya-neo/lib/"..ent, update:fetch("lib/"..ent))
end
end
if (comp.eeprom.address == "vdev-ZY_VBIOS") then
io.stderr:write("WARNING: Updating Zorya NEO in a vBIOS does not update Zorya NEO completely!\n")
else
print("Flashing EEPROM! Do not turn off the computer!")
comp.eeprom.set(update:fetch("bios/managed.bios"))
print("Flashing complete.")
end
print("Running zyneo-geninitramfs to finish the update...")
os.execute("zyneo-geninitramfs")
print("Update complete. Please restart your computer.")

View File

@ -105,8 +105,10 @@ fs.makeDirectory("/etc/zorya-neo/lib")
fs.makeDirectory("/etc/zorya-neo/config.d")
fs.makeDirectory("/etc/zorya-neo/initramfs.d")
print("Installing utils to /usr")
fs.makeDirectory("/usr/bin")
writefile("/usr/bin/zyneo-gencfg.lua", getfile("OpenOS/zyneo-gencfg.lua"))
writefile("/usr/bin/zyneo-geninitramfs.lua", getfile("OpenOS/zyneo-geninitramfs.lua"))
writefile("/usr/bin/zyneo-update.lua", getfile("OpenOS/zyneo-update.lua"))
print("Installing scripts...")
for i=1, #tbl do
if tbl[i].name:sub(1, 16) == "OpenOS/config.d/" then