Minecraft/cc-mek-scada
1
0
Fork 0
mirror of https://github.com/MikaylaFischler/cc-mek-scada.git synced 2024-08-30 18:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

#117 installer v0.9b cleanup and improvements to check list

Browse Source
This commit is contained in:
Mikayla Fischler 2023-02-19 20:43:39 -05:00
parent 279a40e335
commit 632e96c8b3
1 changed files with 73 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
ccmsi.lua
View File

@ -3,7 +3,6 @@
-- --
--[[ --[[
Copyright © 2023 Mikayla Fischler Copyright © 2023 Mikayla Fischler
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
@ -16,13 +15,12 @@ LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE A
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
]]-- ]]--
local function println(message) print(tostring(message)) end local function println(message) print(tostring(message)) end
local function print(message) term.write(tostring(message)) end local function print(message) term.write(tostring(message)) end
local VERSION = "v0.9a" local VERSION = "v0.9b"
local install_dir = "/.install-cache" local install_dir = "/.install-cache"
local repo_path = "http://raw.githubusercontent.com/MikaylaFischler/cc-mek-scada/" local repo_path = "http://raw.githubusercontent.com/MikaylaFischler/cc-mek-scada/"
@ -45,9 +43,7 @@ local function write_install_manifest(manifest, dependencies)
end end
end end
if key == app or key == "comms" or is_dependency then if key == app or key == "comms" or is_dependency then versions[key] = value end
versions[key] = value
end
end end
manifest.versions = versions manifest.versions = versions
@ -86,9 +82,10 @@ if #opts == 0 or opts[1] == "help" then
term.setTextColor(colors.white) term.setTextColor(colors.white)
println("<tag/branch>") println("<tag/branch>")
term.setTextColor(colors.yellow) term.setTextColor(colors.yellow)
println(" second parameter instead of app when used with check") println(" second parameter when used with check")
term.setTextColor(colors.lightGray) term.setTextColor(colors.lightGray)
println(" target GitHub tag or branch name instead of main") println(" note: defaults to main")
println(" target GitHub tag or branch name")
return return
else else
for _, v in pairs({ "check", "install", "update", "remove", "purge" }) do for _, v in pairs({ "check", "install", "update", "remove", "purge" }) do
@ -131,9 +128,10 @@ if mode == "check" then
local response, error = http.get(install_manifest) local response, error = http.get(install_manifest)
if response == nil then if response == nil then
term.setTextColor(colors.red) term.setTextColor(colors.orange)
println("failed to get installation manifest from GitHub, cannot update or install") println("failed to get installation manifest from GitHub, cannot update or install")
println("http error " .. error) term.setTextColor(colors.red)
println("HTTP error: " .. error)
term.setTextColor(colors.white) term.setTextColor(colors.white)
return return
end end
@ -162,25 +160,37 @@ if mode == "check" then
if not local_ok then if not local_ok then
term.setTextColor(colors.yellow) term.setTextColor(colors.yellow)
println("warning: failed to load local installation information") println("failed to load local installation information")
term.setTextColor(colors.white) term.setTextColor(colors.white)
end end
-- list all versions
for key, value in pairs(manifest.versions) do for key, value in pairs(manifest.versions) do
term.setTextColor(colors.purple) term.setTextColor(colors.purple)
print(string.format("%-14s", "[" .. key .. "]")) print(string.format("%-14s", "[" .. key .. "]"))
term.setTextColor(colors.blue)
print(value)
if local_ok and (local_manifest.versions[key] ~= nil) then if local_ok and (local_manifest.versions[key] ~= nil) then
term.setTextColor(colors.white)
print(" (current ")
term.setTextColor(colors.blue) term.setTextColor(colors.blue)
print(value) print(local_manifest.versions[key])
term.setTextColor(colors.white) if value ~= local_manifest.versions[key] then
println(")") term.setTextColor(colors.white)
print(" (")
term.setTextColor(colors.cyan)
print(value)
term.setTextColor(colors.white)
println(" available)")
else
term.setTextColor(colors.green)
print(" (up to date)")
end
else else
term.setTextColor(colors.lightGray) term.setTextColor(colors.lightGray)
println(" (not installed)") println("not installed")
term.setTextColor(colors.white)
print(" (")
term.setTextColor(colors.cyan)
print(value)
term.setTextColor(colors.white)
println(" available)")
end end
end end
elseif mode == "install" or mode == "update" then elseif mode == "install" or mode == "update" then
@ -194,9 +204,10 @@ elseif mode == "install" or mode == "update" then
local response, error = http.get(install_manifest) local response, error = http.get(install_manifest)
if response == nil then if response == nil then
term.setTextColor(colors.red) term.setTextColor(colors.orange)
println("failed to get installation manifest from GitHub, cannot update or install") println("failed to get installation manifest from GitHub, cannot update or install")
println("http error " .. error) term.setTextColor(colors.red)
println("HTTP error: " .. error)
term.setTextColor(colors.white) term.setTextColor(colors.white)
return return
end end
@ -226,6 +237,7 @@ elseif mode == "install" or mode == "update" then
local local_comms_version = nil local local_comms_version = nil
local local_boot_version = nil local local_boot_version = nil
-- try to find local versions
if not local_ok then if not local_ok then
if mode == "update" then if mode == "update" then
term.setTextColor(colors.yellow) term.setTextColor(colors.yellow)
@ -257,6 +269,7 @@ elseif mode == "install" or mode == "update" then
end end
term.setTextColor(colors.white) term.setTextColor(colors.white)
-- display bootloader version change information
if local_boot_version ~= nil then if local_boot_version ~= nil then
if local_boot_version ~= remote_boot_version then if local_boot_version ~= remote_boot_version then
print("[bootldr] updating ") print("[bootldr] updating ")
@ -267,6 +280,11 @@ elseif mode == "install" or mode == "update" then
term.setTextColor(colors.blue) term.setTextColor(colors.blue)
println(remote_boot_version) println(remote_boot_version)
term.setTextColor(colors.white) term.setTextColor(colors.white)
elseif mode == "install" then
print("[bootldr] reinstalling ")
term.setTextColor(colors.blue)
print(local_boot_version)
term.setTextColor(colors.white)
end end
else else
print("[bootldr] new install of ") print("[bootldr] new install of ")
@ -275,6 +293,7 @@ elseif mode == "install" or mode == "update" then
term.setTextColor(colors.white) term.setTextColor(colors.white)
end end
-- display app version change information
if local_app_version ~= nil then if local_app_version ~= nil then
if local_app_version ~= remote_app_version then if local_app_version ~= remote_app_version then
print("[" .. app .. "] updating ") print("[" .. app .. "] updating ")
@ -285,6 +304,11 @@ elseif mode == "install" or mode == "update" then
term.setTextColor(colors.blue) term.setTextColor(colors.blue)
println(remote_app_version) println(remote_app_version)
term.setTextColor(colors.white) term.setTextColor(colors.white)
elseif mode == "install" then
print("[" .. app .. "] reinstalling ")
term.setTextColor(colors.blue)
print(local_app_version)
term.setTextColor(colors.white)
end end
else else
print("[" .. app .. "] new install of ") print("[" .. app .. "] new install of ")
@ -293,6 +317,7 @@ elseif mode == "install" or mode == "update" then
term.setTextColor(colors.white) term.setTextColor(colors.white)
end end
-- display comms version change information
if local_comms_version ~= nil then if local_comms_version ~= nil then
if local_comms_version ~= remote_comms_version then if local_comms_version ~= remote_comms_version then
print("[comms] updating ") print("[comms] updating ")
@ -303,11 +328,15 @@ elseif mode == "install" or mode == "update" then
term.setTextColor(colors.blue) term.setTextColor(colors.blue)
println(remote_comms_version) println(remote_comms_version)
term.setTextColor(colors.white) term.setTextColor(colors.white)
print("[comms] ") print("[comms] ")
term.setTextColor(colors.yellow) term.setTextColor(colors.yellow)
println("other devices on the network will require an update") println("other devices on the network will require an update")
term.setTextColor(colors.white) term.setTextColor(colors.white)
elseif mode == "install" then
print("[comms] reinstalling ")
term.setTextColor(colors.blue)
print(local_comms_version)
term.setTextColor(colors.white)
end end
else else
print("[comms] new install of ") print("[comms] new install of ")
@ -336,10 +365,11 @@ elseif mode == "install" or mode == "update" then
space_required = space_required + size space_required = space_required + size
end end
-- check space constraints
if space_available < space_required then if space_available < space_required then
single_file_mode = true single_file_mode = true
term.setTextColor(colors.red) term.setTextColor(colors.yellow)
println("WARNING: Insuffienct space available for a full download!") println("WARNING: Insufficient space available for a full download!")
term.setTextColor(colors.white) term.setTextColor(colors.white)
println("Files will be downloaded one by one, so if you are replacing a current install this will not be a problem unless installation fails.") println("Files will be downloaded one by one, so if you are replacing a current install this will not be a problem unless installation fails.")
println("Do you wish to continue? (y/N)") println("Do you wish to continue? (y/N)")
@ -362,6 +392,7 @@ elseif mode == "install" or mode == "update" then
fs.makeDir(install_dir) fs.makeDir(install_dir)
end end
-- download all dependencies
for _, dependency in pairs(dependencies) do for _, dependency in pairs(dependencies) do
if mode == "update" and ((dependency == "system" and local_boot_version == remote_boot_version) or (local_app_version == remote_app_version)) then if mode == "update" and ((dependency == "system" and local_boot_version == remote_boot_version) or (local_app_version == remote_app_version)) then
-- skip system package if unchanged, skip app package if not changed -- skip system package if unchanged, skip app package if not changed
@ -379,12 +410,12 @@ elseif mode == "install" or mode == "update" then
term.setTextColor(colors.lightGray) term.setTextColor(colors.lightGray)
local files = file_list[dependency] local files = file_list[dependency]
for _, file in pairs(files) do for _, file in pairs(files) do
println("get: " .. file) println("GET: " .. file)
local dl, err_c = http.get(repo_path .. file) local dl, err = http.get(repo_path .. file)
if dl == nil then if dl == nil then
term.setTextColor(colors.red) term.setTextColor(colors.red)
println("get: error " .. err_c) println("GET: HTTP Error " .. err)
success = false success = false
break break
else else
@ -396,6 +427,7 @@ elseif mode == "install" or mode == "update" then
end end
end end
-- copy in downloaded files (installation)
if success then if success then
for _, dependency in pairs(dependencies) do for _, dependency in pairs(dependencies) do
if mode == "update" and ((dependency == "system" and local_boot_version == remote_boot_version) or (local_app_version == remote_app_version)) then if mode == "update" and ((dependency == "system" and local_boot_version == remote_boot_version) or (local_app_version == remote_app_version)) then
@ -446,6 +478,7 @@ elseif mode == "install" or mode == "update" then
end end
end end
else else
-- go through all files and replace one by one
for _, dependency in pairs(dependencies) do for _, dependency in pairs(dependencies) do
if mode == "update" and ((dependency == "system" and local_boot_version == remote_boot_version) or (local_app_version == remote_app_version)) then if mode == "update" and ((dependency == "system" and local_boot_version == remote_boot_version) or (local_app_version == remote_app_version)) then
-- skip system package if unchanged, skip app package if not changed -- skip system package if unchanged, skip app package if not changed
@ -463,11 +496,11 @@ elseif mode == "install" or mode == "update" then
term.setTextColor(colors.lightGray) term.setTextColor(colors.lightGray)
local files = file_list[dependency] local files = file_list[dependency]
for _, file in pairs(files) do for _, file in pairs(files) do
println("get: " .. file) println("GET: " .. file)
local dl, err_c = http.get(repo_path .. file) local dl, err = http.get(repo_path .. file)
if dl == nil then if dl == nil then
println("get: error " .. err_c) println("GET: HTTP Error " .. err)
success = false success = false
break break
else else
@ -513,7 +546,7 @@ elseif mode == "remove" or mode == "purge" then
println("error parsing local installation manifest") println("error parsing local installation manifest")
term.setTextColor(colors.white) term.setTextColor(colors.white)
return return
elseif manifest.versions[app] == nil then elseif mode == "remove" and manifest.versions[app] == nil then
term.setTextColor(colors.red) term.setTextColor(colors.red)
println(app .. " is not installed") println(app .. " is not installed")
term.setTextColor(colors.white) term.setTextColor(colors.white)
@ -551,7 +584,7 @@ elseif mode == "remove" or mode == "purge" then
if not log_deleted then if not log_deleted then
term.setTextColor(colors.red) term.setTextColor(colors.red)
println("failed to delete log file") println("failed to delete log file")
term.setTextColor(colors.white) term.setTextColor(colors.lightGray)
---@diagnostic disable-next-line: undefined-field ---@diagnostic disable-next-line: undefined-field
os.sleep(1) os.sleep(1)
end end
@ -569,6 +602,7 @@ elseif mode == "remove" or mode == "purge" then
end end
end end
-- delete folders that we should be deleteing
if mode == "purge" or dependency ~= app then if mode == "purge" or dependency ~= app then
local folder = files[1] local folder = files[1]
while true do while true do
@ -603,9 +637,16 @@ elseif mode == "remove" or mode == "purge" then
end end
end end
-- only delete manifest if purging
if mode == "purge" then if mode == "purge" then
fs.delete("install_manifest.json") fs.delete("install_manifest.json")
println("deleted install_manifest.json") println("deleted install_manifest.json")
else
-- remove all data from versions list to show nothing is installed
manifest.versions = {}
imfile = fs.open("install_manifest.json", "w")
imfile.write(textutils.serializeJSON(manifest))
imfile.close()
end end
term.setTextColor(colors.green) term.setTextColor(colors.green)