diff --git a/data/computercraft/lua/rom/programs/imageview.lua b/data/computercraft/lua/rom/programs/imageview.lua index c237ced..97468fd 100644 --- a/data/computercraft/lua/rom/programs/imageview.lua +++ b/data/computercraft/lua/rom/programs/imageview.lua @@ -2,7 +2,7 @@ local http = require("http") local paintutils = require("paintutils") local term = require("term") -local event = require("event") + local shell = require("shell") -- 帮助信息函数 @@ -78,7 +78,7 @@ local function main(args) -- 监听ESC键 while true do - local _, key = event.pull("key") + local _, key = os.pullEvent("key") if key == 27 then -- ESC键 term.clear() term.setCursorPos(1, 1) diff --git a/data/computercraft/lua/rom/programs/time.lua b/data/computercraft/lua/rom/programs/time.lua index 2fb9c59..2fa3598 100644 --- a/data/computercraft/lua/rom/programs/time.lua +++ b/data/computercraft/lua/rom/programs/time.lua @@ -7,14 +7,15 @@ local function printHelp() print("Options:") print(" --help, -h Show this help message") print(" --format, -f Specify time format string (see below for details)") - print(" -Formats for --format option:") - print(" %Y: Year (4 digits)") - print(" %m: Month (01-12)") - print(" %d: Day (01-31)") - print(" %H: Hour (00-23)") - print(" %M: Minute (00-59)") - print(" %S: Second (00-59)") + print([[ +Formats for --format option: + %Y: Year (4 digits) + %m: Month (01-12) + %d: Day (01-31) + %H: Hour (00-23) + %M: Minute (00-59) + %S: Second (00-59) +]]) print(" %A: Full weekday name") print(" %B: Full month name") print(" diff --git a/installer.lua b/installer.lua index 65b82a4..107f311 100644 --- a/installer.lua +++ b/installer.lua @@ -1,5 +1,5 @@ -- LeonOS installer -local INSTALLER_VERSION = "0.3.7 Beta 7" +local INSTALLER_VERSION = "0.3.7 Beta 8" local DEFAULT_ROM_DIR = "/leonos" print("Start loading LeonOS installer ("..INSTALLER_VERSION..")...")