Final changes for release

Author: hugeblank

Diff for: allium.lua

@@ -66,7 +66,7 @@ local cli = {
 	error = {"[", colors.red, "E", colors.white, "] "}
 }
 
-local config = ...
+local config, up = ...
 do -- Configuration parsing
 	if type(config) ~= "table" then
 		printError("Invalid input configuration, make sure you're using the provided init file.")
@@ -612,32 +612,30 @@ local player_scanner = function() -- Login/out scanner thread
     end
 end
 
-local common = {
-	unhide_update = false,
-	run = {}
-}
-common.refresh = function()
-	local done = term.redirect(main)
-	local x, y = term.getSize()
-	common.bY = y-1
-	if common.unhide_update then
-		common.bX = x-6
-		term.setCursorPos(x-6, y-1)
-		term.blit("TRS \24", "888f8", "14efb")
-	else
-		common.bX = x-5
-		term.setCursorPos(x-5, y-1)
-		term.blit("TRS", "888", "14e")
+local update_interaction = function() -- Update UI scanning and handling thread
+	local common = {
+		run = {}
+	}
+	common.refresh = function()
+		local done = term.redirect(main)
+		local x, y = term.getSize()
+		common.bY = y-1
+		if #common.run > 0 then
+			common.bX = x-6
+			term.setCursorPos(x-6, y-1)
+			term.blit("TRS \24", "888f8", "14efb")
+		else
+			common.bX = x-5
+			term.setCursorPos(x-5, y-1)
+			term.blit("TRS", "888", "14e")
+		end
+		term.setBackgroundColor(colors.black) -- Reset terminal and cursor
+		term.setTextColor(colors.white)
+		term.redirect(done)
 	end
-	term.setBackgroundColor(colors.black) -- Reset terminal and cursor
-	term.setTextColor(colors.white)
-	term.redirect(done)
-end
-
-local update_interaction = function()
 	parallel.waitForAll(function() -- Update checker on initialize
-		if config.updates.check.dependencies then
-			local suc, deps = config.updates.check.dependencies()
+		if config.updates.notify.dependencies then
+			local suc, deps = up.check.dependencies()
 			local suffixer
 			if type(deps) == "table" and #deps > 0 then
 				if #deps == 1 then
@@ -646,18 +644,16 @@ local update_interaction = function()
 					suffixer = {"Utilities: ", " are "}
 				end
 				allium.log(suffixer[1]..table.concat(deps, ", ")..suffixer[2].."ready to be updated")
-				common.run[#common.run+1] = {config.updates.run.dependencies}
-				common.unhide_update = true
+				common.run[#common.run+1] = {up.run.dependencies}
 			elseif not suc then
 				print(cli.error, true, "Error in checking for dependency updates: "..deps)
 			end
 		end
-		if config.updates.check.allium then
-			local sha = config.updates.check.allium()
+		if config.updates.notify.allium then
+			local sha = up.check.allium()
 			if sha ~= config.sha then
 				allium.log("Allium is ready to be updated")
-				common.run[#common.run+1] = {config.updates.run.allium, sha}
-				common.unhide_update = true
+				common.run[#common.run+1] = {up.run.allium, sha}
 			elseif not sha then
 				allium.warn("Failed to scan for allium updates")
 			end
@@ -685,7 +681,7 @@ local update_interaction = function()
 						allium.log("Shutting down...")
 						sleep(1)
 						os.shutdown()
-					elseif x-common.bX == 4 and common.unhide_update then -- Update
+					elseif x-common.bX == 4 and #common.run > 0 then -- Update
 						allium.log("Downloading updates...")
 						for i = 1, #common.run do
 							local s, err = pcall(table.unpack(common.run[i]))

Diff for: startup.lua

@@ -1,6 +1,6 @@
 -- Allium version
 -- x.x.x-pr = unstable, potential breaking changes
-local allium_version = "0.9.0-pr.newcolor"
+local allium_version = "0.9.0"
 
 local path = "/"
 local firstrun = false
@@ -65,10 +65,10 @@ local loadSettings = function(file, default)
     return config
 end
 
-local config = loadSettings(path.."cfg/allium.lson", default)
+local config, up = loadSettings(fs.combine(path, "cfg/allium.lson"), default), {}
 local depman
-config.updates.check = {}
-config.updates.run = {}
+up.check = {}
+up.run = {}
 
 if config.updates.notify.dependencies then
     local depget = http.get("https://raw.githubusercontent.com/hugeblank/allium-depman/master/instance.lua")
@@ -90,15 +90,15 @@ if config.updates.notify.dependencies then
             _G.print = temp
             return result, table.unpack(out)
         end
-        config.updates.check.dependencies = function()
+        up.check.dependencies = function()
             local suc, out = depman("scan")
             if suc then
                 return suc, textutils.unserialise(out)
             else
                 return suc, out
             end
         end
-        config.updates.run.dependencies = function()
+        up.run.dependencies = function()
             return depman("upgrade")
         end
     end
@@ -116,7 +116,7 @@ end
 local github, json = require("lib.nap")("https://api.github.com"), require("lib.json")
 
 if config.updates.notify.allium then
-    config.updates.check.allium = function()
+    up.check.allium = function()
         local repo = config.updates.repo
         local jsonresponse = github.repos[repo.user][repo.name].commits[repo.branch]({
             method = "GET"
@@ -126,10 +126,10 @@ if config.updates.notify.allium then
             jsonresponse.close()
             return json.decode(out).sha
         else
-            return false
+            return false, "No response from github"
         end
     end
-    config.updates.run.allium = function(sha)
+    up.run.allium = function(sha)
         local repo = config.updates.repo
         local null = function() end
         os.run({
@@ -215,7 +215,7 @@ term.setCursorPos(1, 1)
 
 -- Running Allium
 multishell.setTitle(multishell.getCurrent(), "Allium")
-local s, e = pcall(os.run, _ENV, path.."allium.lua", config)
+local s, e = pcall(os.run, _ENV, path.."allium.lua", config, up)
 if not s then
     printError(e)
 end