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

#258 bugfixes

Browse Source
This commit is contained in:
Mikayla Fischler
2023-06-18 01:09:46 -04:00
parent 49db75f34d
commit d42327a20d
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ccmsi.lua
View File

@ -20,7 +20,7 @@ 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 CCMSI_VERSION = "v1.4a" local CCMSI_VERSION = "v1.4b"
local install_dir = "/.install-cache" local install_dir = "/.install-cache"
local manifest_path = "https://mikaylafischler.github.io/cc-mek-scada/manifests/" local manifest_path = "https://mikaylafischler.github.io/cc-mek-scada/manifests/"
@ -44,7 +44,7 @@ local function write_install_manifest(manifest, dependencies)
end end
end end
if key == app or is_dependency then versions[key] = value end if key == app or key == "comms" or is_dependency then versions[key] = value end
end end
manifest.versions = versions manifest.versions = versions
@ -418,9 +418,9 @@ elseif mode == "install" or mode == "update" then
-- download all dependencies -- download all dependencies
for _, dependency in pairs(dependencies) do for _, dependency in pairs(dependencies) do
if mode == "update" and ((dependency == "system" and ver.boot.changed) or if mode == "update" and ((dependency == "system" and not ver.boot.changed) or
(dependency == "graphics" and ver.graphics.changed) or (dependency == "graphics" and not ver.graphics.changed) or
(ver.app.changed)) then (not ver.app.changed)) then
pkg_message("skipping download of unchanged package", dependency) pkg_message("skipping download of unchanged package", dependency)
else else
pkg_message("downloading package", dependency) pkg_message("downloading package", dependency)
@ -448,9 +448,9 @@ elseif mode == "install" or mode == "update" then
-- copy in downloaded files (installation) -- 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 ver.boot.changed) or if mode == "update" and ((dependency == "system" and not ver.boot.changed) or
(dependency == "graphics" and ver.graphics.changed) or (dependency == "graphics" and not ver.graphics.changed) or
(ver.app.changed)) then (not ver.app.changed)) then
pkg_message("skipping install of unchanged package", dependency) pkg_message("skipping install of unchanged package", dependency)
else else
pkg_message("installing package", dependency) pkg_message("installing package", dependency)
@ -492,9 +492,9 @@ elseif mode == "install" or mode == "update" then
else else
-- go through all files and replace one by one -- 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 ver.boot.changed) or if mode == "update" and ((dependency == "system" and not ver.boot.changed) or
(dependency == "graphics" and ver.graphics.changed) or (dependency == "graphics" and not ver.graphics.changed) or
(ver.app.changed)) then (not ver.app.changed)) then
pkg_message("skipping install of unchanged package", dependency) pkg_message("skipping install of unchanged package", dependency)
else else
pkg_message("installing package", dependency) pkg_message("installing package", dependency)

2
graphics/core.lua
View File

@ -7,7 +7,7 @@ local flasher = require("graphics.flasher")
local core = {} local core = {}
core.version = "1.0.0-test" core.version = "1.0.0-test2"
core.flasher = flasher core.flasher = flasher
core.events = events core.events = events