From d42327a20d5f7ce57283e76687b19dfb093c9694 Mon Sep 17 00:00:00 2001
From: Mikayla Fischler <mikayla@ky8.io>
Date: Sun, 18 Jun 2023 01:09:46 -0400
Subject: [PATCH] #258 bugfixes

---
 ccmsi.lua         | 22 +++++++++++-----------
 graphics/core.lua |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ccmsi.lua b/ccmsi.lua
index dd66062..7fefba7 100644
--- a/ccmsi.lua
+++ b/ccmsi.lua
@@ -20,7 +20,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 local function println(message) print(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 manifest_path = "https://mikaylafischler.github.io/cc-mek-scada/manifests/"
@@ -44,7 +44,7 @@ local function write_install_manifest(manifest, dependencies)
             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
 
     manifest.versions = versions
@@ -418,9 +418,9 @@ elseif mode == "install" or mode == "update" then
 
         -- download all dependencies
         for _, dependency in pairs(dependencies) do
-            if mode == "update" and ((dependency == "system" and ver.boot.changed) or
-                                     (dependency == "graphics" and ver.graphics.changed) or
-                                     (ver.app.changed)) then
+            if mode == "update" and ((dependency == "system" and not ver.boot.changed) or
+                                     (dependency == "graphics" and not ver.graphics.changed) or
+                                     (not ver.app.changed)) then
                 pkg_message("skipping download of unchanged package", dependency)
             else
                 pkg_message("downloading package", dependency)
@@ -448,9 +448,9 @@ elseif mode == "install" or mode == "update" then
         -- copy in downloaded files (installation)
         if success then
             for _, dependency in pairs(dependencies) do
-                if mode == "update" and ((dependency == "system" and ver.boot.changed) or
-                                         (dependency == "graphics" and ver.graphics.changed) or
-                                         (ver.app.changed)) then
+                if mode == "update" and ((dependency == "system" and not ver.boot.changed) or
+                                         (dependency == "graphics" and not ver.graphics.changed) or
+                                         (not ver.app.changed)) then
                     pkg_message("skipping install of unchanged package", dependency)
                 else
                     pkg_message("installing package", dependency)
@@ -492,9 +492,9 @@ elseif mode == "install" or mode == "update" then
     else
         -- go through all files and replace one by one
         for _, dependency in pairs(dependencies) do
-            if mode == "update" and ((dependency == "system" and ver.boot.changed) or
-                                     (dependency == "graphics" and ver.graphics.changed) or
-                                     (ver.app.changed)) then
+            if mode == "update" and ((dependency == "system" and not ver.boot.changed) or
+                                     (dependency == "graphics" and not ver.graphics.changed) or
+                                     (not ver.app.changed)) then
                 pkg_message("skipping install of unchanged package", dependency)
             else
                 pkg_message("installing package", dependency)
diff --git a/graphics/core.lua b/graphics/core.lua
index 657bc0d..c343308 100644
--- a/graphics/core.lua
+++ b/graphics/core.lua
@@ -7,7 +7,7 @@ local flasher = require("graphics.flasher")
 
 local core = {}
 
-core.version = "1.0.0-test"
+core.version = "1.0.0-test2"
 
 core.flasher = flasher
 core.events = events