Possible new app system?; Changed copyright; Some fixes

13 files changed, 25 insertions, 19 deletions

diff --git a/boot/ccboot/boot.lua b/boot/ccboot/boot.lua
index f094de0..f5d1013 100644
--- a/boot/ccboot/boot.lua
+++ b/boot/ccboot/boot.lua
@@ -1,6 +1,6 @@
 if os.ccboot then
 	term.setTextColor(colors.red);
-	print("Insufficient memory.");
+	print("Please reboot if you want to use this bootloader.");
 	error();
 end;
 
diff --git a/boot/ccboot/ccboot.cfg b/boot/ccboot/ccboot.cfg
index 3c7cbd4..f9cff2f 100644
--- a/boot/ccboot/ccboot.cfg
+++ b/boot/ccboot/ccboot.cfg
@@ -5,4 +5,5 @@ entry bits-UI;system/boot.lua
 entry bits-UI Update;system/update.lua
 entry bits-UI Recovery;system/recovery/main.lua
 entry CraftOS Regular;rom/programs/shell.lua
-entry CraftOS (MBS);boot/mbs.lua
\ No newline at end of file
+entry CraftOS (MBS);boot/mbs.lua
+entry Shutdown;shutdown
\ No newline at end of file
diff --git a/boot/mbs.lua b/boot/mbs.lua
index a80ee70..129109f 100644
--- a/boot/mbs.lua
+++ b/boot/mbs.lua
@@ -2,4 +2,4 @@ assert(loadfile("/.mbs/bin/mbs.lua", _ENV))('startup')
 term.setTextColor(16)
 print(os.version() .. " (+MBS)")
 term.setCursorPos(1,2)
-term.setTextColor(1)
\ No newline at end of file
+term.setTextColor(1)
diff --git a/programs/TestApp.bup/Contents/Resources/resources_here.txt b/programs/TestApp.bup/Contents/Resources/resources_here.txt
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/programs/TestApp.bup/Contents/Resources/resources_here.txt
@@ -0,0 +1 @@
+ 
diff --git a/programs/TestApp.bup/Contents/bits-UI/testapp.lua b/programs/TestApp.bup/Contents/bits-UI/testapp.lua
new file mode 100644
index 0000000..8d1c8b6
--- /dev/null
+++ b/programs/TestApp.bup/Contents/bits-UI/testapp.lua
@@ -0,0 +1 @@
+ 
diff --git a/system/bits-UI.exists b/system/bits-UI.exists
new file mode 100644
index 0000000..b85a3bf
--- /dev/null
+++ b/system/bits-UI.exists
@@ -0,0 +1,2 @@
+DO NOT DELETE THIS FILE.
+This file is required for the updater.
diff --git a/system/boot.lua b/system/boot.lua
index c1caace..4777ede 100644
--- a/system/boot.lua
+++ b/system/boot.lua
@@ -1,6 +1,6 @@
 --[[
     bits-UI Boot: A boot script for bits-UI.
-    Copyright (C) 2019 Alee14
+    Copyright (C) 2020 Alee14
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/system/desktop.lua b/system/desktop.lua
index d49b6e8..fe6cbb6 100644
--- a/system/desktop.lua
+++ b/system/desktop.lua
@@ -1,6 +1,6 @@
 --[[
     bits-UI Desktop: A Desktop for bits-UI
-    Copyright (C) 2019 Alee14
+    Copyright (C) 2020 Alee14
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/system/post-setup.lua b/system/post-setup.lua
index 2ed8b70..18f289f 100644
--- a/system/post-setup.lua
+++ b/system/post-setup.lua
@@ -1,6 +1,6 @@
 --[[
     bits-UI Setup: Post installation setup for bits-UI
-    Copyright (C) 2019 Alee14
+    Copyright (C) 2020 Alee14
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
diff --git a/system/recovery/main.lua b/system/recovery/main.lua
index 944e168..10fbe18 100644
--- a/system/recovery/main.lua
+++ b/system/recovery/main.lua
@@ -1,6 +1,6 @@
 --[[ 
     bits-UI Recovery Script: A script that's going to show you to either reset the computer or transfer files.
-    Copyright (C) 2019 Alee14
+    Copyright (C) 2020 Alee14
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -25,5 +25,5 @@ if input == "reset" then
 elseif input == "transfer" then
     shell.run("/system/recovery/transfer.lua")
 else
-    shell.run("/startup.lua")
+    os.reboot()
 end
\ No newline at end of file
diff --git a/system/recovery/reset.lua b/system/recovery/reset.lua
index 9b8efb4..a8c8cf1 100644
--- a/system/recovery/reset.lua
+++ b/system/recovery/reset.lua
@@ -1,6 +1,6 @@
 --[[ 
     bits-UI Reset Script: A script that will wipe the system to the default factory settings.
-    Copyright (C) 2019 Alee14
+    Copyright (C) 2020 Alee14
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -32,5 +32,5 @@ if input == "y" then
     sleep(3)
     os.reboot()
 else
-    shell.run("startup.lua")
+    os.reboot()
 end
\ No newline at end of file
diff --git a/system/recovery/transfer.lua b/system/recovery/transfer.lua
index 56be78c..b1b98f1 100644
--- a/system/recovery/transfer.lua
+++ b/system/recovery/transfer.lua
@@ -1,6 +1,6 @@
 --[[ 

     bits-UI Transfer Script: A script that will transfer files from one system to the other.

-    Copyright (C) 2019 Alee14

+    Copyright (C) 2020 Alee14

 

     This program is free software: you can redistribute it and/or modify

     it under the terms of the GNU General Public License as published by

@@ -25,5 +25,5 @@ else
     print("You need a floppy disk to copy over data.")

     print("Transfer has been halted.")

     sleep(2)

-    shell.run("/startup.lua")

+    os.reboot()

 end
\ No newline at end of file
diff --git a/system/update.lua b/system/update.lua
index 7239f9a..3e04931 100644
--- a/system/update.lua
+++ b/system/update.lua
@@ -1,6 +1,6 @@
 --[[ 
     bits-UI Update: A boot loader for bits-UI
-    Copyright (C) 2019 Alee14
+    Copyright (C) 2020 Alee14
 
     This program is free software: you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -13,18 +13,19 @@
     GNU General Public License for more details.
 
 ]]--
-local devMode = false
+local gitMode = false
 if fs.exists("/.git") then
-    devMode = true
+    gitMode = true
 else
-    devMode = false
+    gitMode = false
 end
-if devMode == true then
-    print("Developer mode is set to true!\nWhich means that you cannot update, you must use github to update.")
+if gitMode == true then
+    print("NOTICE: Git mode is set to true!\n\nWhich means that you cannot update, you must use Git to update.\n")
+    print("Args: \"git pull\"")
     sleep(2)
     os.reboot()
 else
 print("Running the updater...")
 sleep(1)
 shell.run("pastebin", "run", "7XY80hfG")
-end
\ No newline at end of file
+end