From f2cd98c57aaa6bc83c46f904774873fc42be8515 Mon Sep 17 00:00:00 2001
From: Mikayla Fischler <mikayla@ky8.io>
Date: Wed, 3 Jul 2024 21:14:39 -0400
Subject: [PATCH] #194 fixes to log file handling, improved failure behavior,
 skip extra dialogs if nothing can be updated

---
 ccmsi.lua | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/ccmsi.lua b/ccmsi.lua
index 7f4647f..be9c2e8 100644
--- a/ccmsi.lua
+++ b/ccmsi.lua
@@ -132,7 +132,7 @@ local function http_get_file(file, w_path)
             f.close()
             break
         else
-            red();println("HTTP Error "..err)
+            red();println("HTTP Error: "..err)
             if i < 3 then lgray();print("> retrying...") end
 ---@diagnostic disable-next-line: undefined-field
             os.sleep(i/3.0)
@@ -193,6 +193,7 @@ local function clean(manifest)
     local log = nil
     if fs.exists(app..".settings") and settings.load(app..".settings") then
         log = settings.get("LogPath")
+        if log:sub(1, 1) == "/" then log = log:sub(2) end
     end
 
     local tree = gen_tree(manifest, log)
@@ -343,7 +344,7 @@ elseif mode == "install" or mode == "update" then
             local dl, err = http.get(repo_path.."ccmsi.lua")
 
             if dl == nil then
-                red();println("HTTP Error "..err)
+                red();println("HTTP Error: "..err)
                 println("Installer download failed.");white()
             else
                 local handle = fs.open(debug.getinfo(1, "S").source:sub(2), "w") -- this file, regardless of name or location
@@ -380,9 +381,6 @@ elseif mode == "install" or mode == "update" then
     ver.graphics.changed = show_pkg_change("graphics", ver.graphics)
     ver.lockbox.changed = show_pkg_change("lockbox", ver.lockbox)
 
-    -- ask for confirmation
-    if not ask_y_n("Continue", false) then return end
-
     --------------------------
     -- START INSTALL/UPDATE --
     --------------------------
@@ -397,11 +395,32 @@ elseif mode == "install" or mode == "update" then
 
     table.insert(dependencies, app)
 
+    -- helper function to check if a dependency is unchanged
+    local function unchanged(dependency)
+        if dependency == "system" then return not ver.boot.changed
+        elseif dependency == "graphics" then return not ver.graphics.changed
+        elseif dependency == "lockbox" then return not ver.lockbox.changed
+        elseif dependency == "common" then return not (ver.common.changed or ver.comms.changed)
+        elseif dependency == app then return not ver.app.changed
+        else return true end
+    end
+
+    local any_change = false
+
     for _, dependency in pairs(dependencies) do
         local size = size_list[dependency]
         space_required = space_required + size
+        any_change = any_change or not unchanged(dependency)
     end
 
+    if mode == "update" and not any_change then
+        yellow();println("Nothing to do, everything is already up-to-date!");white()
+        return
+    end
+
+    -- ask for confirmation
+    if not ask_y_n("Continue", false) then return end
+
     -- check space constraints
     if space_available < space_required then
         single_file_mode = true
@@ -417,16 +436,6 @@ elseif mode == "install" or mode == "update" then
 
     local success = true
 
-    -- helper function to check if a dependency is unchanged
-    local function unchanged(dependency)
-        if dependency == "system" then return not ver.boot.changed
-        elseif dependency == "graphics" then return not ver.graphics.changed
-        elseif dependency == "lockbox" then return not ver.lockbox.changed
-        elseif dependency == "common" then return not (ver.common.changed or ver.comms.changed)
-        elseif dependency == app then return not ver.app.changed
-        else return true end
-    end
-
     if not single_file_mode then
         if fs.exists(install_dir) then fs.delete(install_dir);fs.makeDir(install_dir) end
 
@@ -448,6 +457,7 @@ elseif mode == "install" or mode == "update" then
                     end
                 end
             end
+            if not success then break end
         end
 
         -- copy in downloaded files (installation)
@@ -504,6 +514,7 @@ elseif mode == "install" or mode == "update" then
                     end
                 end
             end
+            if not success then break end
         end
 
         if success then