diff options
| author | Andrew Lee <alee14498@protonmail.com> | 2020-11-16 17:08:41 -0500 |
|---|---|---|
| committer | Andrew Lee <alee14498@protonmail.com> | 2020-11-16 17:08:41 -0500 |
| commit | 53e4faeef243c8e229b29012a8031878d7ba666a (patch) | |
| tree | 426ef27599be741c710f46cb80373ab49331564b | |
| parent | d971f492e0939d85bb55361d028dd0fe9428be63 (diff) | |
| download | bits-UI-53e4faeef243c8e229b29012a8031878d7ba666a.tar.gz bits-UI-53e4faeef243c8e229b29012a8031878d7ba666a.tar.bz2 bits-UI-53e4faeef243c8e229b29012a8031878d7ba666a.zip | |
Revert changes; Added a welcome text
| -rw-r--r-- | System/desktop.lua | 2 | ||||
| -rw-r--r-- | System/post-setup.lua | 4 | ||||
| -rw-r--r-- | System/recovery/main.lua | 5 | ||||
| -rw-r--r-- | startup.lua | 10 |
4 files changed, 15 insertions, 6 deletions
diff --git a/System/desktop.lua b/System/desktop.lua index 58888ed..786b668 100644 --- a/System/desktop.lua +++ b/System/desktop.lua @@ -13,7 +13,7 @@ GNU General Public License for more details. ]]-- -os.require("/System/apis/flib.lua") +os.loadAPI("/System/apis/flib.lua") local backgroundColour = 32768 local backgroundImage = "/home/.background" local panelColour = 8192 diff --git a/System/post-setup.lua b/System/post-setup.lua index d213650..94c9d65 100644 --- a/System/post-setup.lua +++ b/System/post-setup.lua @@ -12,8 +12,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. ]]-- -os.require("/System/apis/sha256.lua") -os.require("/System/apis/json.lua") +os.loadAPI("/System/apis/sha256.lua") +os.loadAPI("/System/apis/json.lua") local config = "/Home/.config" term.clear() diff --git a/System/recovery/main.lua b/System/recovery/main.lua index 15c51aa..0adb7cc 100644 --- a/System/recovery/main.lua +++ b/System/recovery/main.lua @@ -19,10 +19,11 @@ term.setTextColor(colors.white) print("Welcome to the bits-UI recovery mode!") sleep(2) print("Do you want to either reset or transfer?") +print("1 or 2") local input = read(); -if input == "reset" then +if input == "1" then shell.run("/System/recovery/reset.lua") -elseif input == "transfer" then +elseif input == "2" then shell.run("/System/recovery/transfer.lua") else os.reboot() diff --git a/startup.lua b/startup.lua index f0dd84d..81b8daa 100644 --- a/startup.lua +++ b/startup.lua @@ -1,5 +1,13 @@ if fs.exists("/boot/ccboot/boot.lua") then -shell.run("boot/ccboot/boot.lua"); + term.clear() + term.setCursorPos(1,1) + term.setBackgroundColor(colours.white) + term.setTextColor(colours.black) + print("Welcome to CCBoot!") + sleep(1) + term.setBackgroundColor(colours.black) + term.setTextColor(colours.white) + shell.run("boot/ccboot/boot.lua"); else term.clear() term.setCursorPos(1,1) |