diff --git a/installer_dat/package_list.lua b/installer_dat/package_list.lua index 66c3671..a6286a8 100644 --- a/installer_dat/package_list.lua +++ b/installer_dat/package_list.lua @@ -15,7 +15,6 @@ {name="minitel", cat="net", path="lib/net_minitel.zy2l"}, --{name="vdev", cat="util", path="mods/util_vdev.zy2m"}, {name="menu", cat="menu", path="mods/menu_classic.zy2m"}, - {name="thd", cat="core", path="lib/thd.zy2l"} --{name="vdevrt", cat="rtmod", path="mods/rtmod_vdevrt.zy2m"}, --{name="tsukinet", cat="net", path="mods/net_tsukinet"}, --{name="biosemu", cat="loader", path="mods/loader_biosemu.zy2m", warning="warn_mod_biosemu"}, diff --git a/src/zy-neo/builtins/util_romfs.lua b/src/zy-neo/builtins/util_romfs.lua index 1d592fc..19a6bc3 100644 --- a/src/zy-neo/builtins/util_romfs.lua +++ b/src/zy-neo/builtins/util_romfs.lua @@ -18,6 +18,7 @@ function romfs.read(read, seek, close) local fsize = readint(read, 2) local exec = read(1) tbl[#tbl+1] = {name = name, size = fsize, exec = exec == "x", pos = seek(0)} + utils.debug_log(nz, name, fsize, exec) seek(fsize) lname = name end diff --git a/utils/ser.lua b/utils/ser.lua index 02e8ae7..3fd808d 100644 --- a/utils/ser.lua +++ b/utils/ser.lua @@ -4,9 +4,6 @@ local dat = args[2] table.remove(args, 1) table.remove(args, 1) -local comp = component or require("component") -local computer = computer or require("computer") - function getfile(path) for i=1, #tbl do if (tbl[i].name == path) then @@ -15,6 +12,18 @@ function getfile(path) end end +if debug.debug then + for i=1, #tbl do + print(tbl[i].name, tbl[i].filesize) + end + print("Zorya NEO Installer") + print("This was made for OpenComputers, and, as such, is not compatible with your system.") + os.exit(0) +end + +local comp = component or require("component") +local computer = computer or require("computer") + --[[local baddr = computer.getBootAddress() local c = comp.proxy(baddr) print("Making directories...")