#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,22 +400,22 @@ 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.app.v_local = l_manifest.versions[app]
ver.comms.v_local = l_manifest.versions.comms
ver.common.v_local = l_manifest.versions.common
ver.graphics.v_local = l_manifest.versions.graphics
ver.lockbox.v_local = l_manifest.versions.lockbox
ver.boot.v_local = l_manifest.versions.bootloader if l_manifest.versions[app] == nil then
ver.app.v_local = l_manifest.versions[app] red();println("Another application is already installed, please uninstall it before installing a new application.");white()
ver.comms.v_local = l_manifest.versions.comms return
ver.common.v_local = l_manifest.versions.common end
ver.graphics.v_local = l_manifest.versions.graphics
ver.lockbox.v_local = l_manifest.versions.lockbox
if l_manifest.versions[app] == nil then
red();println("Another application is already installed, please uninstall it before installing a new application.");white()
return
end end
end end