diff --git a/argentum/registry.cfg b/argentum/registry.cfg index 35658d1..d3b2cd3 100644 --- a/argentum/registry.cfg +++ b/argentum/registry.cfg @@ -2,7 +2,9 @@ local agregistry = { ["halyde"] = "https://raw.githubusercontent.com/Team-Cerulean-Blue/Halyde/refs/heads/main/", ["edit"] = "https://raw.githubusercontent.com/Team-Cerulean-Blue/Halyde/refs/heads/main/", ["argentum"] = "https://raw.githubusercontent.com/Team-Cerulean-Blue/Halyde/refs/heads/main/", - ["donut"] = "https://raw.githubusercontent.com/Ponali/donut/refs/heads/master/" + ["donut"] = "https://raw.githubusercontent.com/Ponali/ArgentumPackages/refs/heads/master/", + ["libocif"] = "https://raw.githubusercontent.com/Ponali/ArgentumPackages/refs/heads/master/", + ["ocif-tools"] = "https://raw.githubusercontent.com/Ponali/ArgentumPackages/refs/heads/master/" } return agregistry diff --git a/halyde/apps/helpdb/default.txt b/halyde/apps/helpdb/default.txt index 1c32e4c..73a53c4 100644 --- a/halyde/apps/helpdb/default.txt +++ b/halyde/apps/helpdb/default.txt @@ -7,6 +7,7 @@ All default Halyde shell commands: fetch Displays system information. help Shows this. ls Lists files. + lscor Lists coroutines. lua Starts the Lua shell. mkdir Makes a directory. mv Moves/renames a file. diff --git a/halyde/core/boot.lua b/halyde/core/boot.lua index f3e5714..0f585b2 100644 --- a/halyde/core/boot.lua +++ b/halyde/core/boot.lua @@ -1,7 +1,11 @@ local loadfile = ... local filesystem = loadfile("/halyde/lib/filesystem.lua")(loadfile) +<<<<<<< HEAD _G._OSVERSION = "Halyde 1.11.1" +======= +_G._OSVERSION = "Halyde 1.11.0" +>>>>>>> mikethe223-patch-1 _G._OSLOGO = "" local handle, tmpdata = filesystem.open("/halyde/config/oslogo.ans", "r"), nil repeat diff --git a/halyde/lib/filesystem.lua b/halyde/lib/filesystem.lua index a8f1906..c058af4 100644 --- a/halyde/lib/filesystem.lua +++ b/halyde/lib/filesystem.lua @@ -69,12 +69,60 @@ function filesystem.exists(path) -- check if path exists return component.invoke(address, "exists", absPath) end -function filesystem.open(path, mode) -- opens a file and returns its handle +local function readUniChar(readByte) + local function inRange(min,max,...) + for _,v in ipairs({...}) do + if not (v and v>=min and v