Merge branch 'main' of https://git.astronand.dev/Hyperion/HyperionOS

Reviewed-on: #12

installers/HyperionOS-install-cct.lua

@@ -63,7 +63,7 @@ end
 
 local function menu(m)
     local exit,sel=false,1
-    while not exit and not exitall do
+    while not exit or not exitall do
         printTitle()
         drawMenu(m, sel)
         local _,key = os.pullEvent("key")
@@ -87,27 +87,24 @@ end
 
 local releases,page={},1
 while true do
-    local handle=http.get("https://git.astronand.dev/api/v1/repos/Hyperion/HyperionOS/releases?page="..tostring(page).."&limit=1")
+    local raw=http.get("https://git.astronand.dev/api/v1/repos/Hyperion/HyperionOS/releases?page="..tostring(page).."&limit=1")
-    local raw=handle.readAll()
+    if raw=="[]" then
-    handle.close()
-    if raw=="[]\n" then
         break
     end
-    releases[page]=json.decode(raw)[1]
+    releases[#releases+1]=json.decode(raw)[1]
-    page=page+1
 end
 
 local function makePage(start, num)
-    local m={}
+    local m,nonext={},false
     for i=start, num do
-        if not releases[i] then break end
+        if not releases[i] then nonext=true; break end
         local release=releases[i]
         m[#m+1]={
             name=release.name,
             desc=release.body,
             color=release.prerelease and colors.orange or colors.white,
             func=function()
-                local data, err=http.get("https://git.astronand.dev/Hyperion/HyperionOS/raw/tag/"..release.tag_name.."/misc/cct/installcct.lua")
+                local data, err=http.get("https://git.astronand.dev/Hyperion/HyperionOS/raw/tag/"..release.tag_name.."/misc/cct/installcc.lua")
                 releasename=release.tag_name
                 if not data then
                     term.clear()
@@ -116,8 +113,7 @@ local function makePage(start, num)
                     sleep(3)
                     return
                 end
-                local func, err = load(data.readAll(), "@Installer","t",_ENV)
+                local func, err = load(data.readAll(), "@Installer")
-                data.close()
                 if not func then
                     term.clear()
                     term.setCursorPos(1,1)
@@ -126,11 +122,10 @@ local function makePage(start, num)
                     return
                 end
                 install=func
-                exitall=true
             end
         }
     end
-    if #releases>start+num then
+    if not nonext then
         m[#m+1]={
             name="Next",
             desc="Next menu",
@@ -141,7 +136,6 @@ local function makePage(start, num)
             end
         }
     end
-    return m
 end
 
 menu(makePage(1,5))
@@ -149,7 +143,7 @@ term.clear()
 term.setCursorPos(1,1)
 term.setTextColor(colors.white)
 term.write("Formating disk in ")
-for i=5, 1, -1 do
+for i=5, 0, -1 do
     term.write(tostring(i))
     sleep(.25)
     for v=1, 3 do
@@ -157,7 +151,6 @@ for i=5, 1, -1 do
         sleep(.25)
     end
 end
-print("")
 
 local function printc(text, c)
     term.setTextColor(c)
@@ -178,12 +171,8 @@ local function delDir(dir)
             fs.delete(dir..list[i])
             printc("rm "..dir..list[i], colors.orange)
         end
-        sleep(.01)
     end
 end
 
 delDir("/")
-term.clear()
-term.setCursorPos(1,1)
-term.setTextColor(colors.white)
 install(releasename)

misc/cct/installcct.lua

@@ -8,13 +8,12 @@ print("Installing HyperionOS...")
 print("Installing precompiled tar")
 shell.run("wget https://git.astronand.dev/Hyperion/HyperionOS/raw/tag/"..release.."/misc/cct/installdata/Build.tar /Build.tar")
 shell.run("tar Build.tar /")
-sleep(1)
 print("Removing tar but bad...")
 shell.run("rm /tar.lua")
 shell.run("rm $")
-shell.run("rm Build.tar")
 shell.run("cp Build $")
 shell.run("rm Build")
+shell.run("rm Build.tar")
 fs.copy("/$/boot/cct/eeprom","/startup.lua")
 print("Installing...")
 sleep(1)