From 5f7ec88abf5a26f22817e69bd5a67089b44b6715 Mon Sep 17 00:00:00 2001 From: osmarks Date: Mon, 24 Aug 2020 12:12:34 +0100 Subject: [PATCH] fix (un)install, nicer colors --- manifest | 4 ++-- src/main.lua | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 314193a..d983c1d 100644 --- a/manifest +++ b/manifest @@ -1,2 +1,2 @@ -{"build":143,"description":"handle update errors better","files":{"LICENSES":"f3549d84d66eb53dd4a421a4341d77d3d217c1b117d67e3be8f5211adcda0952","autorun.lua":"23a539556233410e934893fdecf9e5606ab02805a6c2981a2b19e8bb83e10fc7","bin/5rot26.lua":"91b66cd6d4b33081b25c456142dd7efcb894e819e842693c9e1e17ff48872ff5","bin/chronometer.lua":"db5363993a04382145aef7db2fbe262f0bf10697a589e1e2d2f9ce0f87430dd8","bin/kristminer.lua":"7e7f9fe2a6493d584ad6926cda915e02c1c3d800dc209680898ce930d0bb0e6f","bin/livegps.lua":"c3d17d495cda01aa1261e4c4fcd43439b29af422671972117ec34f68e32c5bba","bin/loading.lua":"c85f7aa1765170325155b921c1fceeb62643f552f12d41b529a22af3a67f5a97","bin/potatoflight.lua":"2fbb0b6f8d78728d8cb0ec64af1bc598bd00cb55f202378e7acdb86bba71efd1","bin/potatoplex.lua":"86c9e7597bbe23d7de7e7f1bfc976d0b94dcdf3af9e6c7c6c9b18b98596898c8","bin/relay.lua":"261ae6c220b83506e3326e8f2b091d246baae458ff0d2ee87512be2c4e35a75d","bin/tryhaskell.lua":"07810d85145da65a3e434154c79d5a9d72f2dcbe59c8d6829040fb925df878ec","potatobios.lua":"9d32752f5bab07085dd574dc22d15141f4dfdf736820e7d70d11c4f836747397","signing-key.tbl":"b32af5229c23af3bc03d538e42751b26044e404a7b1af064ed89894efe421607","startup":"f17bfb9b4322c4467dc9170d50827f2d75717e5c3125d734f21f3406657917bc","update-key.hex":"8d8afb7a45833bb7d68f929421ad60a211d4d73e0ee03b24dc0106ba1de2e1a0","xlib/00_cbor.lua":"464b075e4f094b8db42506bd4bdaad0db87699ea7fbf80e5b87739b4aa9279af","xlib/01_skynet.lua":"1d2902d89a61f6c5853157e8ee1b3f2ba2664b1b08af16ad21b41115d551b78f"},"timestamp":1598218064} -{"hash":"45b8802ece2eabeeb4c9bee074692a39d488e21546868b4372883ecce3072845","sig":"f1914eb34d62a90b83d6884f29f1190172ee06fe2f99b72609c4ce668c49a8d22af906184009b4852224"} \ No newline at end of file +{"build":146,"description":"change colors","files":{"LICENSES":"f3549d84d66eb53dd4a421a4341d77d3d217c1b117d67e3be8f5211adcda0952","autorun.lua":"30c39e6b0f9bf197e9db5cf4a7b86bbd48343ab12f8bd5e98289c4a1609efc24","bin/5rot26.lua":"91b66cd6d4b33081b25c456142dd7efcb894e819e842693c9e1e17ff48872ff5","bin/chronometer.lua":"db5363993a04382145aef7db2fbe262f0bf10697a589e1e2d2f9ce0f87430dd8","bin/kristminer.lua":"7e7f9fe2a6493d584ad6926cda915e02c1c3d800dc209680898ce930d0bb0e6f","bin/livegps.lua":"c3d17d495cda01aa1261e4c4fcd43439b29af422671972117ec34f68e32c5bba","bin/loading.lua":"c85f7aa1765170325155b921c1fceeb62643f552f12d41b529a22af3a67f5a97","bin/potatoflight.lua":"2fbb0b6f8d78728d8cb0ec64af1bc598bd00cb55f202378e7acdb86bba71efd1","bin/potatoplex.lua":"86c9e7597bbe23d7de7e7f1bfc976d0b94dcdf3af9e6c7c6c9b18b98596898c8","bin/relay.lua":"261ae6c220b83506e3326e8f2b091d246baae458ff0d2ee87512be2c4e35a75d","bin/tryhaskell.lua":"07810d85145da65a3e434154c79d5a9d72f2dcbe59c8d6829040fb925df878ec","potatobios.lua":"9d32752f5bab07085dd574dc22d15141f4dfdf736820e7d70d11c4f836747397","signing-key.tbl":"b32af5229c23af3bc03d538e42751b26044e404a7b1af064ed89894efe421607","startup":"f17bfb9b4322c4467dc9170d50827f2d75717e5c3125d734f21f3406657917bc","xlib/00_cbor.lua":"464b075e4f094b8db42506bd4bdaad0db87699ea7fbf80e5b87739b4aa9279af","xlib/01_skynet.lua":"1d2902d89a61f6c5853157e8ee1b3f2ba2664b1b08af16ad21b41115d551b78f"},"timestamp":1598267369} +{"hash":"f0184322984a1cfa0ab06af3b4de4a517e3cdb806403c6eb13125786366b69d3"} \ No newline at end of file diff --git a/src/main.lua b/src/main.lua index 307fe28..615e2b4 100644 --- a/src/main.lua +++ b/src/main.lua @@ -16,7 +16,13 @@ This license also extends to other PotatOS components or bundled software owned term.clear() term.setCursorPos(1, 1) -term.setTextColor(colors.lime) +if term.isColor() then + term.setTextColor(colors.lightBlue) +else + term.setTextColor(colors.white) +end +term.setCursorBlink(false) +print "Loading..." if settings.get "potatOS.rph_mode" == true then print "PotatOS Rph Compliance Mode: Enabled." @@ -143,9 +149,6 @@ local secureish_randomseed = math.random(0xFFFFFFF) local version = "TuberOS" local versions = {"ErOSion", "TuberOS", "TuberculOSis", "mOSaic", "pOSitron", "ViscOSity", "AtmOSphere", "AsbestOS", "KerOSene", "ChromOSome", "GlucOSe", "MitOSis", "PhotOSynthesis", "PhilOSophy", "ApOStrophe", "AerOSol", "DisclOSure", "PhOSphorous", "CompOSition", "RepOSitory", "AlbatrOSs", "StratOSphere", "GlOSsary", "TranspOSition", "ApotheOSis", "HypnOSis", "IdiOSyncrasy", "OStrich", "ErOS", "ExplOSive", "OppOSite", "RhinocerOS", "AgnOStic", "PhOSphorescence", "CosmOS", "IonOSphere", "KaleidOScope", "cOSine", "OtiOSe", "GyrOScope", "MacrOScopic", "JuxtapOSe", "ChaOS", "ThanatOS", "AvocadOS", "IcOSahedron", "pOSsum", "albatrOSs", "crOSs", "mOSs", "purpOSe"} -term.clear() -term.setCursorBlink(false) - -- Utility functions and stuff -- Because we're COOL PEOPLE who open LOTS OF WEBSOCKETS, and don't want them to conflict, globally meddle with it for no good reason. @@ -754,7 +757,11 @@ function _G.uninstall(cause) --pcall(fs.move, filename, newpath) --pcall(fs.delete, filename) --end - pcall(fs.delete, "startup") + -- we no longer have a convenient `files` table in the source, so use the latest manifest instead + for file in pairs(registry.get "potatOS.current_manifest.files") do + pcall(fs.delete, file) + print("deleted", file) + end pcall(fs.delete, "startup.lua") print "Press any key to continue." os.pullEvent "key" @@ -1540,7 +1547,7 @@ return function(...) end if not polychoron or not fs.exists "potatobios.lua" or not fs.exists "autorun.lua" then -- Polychoron not installed, so PotatOS Tau isn't. - install() + install(true) else process.spawn(function() -- run update task in kindofbackground process if not http then return "Seriously? Why no HTTP?" end