#573 fix to install

This commit is contained in:
Mikayla Fischler 2024-11-09 12:10:50 -05:00
parent 8439e02586
commit d36f7adab1

View File

@ -15,7 +15,7 @@ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
]]-- ]]--
local CCMSI_VERSION = "v1.19a" local CCMSI_VERSION = "v1.19b"
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/"
@ -400,12 +400,11 @@ elseif mode == "install" or mode == "update" then
-- try to find local versions -- try to find local versions
ok, l_manifest = read_local_manifest() ok, l_manifest = read_local_manifest()
if not update_installer then if mode == "update" and not update_installer then
if mode == "update" and not ok then if not ok then
red();println("Failed to load local installation information, cannot update.");white() red();println("Failed to load local installation information, cannot update.");white()
return return
end else
ver.boot.v_local = l_manifest.versions.bootloader ver.boot.v_local = l_manifest.versions.bootloader
ver.app.v_local = l_manifest.versions[app] ver.app.v_local = l_manifest.versions[app]
ver.comms.v_local = l_manifest.versions.comms ver.comms.v_local = l_manifest.versions.comms
@ -418,6 +417,7 @@ elseif mode == "install" or mode == "update" then
return return
end end
end end
end
if r_manifest.versions.installer ~= CCMSI_VERSION then if r_manifest.versions.installer ~= CCMSI_VERSION then
if not update_installer then yellow();println("A different version of the installer is available, it is recommended to update to it.");white() end if not update_installer then yellow();println("A different version of the installer is available, it is recommended to update to it.");white() end