Revert pre-alpha 3.0.0 because I was supposed to push it to a branch.

This reverts commit cbf25999f0.

halyde/apps/argentum.lua

@@ -1,9 +1,9 @@
 local packages = {...}
 local command = packages[1]
 table.remove(packages, 1)
-local fs = require("filesystem")
-local component = require("component")
-local agReg = require("/argentum/registry.cfg")
+local fs = import("filesystem")
+local component = import("component")
+local agReg = import("/argentum/registry.cfg")
 if not command then
   shell.run("help argentum")
   return
@@ -346,7 +346,7 @@ if command == "install" then
   else
     print("\27[91mFailed to fetch Ag registry: " .. (errorMessage or "returned nil"))
   end
-  agReg = require("/argentum/registry.cfg")
+  agReg = import("/argentum/registry.cfg")
   while true do
     if not doChecks(packages[i]) then
       table.insert(fails, packages[i])
@@ -497,7 +497,7 @@ elseif command == "update" then
   else
     print("\27[91mFailed to fetch Ag registry: " .. (errorMessage or "returned nil"))
   end
-  agReg = require("/argentum/registry.cfg")
+  agReg = import("/argentum/registry.cfg")
   if not packages[1] then
     local packagesInstalled = fs.list("/argentum/store/")
     for _, currentPackage in pairs(packagesInstalled) do
@@ -632,7 +632,7 @@ elseif command == "info" then
   else
     print("\27[91mFailed to fetch Ag registry: " .. (errorMessage or "returned nil"))
   end
-  agReg = require("/argentum/registry.cfg")
+  agReg = import("/argentum/registry.cfg")
   if not agReg[packages[1]] and not source then
     print("\27[91mPackage " .. packages[1] .. " does not exist.")
     return
@@ -656,7 +656,7 @@ elseif command == "search" then
   else
     print("\27[91mFailed to fetch Ag registry: " .. (errorMessage or "returned nil"))
   end
-  agReg = require("/argentum/registry.cfg")
+  agReg = import("/argentum/registry.cfg")
   local searchResults = {}
   for packageName, _ in pairs(agReg) do
     if packageName:find(packages[1], 1, true) then
@@ -679,7 +679,7 @@ elseif command == "list" then
   else
     print("\27[91mFailed to fetch Ag registry: " .. (errorMessage or "returned nil"))
   end
-  agReg = require("/argentum/registry.cfg")
+  agReg = import("/argentum/registry.cfg")
   local sortedPackages = {}
   for packageName, _ in pairs(agReg) do
     table.insert(sortedPackages, packageName)

halyde/apps/boot.lua

@@ -1,5 +1,5 @@
-local component = require("component")
-local computer = require("computer")
+local component = import("component")
+local computer = import("computer")
 local args = {...}
 
 local force = false

halyde/apps/cat.lua

@@ -1,5 +1,5 @@
 local files = {...}
-local fs = require("filesystem")
+local fs = import("filesystem")
 if not files or not files[1] then
   shell.run("help cat")
   return

halyde/apps/cd.lua

@@ -1,5 +1,5 @@
 local directory = ...
-local fs = require("filesystem")
+local fs = import("filesystem")
 
 if not directory then
   return

halyde/apps/cp.lua

@@ -1,5 +1,5 @@
 local fromFile, toFile = ...
-local fs = require("filesystem")
+local fs = import("filesystem")
 
 if not fromFile or not toFile then
   shell.run("help cp")

halyde/apps/download.lua

@@ -1,7 +1,7 @@
 local url = ...
 
-local component = require("component")
-local fs = require("filesystem")
+local component = import("component")
+local fs = import("filesystem")
 
 if not component.list("internet")() then
   print("\27[91mThis program requires an internet card to run.")

halyde/apps/edit.lua

@@ -1,8 +1,8 @@
 local file = ...
-local fs = require("filesystem")
-local event = require("event")
-local component = require("component")
-local unicode = require("unicode")
+local fs = import("filesystem")
+local event = import("event")
+local component = import("component")
+local unicode = import("unicode")
 local gpu = component.gpu
 local width, height = gpu.getResolution()
 local scrollPosX, scrollPosY = 1, 1

halyde/apps/fetch.lua

@@ -1,13 +1,13 @@
-local component = require("component")
-local computer = require("computer")
+local component = import("component")
+local computer = import("computer")
 
 local function printstat(text)
-  terminal.cursorPosX = 35
-  terminal.write(text .. "\n", false)
+  termlib.cursorPosX = 35
+  termlib.write(text .. "\n", false)
 end
 
-terminal.write(_OSLOGO, false)
-terminal.cursorPosY = terminal.cursorPosY - 17
+termlib.write(_OSLOGO, false)
+termlib.cursorPosY = termlib.cursorPosY - 17
 printstat("\27[92mOS\27[0m: ".._OSVERSION)
 printstat("\27[92mArchitecture\27[0m: ".._VERSION)
 local componentCounter = 0
@@ -15,7 +15,7 @@ for _, _ in component.list() do
   componentCounter = componentCounter + 1
 end
 printstat("\27[92mComponents\27[0m: "..tostring(componentCounter))
-printstat("\27[92mCoroutines\27[0m: "..tostring(#tsched.getTasks()))
+printstat("\27[92mCoroutines\27[0m: "..tostring(#cormgr.corList))
 printstat("\27[92mBattery\27[0m: "..tostring(math.floor(computer.energy() / computer.maxEnergy() * 1000 + 0.5) / 10).."%")
 local totalMemory = computer.totalMemory()
 local usedMemory = computer.totalMemory() - computer.freeMemory()
@@ -67,4 +67,4 @@ local width, height = component.invoke(component.list("gpu")(), "getResolution")
 printstat("\27[92mResolution\27[0m: "..tostring(width).."x"..tostring(height).."\n")
 printstat("\27[40m  \27[41m  \27[42m  \27[43m  \27[44m  \27[45m  \27[46m  \27[47m  ")
 printstat("\27[100m  \27[101m  \27[102m  \27[103m  \27[104m  \27[105m  \27[106m  \27[107m  ")
-terminal.cursorPosY = terminal.cursorPosY + 5
+termlib.cursorPosY = termlib.cursorPosY + 5

halyde/apps/help.lua

@@ -1,4 +1,4 @@
-local fs = require("filesystem")
+local fs = import("filesystem")
 local args = {...}
 local command = args[1]
 args = nil

halyde/apps/label.lua

@@ -1,5 +1,5 @@
-local component = require("component")
-local computer = require("computer")
+local component = import("component")
+local computer = import("computer")
 local args = {...}
 if not args then return print("\x1b[91mCannot get arguments.") end
 if not args[1] then

halyde/apps/ls.lua

@@ -1,8 +1,8 @@
 local args = {...}
 local target = args[1]
 args = nil
-local fs = require("filesystem")
-local unicode = require("unicode")
+local fs = import("filesystem")
+local unicode = import("unicode")
 local maxLength = 0
 local margin = 2 -- minimum space between filename and size
 local dirTable = {}

halyde/apps/lsdrv.lua

@@ -1,7 +1,7 @@
-local serialize = require("serialize")
-local component = require("component")
-local computer = require("computer")
-local unicode = require("unicode")
+local serialize = import("serialize")
+local component = import("component")
+local computer = import("computer")
+local unicode = import("unicode")
 
 local width,height = component.gpu.getResolution()
 

halyde/apps/lua.lua

@@ -1,13 +1,13 @@
 print("\27[44m".._VERSION.."\27[0m shell")
 print('Type "exit" to exit.')
 termlib.readHistory["lua"] = {""}
-local fs = require("filesystem")
+local fs = import("filesystem")
 
 local loadedLibraries = ""
 local libList = fs.list("halyde/lib")
 for _, lib in pairs(libList) do
   if lib:match("(.+)%.lua") then
-    loadedLibraries = loadedLibraries .. "local " .. lib:match("(.+)%.lua") .. ' = require("' .. lib:match("(.+)%.lua") .. '")\n'
+    loadedLibraries = loadedLibraries .. "local " .. lib:match("(.+)%.lua") .. ' = import("' .. lib:match("(.+)%.lua") .. '")\n'
   end
 end
 

halyde/apps/maindrv.lua

@@ -1,4 +1,4 @@
-local computer = require("computer")
+local computer = import("computer")
 
 if type(computer)~="table" then
   return print("\x1b[91mComputer library returned '"..type(computer).."' type\x1b[39m")

halyde/apps/mkdir.lua

@@ -1,5 +1,5 @@
 local directory = ...
-local fs = require("filesystem")
+local fs = import("filesystem")
 
 if not directory then
   shell.run("help mkdir")

halyde/apps/mv.lua

@@ -1,5 +1,5 @@
 local fromFile, toFile = ...
-local fs = require("filesystem")
+local fs = import("filesystem")
 
 if not fromFile or not toFile then
   shell.run("help mv")

halyde/apps/reboot.lua

@@ -1 +1 @@
-require("computer").shutdown(true)
+import("computer").shutdown(true)

halyde/apps/rm.lua

@@ -1,5 +1,5 @@
 local file = ...
-local fs = require("filesystem")
+local fs = import("filesystem")
 
 if not file then
   shell.run("help rm")

halyde/apps/rtest.lua

@@ -1,4 +1,4 @@
-local raster = require("raster")
+local raster = import("raster")
 
 raster.init()
 
@@ -15,7 +15,7 @@ end]]
     end
 end ]]
 
-local event = require("event")
+local event = import("event")
 local x=0
 local y=0
 local vx=1
@@ -88,4 +88,4 @@ end
 end ]]
 
 raster.free()
-termlib.cursorPosY=1
+termlib.cursorPosY=1

halyde/apps/rtest3d.lua

@@ -1,7 +1,7 @@
-local component = require("component")
-local computer = require("computer")
-local raster = require("raster")
-local event = require("event")
+local component = import("component")
+local computer = import("computer")
+local raster = import("raster")
+local event = import("event")
 
 -- Initialize the 3D renderer for a spinning cube
 -- Using the raster library for drawing

halyde/apps/shutdown.lua

@@ -1 +1 @@
-require("computer").shutdown()
+import("computer").shutdown()