LeonMMcoset/LeonOS
1
0
Fork 0
mirror of https://github.com/CCLeonOS/LeonOS.git synced 2026-03-03 15:17:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(installer): 将term.write替换为print以简化输出逻辑

Browse Source 
修改installer.lua中的输出方式，使用print替代term.write以提高代码简洁性，同时保持相同功能
This commit is contained in:
Leonmmcoset
2025-08-31 22:22:49 +08:00
parent 16ff0f0d29
commit ce6c7b6403
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
installer.lua
View File

@@ -1,8 +1,8 @@
-- LeonOS installer -- LeonOS installer
local DEFAULT_ROM_DIR = "/rc" local DEFAULT_ROM_DIR = "/rc"
term.at(1, 2).write("Start loading LeonOS installer...\n") print("Start loading LeonOS installer...\n")
term.write("[Installer] Loading module 1\n") print("[Installer] Loading module 1\n")
local function dl(f) local function dl(f)
local hand, err = http.get(f, nil, true) local hand, err = http.get(f, nil, true)
if not hand then if not hand then
@@ -14,41 +14,41 @@ local function dl(f)
return data return data
end end
term.write("[Installer] Loading done.\n") print("[Installer] Loading done.\n")
term.write("[Installer] Loading module 2\n") print("[Installer] Loading module 2\n")
-- set up package.loaded for LeonOS libs -- set up package.loaded for LeonOS libs
package.loaded.rc = { package.loaded.rc = {
expect = require("cc.expect").expect, expect = require("cc.expect").expect,
write = write, sleep = sleep write = write, sleep = sleep
} }
term.write("[Installer] Loading done.\n") print("[Installer] Loading done.\n")
term.write("[Installer] Loading module 3\n") print("[Installer] Loading module 3\n")
package.loaded.term = term package.loaded.term = term
package.loaded.colors = colors package.loaded.colors = colors
_G.require = require _G.require = require
term.write("[Installer] Loading done.\n") print("[Installer] Loading done.\n")
term.write("[Installer] Loading module 4\n") print("[Installer] Loading module 4\n")
function term.at(x, y) function term.at(x, y)
term.setCursorPos(x, y) term.setCursorPos(x, y)
return term return term
end end
term.write("[Installer] Loading done.\n") print("[Installer] Loading done.\n")
term.write("[Installer] Loading module 5\n") print("[Installer] Loading module 5\n")
local function ghload(f, c) local function ghload(f, c)
return assert(load(dl("https://gh.catmak.name/https://raw.githubusercontent.com/"..f), return assert(load(dl("https://gh.catmak.name/https://raw.githubusercontent.com/"..f),
"="..(c or f), "t", _G))() "="..(c or f), "t", _G))()
end end
term.write("[Installer] Loading done.\n") print("[Installer] Loading done.\n")
term.write("[Installer] Loading module 6\n") print("[Installer] Loading module 6\n")
local json = ghload("rxi/json.lua/master/json.lua", "ghload(json)") local json = ghload("rxi/json.lua/master/json.lua", "ghload(json)")
package.loaded["rc.json"] = json package.loaded["rc.json"] = json
term.write("[Installer] Loading module 7\n") print("[Installer] Loading module 7\n")
local function rcload(f) local function rcload(f)
return ghload( return ghload(
"Leonmmcoset/LeonOS/refs/heads/main/data/computercraft/lua/rom/"..f, f) "Leonmmcoset/LeonOS/refs/heads/main/data/computercraft/lua/rom/"..f, f)
end end
term.write("[Installer] Loading done.\n") print("[Installer] Loading done.\n")
term.write("[Installer] Loading module 8\n") print("[Installer] Loading module 8\n")
-- get LeonOS's textutils with its extra utilities -- get LeonOS's textutils with its extra utilities
local tu = rcload("apis/textutils.lua") local tu = rcload("apis/textutils.lua")