diff --git a/argentum/store/argentum/package.cfg b/argentum/store/argentum/package.cfg index 7d98f7c..b2165d5 100644 --- a/argentum/store/argentum/package.cfg +++ b/argentum/store/argentum/package.cfg @@ -1,6 +1,6 @@ Aargentum/registry.cfg Ahalyde/apps/argentum.lua Ahalyde/apps/helpdb/argentum.txt -V1.0.0 +V1.0.1 Aargentum/ Aargentum/store/ diff --git a/argentum/store/halyde/package.cfg b/argentum/store/halyde/package.cfg index fcc3fd1..1adeb39 100644 --- a/argentum/store/halyde/package.cfg +++ b/argentum/store/halyde/package.cfg @@ -1,3 +1,10 @@ +Ahome/ +Ahalyde/lib/ +Ahalyde/core/ +Ahalyde/config/ +Ahalyde/apps/helpdb/ +Ahalyde/apps/ +V1.3.0 Ainit.lua Ahalyde/apps/helpdb/cat.txt Ahalyde/apps/helpdb/cd.txt @@ -15,12 +22,12 @@ Ahalyde/apps/cat.lua Ahalyde/apps/cd.lua Ahalyde/apps/clear.lua Ahalyde/apps/cp.lua -Ahalyde/apps/download.lua Ahalyde/apps/echo.lua Ahalyde/apps/fetch.lua Ahalyde/apps/help.lua Ahalyde/apps/ls.lua Ahalyde/apps/lua.lua +Ahalyde/apps/mkdir.lua Ahalyde/apps/mv.lua Ahalyde/apps/rm.lua Ahalyde/config/oslogo.ans @@ -36,11 +43,4 @@ Ahalyde/core/termlib.lua Ahalyde/lib/component.lua Ahalyde/lib/event.lua Ahalyde/lib/filesystem.lua -Ahalyde/lib/raster.lua -V1.3.1 -Ahalyde/ -Ahalyde/apps/ -Ahalyde/apps/helpdb/ -Ahalyde/config/ -Ahalyde/core/ -Ahalyde/lib/ +Ahalyde/lib/raster.lua \ No newline at end of file diff --git a/halyde/apps/argentum.lua b/halyde/apps/argentum.lua index a65783f..f917046 100644 --- a/halyde/apps/argentum.lua +++ b/halyde/apps/argentum.lua @@ -290,13 +290,22 @@ local function updatePackage(package) return installPackage(package, true) end --- update registry local fails = {} if command == "install" then if not packages or not packages[1] then print("Please specify packages to install.") return end + print("Fetching Ag registry...") + local newRegistry, errorMessage = getFile("https://raw.githubusercontent.com/Team-Cerulean-Blue/Halyde/refs/heads/main/argentum/registry.cfg") + if newRegistry then + local handle = fs.open("/argentum/registry.cfg", "w") + handle:write(newRegistry) + handle:close() + else + print("\27[91mFailed to fetch Ag registry: " .. (errorMessage or "returned nil")) + end + agReg = import("/argentum/registry.cfg") while true do if not doChecks(packages[i]) then table.insert(fails, packages[i]) @@ -438,6 +447,16 @@ elseif command == "remove" then print("Packages that could not be removed: " .. table.concat(fails, ", ")) end elseif command == "update" then + print("Fetching Ag registry...") + local newRegistry, errorMessage = getFile("https://raw.githubusercontent.com/Team-Cerulean-Blue/Halyde/refs/heads/main/argentum/registry.cfg") + if newRegistry then + local handle = fs.open("/argentum/registry.cfg", "w") + handle:write(newRegistry) + handle:close() + else + print("\27[91mFailed to fetch Ag registry: " .. (errorMessage or "returned nil")) + end + agReg = import("/argentum/registry.cfg") if not packages[1] then local packagesInstalled = fs.list("/argentum/store/") for _, currentPackage in pairs(packagesInstalled) do @@ -540,6 +559,16 @@ elseif command == "info" then print("Please specify a package to show information about.") return end + print("Fetching Ag registry...") + local newRegistry, errorMessage = getFile("https://raw.githubusercontent.com/Team-Cerulean-Blue/Halyde/refs/heads/main/argentum/registry.cfg") + if newRegistry then + local handle = fs.open("/argentum/registry.cfg", "w") + handle:write(newRegistry) + handle:close() + else + print("\27[91mFailed to fetch Ag registry: " .. (errorMessage or "returned nil")) + end + agReg = import("/argentum/registry.cfg") if not agReg[packages[1]] and not source then print("\27[91mPackage " .. packages[1] .. " does not exist.") return @@ -554,6 +583,16 @@ elseif command == "search" then print("Please specify a search term.") return end + print("Fetching Ag registry...") + local newRegistry, errorMessage = getFile("https://raw.githubusercontent.com/Team-Cerulean-Blue/Halyde/refs/heads/main/argentum/registry.cfg") + if newRegistry then + local handle = fs.open("/argentum/registry.cfg", "w") + handle:write(newRegistry) + handle:close() + else + print("\27[91mFailed to fetch Ag registry: " .. (errorMessage or "returned nil")) + end + agReg = import("/argentum/registry.cfg") local searchResults = {} for packageName, _ in pairs(agReg) do if packageName:find(packages[1], 1, true) then @@ -567,6 +606,16 @@ elseif command == "search" then table.sort(searchResults) print("Search results: \n " .. table.concat(searchResults, "\n ")) elseif command == "list" then + print("Fetching Ag registry...") + local newRegistry, errorMessage = getFile("https://raw.githubusercontent.com/Team-Cerulean-Blue/Halyde/refs/heads/main/argentum/registry.cfg") + if newRegistry then + local handle = fs.open("/argentum/registry.cfg", "w") + handle:write(newRegistry) + handle:close() + else + print("\27[91mFailed to fetch Ag registry: " .. (errorMessage or "returned nil")) + end + agReg = import("/argentum/registry.cfg") local sortedPackages = {} for packageName, _ in pairs(agReg) do table.insert(sortedPackages, packageName) diff --git a/halyde/core/boot.lua b/halyde/core/boot.lua index 366ce31..2c0c5f9 100644 --- a/halyde/core/boot.lua +++ b/halyde/core/boot.lua @@ -1,7 +1,7 @@ local loadfile = ... local filesystem = loadfile("/halyde/lib/filesystem.lua")(loadfile) -_G._OSVERSION = "Halyde 1.3.1" +_G._OSVERSION = "Halyde 1.4.0" _G._OSLOGO = "" local handle, tmpdata = filesystem.open("/halyde/config/oslogo.ans", "r"), nil repeat @@ -11,34 +11,34 @@ until not tmpdata local gpu = component.proxy(component.list("gpu")()) local screenAddress = component.list("screen")() -local screen = component.proxy(screenAddress) +--local screen = component.proxy(screenAddress) gpu.bind(screenAddress) -local maxWidth, maxHeight = gpu.maxResolution() -local aspectX, aspectY = screen.getAspectRatio() -local screenRatio = aspectX * 2 / aspectY +--local maxWidth, maxHeight = gpu.maxResolution() +--local aspectX, aspectY = screen.getAspectRatio() +--local screenRatio = aspectX * 2 / aspectY -- Calculate potential dimensions -local widthLimited = math.floor(maxHeight * screenRatio) -local heightLimited = math.floor(maxWidth / screenRatio) +--local widthLimited = math.floor(maxHeight * screenRatio) +--local heightLimited = math.floor(maxWidth / screenRatio) -local targetWidth, targetHeight +--local targetWidth, targetHeight -if widthLimited <= maxWidth then - -- Height is the limiting factor - targetWidth = widthLimited - targetHeight = maxHeight -else - -- Width is the limiting factor - targetWidth = maxWidth - targetHeight = heightLimited -end +--if widthLimited <= maxWidth then + -- height is the limiting factor +-- targetWidth = widthLimited +-- targetHeight = maxHeight +--else + -- width is the limiting factor +-- targetWidth = maxWidth +-- targetHeight = heightLimited +--end --- Ensure we never exceed maximum resolution -targetWidth = math.min(targetWidth, maxWidth) -targetHeight = math.min(targetHeight, maxHeight) +--targetWidth = math.min(targetWidth, maxWidth) +--targetHeight = math.min(targetHeight, maxHeight) -gpu.setResolution(targetWidth, targetHeight) +--gpu.setResolution(targetWidth, targetHeight) +gpu.setResolution(gpu.maxResolution()) function _G.import(module, ...) local args = table.pack(...)