Added Gitea migration warning

This is what happens when you use software that has been abandoned for 7 years

.editorconfig

@@ -1,3 +0,0 @@
-[*.lua]
-indent_style = space
-indent_size = 2

.github/workflows/minify.js

@@ -0,0 +1,14 @@
+const fs = require("fs")
+const luamin = require('lua-format')
+
+const Code = fs.readFileSync(process.argv[2],"utf-8")
+const Settings = {
+  RenameVariables: true,
+  RenameGlobals: false,
+  SolveMath: false,
+  Indentation: '\t'
+}
+
+const Beautified = luamin.Beautify(Code, Settings)
+const Minified = luamin.Minify(Code, Settings)
+fs.writeFileSync(process.argv[2],Minified)

.github/workflows/minify.yml

@@ -0,0 +1,57 @@
+name: Minify all Lua files to minified branch
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  minify:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - name: Checkout main branch
+        uses: actions/checkout@v4
+        with:
+          ref: main
+          fetch-depth: 0
+
+      - name: Get latest commit info
+        id: commit
+        run: |
+          COMMIT_MSG=$(git log -1 --pretty=%s)
+          echo "message=${COMMIT_MSG}" >> $GITHUB_OUTPUT
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 25.6.1
+
+      - name: Switch to minified branch
+        run: git checkout minified
+
+      - name: Copy files from main
+        run: |
+          git checkout main -- .
+          git reset HEAD
+
+      - name: Just do the whole damn thing
+        run: |
+          cd .github/workflows
+          npm install github:Ponali/luamin.js
+          for file in $(find ../.. -name "*.lua" -not -path "../../.git/*" -not -path "../../.github/*"); do
+            echo $file
+            node minify.js $file
+          done
+          cd ../..
+
+      - name: Commit and push to minified branch
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+          git add $(find . -name "*.lua" -not -path "./.git/*" -not -path "./.github/*")
+          git commit -m "${{ steps.commit.outputs.message }} (minified)"
+          git push origin minified

.gitignore

@@ -1,5 +0,0 @@
-.stfolder
-.idea
-home/*
-halyde/logs/*
-*.kate-swp

.luarc.json

@@ -1,101 +1,10 @@
 {
-  "$schema": "https://raw.githubusercontent.com/LuaLS/lua-language-server/master/locale/en-us/setting.lua",
-  "runtime": {
-    "version": "Lua 5.3",
-    "special": {},
-    "unicodeName": false,
-    "nonstandardSymbol": []
-  },
-  "workspace": {
-    "checkThirdParty": false,
-    "maxPreload": 5000,
-    "preloadFileSize": 500
-  },
-  "diagnostics": {
-    "disable": [
-      "undefined-global",
-      "lowercase-global",
-      "missing-fields"
+    "diagnostics.globals": [
+        "checkArg",
+        "computer",
+        "component"
     ],
-    "globals": [
-      "_G",
-      "_VERSION",
-      "assert",
-      "error",
-      "getmetatable",
-      "ipairs",
-      "load",
-      "next",
-      "pairs",
-      "pcall",
-      "rawequal",
-      "rawget",
-      "rawlen",
-      "rawset",
-      "select",
-      "setmetatable",
-      "tonumber",
-      "tostring",
-      "type",
-      "xpcall",
-      "checkArg",
-      "bit32",
-      "coroutine",
-      "debug",
-      "math",
-      "os",
-      "string",
-      "table",
-      "component",
-      "computer",
-      "unicode",
-      "utf8"
+    "diagnostics.disable": [
+        "lowercase-global"
     ]
-  },
-  "completion": {
-    "enable": true,
-    "callSnippet": "Both",
-    "keywordSnippet": "Both",
-    "displayContext": 6
-  },
-  "hover": {
-    "enable": true,
-    "viewString": true,
-    "viewStringMax": 1000,
-    "viewNumber": true,
-    "fieldInfer": 3000,
-    "previewFields": 50,
-    "enumsLimit": 5
-  },
-  "semantic": {
-    "enable": true,
-    "variable": true,
-    "annotation": true,
-    "keyword": false
-  },
-  "format": {
-    "enable": true,
-    "defaultConfig": {
-      "indent_style": "space",
-      "indent_size": "2",
-      "tab_width": "2"
-    }
-  },
-  "spell": {
-    "dict": []
-  },
-  "telemetry": {
-    "enable": false
-  },
-  "IntelliSense": {
-    "traceLocalSet": false,
-    "traceReturn": false,
-    "traceBeSetted": false,
-    "traceFieldInject": false
-  },
-  "type": {
-    "castNumberToInteger": false,
-    "weakUnionCheck": false,
-    "weakNilCheck": false
-  }
 }

ag2/registry.json

@@ -1,9 +0,0 @@
-{
-  "halyde": "https://raw.githubusercontent.com/Team-Cerulean-Blue/Halyde/refs/heads/Pre-Alpha-3.0.0/",
-  "argentum": "https://raw.githubusercontent.com/Team-Cerulean-Blue/Halyde/refs/heads/Pre-Alpha-3.0.0/",
-  "edit": "https://raw.githubusercontent.com/Team-Cerulean-Blue/Halyde/refs/heads/Pre-Alpha-3.0.0/",
-  "package1": "https://raw.githubusercontent.com/WahPlus/ArgentumPackages/refs/heads/main/",
-  "package2": "https://raw.githubusercontent.com/WahPlus/ArgentumPackages/refs/heads/main/",
-  "vpkg": "https://raw.githubusercontent.com/WahPlus/ArgentumPackages/refs/heads/main/",
-  "grouper": "https://raw.githubusercontent.com/WahPlus/ArgentumPackages/refs/heads/main/"
-}

argentum.cfg

@@ -79,7 +79,7 @@ local agcfg = {
   },
   ["argentum"] = {
     ["maindir"] = "",
-    ["version"] = "1.3.1",
+    ["version"] = "1.3.3",
     ["description"] = "The default package manager for Halyde.",
     ["directories"] = {
       "argentum",

argentum/registry.cfg

@@ -12,7 +12,8 @@ local agregistry = {
   ["ctif-viewer"] = "https://raw.githubusercontent.com/Ponali/ArgentumPackages/refs/heads/master/",
   ["libsha256"] = "https://raw.githubusercontent.com/tema5002/ag-packages/refs/heads/main/",
   ["sha256sum"] = "https://raw.githubusercontent.com/tema5002/ag-packages/refs/heads/main/",
-  ["base64"] = "https://raw.githubusercontent.com/mcplayer3/AgPackages/refs/heads/main/"
+  ["base64"] = "https://raw.githubusercontent.com/mcplayer3/AgPackages/refs/heads/main/",
+  ["gitget"] = "https://raw.githubusercontent.com/mcplayer3/AgPackages/refs/heads/main/"
 }
 
 return agregistry

argentum/store/argentum/package.cfg

@@ -1,6 +1,6 @@
 Aargentum/store/
 Aargentum/
-V1.2.0
+V1.3.3
 Aargentum/registry.cfg
 Ahalyde/apps/argentum.lua
 Ahalyde/apps/helpdb/argentum.txt

halyde/apps/ag2.lua

@@ -1,520 +0,0 @@
-local cliparse = require("cliparse")
-local fs = require("filesystem")
-local component = require("component")
-local json = require("json")
-
-local function getFile(path)
-  checkArg(1, path, "string")
-  if path:sub(1, 7) == "http://" or path:sub(1, 8) == "https://" then
-    if not component.list("internet")() then
-      return false, "Internet card required but not found."
-    end
-    local handle, data, tmpdata = component.internet.request(path), "", nil
-    local success, errorMessage = pcall(function()
-      handle:finishConnect()
-    end)
-    if not success then
-      return false, errorMessage
-    end
-    local code, message = handle:response()
-    if code and code ~= 200 then
-      return false, ("%d %s"):format(code, message)
-    end
-    repeat
-      tmpdata = handle.read(math.huge or math.maxinteger)
-      data = data .. (tmpdata or "")
-    until not tmpdata
-    return true, data
-  elseif path:sub(1, 1) == "/" then
-    if not fs.exists(path) then
-      return false, "No such file or directory: " .. path
-    end
-    if fs.isDirectory(path) then
-      return false, "Expected file, found directory: " .. path
-    end
-    local handle, data, tmpdata = fs.open(path, "r", false), "", nil
-    if not handle then
-      return false, data
-    end
-    repeat
-      tmpdata = handle:read(math.huge or math.maxinteger)
-      data = data .. (tmpdata or "")
-    until not tmpdata
-    return true, data
-  else
-    return false, "Unsupported path: " .. path
-  end
-end
-
-cliparse.config({
-  ["x"] = 0,
-  ["exclude-deps"] = 0,
-  ["u"] = 0,
-  ["update-registry"] = 0,
-  ["f"] = 0,
-  ["force"] = 0,
-  ["c"] = 0,
-  ["clean"] = 0,
-  ["s"] = 1,
-  ["source"] = 1,
-  ["C"] = 0,
-  ["cascade"] = 0,
-})
-
-local parsed, errorMessage = cliparse.parse(...)
-
-if not parsed then
-  print(("\27[91m%s\n\27[0mExiting."):format(errorMessage))
-  return
-end
-
-local command = parsed.args[1]
-
-if not command then
-  print("\27[91mNo command specified.\n\27[0mExiting.")
-  return
-end
-
-if
-  not (
-    command == "install"
-    or command == "remove"
-    or command == "update"
-    or command == "list"
-    or command == "repo-list"
-    or command == "repo-add"
-    or command == "repo-remove"
-    or command == "info"
-  )
-then
-  print(("\27[91mInvalid command: %s\n\27[0mExiting."):format(command))
-  return
-end
-
-local packages = parsed.args
-table.remove(packages, 1)
--- Remove the command from the actual package list
--- local result, data, failure
-do
-  local function check(condition, message)
-    if not condition then
-      print(message)
-      failure = true
-    end
-  end
-
-  if parsed.flags.u or parsed.flags["update-registry"] then
-    terminal.write("Updating registry...")
-    result, data = getFile("https://raw.githubusercontent.com/Team-Cerulean-Blue/Halyde/refs/heads/Pre-Alpha-3.0.0/ag2/registry.json")
-    check(result, "\27[91mFailed to get registry: " .. data .. "\27[0m")
-    local handle, errorMessage = fs.open("/ag2/registry.json", "w")
-    check(handle, "\27[91mFailed to open write handle to registry: " .. errorMessage .. "\27[0m")
-    local success, errorMessage = handle:write(data)
-    check(success, "\27[91mFailed to write to registry: " .. errorMessage .. "\27[0m")
-    handle:close()
-  else
-    result, data = getFile("/ag2/registry.json")
-    check(result, "\27[91mFailed to get registry: " .. data .. "\27[0m")
-  end
-end
-
-local success, registry = pcall(function()
-  return json.decode(data)
-end)
-if not success then
-  print(("\27[91mFailed to parse registry: %s\n\27[0mExiting."):format(registry))
-  return
-end
-
-local function getServersidePackageConfig(source, package)
-  local success, data = getFile(fs.concat(source, "/ag2.json"))
-  if not success then
-    return false, ("\27[91mFailed to get package config (ag2.json) of package '%s': " .. data .. "\27[0m"):format(package)
-  end
-  local success, packageConfig = pcall(function()
-    return json.decode(data)
-  end)
-  if not success then
-    return false, ("\27[91mFailed to parse package config (ag2.json) of package '%s': " .. packageConfig .. "\27[0m"):format(package)
-  end
-  if not packageConfig[package] then
-    return false, ("\27[91mRepository package config (ag2.json) does not contain package '%s'.\27[0m"):format(package)
-  end
-  return packageConfig[package]
-end
-
--- Check if everything is valid
-failure = false
-local dependencyCounter = 0
-local previousI = 1 -- See 190
-::RESETLOOP::
-if command == "install" then
-  for i = previousI, #packages do
-    if not packages[i] then
-      -- When packages are removed, the last packages can end up reading as nil
-      goto SKIP
-    end
-    local otherPackages = table.copy(packages)
-    table.remove(otherPackages, i)
-    -- This is to check if the package can be found in the others, or in other words, checking for duplicates
-    if table.find(otherPackages, packages[i]) then
-      print(("\27[93mDuplicate package specified (%s), skipping\27[0m"):format(packages[i]))
-      table.remove(packages, i)
-      i = i - 1
-      goto SKIP
-    end
-    local source
-    if parsed.s or parsed.source then
-      source = parsed.s or parsed.source
-    else
-      source = registry[packages[i]]
-    end
-    if not source then
-      print("\27[91mCould not find package in registry and no source provided: " .. packages[i] .. "\27[0m")
-      failure = true
-      goto SKIP
-    end
-    local packageConfig, errorMessage = getServersidePackageConfig(source, packages[i])
-    if not packageConfig then
-      failure = true
-      print(errorMessage)
-      goto SKIP
-    end
-    if packageConfig.type == "group" then
-      table.remove(packages, i)
-      for _, package in ipairs(packageConfig.packages) do
-        table.insert(packages, package)
-      end
-      previousI = i
-      goto RESETLOOP
-      -- Apparently "for i = 1, n" loops don't change when n changes. So when the table gets extended, packages near the end won't get picked up.
-      -- This is why it is needed to restart the loop.
-    elseif packageConfig.type == "virtual-package" then
-      print(("Installing virtual package %s"):format(packages[i]))
-      local pkgAskText = ("Select a package by typing in its number: 1) %s"):format(packageConfig.packages[1])
-      -- This is all a silly workaround to place commas correctly
-      for i = 2, #packageConfig.packages do
-        pkgAskText = pkgAskText .. (", %d) %s"):format(i, packageConfig.packages[i])
-      end
-      print(pkgAskText)
-      ::RETRY::
-      local packageSel = terminal.read()
-      if not tonumber(packageSel) or tonumber(packageSel) % 1 ~= 0 then
-        -- Is there really no better way to check for an int..?
-        print("\27[93mNon-integer received - try again\27[0m")
-        goto RETRY
-      end
-      if tonumber(packageSel) < 1 or tonumber(packageSel) > #packageConfig.packages then
-        print("\27[93mInteger out of range - try again\27[0m")
-      end
-      packages[i] = packageConfig.packages[tonumber(packageSel)]
-      i = i - 1
-      goto SKIP
-    end
-    if fs.exists(("/ag2/pkg/%s.json"):format(packages[i])) then
-      print(("\27[93mPackage %s is already installed, skipping\27[0m"):format(packages[i]))
-      table.remove(packages, i)
-      i = i - 1
-      goto SKIP
-    end
-    if packageConfig.dependencies then
-      for _, dependency in ipairs(packageConfig.dependencies) do
-        table.insert(packages, i + 1, dependency)
-        dependencyCounter = dependencyCounter + 1
-      end
-    end
-    -- TODO: Add checks for conflicting packages
-    ::SKIP::
-  end
-elseif command == "remove" then
-  ::JUMPBACK::
-  local doJumpBack = false
-  for i = 1, #packages do
-    if not fs.exists(("/ag2/pkg/%s.json"):format(packages[i])) then
-      if parsed.s or parsed.source then
-        source = parsed.s or parsed.source
-      else
-        source = registry[package]
-      end
-      if source then
-        local packageConfig = getServersidePackageConfig(source, packages[i])
-        if packageConfig then
-          if packageConfig.type == "virtual-package" or packageConfig.type == "group" then
-            table.remove(packages, i)
-            for _, groupPackage in ipairs(packageConfig.packages) do
-              table.insert(packages, groupPackage)
-              goto GOAHEAD
-            end
-          end
-        end
-      end
-      print(("\27[93mPackage %s is not installed, skipping\27[0m"):format(packages[i]))
-      table.remove(packages, i)
-      i = i - 1
-      ::GOAHEAD::
-    end
-  end
-
-  -- I was originally gonna add this in the dependency cascade section, but realized it could shorten the normal dependency check code a bit
-  local dependencyList = {}
-  for _, packageConfig in ipairs(fs.list("/ag2/pkg/")) do
-    local package = packageConfig:sub(1, -6)
-    -- I'm not adding error handling here because if this fails then fuck you for touching the files by hand and good luck figuring this shit out
-    local _, data = getFile(("/ag2/pkg/%s.json"):format(package))
-    data = json.decode(data)
-    dependencyList[package] = data.dependencies
-  end
-
-  for _, package in ipairs(packages) do
-    if dependencyList[package] then
-      -- Check if all the deps are no longer needed and if they're auto-installed and stuff
-      for _, dependency in pairs(dependencyList[package]) do
-        if fs.exists(("/ag2/pkg/%s.json"):format(dependency)) then
-          local _, data = getFile(("/ag2/pkg/%s.json"):format(dependency))
-          data = json.decode(data)
-          if data.autoInstalled
-            and not table.find(packages, dependency) -- Just to prevent dependency loops and issues when re-checking the packages after jumpback
-            then
-            dependencyCounter = dependencyCounter + 1
-            table.insert(packages, dependency)
-          end
-        else
-          -- It could still be a group or a vpackage, and checking that is the job of the loop 2 loops back
-          table.insert(packages, dependency)
-          doJumpBack = true
-        end
-      end
-    end
-  end
-
-  -- Check for cascading dependencies
-  for packageName, dependencies in pairs(dependencyList) do
-    if not table.find(packages, packageName) then
-      for _, dependency in ipairs(dependencies) do
-        if table.find(packages, dependency) then
-          if parsed.flags.cascade or parsed.flags.C then
-            table.insert(packages, packageName)
-            dependencyCounter = dependencyCounter + 1
-            doJumpBack = true
-            -- Listen, I'm so sorry for this abhorrent bullshit code, but the newly added packages have to get checked one way or another and hopefully this is readable enough.
-          else
-            -- The Pyramids of Giza were built entirely out of silver. No they weren't...
-            print(("\27[93mPackage %s is depended on by %s, cannot uninstall without --cascade\27[0m"):format(dependency, packageName))
-            failure = true
-          end
-        end
-      end
-    end
-  end
-  if doJumpBack then
-    goto JUMPBACK
-    -- IT'S NOT SPAGHETTI SHUT UP SHUT UP SHU
-  end
-end
--- TODO: Add checks for the other commands
-
-if #packages == 0 then
-  print("\27[93mNo packages selected.\n\27[0mExiting.")
-  return
-end
-if failure then
-  print("Exiting.")
-  return
-end
-
-if command == "install" then
-  if dependencyCounter == 1 then
-    print("\27[93m1 dependency pulled in.\27[0m")
-  elseif dependencyCounter >= 2 then
-    print(("\27[93m%d dependencies pulled in.\27[0m"):format(dependencyCounter))
-  end
-  print("Packages that will be installed:")
-  print(table.concat(packages, ", "))
-  local answer = terminal.read({prefix = "\nContinue? [Y/n] "})
-  if answer:lower() == "n" then
-    print("Exiting.")
-    return
-  end
-
-  for _, package in ipairs(packages) do
-    local source
-    if parsed.s or parsed.source then
-      source = parsed.s or parsed.source
-    else
-      source = registry[package]
-    end
-    print(("Installing %s..."):format(package))
-    local _, data = getFile(fs.concat(source, "/ag2.json"))
-    local packageConfig = json.decode(data)[package]
-    if packageConfig.directories then
-      for _, directory in ipairs(packageConfig.directories) do
-        print(("  Creating directory %s..."):format(directory))
-        fs.makeDirectory(directory)
-      end
-    end
-    if packageConfig.files then
-      for _, file in ipairs(packageConfig.files) do
-        ::RETRY::
-        print(("  Downloading file %s..."):format(file))
-        local success, data = getFile(fs.concat(source, file))
-
-        if not success then
-          print(("\27[91mFailed to get file '%s' of package '%s': " .. data .. "\27[0m"):format(file, package))
-          local answer = terminal.read({prefix = "Abort, Retry, Skip? [a/R/s]"})
-          if answer:lower() == "a" then
-            print("Exiting.")
-            return
-          elseif answer:lower() == "s" then
-            print(("  \27[93mSkipped file %s.\27[0m"):format(file))
-            goto SKIP
-          else
-            goto RETRY
-          end
-        end
-
-        if fs.exists(file) then
-          print(("\27[93mFile '%s' already exists.\27[0m"):format(file))
-          local answer = terminal.read({prefix = "Abort, Overwrite, Skip? [a/O/s]"})
-          if answer:lower() == "a" then
-            print("Exiting.")
-            return
-          elseif answer:lower() == "s" then
-            print(("  \27[93mSkipped file %s.\27[0m"):format(file))
-            goto SKIP
-          end
-        end
-
-        local handle, errorMessage = fs.open(file, "w")
-        if not handle then
-          print(("\27[91mFailed to open write handle to file '%s': " .. errorMessage .. "\27[0m"):format(file))
-          local answer = terminal.read({prefix = "Abort, Retry, Skip? [a/R/s]"})
-          if answer:lower() == "a" then
-            print("Exiting.")
-            return
-          elseif answer:lower() == "s" then
-            print(("  \27[93mSkipped file %s.\27[0m"):format(file))
-            goto SKIP
-          else
-            goto RETRY
-          end
-        end
-
-        local success, errorMessage = handle:write(data)
-        if not success then
-          handle:close()
-          print(("\27[91mFailed to write to file '%s': " .. errorMessage .. "\27[0m"):format(file))
-          local answer = terminal.read({prefix = "Abort, Retry, Skip? [a/R/s]"})
-          if answer:lower() == "a" then
-            print("Exiting.")
-            return
-          elseif answer:lower() == "s" then
-            print(("  \27[93mSkipped file %s.\27[0m"):format(file))
-            goto SKIP
-          else
-            goto RETRY
-          end
-        end
-
-        handle:close()
-
-        ::SKIP::
-      end
-    end
-
-    print("  Writing tracking file...")
-    if not fs.exists("/ag2/pkg/") then
-      fs.makeDirectory("/ag2/pkg/")
-      -- Technically this would break if /ag2/pkg/ was a file, but... why would it be a file?
-    end
-
-    -- TODO: Make functions for reading from and writing to a file with error handling since this is really repetitive
-    ::RETRY::
-    local handle, errorMessage = fs.open(("/ag2/pkg/%s.json"):format(package), "w")
-    if not handle then
-      print(("\27[91mFailed to open write handle to file '/ag2/pkg/%s.json': " .. errorMessage .. "\27[0m"):format(package))
-      local answer = terminal.read({prefix = "Abort, Retry, Skip? [a/R/s]"})
-      if answer:lower() == "a" then
-        print("Exiting.")
-        return
-      elseif answer:lower() == "s" then
-        print(("  \27[93mSkipped file /ag2/pkg/%s.json.\27[0m"):format(package))
-        goto SKIP
-      else
-        goto RETRY
-      end
-    end
-
-    local packageData = {
-      name = package,
-      version = packageConfig.version,
-      autoInstalled = false,
-      -- TODO: Make the above actually work
-      dependencies = packageConfig.dependencies,
-      conflicts = packageConfig.conflicts,
-      files = packageConfig.files,
-      directories = packageConfig.directories,
-      config = packageConfig.config
-    }
-
-    local trackingFile = json.encode(packageData)
-
-    local success, errorMessage = handle:write(trackingFile)
-    if not success then
-      handle:close()
-      print(("\27[91mFailed to write to file '/ag2/pkg/%s.json': " .. errorMessage .. "\27[0m"):format(package))
-      local answer = terminal.read({prefix = "Abort, Retry, Skip? [a/R/s]"})
-      if answer:lower() == "a" then
-        print("Exiting.")
-        return
-      elseif answer:lower() == "s" then
-        print(("  \27[93mSkipped file /ag2/pkg/%s.json.\27[0m"):format(package))
-        goto SKIP
-      else
-        goto RETRY
-      end
-    else
-      handle:close()
-    end
-    ::SKIP::
-  end
-elseif command == "remove" then
-  if dependencyCounter == 1 then
-    print("\27[93m1 orphaned dependency will be removed.\27[0m")
-  elseif dependencyCounter >= 2 then
-    print(("\27[93m%d orphaned dependencies will be removed.\27[0m"):format(dependencyCounter))
-  end
-  print("Packages that will be removed:")
-  print(table.concat(packages, ", "))
-  local answer = terminal.read({prefix = "\nContinue? [Y/n] "})
-  if answer:lower() == "n" then
-    print("Exiting.")
-    return
-  end
-  for _, package in ipairs(packages) do
-    -- See line 263
-    local _, data = getFile(("/ag2/pkg/%s.json"):format(package))
-    data = json.decode(data)
-    if data.files then
-      for _, file in ipairs(data.files) do
-        print(("  Removing file %s..."):format(file))
-        fs.remove(file) -- I cannot think of how this could fail. If you can, please add error handling here
-      end
-    end
-    if data.directories then
-      for _, directory in ipairs(data.directories) do
-        if fs.isDirectory(directory) then
-          if next(fs.list(directory)) == nil then
-            -- Apparently THAT's the best way to check if a table is empty in Lua. Alright I guess.
-            print(("  Removing directory %s..."):format(directory))
-            fs.remove(directory)
-          else
-            print(("  Directory %s specified by package %s still has something in it, skipping"):format(directory))
-          end
-        end
-      end
-    end
-    print("  Removing tracking file...")
-    fs.remove(("/ag2/pkg/%s.json"):format(package)) -- See line 500
-  end
-end
-print("Operation completed successfully.")

halyde/apps/argentum.lua

@@ -1,15 +1,15 @@
 local packages = {...}
-local command = table.remove(packages,1)
-local shell = require("shell")
-local fs = require("filesystem")
-local component = require("component")
-local agReg = require("/argentum/registry.cfg")
+local command = packages[1]
+table.remove(packages, 1)
+local fs = import("filesystem")
+local component = import("component")
+local agReg = import("/argentum/registry.cfg")
 if not command then
   shell.run("help argentum")
   return
 end
 if not component.list("internet")() then
-  print("\27[91mThis program requires an internet card to run.\27[0m")
+  print("\27[91mThis program requires an internet card to run.")
   return
 end
 local internet = component.internet
@@ -69,12 +69,12 @@ local function getAgConfig(package, source)
   source = source or agReg[package]
   local data, errorMessage = getFile(source .. "argentum.cfg")
   if not data or data == "" then
-    print("\27[91mCould not fetch Ag config: " .. (errorMessage or "returned nil data") .. "\27[0m")
+    print("\27[91mCould not fetch Ag config: " .. (errorMessage or "returned nil data"))
     return false
   end
   local func, errorMessage = load(data, "=argentum.cfg", "bt", {})
   if not func then
-    print("\27[91mCould not fetch Ag config: " .. errorMessage .. "\nPlease contact the package owner.\27[0m")
+    print("\27[91mCould not fetch Ag config: " .. errorMessage .. "\nPlease contact the package owner.")
     return false
   end
   local agcfg
@@ -82,22 +82,22 @@ local function getAgConfig(package, source)
     agcfg = func()
   end)
   if not status then
-    print("\27[91mCould not fetch Ag config: " .. errorMessage .. "\nPlease contact the package owner.\27[0m")
+    print("\27[91mCould not fetch Ag config: " .. errorMessage .. "\nPlease contact the package owner.")
     return false
   end
   if not agcfg[package] or not agcfg[package].maindir or not agcfg[package].directories or not agcfg[package].files or not agcfg[package].version then
-    local response = "\27[91mAg config of " .. package .. " is improperly configured.\nPlease contact the package owner.\27[0m"
+    local response = ("\27[91mAg config of " .. package .. " is improperly configured.\nPlease contact the package owner.")
   end
   return agcfg
 end
 
 local function doChecks(package)
   if not agReg[package] and not source then
-    print("\27[91mPackage " .. package .. " does not exist.\27[0m")
+    print("\27[91mPackage " .. package .. " does not exist.")
     return false
   end
   if fs.exists("/argentum/store/" .. package) then
-    print("\27[91mPackage " .. package .. " is already installed.\27[0m")
+    print("\27[91mPackage " .. package .. " is already installed.")
     return false
   end
   agcfg = getAgConfig(package, source)
@@ -107,7 +107,7 @@ local function doChecks(package)
   if agcfg[package].dependencies then
     for _, dependency in ipairs(agcfg[package].dependencies) do
       if not agReg[dependency] and not agcfg[dependency] then
-        local response = terminal.read({prefix = "\27[91mPackage " .. package .. " requires dependency " .. dependency .. " that does not exist.\n[A - Abort/s - Skip]\27[0m"})
+        local response = read(nil, "\27[91mPackage " .. package .. " requires dependency " .. dependency .. " that does not exist.\n[A - Abort/s - Skip]")
         if response:lower() ~= "s" then
           fs.remove("/argentum/store/" .. package)
           return false
@@ -132,21 +132,24 @@ local function lpad(str, len, char)
   return string.rep(char, len - #str) .. str
 end
 
-local width, height = terminal.getResolution()
+local gpu = component.gpu
+local width,height = gpu.getResolution()
+local function progress(package,progress)
+  local info = string.format("%s %s%%",package,lpad(math.floor(progress*100),2))
 
-local function progress(package, progress)
-  terminal.write("\x1b[s")
-  local info = string.format("%s %s%%", package, lpad(math.floor(progress * 100), 2))
-  info = info .. string.rep(" ", width - #info)
-  local progX = math.floor(progress * width)
-  terminal.write("\x1b[42m\x1b[30m" .. info:sub(1, progX) .. "\x1b[40m\x1b[37m" .. info:sub(progX + 1) .. "\x1b[0m")
-  terminal.write("\x1b[u")
+  info=info..string.rep(" ",width-#info)
+  local progX = math.floor(progress*width)
+  gpu.setBackground(0x00FF00)
+  gpu.setForeground(0x000000)
+  gpu.set(1,height,info:sub(1,progX))
+  gpu.setBackground(0x000000)
+  gpu.setForeground(0xFFFFFF)
+  gpu.set(progX+1,height,info:sub(progX+1))
 end
 
 local function clearProgress()
-  terminal.write("\x1b[s")
-  terminal.write("\r\x1b[40m" .. string.rep(" ", width) .. "\x1b[0m\r")
-  terminal.write("\x1b[u")
+  gpu.setBackground(0x000000)
+  gpu.fill(1,height,width,1," ")
 end
 
 local function installPackage(package, overwriteFlag)
@@ -163,7 +166,7 @@ local function installPackage(package, overwriteFlag)
   if agcfg[package].dependencies then
     for _, dependency in ipairs(agcfg[package].dependencies) do
       if not agReg[dependency] and not agcfg[dependency] then
-        local response = terminal.read({prefix = "\27[91mPackage " .. package .. " requires dependency " .. dependency .. " that does not exist.\n[A - Abort/s - Skip]\27[0m"})
+        local response = read(nil, "\27[91mPackage " .. package .. " requires dependency " .. dependency .. " that does not exist.\n[A - Abort/s - Skip]")
         if response:lower() ~= "s" then
           fs.remove("/argentum/store/" .. package)
           return false
@@ -196,7 +199,7 @@ local function installPackage(package, overwriteFlag)
     local data, errorMessage = getFile(source .. agcfg[package].maindir .. file)
     if not data then
       clearProgress()
-      local response = terminal.read({prefix = "\27[91mCould not fetch " .. file .. ": " .. errorMessage .. "\n\27[0m[a - Abort/R - Retry/s - Skip]"})
+      local response = read(nil, "\27[91mCould not fetch " .. file .. ": " .. errorMessage .. "\n\27[0m[a - Abort/R - Retry/s - Skip]")
       if response:lower() == "a" then
         fs.remove("/argentum/store/" .. package)
         return false
@@ -215,7 +218,7 @@ local function installPackage(package, overwriteFlag)
     else
       packageStore = packageStore .. "\nA" .. file
     end
-    local handle, err = fs.open(file, "w")
+    local handle = fs.open(file, "w")
     handle:write(data)
     handle:close()
     ::skip::
@@ -231,7 +234,7 @@ end
 local function removePackage(package)
   print("Removing " .. package .. "...")
   if not fs.exists("/argentum/store/" .. package .. "/package.cfg") then
-    print("\27[91mLocal Ag config of " .. package .. " does not exist.\27[0m")
+    print("\27[91mLocal Ag config of " .. package .. " does not exist.")
     return false
   end
   local handle, data, tmpdata = fs.open("/argentum/store/" .. package .. "/package.cfg", "r"), "", nil
@@ -255,7 +258,7 @@ local function removePackage(package)
         local result, errorMessage = fs.remove(line:sub(2))
         if not result then
           clearProgress()
-          local response = terminal.read({prefix = "\27[91mFailed to remove " .. line:sub(2) .. ": " .. errorMessage .. "\n\27[0m[a - Abort/r - Retry/S - Skip]"})
+          local response = read(nil, "\27[91mFailed to remove " .. line:sub(2) .. ": " .. errorMessage .. "\n\27[0m[a - Abort/r - Retry/S - Skip]")
           if response:lower() == "a" then
             return false
           elseif response:lower() == "r" then
@@ -271,7 +274,7 @@ local function removePackage(package)
       local handle, data, tmpdata = fs.open("/argentum/store/" .. package .. "/files/" .. line:sub(2), "r"), "", nil
       if not handle then
         clearProgress()
-        local response = terminal.read({prefix = "\27[91mFailed to revert " .. line:sub(2) .. ": " .. data .. "\n\27[0m[a - Abort/R - Retry/s - Skip]"}) -- this is pretty stupid but i think the error message would get pushed to data
+        local response = read(nil, "\27[91mFailed to revert " .. line:sub(2) .. ": " .. data .. "\n\27[0m[a - Abort/R - Retry/s - Skip]") -- this is pretty stupid but i think the error message would get pushed to data
         if response:lower() == "a" then
           return false
         elseif response:lower() == "s" then
@@ -341,9 +344,9 @@ if command == "install" then
     handle:write(newRegistry)
     handle:close()
   else
-    print("\27[91mFailed to fetch Ag registry: " .. (errorMessage or "returned nil") .. "\27[0m")
+    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])
@@ -357,7 +360,7 @@ if command == "install" then
   local answer
   if #fails == 0 then
     print("Packages that will be installed: " .. table.concat(packageList, ", "))
-    if terminal.read({prefix = "Would you like to proceed? [Y/n] "}):lower() == "n" then
+    if read(nil, "Would you like to proceed? [Y/n] "):lower() == "n" then
       return
     end
   elseif #packageList == 0 then
@@ -367,7 +370,7 @@ if command == "install" then
     print("Some packages cannot be installed.")
     print("Packages that will be installed: " .. table.concat(packageList, ", "))
     print("Packages that cannot be installed: " .. table.concat(fails, ", "))
-    if terminal.read({prefix = "Would you like to proceed? [y/N] "}):lower() ~= "y" then
+    if read(nil, "Would you like to proceed? [y/N] "):lower() ~= "y" then
       return
     end
   end
@@ -399,19 +402,19 @@ elseif command == "remove" then
   end
   while true do
     if not fs.exists("/argentum/store/" .. packages[i]) then
-      print("\27[91mPackage " .. packages[i] .. " is not installed.\27[0m")
+      print("\27[91mPackage " .. packages[i] .. " is not installed.")
       table.insert(fails, packages[i])
       table.remove(packageList, table.find(packageList, packages[i]))
       table.remove(packages, table.find(packages, packages[i]))
       i = i - 1
     elseif packages[i] == "halyde" then -- yes, this stuff is hard-coded.
-      print("\27[91mFor obvious reasons, you can't uninstall Halyde.\27[0m")
+      print("\27[91mFor obvious reasons, you can't uninstall Halyde.")
       table.insert(fails, packages[i])
       table.remove(packageList, table.find(packageList, packages[i]))
       table.remove(packages, table.find(packages, packages[i]))
       i = i - 1
     elseif packages[i] == "argentum" then
-      print("\27[91mFor obvious reasons, you can't uninstall Argentum.\27[0m")
+      print("\27[91mFor obvious reasons, you can't uninstall Argentum.")
       table.insert(fails, packages[i])
       table.remove(packageList, table.find(packageList, packages[i]))
       table.remove(packages, table.find(packages, packages[i]))
@@ -449,7 +452,7 @@ elseif command == "remove" then
   local answer
   if #fails == 0 then
     print("Packages that will be removed: " .. table.concat(packageList, ", "))
-    if terminal.read({prefix = "Would you like to proceed? [Y/n] "}):lower() == "n" then
+    if read(nil, "Would you like to proceed? [Y/n] "):lower() == "n" then
       return
     end
   elseif #packageList == 0 then
@@ -459,7 +462,7 @@ elseif command == "remove" then
     print("Some packages cannot be removed.")
     print("Packages that will be removed: " .. table.concat(packageList, ", "))
     print("Packages that cannot be removed: " .. table.concat(fails, ", "))
-    if terminal.read({prefix = "Would you like to proceed? [y/N] "}):lower() ~= "y" then
+    if read(nil, "Would you like to proceed? [y/N] "):lower() ~= "y" then
       return
     end
   end
@@ -492,9 +495,9 @@ elseif command == "update" then
     handle:write(newRegistry)
     handle:close()
   else
-    print("\27[91mFailed to fetch Ag registry: " .. (errorMessage or "returned nil") .. "\27[0m")
+    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
@@ -538,7 +541,7 @@ elseif command == "update" then
         table.remove(packages, table.find(packages, packages[i]))
         i = i - 1
       else
-        print(packages[i].." is out of date [\x1b[93m"..version.."\x1b[0m < \x1b[92m"..agcfg[packages[i]].version.."\x1b[0m")
+        print(packages[i].." is out of date [\x1b[93m"..version.."\x1b[39m < \x1b[92m"..agcfg[packages[i]].version.."\x1b[39m]")
       end
     end
     i = i + 1
@@ -557,14 +560,14 @@ elseif command == "update" then
     end
   elseif #fails == 0 then
     print("Packages that will be updated: " .. table.concat(packageList, ", "))
-    if terminal.read({prefix = "Would you like to proceed? [Y/n] "}):lower() == "n" then
+    if read(nil, "Would you like to proceed? [Y/n] "):lower() == "n" then
       return
     end
   else
     print("Some packages cannot be updated.")
     print("Packages that will be updated: " .. table.concat(packageList, ", "))
     print("Packages that cannot be updated: " .. table.concat(fails, ", "))
-    if terminal.read({prefix = "Would you like to proceed? [y/N] "}):lower() ~= "y" then
+    if read(nil, "Would you like to proceed? [y/N] "):lower() ~= "y" then
       return
     end
   end
@@ -627,9 +630,9 @@ elseif command == "info" then
     handle:write(newRegistry)
     handle:close()
   else
-    print("\27[91mFailed to fetch Ag registry: " .. (errorMessage or "returned nil") .. "\27[0m")
+    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
@@ -653,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
@@ -674,9 +677,9 @@ elseif command == "list" then
     handle:write(newRegistry)
     handle:close()
   else
-    print("\27[91mFailed to fetch Ag registry: " .. (errorMessage or "returned nil") .. "\27[0m")
+    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/bedit.lua

@@ -1,334 +0,0 @@
-local fs = require("filesystem")
-local shell = require("shell")
-local gpu = require("component").gpu
-local event = require("event")
-local computer = require("computer")
-local ocelot = require("component").ocelot
-
-local resX, resY = gpu.getResolution()
-local textBuffer = gpu.allocateBuffer(resX, resY - 1)
-
-local args = {...}
-local file = args[1]
-if not file then
-    print("\x1b[91mEnter a file name.")
-    return
-end
-if fs.isDirectory(file) then
-    print("\x1b[91mThe specified file is a directory.")
-    return
-end
-
-if file:sub(1, 1) ~= "/" then
-    file = fs.concat(shell.getWorkingDirectory(), file)
-end
-
-local data = ""
-if fs.exists(file) then
-    local handle = fs.open(file)
-    local tmpdata
-    repeat
-        tmpdata = handle:read(math.huge or math.maxinteger)
-        data = data .. (tmpdata or "")
-    until not tmpdata
-end
-
-local lines = {}
-for line in data:gmatch("[^\r\n]+") do
-  table.insert(lines, line)
-end
-
-local function renderText(xOffset, yOffset)
-  gpu.setActiveBuffer(textBuffer)
-  gpu.setBackground(0x000000)
-  gpu.setForeground(0xFFFFFF)
-  gpu.fill(1, 1, resX, resY - 1, " ")
-  for i = yOffset + 1, #lines do
-    gpu.set(1, i - yOffset, lines[i]:sub(xOffset + 1))
-  end
-  gpu.setActiveBuffer(0)
-  gpu.bitblt(0, 1, 1, resX, resY - 1, textBuffer, 1, 1)
-end
-
-local function addLine(pos)
-  if pos <= #lines then
-    for i = #lines, pos, -1 do
-      lines[i + 1] = lines[i]
-    end
-    lines[pos] = ""
-  else
-    table.insert(lines, "")
-  end
-end
-
-local function removeLine(pos)
-  length = #lines
-  for i = pos + 1, length do
-    lines[i - 1] = lines[i]
-  end
-  lines[length] = nil
-end
-
-local function save()
-  gpu.setForeground(0xFFFFFF)
-  gpu.setBackground(0x000000)
-  gpu.set(1, resY, "Enter a location to save:")
-
-  local savepath = file or ""
-  local saveCursorX = 27 + #savepath
-  local ready = false
-  local eventArgs = {}
-
-  gpu.fill(27, resY, resX - 27, 1, " ")
-  gpu.set(27, resY, savepath)
-  gpu.setForeground(0x000000)
-  gpu.setBackground(0xFFFFFF)
-  gpu.set(saveCursorX, resY, " ")
-  gpu.setForeground(0xFFFFFF)
-  gpu.setBackground(0x000000)
-
-  repeat
-    local shouldRender = false
-    coroutine.yield()
-
-    eventArgs = {event.pull("key_down", 0)}
-    if keyboard.keys[eventArgs[4]] == "enter" then
-      ready = true
-    end
-    if keyboard.keys[eventArgs[4]] == "back" then
-      savepath = string.sub(savepath, 1, #savepath - 1)
-      if saveCursorX > 27 then
-        saveCursorX = saveCursorX - 1
-      end
-      shouldRender = true
-    end
-    if not keyboard.keys.special[eventArgs[4]] and keyboard.keys[eventArgs[4]] then
-      savepath = savepath .. (string.char(eventArgs[3]) or "")
-      saveCursorX = saveCursorX + 1
-      shouldRender = true
-    end
-
-    if shouldRender then
-      gpu.fill(27, resY, resX - 27, 1, " ")
-      gpu.set(27, resY, savepath)
-      gpu.setForeground(0x000000)
-      gpu.setBackground(0xFFFFFF)
-      gpu.set(saveCursorX, resY, " ")
-      gpu.setForeground(0xFFFFFF)
-      gpu.setBackground(0x000000)
-    end
-  until ready
-
-  gpu.fill(1, resY, resX, 1, " ")
-  gpu.setForeground(0x000000)
-  gpu.setBackground(0xFFFFFF)
-  gpu.set(1, resY, "^X")
-  gpu.set(10, resY, "^S")
-  gpu.setForeground(0xFFFFFF)
-  gpu.setBackground(0x000000)
-  gpu.set(4, resY, "Exit")
-  gpu.set(13, resY, "Save")
-
-  local text = table.concat(lines, "\n")
-  local handle = fs.open(savepath, "w")
-  handle:write(text)
-  handle:close()
-  file = savepath
-end
-
--- Initialize screen
-renderText(0, 0)
-gpu.setForeground(0x000000)
-gpu.setBackground(0xFFFFFF)
-gpu.set(1, resY, "^X")
-gpu.set(10, resY, "^S")
-gpu.setForeground(0xFFFFFF)
-gpu.setBackground(0x000000)
-gpu.set(4, resY, "Exit")
-gpu.set(13, resY, "Save")
-
-local scrollX = 0
-local scrollY = 0
-local cursorX = 1 -- Absolute position, not accounting for scrolling
-local cursorY = 1
-local cursorWhite = true
-local oldTime = computer.uptime()
-
-while true do
-  local renderBufferFlag = false -- Flag to render the whole text buffer
-  -- Handle events
-  local previousCursorX -- Used for blackening the previous cursor location when the cursor is moved
-  local previousCursorY
-  coroutine.yield()
-  local eventArgs = {}
-  repeat
-    eventArgs = {event.pull("key_down", 0)}
-
-    -- The logical solution here for flashing the cursor would be to set the timeout to 0.5, and, if the timeout is reached, change the color.
-    -- However, that makes scrolling freeze the screen up completely.
-    -- Thus, for flashing the cursor, a timer is needed.
-
-    if computer.uptime() >= oldTime + 0.5 then
-      oldTime = computer.uptime()
-      cursorWhite = not cursorWhite
-    end
-
-    if next(eventArgs) ~= nil then
-      cursorWhite = true
-      oldTime = computer.uptime()
-    end
-
-    if eventArgs[1] == "key_down" then
-      -- Mouse events might be added later, that's why this if statement is here
-      if keyboard.getCtrlDown() then
-        -- Special commands
-        if keyboard.keys[eventArgs[4]] == "x" then
-          goto exit
-        end
-        if keyboard.keys[eventArgs[4]] == "s" then
-          save()
-        end
-      else
-        if keyboard.keys[eventArgs[4]] == "up" and cursorY > 1 then
-          if cursorY - scrollY <= 1 then
-            renderBufferFlag = true
-            scrollY = scrollY - 1
-          else
-            if not previousCursorX and not previousCursorY then
-              previousCursorX = cursorX
-              previousCursorY = cursorY
-            end
-          end
-          cursorY = cursorY - 1
-          -- The cursor absolute position still has to be moved, even if on-screen it won't move
-          if cursorX > string.len(lines[cursorY]) + 1 then -- cursor snapping, +1 to be 1 char in front of end of line
-              cursorX = string.len(lines[cursorY]) + 1
-          end
-        end
-        if keyboard.keys[eventArgs[4]] == "down" then
-          if cursorY - scrollY >= resY - 1 then
-            renderBufferFlag = true
-            scrollY = scrollY + 1
-          else
-            if not previousCursorX and not previousCursorY then
-              previousCursorX = cursorX
-              previousCursorY = cursorY
-            end
-          end
-          cursorY = cursorY + 1
-          if cursorX > string.len(lines[cursorY]) + 1 then
-              cursorX = string.len(lines[cursorY]) + 1
-          end
-        end
-        if keyboard.keys[eventArgs[4]] == "left" and cursorX > 1 then
-          if cursorX - scrollX <= 1 then
-            renderBufferFlag = true
-            scrollX = scrollX - 1
-          else
-            if not previousCursorX and not previousCursorY then
-              previousCursorX = cursorX
-              previousCursorY = cursorY
-            end
-          end
-          cursorX = cursorX - 1
-        end
-        if keyboard.keys[eventArgs[4]] == "right" and cursorX < string.len(lines[cursorY]) + 1 then
-          if cursorX - scrollX >= resX then
-            renderBufferFlag = true
-            scrollX = scrollX + 1
-          else
-            if not previousCursorX and not previousCursorY then
-              previousCursorX = cursorX
-              previousCursorY = cursorY
-            end
-          end
-          cursorX = cursorX + 1
-        end
-        if not keyboard.keys.special[eventArgs[4]] then
-          local line = lines[cursorY] or ""
-          line = string.sub(line, 1, cursorX - 1) .. string.char(eventArgs[3]) .. string.sub(line, cursorX, -1)
-          lines[cursorY] = line
-          cursorX = cursorX + 1
-          renderBufferFlag = true
-        end
-        if keyboard.keys[eventArgs[4]] == "back" then
-          local line = lines[cursorY]
-          local prevline = lines[cursorY - 1]
-          if cursorX > 1 then
-            line = string.sub(line, 1, cursorX - 2) .. string.sub(line, cursorX, -1) -- remove 1 char
-          elseif prevline then
-            prevline = prevline .. line -- copy line up to the next before removing it
-            ocelot.log(prevline)
-            line = nil
-          end
-          if line then
-            lines[cursorY] = line
-          else
-            removeLine(cursorY)
-          end
-          lines[cursorY - 1] = prevline
-          if not line then
-            cursorY = cursorY - 1 -- this can only trigger if the line is not the first
-          end
-          if cursorX > 1 then
-            cursorX = cursorX - 1
-          end
-          renderBufferFlag = true
-        end
-        if keyboard.keys[eventArgs[4]] == "enter" then
-          addLine(cursorY + 1)
-          cursorY = cursorY + 1
-          cursorX = 1
-          renderBufferFlag = true
-        end
-      end
-    end
-  until next(eventArgs) == nil
-  local displayedCursorX = cursorX - scrollX
-  local displayedCursorY = cursorY - scrollY
-  local previousDisplayedCursorX -- What a mouthful
-  local previousDisplayedCursorY
-  if previousCursorX and previousCursorY then
-    previousDisplayedCursorX = previousCursorX - scrollX
-    previousDisplayedCursorY = previousCursorY - scrollY
-  end
-
-  if renderBufferFlag then
-    renderText(scrollX, scrollY)
-    if cursorWhite then
-      -- If the cursor is black, then there's no need to do anything because there is no cursor after calling renderText().
-      gpu.setForeground(0x000000)
-      gpu.setBackground(0xFFFFFF)
-      local letter = gpu.get(displayedCursorX, displayedCursorY)
-      gpu.set(displayedCursorX, displayedCursorY, letter)
-      -- TODO: Account for scrolling
-    end
-  else
-    if cursorWhite then
-      if previousCursorX or previousCursorY then
-        -- Remove old cursor
-        gpu.setForeground(0xFFFFFF)
-        gpu.setBackground(0x000000)
-        local letter = gpu.get(previousDisplayedCursorX, previousDisplayedCursorY)
-        gpu.set(previousDisplayedCursorX, previousDisplayedCursorY, letter)
-      end
-
-      gpu.setForeground(0x000000)
-      gpu.setBackground(0xFFFFFF)
-      local letter = gpu.get(displayedCursorX, displayedCursorY)
-      gpu.set(displayedCursorX, displayedCursorY, letter)
-    else
-      -- If renderText() hasn't been called, the cursor may still be white and need to be turned black.
-      gpu.setForeground(0xFFFFFF)
-      gpu.setBackground(0x000000)
-      local letter = gpu.get(displayedCursorX, displayedCursorY)
-      gpu.set(displayedCursorX, displayedCursorY, letter)
-    end
-  end
-end
-
--- Cleanup
-::exit::
-gpu.freeBuffer(textBuffer)
-gpu.setActiveBuffer(0)
-terminal.clear()

halyde/apps/beep.lua

@@ -1,19 +0,0 @@
-local computer = require("computer")
-local cliparse = require("cliparse")
-
-cliparse.config({
-  ["f"] = 1,
-  ["frequency"] = 1,
-  ["t"] = 1,
-  ["time"] = 1,
-})
-local parsed, err = cliparse.parse(...)
-if not parsed then
-  return print("\x1b[91m" .. err .. "\x1b[0m")
-end
-
-local freq =
-  tonumber(parsed.flags.f and parsed.flags.f[1] or parsed.flags.frequency and parsed.flags.frequency[1] or "440")
-local time = tonumber(parsed.flags.t and parsed.flags.t[1] or parsed.flags.time and parsed.flags.time[1] or "0.1")
-
-computer.beep(freq, time)

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
@@ -34,27 +34,27 @@ if type(args[1])=="string" then
   local compID,err = getComponentID(args[1])
   if not compID then
     print("\x1b[91mCould not get component ID from '"..args[1].."'.")
-    if type(err)=="string" then print("\x1b[91m"..err.."\x1b[0m") end
+    if type(err)=="string" then print("\x1b[91m"..err) end
     return
   end
   if not force then
-    if component.virtual.check(compID) then
-      return print("\x1b[91mThis component is virtual and cannot be booted from directly.\nID: "..compID.."\x1b[0m")
+    if componentlib.additions[compID] then
+      return print("\x1b[91mThis component is virtual and cannot be booted from directly.\nID: "..compID)
     end
     local type = component.type(compID)
     if type~="filesystem" and type~="drive" then
-      return print("\x1b[91mThis component is not a storage medium.\nID: "..compID.."\x1b[0m")
+      return print("\x1b[91mThis component is not a storage medium.\nID: "..compID)
     end
     if type=="filesystem" and not fileExists(compID,"/init.lua") then
-      return print("\x1b[91mThis storage medium doesn't have an \"init.lua\" file.\nID: "..compID.."\x1b[0m")
+      return print("\x1b[91mThis storage medium doesn't have an \"init.lua\" file.\nID: "..compID)
     end
   end
 
   computer.setBootAddress(compID)
   if computer.getBootAddress()~=compID then
-    return print("\x1b[91mFailed to set the boot address.\x1b[0m")
+    return print("\x1b[91mFailed to set the boot address.")
   end
   computer.shutdown(true)
 else
-  require("shell").run("help boot")
+  shell.run("help boot")
 end

halyde/apps/cat.lua

@@ -1,30 +1,20 @@
-local fs = require("filesystem")
-local shell = require("shell")
-
-local args = {...}
-
-if not args[1] then
-  return shell.run("help cat")
+local files = {...}
+local fs = import("filesystem")
+if not files or not files[1] then
+  shell.run("help cat")
+  return
 end
-
-for _, file in pairs(args) do
-  file = shell.resolvePath(file)
-
+for _, file in ipairs(files) do 
+  if file:sub(1, 1) ~= "/" then
+    file = fs.concat(shell.workingDirectory, file)
+  end
+  if not fs.exists(file) then
+    print("\27[91mFile does not exist.")
+  end
   local handle = fs.open(file, "r")
-  if handle == nil then
-    terminal.write("\27[91mCan't open " .. file .. "\27[0m\n")
-    goto continue
-  end
-  local enddata
-  while true do
-    local data = handle:read(math.huge or math.maxinteger)
-    if data == nil then break end
-    terminal.write(data)
-    enddata = data
-  end
-  handle:close()
-  if string.sub(enddata, -1, -1) ~= "\n" then
-    print("")
-  end
-  ::continue::
+  local data
+  repeat
+    data = handle:read(math.huge or math.maxinteger)
+    termlib.write(data)
+  until not data
 end

halyde/apps/cd.lua

@@ -1,26 +1,14 @@
-local args = {...}
+local directory = ...
+local fs = import("filesystem")
 
-if args[2] then
-  terminal.write("\27[91mToo many arguments.\27[0m")
-end
-
-if not args[1] then
+if not directory then
   return
 end
-
-local fs = require("filesystem")
-local shell = require("shell")
-
-local directory = shell.resolvePath(args[1])
-
-if not fs.exists(directory) then
-  terminal.write("\27[91mError: " .. directory .. ": No such file or directory\27[0m\n")
-  return
+if directory:sub(1, 1) ~= "/" then
+  directory = fs.concat(shell.workingDirectory, directory)
 end
-
-if not fs.isDirectory(directory) then
-  terminal.write("\27[91mError: " .. directory .. ": Not a directory\27[0m\n")
-  return
+if fs.exists(directory) and fs.isDirectory(directory) then
+  shell.workingDirectory = fs.canonical(directory)
+else
+  print("\27[91mNo such directory.")
 end
-
-shell.setWorkingDirectory(fs.canonical(directory))

halyde/apps/clear.lua

@@ -1,3 +1,2 @@
-terminal.clear()
+clear()
 -- truly so much going on here
--- meow

halyde/apps/cp.lua

@@ -1,70 +1,26 @@
-local fs = require("filesystem")
-local shell = require("shell")
+local fromFile, toFile = ...
+local fs = import("filesystem")
 
-local args = {...}
-
-if not args[1] then
-  return shell.run("help cp")
-end
-
-if not args[2] then
-  terminal.write("\27[91mError: No destination\27[0m\n")
+if not fromFile or not toFile then
+  shell.run("help cp")
   return
 end
-
-local dest = shell.resolvePath(args[#args])
-
-if fs.isFile(dest) then
-  if #args ~= 2 then
-    terminal.write("\27[91mError: Destination is not a directory\27[0m\n")
-    return
-  end
-  local src = shell.resolvePath(args[1])
-  if not fs.exists(src) then
-    terminal.write("\27[91mError: " .. src .. ": No such file or directory\27[0m\n")
-    return
-  end
-  if fs.isDirectory(src) then
-    terminal.write("\27[91mError: Cannot write directory " .. src .. " to file " .. dest .. "\27[0m\n")
-    return
-  end
-  fs.copy(src, dest)
-elseif fs.isDirectory(dest) then
-  for i = 1, #args - 1 do
-    local src = shell.resolvePath(args[i])
-    if src == dest then
-      terminal.write("\27[91mError: Source and destination are the same\27[0m\n")
-      goto continue
-    end
-
-    if not fs.exists(src) then
-      terminal.write("\27[91mError: " .. src .. ": No such file or directory\27[0m\n")
-      goto continue
-    end
-
-    fs.copy(src, fs.concat(dest, fs.basename(src)))
-    ::continue::
-  end
-elseif not fs.exists(dest) then
-  if #args ~= 2 then
-    terminal.write("\27[91mError: " .. dest .. ": No such file or directory\27[0m\n")
-    return
-  end
-  local src = shell.resolvePath(args[1])
-  if not fs.exists(src) then
-    terminal.write("\27[91mError: " .. src .. ": No such file or directory\27[0m\n")
-    return
-  end
-  local destp = fs.parent(dest)
-  if not fs.exists(destp) then
-    terminal.write("\27[91mError: " .. destp .. ": No such file or directory\27[0m\n")
-    return
-  end
-  if not fs.isDirectory(destp) then
-    terminal.write("\27[91mError: " .. destp .. ": Not a directory\27[0m\n")
-    return
-  end
-  fs.copy(src, dest)
-else
-  terminal.write("\27[91mUnknown error\27[0m\n")
+if fromFile:sub(1, 1) ~= "/" then
+  fromFile = fs.concat(shell.workingDirectory, fromFile)
 end
+if toFile:sub(1, 1) ~= "/" then
+  toFile = fs.concat(shell.workingDirectory, toFile)
+end
+if fromFile == toFile then
+  print("\27[91mSource and destination are the same.")
+  return
+end
+if not fs.exists(fromFile) then
+  print("\27[91mSource file does not exist.")
+  return
+end
+if fs.exists(toFile) and not (table.find({...}, "-o") or table.find({...}, "--overwrite")) then
+  print("\27[91mDestination file already exists. Run this command again with -o to overwrite it.")
+  return
+end
+fs.copy(fromFile, toFile)

halyde/apps/download.lua

@@ -1,16 +1,16 @@
 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.\27[0m")
+  print("\27[91mThis program requires an internet card to run.")
   return
 end
 
 if not url then
   print("Please enter a URL to download from.")
-  require("shell").run("help download")
+  shell.run("help download")
   return
 end
 
@@ -26,11 +26,11 @@ local status, errorMessage = pcall(function()
   request:finishConnect()
 end)
 if not status then
-  print("\27[91mDownload failed: " .. errorMessage .. "\27[0m")
+  print("\27[91mDownload failed: " .. errorMessage)
 end
 local responseCode = request:response()
 if responseCode and responseCode ~= 200 then
-  print("\27[91mDownload failed: " .. tostring(responseCode) .. "\27[0m")
+  print("\27[91mDownload failed: " .. tostring(responseCode))
 end
 repeat
   tmpdata = request.read(math.huge)
@@ -39,11 +39,11 @@ until not tmpdata
 local saveLocation
 local saveLocationOK = false
 repeat
-  saveLocation = terminal.read(nil, "File save location: ", fs.concat(require("shell").getWorkingDirectory(), url:match("/([^/]+)$")))
+  saveLocation = read(nil, "File save location: ", fs.concat(shell.workingDirectory, url:match("/([^/]+)$")))
   if fs.isDirectory(saveLocation) then
-    print("\27[91mThe specified location is a directory.\27[0m")
+    print("\27[91mThe specified location is a directory.")
   elseif fs.exists(saveLocation) then
-    local answer = terminal.read({prefix = "\27[91mThere is already a file at the specified directory. Overwrite it? [Y/n]\27[0m"})
+    local answer = read(nil, "\27[91mThere is already a file at the specified directory. Overwrite it? [Y/n]")
     if answer:lower() ~= "n" then
       saveLocationOK = true
     end

halyde/apps/edit.lua

@@ -1,9 +1,8 @@
 local file = ...
-local fs = require("filesystem")
-local event = require("event")
-local component = require("component")
-local unicode = require("unicode")
-local workingDirectory = require("shell").getWorkingDirectory()
+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
@@ -16,7 +15,9 @@ local tab = "  "
 --local ocelot = component.ocelot
 
 local function rawset(x, y, text)
-  terminal.write("\x1b[".. tostring(y) .. ";" .. tostring(x) .. "H" .. text)
+  termlib.cursorPosX = x
+  termlib.cursorPosY = y
+  termlib.write(text, false)
 end
 
 local filestring, filepath, handle, data, tmpdata
@@ -24,7 +25,7 @@ if file then
   if file:sub(1, 1) == "/" then
     filepath = file
   else
-    filepath = workingDirectory .. file
+    filepath = shell.workingDirectory .. file
   end
   handle, data, tmpdata = fs.open(filepath, "r"), "", nil
   if fs.exists(filepath) then
@@ -43,7 +44,7 @@ if file then
       tmpdata = {data}
     end
   else
-    filepath = workingDirectory .. file
+    filepath = shell.workingDirectory .. file
     filestring = "[NEW FILE]"
     tmpdata = {""}
   end
@@ -54,7 +55,7 @@ else
 end
 local function render()
   gpu.setActiveBuffer(renderBuffer)
-  terminal.clear()
+  clear()
   --ocelot.log(tostring(scrollPosY))
   local realCursorX = math.min(cursorPosX, unicode.wlen(tmpdata[cursorPosY + scrollPosY - 1]) - scrollPosX + 2)
   if realCursorX < 1 then
@@ -151,7 +152,7 @@ local function processEvent(args)
   if args[1] == "key_down" then
     local keycode = args[4]
     local key = keyboard.keys[keycode]
-    if keyboard.getCtrlDown() then
+    if keyboard.ctrlDown then
       return false, false, key
     end
     if key == "down" and cursorPosY < #tmpdata then
@@ -260,13 +261,14 @@ local function save()
   gpu.setBackground(0xFFFFFF)
   gpu.setForeground(0)
   gpu.set(1, height - 1, string.rep(" ", width))
-  rawset(1, height - 1)
-  local savepath = terminal.read({prefix = "\27[107m\27[30mSave location: ", defaultText = filepath})
+  termlib.cursorPosX = 1
+  termlib.cursorPosY = height - 1
+  local savepath = read(nil, "\27[107m\27[30mSave location: ", filepath)
   gpu.setBackground(0xFFFFFF)
   gpu.setForeground(0)
   if fs.exists(savepath) then
     gpu.set(1, height - 1, string.rep(" ", width))
-    local answer = terminal.read({prefix = "\27[107m\27[30mFile already exists. Overwrite it? [Y/n] "})
+    local answer = read(nil, "\27[107m\27[30mFile already exists. Overwrite it? [Y/n] ")
     if answer:lower() == "n" then
       gpu.setBackground(0xFFFFFF)
       gpu.setForeground(0)
@@ -299,14 +301,15 @@ while true do
     renderFlag, cursorRenderFlag, specialKey = processEvent(args)
     if specialKey == "x" then
       if changesMade then
-        rawset(1, height - 1)
-        local response = terminal.read({prefix = "\27[107m\27[30mWould you like to save changes? [Y/n] "})
+        termlib.cursorPosX = 1
+        termlib.cursorPosY = height - 1
+        local response = read(nil, "\27[107m\27[30mWould you like to save changes? [Y/n] ")
         if response:lower() ~= "n" then
           save()
         end
       end
       gpu.freeAllBuffers()
-      terminal.clear()
+      clear()
       return
     end
     if specialKey == "s" then

halyde/apps/fetch.lua

@@ -1,66 +1,70 @@
-local component = require("component")
-local computer = require("computer")
-local filesystem = require("filesystem")
-
-local function convert(value, fromUnit, toUnit)
-  local units = {B = 1, KiB = 1024, MiB = 1024^2, GiB = 1024^3}
-  return value * units[fromUnit] / units[toUnit]
-end
+local component = import("component")
+local computer = import("computer")
 
 local function printstat(text)
-  terminal.write("\27[35G" .. text .. "\n")
+  termlib.cursorPosX = 35
+  termlib.write(text .. "\n", false)
 end
 
-local logo = ""
-local handle, tmpdata = filesystem.open("/halyde/config/oslogo.ans", "r"), nil
-repeat
-  tmpdata = handle:read(math.huge)
-  logo = logo .. (tmpdata or "")
-until not tmpdata
-handle:close()
-
-terminal.write(logo)
-
-terminal.write("\27[17A")
-
-printstat("\27[92mOS\27[0m: " .. _OSVERSION)
-printstat("\27[92mArchitecture\27[0m: " .. _VERSION)
-
+termlib.write(_OSLOGO, false)
+termlib.cursorPosY = termlib.cursorPosY - 17
+printstat("\27[92mOS\27[0m: ".._OSVERSION)
+printstat("\27[92mArchitecture\27[0m: ".._VERSION)
 local componentCounter = 0
-for _ in component.list() do
+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[92mBattery\27[0m: " .. tostring(math.floor(computer.energy() / computer.maxEnergy() * 1000 + 0.5) / 10) .. "%")
-
+printstat("\27[92mComponents\27[0m: "..tostring(componentCounter))
+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()
-
-local function formatBytes(bytes)
-  if convert(bytes, "B", "GiB") >= 1 then
-    return tostring(math.floor(convert(bytes, "B", "GiB") * 100 + 0.5) / 100) .. " GiB"
-  elseif convert(bytes, "B", "MiB") >= 1 then
-    return tostring(math.floor(convert(bytes, "B", "MiB") * 100 + 0.5) / 100) .. " MiB"
-  elseif convert(bytes, "B", "KiB") >= 1 then
-    return tostring(math.floor(convert(bytes, "B", "KiB") * 100 + 0.5) / 100) .. " KiB"
-  else
-    return tostring(bytes) .. " B"
-  end
+local totalMemoryString
+if convert(totalMemory, "B", "GiB") >= 1 then
+  totalMemoryString = tostring(math.floor(convert(totalMemory, "B", "GiB") * 100 + 0.5) / 100) .. " GiB"
+elseif convert(totalMemory, "B", "MiB") >= 1 then
+  totalMemoryString = tostring(math.floor(convert(totalMemory, "B", "MiB") * 100 + 0.5) / 100) .. " MiB"
+elseif convert(totalMemory, "B", "KiB") >= 1 then
+  totalMemoryString = tostring(math.floor(convert(totalMemory, "B", "KiB") * 100 + 0.5) / 100) .. " KiB"
+else
+  totalMemoryString = tostring(totalMemory) .. " B"
 end
-
-printstat("\27[92mMemory\27[0m: " .. formatBytes(usedMemory) .. " / " .. formatBytes(totalMemory))
-
+local usedMemoryString
+if convert(usedMemory, "B", "GiB") >= 1 then
+  usedMemoryString = tostring(math.floor(convert(usedMemory, "B", "GiB") * 100 + 0.5) / 100) .. " GiB"
+elseif convert(usedMemory, "B", "MiB") >= 1 then
+  usedMemoryString = tostring(math.floor(convert(usedMemory, "B", "MiB") * 100 + 0.5) / 100) .. " MiB"
+elseif convert(usedMemory, "B", "KiB") >= 1 then
+  usedMemoryString = tostring(math.floor(convert(usedMemory, "B", "KiB") * 100 + 0.5) / 100) .. " KiB"
+else
+  usedMemoryString = tostring(usedMemory) .. " B"
+end
+printstat("\27[92mMemory\27[0m: "..usedMemoryString.." / "..totalMemoryString)
 local totalDisk = component.invoke(computer.getBootAddress(), "spaceTotal")
 local usedDisk = component.invoke(computer.getBootAddress(), "spaceUsed")
-
-printstat("\27[92mDisk\27[0m: " .. formatBytes(usedDisk) .. " / " .. formatBytes(totalDisk))
-
-local gpuComponent = component.list("gpu")()
-local width, height = component.invoke(gpuComponent, "getResolution")
-printstat("\27[92mResolution\27[0m: " .. tostring(width) .. "x" .. tostring(height) .. "\n")
-
+local totalDiskString
+if convert(totalDisk, "B", "GiB") >= 1 then
+  totalDiskString = tostring(math.floor(convert(totalDisk, "B", "GiB") * 100 + 0.5) / 100) .. " GiB"
+elseif convert(totalDisk, "B", "MiB") >= 1 then
+  totalDiskString = tostring(math.floor(convert(totalDisk, "B", "MiB") * 100 + 0.5) / 100) .. " MiB"
+elseif convert(totalDisk, "B", "KiB") >= 1 then
+  totalDiskString = tostring(math.floor(convert(totalDisk, "B", "KiB") * 100 + 0.5) / 100) .. " KiB"
+else
+  totalDiskString = tostring(totalDisk) .. " B"
+end
+local usedDiskString
+if convert(usedDisk, "B", "GiB") >= 1 then
+  usedDiskString = tostring(math.floor(convert(usedDisk, "B", "GiB") * 100 + 0.5) / 100) .. " GiB"
+elseif convert(usedDisk, "B", "MiB") >= 1 then
+  usedDiskString = tostring(math.floor(convert(usedDisk, "B", "MiB") * 100 + 0.5) / 100) .. " MiB"
+elseif convert(usedDisk, "B", "KiB") >= 1 then
+  usedDiskString = tostring(math.floor(convert(usedDisk, "B", "KiB") * 100 + 0.5) / 100) .. " KiB"
+else
+  usedDiskString = tostring(usedDisk) .. " B"
+end
+printstat("\27[92mDisk\27[0m: "..usedDiskString.." / "..totalDiskString)
+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.write("\27[5B\27[0m")
+termlib.cursorPosY = termlib.cursorPosY + 5

halyde/apps/help.lua

@@ -1,268 +1,38 @@
-local fs = require("filesystem")
-local shell = require("shell")
-
-local arg = ... or "default"
-local what = arg
-
-local aliases = shell.getAliases()
-if aliases[what] then
-  what = aliases[what]
-end
-local path = "/halyde/apps/helpdb/" .. what
-if not fs.exists(path) then
-  print("Could not find help file for: " .. arg .. ".")
+local fs = import("filesystem")
+local args = {...}
+local command = args[1]
+args = nil
+if not command then
+  local handle, data, tmpdata = fs.open("/halyde/apps/helpdb/default.txt", "r"), "", nil
+  repeat
+    tmpdata = handle:read(math.huge or math.maxinteger)
+    data = data .. (tmpdata or "")
+  until not tmpdata
+  print(data)
   return
 end
-if path == "/halyde/apps/helpdb/default" then
-  return shell.run("cat " .. path) -- smh
+if shell.aliases[command] then
+  command = shell.aliases[command]
 end
-local handle = fs.open(path, "r")
-local data = {
-  command = "",
-  usage = "",
-  description = "",
-  args = {},
-  examples = {}
-}
-
-while true do
-  local line = ""
-  while true do
-    local char = handle:read(1)
-    if not char then
-      if line == "" then
-        line = nil
-        break
-      end
-      break
+if fs.exists("/halyde/apps/helpdb/" .. command .. ".txt") then
+  local handle, data, tmpdata = fs.open("/halyde/apps/helpdb/" .. command .. ".txt", "r"), "", nil
+  repeat
+    tmpdata = handle:read(math.huge or math.maxinteger)
+    data = data .. (tmpdata or "")
+  until not tmpdata
+  print(data)
+  local aliases = table.copy(shell.aliases)
+  if table.find(aliases, command) then
+    local aliasIndex = table.find(aliases, command)
+    local aliasString = "Aliases:\n  " .. aliasIndex
+    aliases[aliasIndex] = nil
+    while table.find(aliases, command) do
+      aliasIndex = table.find(aliases, command)
+      aliasString = aliasString .. ", " .. aliasIndex
+      aliases[aliasIndex] = nil
     end
-    if char == "\n" then
-      break
-    end
-    if char == "\r" then
-      local next_char = handle:read(1)
-      if next_char and next_char == "\n" then
-        break
-      elseif next_char then
-        local pos = file:seek("cur")
-        if pos then
-          file:seek("set", pos - 1)
-        end
-        break
-      end
-      break
-    end
-    line = line .. char
-  end
-  if line == nil then
-    break
-  end
-  line = line:match("^%s*(.-)%s*$")
-  if line then
-    local key, value = line:match("^(%w+)%s+(.*)$")
-    if not key then goto continue end
-    if key:lower() == "command" then
-      data.command = value
-    end
-
-    if key:lower() == "usage" then
-      data.usage = value
-    end
-
-    if key:lower() == "description" then
-      data.description = value
-    end
-
-    if key:lower():match("^arg%d+$") then
-      local num = key:lower():match("^arg(%d+)$")
-      if not data.args[tonumber(num)] then data.args[tonumber(num)] = {} end
-      data.args[tonumber(num)].name = value
-    end
-
-    if key:lower():match("^arg%d+description$") then
-      local num = key:lower():match("^arg(%d+)description$")
-      if not data.args[tonumber(num)] then data.args[tonumber(num)] = {} end
-      data.args[tonumber(num)].description = value
-    end
-
-    if key:lower():match("^arg%d+sub%d+$") then
-      local main_num, sub_num = key:lower():match("^arg(%d+)sub(%d+)$")
-      if main_num and sub_num then
-        if not data.args[tonumber(main_num)] then data.args[tonumber(main_num)] = {} end
-        if not data.args[tonumber(main_num)].subflags then data.args[tonumber(main_num)].subflags = {} end
-        if not data.args[tonumber(main_num)].subflags[tonumber(sub_num)] then
-          data.args[tonumber(main_num)].subflags[tonumber(sub_num)] = {}
-        end
-        data.args[tonumber(main_num)].subflags[tonumber(sub_num)].name = value
-      end
-    end
-
-    if key:lower():match("^arg%d+sub%d+description$") then
-      local main_num, sub_num = key:lower():match("^arg(%d+)sub(%d+)description$")
-      if main_num and sub_num then
-        if not data.args[tonumber(main_num)] then data.args[tonumber(main_num)] = {} end
-        if not data.args[tonumber(main_num)].subflags then data.args[tonumber(main_num)].subflags = {} end
-        if not data.args[tonumber(main_num)].subflags[tonumber(sub_num)] then
-          data.args[tonumber(main_num)].subflags[tonumber(sub_num)] = {}
-        end
-        data.args[tonumber(main_num)].subflags[tonumber(sub_num)].description = value
-      end
-    end
-
-    if key:lower():match("^example%d+$") then
-      local num = key:lower():match("^example(%d+)$")
-      if not data.examples[tonumber(num)] then data.examples[tonumber(num)] = {} end
-      data.examples[tonumber(num)].name = value
-    end
-
-    if key:lower():match("^example%d+description$") then
-      local num = key:lower():match("^example(%d+)description$")
-      if not data.examples[tonumber(num)] then data.examples[tonumber(num)] = {} end
-      data.examples[tonumber(num)].description = value
-    end
-    ::continue::
+    print(aliasString)
   end
-end
-
-handle:close()
-
---print(require("serialize")(data, "\t"))
-
--- Halyde terminal doesn't support bold (CSI 1 m) but who cares
-
-if data.command then
-  terminal.write("\27[1mUsage: \27[0m\n")
-  terminal.write("  \27[96m" .. data.command)
-  if data.usage then
-    terminal.write("\27[93m " .. data.usage)
-  end
-  terminal.write("\27[0m\n\n")
-end
-
-local width, height = terminal.getResolution()
-
-local function wrap_text(text, indent)
-  if not text then return "" end
-  local words = {}
-  for word in text:gmatch("%S+") do
-    table.insert(words, word)
-  end
-
-  local lines = {}
-  local current_line = ""
-
-  for i, word in ipairs(words) do
-    if #current_line + #word + 1 <= width * 0.66 - indent then
-      if current_line == "" then
-        current_line = word
-      else
-        current_line = current_line .. " " .. word
-      end
-    else
-      table.insert(lines, current_line)
-      current_line = word
-    end
-  end
-  if current_line ~= "" then
-    table.insert(lines, current_line)
-  end
-
-  local result = {}
-  for i, line in ipairs(lines) do
-    if i == 1 then
-      table.insert(result, line)
-    else
-      table.insert(result, string.rep(" ", indent) .. line)
-    end
-  end
-  return table.concat(result, "\n")
-end
-
-if data.description then
-  terminal.write("\27[1mDescription:\27[0m\n")
-  terminal.write("  " .. wrap_text(data.description, 2))
-  terminal.write("\n\n")
-end
-
-if #data.args > 0 then
-  terminal.write("\27[1mArguments:\27[0m\n")
-  local max_len = 0
-  for _, flag in ipairs(data.args) do
-    if flag.name then
-      max_len = math.max(max_len, #flag.name)
-    end
-    for _, subf in ipairs(flag.subflags or {}) do
-      if subf.name then
-        max_len = math.max(max_len, #subf.name + 2)
-      end
-    end
-  end
-
-  for _, flag in ipairs(data.args) do
-    terminal.write("  \27[93m" .. (flag.name or "") .. "\27[0m" .. string.rep(" ", max_len - (flag.name and #flag.name or 0) + 2) .. wrap_text(flag.description, 4 + max_len) .. "\n")
-    for _, subf in ipairs(flag.subflags or {}) do
-      terminal.write("    \27[92m" .. (subf.name or "") .. "\27[0m" .. string.rep(" ", max_len - (subf.name and #subf.name or 0)) .. wrap_text(subf.description, 4 + max_len) .. "\n")
-    end
-  end
-  terminal.write("\n")
-end
-
-local function formatExampleName(name, utility)
-  if not name then return name end
-
-  local contains = false
-  if name:find(utility, 1, true) then
-    contains = true
-  else
-    for alias, cmd in pairs(aliases) do
-      if cmd == utility and name:find(alias, 1, true) then
-        contains = true
-        break
-      end
-    end
-  end
-
-  if not contains then
-    return "\27[92m" .. name
-  end
-
-  local formatted = name
-  formatted = formatted:gsub("(" .. utility .. ")", "\27[96m%1\27[92m")
-  for alias, cmd in pairs(aliases) do
-    if cmd == utility then
-      formatted = formatted:gsub("(" .. alias .. ")", "\27[96m%1\27[92m")
-    end
-  end
-
-  return formatted
-end
-
-if #data.examples > 0 then
-  terminal.write("\27[1mExamples:\27[0m\n")
-  local max_len = 0
-  for _, flag in ipairs(data.examples) do
-    max_len = math.max(max_len, #flag.name)
-  end
-
-  for _, flag in ipairs(data.examples) do
-    terminal.write("  " .. formatExampleName(flag.name, arg) .. "\27[0m" .. string.rep(" ", max_len - #flag.name + 2) .. wrap_text(flag.description, 4 + max_len) .. "\n")
-  end
-  terminal.write("\n")
-end
-
-local first = true
-for k, v in pairs(aliases) do
-  if v == arg then
-    if first then
-      terminal.write("\27[1mAliases:\27[0m\n  ")
-    end
-    terminal.write("\27[96m" .. k)
-    if not first then
-      terminal.write("\27[0m, ")
-    end
-    first = false
-  end
-end
-if not first then
-  terminal.writec(0xa)
+else
+  print("Could not find help file for: " .. command .. ".")
 end

halyde/apps/helpdb/ag2

@@ -1,47 +0,0 @@
-COMMAND ag2
-USAGE [COMMAND] [PACKAGES] [FLAGS]
-DESCRIPTION Uses the Argentum 2 package manager.
-ARG1 COMMAND
-ARG1SUB1 install
-ARG1SUB2 remove
-ARG1SUB3 update
-ARG1SUB4 list
-ARG1SUB5 repo-list
-ARG1SUB6 repo-add
-ARG1SUB7 repo-remove
-ARG1SUB8 info
-ARG2 PACKAGES
-ARG3 FLAGS
-ARG3SUB1 -x, --exclude-deps
-ARG3SUB2 -u, --update-repos
-ARG3SUB3 -f, --force
-ARG3SUB4 -c, --clean
-ARG3SUB5 -s, --source [URL]
-ARG3SUB6 -C, --cascade
-ARG1DESCRIPTION Specifies the operation for Argentum 2 to do.
-ARG1SUB1DESCRIPTION Installs packages.
-ARG1SUB2DESCRIPTION Removes packages.
-ARG1SUB3DESCRIPTION Updates packages.
-ARG1SUB4DESCRIPTION Lists all available packages.
-ARG1SUB5DESCRIPTION Lists all installed repositories.
-ARG1SUB6DESCRIPTION Adds a custom repository.
-ARG1SUB7DESCRIPTION Removes a repository.
-ARG1SUB8DESCRIPTION Shows a packages version, description and other relevant information.
-ARG2DESCRIPTION Packages to apply operations to.
-ARG3DESCRIPTION These flags are available and can be inserted anywhere
-ARG3SUB1DESCRIPTION Ignore dependencies. WARNING: Using this can and will leave you with broken packages. Use it at your own risk and only when truly necessary.
-ARG3SUB2DESCRIPTION Update the list of repositories.
-ARG3SUB3DESCRIPTION Force the operation, even if there are conflicts or unresolvable dependencies. WARNING: Using this can and will leave you with broken packages. Use it at your own risk and only when truly necessary.
-ARG3SUB4DESCRIPTION Clean up now-unnecessary packages (previous dependencies).
-ARG3SUB5DESCRIPTION Use a custom source for the operation.
-ARG3SUB6DESCRIPTION When removing a package that other packages depend on, remove those packages too instead of aborting.
-EXAMPLE1 ag2 install halyde
-EXAMPLE2 ag2 list
-EXAMPLE3 ag2 info halyde
-EXAMPLE4 ag2 remove -x edit
-EXAMPLE5 ag2 remove -c hal-draw
-EXAMPLE1DESCRIPTION Installs the halyde package.
-EXAMPLE2DESCRIPTION Lists all packages.
-EXAMPLE3DESCRIPTION Shows information about the halyde package.
-EXAMPLE4DESCRIPTION Removes edit, but does not remove any packages that depend on it.
-EXAMPLE5DESCRIPTION Removes hal-draw and any dependencies that are no longer needed.

halyde/apps/helpdb/argentum

@@ -1,29 +0,0 @@
-COMMAND argentum
-USAGE [COMMAND] [PACKAGES]
-DESCRIPTION Uses the Argentum package manager.
-ARG1 COMMAND
-ARG1SUB1 install
-ARG1SUB2 remove
-ARG1SUB3 update
-ARG1SUB4 list
-ARG1SUB5 search
-ARG1SUB6 info
-ARG2 PACKAGES
-ARG1DESCRIPTION Specifies the operation for Ag to do.
-ARG1SUB1DESCRIPTION Installs packages.
-ARG1SUB2DESCRIPTION Removes packages.
-ARG1SUB3DESCRIPTION Updates packages.
-ARG1SUB4DESCRIPTION Lists all available packages.
-ARG1SUB5DESCRIPTION Searches all available packages.
-ARG1SUB6DESCRIPTION Shows information on a specific package.
-ARG2DESCRIPTION Packages to apply operations to.
-EXAMPLE1 ag install hal-draw
-EXAMPLE2 ag list
-EXAMPLE3 ag info hal-draw
-EXAMPLE4 ag update hal-draw
-EXAMPLE5 ag update hal-draw
-EXAMPLE1DESCRIPTION Installs the hal-draw package.
-EXAMPLE2DESCRIPTION Lists all packages.
-EXAMPLE3DESCRIPTION Shows information about hal-draw.
-EXAMPLE4DESCRIPTION Updates the hal-draw package if it's not at the newest version.
-EXAMPLE5DESCRIPTION Updates all packages.

halyde/apps/helpdb/argentum.txt

@@ -0,0 +1,18 @@
+Usage: argentum [COMMAND] [PACKAGES]
+Uses the Argentum package manager.
+
+  COMMAND     Specifies the operation for Ag to do.
+    install   Installs packages.
+    remove    Removes packages.
+    update    Updates packages.
+    list      Lists all available packages.
+    search    Searches all available packages.
+    info      Shows information on a specific package.
+  PACKAGES*   Packages to apply operations to.
+
+Examples:
+  ag install hal-draw   Installs the hal-draw package.
+  ag list               Lists all packages.
+  ag info hal-draw      Shows information about hal-draw.
+  ag update hal-draw    Updates the hal-draw package if it's not at the newest version.
+  ag update             Updates all packages.

halyde/apps/helpdb/beep

@@ -1,8 +0,0 @@
-COMMAND beep
-USAGE [FLAGS]
-DESCRIPTION Make the computer beep.
-ARG1 FLAGS
-ARG1SUB1 -f, --frequency
-ARG1SUB2 -t, --time
-ARG1SUB1DESCRIPTION Specifies the frequency, in Hz. Defaults to 440Hz.
-ARG1SUB2DESCRIPTION Specifies how long, in seconds, the computer should beep. Defaults to 0.1s.

halyde/apps/helpdb/boot

@@ -1,23 +0,0 @@
-COMMAND boot
-USAGE [ADDRESS] [FLAGS]
-DESCRIPTION Restarts and automatically boots into any storage medium. Meant to be used for systems using a Lua BIOS EEPROM.
-ARG1 ADDRESS
-ARG1SUB1 hdd1
-ARG1SUB2 hdd2
-ARG1SUB3 floppy
-ARG1SUB4
-ARG2 FLAGS
-ARG2SUB1 -f, --force
-ARG1DESCRIPTION The storage medium to boot to.
-ARG1SUB1DESCRIPTION The first hard drive inserted in the computer.
-ARG1SUB2DESCRIPTION The second hard drive inserted in the computer.
-ARG1SUB3DESCRIPTION The floppy disk that is inserted in the computer.
-ARG1SUB4DESCRIPTION The ID of the component, abbreviated. Must have three or more characters.
-ARG2DESCRIPTION Specifies extra options when executing the command.
-ARG2SUB1DESCRIPTION Forces booting into the storage medium.
-EXAMPLE1 boot hdd1
-EXAMPLE2 boot hdd2
-EXAMPLE3 boot floppy
-EXAMPLE1DESCRIPTION Boot into the first hard drive inserted in the computer.
-EXAMPLE2DESCRIPTION Boot into the second hard drive inserted in the computer.
-EXAMPLE3DESCRIPTION Boot into the floppy disk inserted in the comuter.

halyde/apps/helpdb/boot.txt

@@ -0,0 +1,15 @@
+Usage: boot [ADDRESS] [FLAGS]
+Restarts and automatically boots into any storage medium. Meant to be used for systems using a Lua BIOS EEPROM.
+
+  ADDRESS         The storage medium to boot to.
+    hdd1          The first hard drive inserted in the computer.
+    hdd2          The second hard drive inserted in the computer.
+    floppy        The floppy disk that is inserted in the computer.
+                  The ID of the component, abbreviated. Must have three or more characters.
+  FLAGS           Specifies extra options when executing the command.
+    -f, --force   Forces booting into the storage medium.
+
+Examples:
+  boot hdd1     Boot into the first hard drive inserted in the computer.
+  boot hdd2     Boot into the second hard drive inserted in the computer.
+  boot floppy   Boot into the floppy disk inserted in the comuter.

halyde/apps/helpdb/cat

@@ -1,9 +0,0 @@
-COMMAND cat
-USAGE [FILES]...
-DESCRIPTION Concatenates and prints a file.
-ARG1 FILES
-ARG1DESCRIPTION Specifies the paths to the files to print.
-EXAMPLE1 cat /init.lua
-EXAMPLE2 cat help.lua cat.lua
-EXAMPLE1DESCRIPTION Concatenates and prints init.lua in the root directory.
-EXAMPLE2DESCRIPTION Concatenates and prints help.lua and cat.lua in the current working directory.

halyde/apps/helpdb/cat.txt

@@ -0,0 +1,8 @@
+Usage: cat [FILES]...
+Concatenates and prints a file.
+
+  FILES   Specifies the paths to the files to print.
+
+Examples:
+  cat /init.lua           Concatenates and prints init.lua in the root directory.
+  cat help.lua cat.lua    Concatenates and prints help.lua and cat.lua in the current working directory.

halyde/apps/helpdb/cd

@@ -1,13 +0,0 @@
-COMMAND cd
-USAGE [PATH]
-DESCRIPTION Sets the shell working directory.
-ARG1 PATH
-ARG1DESCRIPTION Specifies the path to set the shell working directory to.
-EXAMPLE1 cd /home/
-EXAMPLE2 cd halyde
-EXAMPLE3 cd ..
-EXAMPLE4 ..
-EXAMPLE1DESCRIPTION Sets the shell working directory to /home/.
-EXAMPLE2DESCRIPTION Sets the shell working directory to a directory named "halyde" in the current working directory.
-EXAMPLE3DESCRIPTION Sets the shell working directory back one directory.
-EXAMPLE4DESCRIPTION Equivalent of "cd ..".

halyde/apps/helpdb/cd.txt

@@ -0,0 +1,10 @@
+Usage: cd [PATH]
+Sets the shell working directory.
+
+  PATH   Specifies the path to set the shell working directory to.
+
+Examples:
+  cd /home/   Sets the shell working directory to /home/.
+  cd halyde   Sets the shell working directory to a directory named "halyde" in the current working directory.
+  cd ..       Sets the shell working directory back one directory.
+  ..          Equivalent of "cd ..".

halyde/apps/helpdb/clear

@@ -1,4 +0,0 @@
-COMMAND clear
-DESCRIPTION Clears the screen.
-EXAMPLE1 clear
-EXAMPLE1DESCRIPTION Clears the screen.

halyde/apps/helpdb/clear.txt

@@ -0,0 +1,5 @@
+Usage: clear
+Clears the screen.
+
+Examples:
+  clear   Clears the screen.

halyde/apps/helpdb/cp

@@ -1,11 +0,0 @@
-COMMAND cp
-USAGE [SOURCES]... [DESTINATION]
-DESCRIPTION Copy files and directories.
-ARG1 SOURCES
-ARG2 DESTINATION
-ARG1DESCRIPTION Specifies the files and directories to be copied.
-ARG2DESCRIPTION Specifies the path or a directory to copy to.
-EXAMPLE1 cp /home/a.txt /b.txt
-EXAMPLE2 cp c.lua /halyde/apps .
-EXAMPLE1DESCRIPTION Copies the file at /home/a.txt to /b.txt.
-EXAMPLE2DESCRIPTION Copies c.lua and /halyde/apps to the shell working directory.

halyde/apps/helpdb/cp.txt

@@ -0,0 +1,11 @@
+Usage: cp [FLAGS] [SOURCE] [DESTINATION]
+Copies a file.
+
+  FLAGS               Specifies extra options when executing the command.
+    -o, --overwrite   Allows any file that might be at the destination to be overwritten.
+  SOURCE              Specifies the file to be copied.
+  DESTINATION         Specifies the path to copy the file to.
+
+Examples:
+  cp /home/a.txt /b.txt   Copies the file at /home/a.txt to /b.txt.
+  cp -o c.lua d.txt       Copies the file c.lua to another file called d.txt in the shell working directory, overwriting any file that might be there.

halyde/apps/helpdb/default

@@ -1,28 +0,0 @@
-All default Halyde shell commands:
-  argentum     Uses the Argentum package manager.
-  boot         Boots to another OS.
-  cat          Concatenates and prints a file.
-  cd           Changes directory.
-  clear        Clears the screen.
-  cp           Copies a file.
-  download     Downloads a file from the internet.
-  echo         Prints a message.
-  edit         Opens the text editor.
-  fetch        Displays system information.
-  help         Shows this.
-  label        Labels storage devices and EEPROMS.
-  ls           Lists files.
-  lscor        Lists coroutines.
-  lua          Starts the Lua shell.
-  mkdir        Makes a directory.
-  mv           Moves/renames a file.
-  reboot       Reboots the computer.
-  resolution   Sets the resolution.
-  rm           Deletes a file.
-  shutdown     Shuts down the computer.
-
-You can get additional information on any app or command by running:
-  help [COMMAND]
-
-In the help documentation, an asterisk (*) next to an argument means it is optional.
-This is excluding flags, which are all optional.

halyde/apps/helpdb/default.txt

@@ -0,0 +1,25 @@
+All default Halyde shell commands:
+  argentum   Uses the Argentum package manager.
+  cat        Concatenates and prints a file.
+  cd         Changes directory.
+  clear      Clears the screen.
+  cp         Copies a file.
+  download   Downloads a file from the internet.
+  echo       Prints a message.
+  edit       Opens the text editor.
+  fetch      Displays system information.
+  help       Shows this.
+  ls         Lists files.
+  lscor      Lists coroutines.
+  lua        Starts the Lua shell.
+  mkdir      Makes a directory.
+  mv         Moves/renames a file.
+  reboot     Reboots the computer.
+  rm         Deletes a file.
+  shutdown   Shuts down the computer.
+
+You can get additional information on any app or command by running:
+  help [COMMAND]
+
+In the help documentation, an asterisk (*) next to an argument means it is optional.
+This is excluding flags, which are all optional.

halyde/apps/helpdb/download

@@ -1,7 +0,0 @@
-COMMAND download
-USAGE [URL]
-DESCRIPTION Downloads a file from the internet.
-ARG1 URL
-ARG1DESCRIPTION Specifies the URL from which to download the file from.
-EXAMPLE1 download https://github.com/
-EXAMPLE1DESCRIPTION Downloads github.com.

halyde/apps/helpdb/download.txt

@@ -0,0 +1,7 @@
+Usage: download [URL]
+Downloads a file from the internet.
+
+  URL   Specifies the URL from which to download the file from.
+
+Examples:
+  download https://github.com/   Downloads github.com.

halyde/apps/helpdb/echo

@@ -1,9 +0,0 @@
-COMMAND echo
-USAGE [TEXT]...
-DESCRIPTION Concatenates and prints text to the standard output.
-ARG1 TEXT
-ARG1DESCRIPTION Text to print.
-EXAMPLE1 echo test
-EXAMPLE2 echo Hello World!
-EXAMPLE1DESCRIPTION Prints "test" to the standard output.
-EXAMPLE2DESCRIPTION Prints "Hello World!" to the standard output.

halyde/apps/helpdb/echo.txt

@@ -0,0 +1,8 @@
+Usage: echo [TEXT]...
+Concatenates and prints text to the terminal.
+
+  TEXT   Text to print.
+
+Examples:
+  echo test           Prints "test" to the terminal.
+  echo Hello World!   Prints "Hello World!" to the terminal.

halyde/apps/helpdb/edit

@@ -1,9 +0,0 @@
-COMMAND edit
-USAGE [PATH]
-DESCRIPTION Opens a file with the text editor, or a new blank file if not specified.
-ARG1 PATH
-ARG1DESCRIPTION Specifies the file to be opened.
-EXAMPLE1 edit
-EXAMPLE2 edit /LICENSE
-EXAMPLE1DESCRIPTION Opens a new blank file in the text editor.
-EXAMPLE2DESCRIPTION Opens /LICENSE in the text editor.

halyde/apps/helpdb/edit.txt

@@ -0,0 +1,8 @@
+Usage: edit [PATH]
+Opens a file with the text editor, or a new blank file if not specified.
+
+  PATH*  Specifies the file to be opened.
+
+Examples:
+  edit           Opens a new blank file in the text editor.
+  edit /LICENSE  Opens /LICENSE in the text editor.

halyde/apps/helpdb/fetch

@@ -1,4 +0,0 @@
-COMMAND fetch
-DESCRIPTION Displays system information including OS version, Lua version, memory, etc.
-EXAMPLE1 fetch
-EXAMPLE1DESCRIPTION Displays system information.

halyde/apps/helpdb/fetch.txt

@@ -0,0 +1,5 @@
+Usage: fetch
+Displays system information including OS version, Lua version, memory, etc.
+
+Examples:
+  fetch   Displays system information.

halyde/apps/helpdb/help

@@ -1,9 +0,0 @@
-COMMAND help
-USAGE [COMMAND]
-DESCRIPTION Displays info on the command specified, or a list of commands if one is not specified.
-ARG1 COMMAND
-ARG1DESCRIPTION Command to display information on.
-EXAMPLE1 help
-EXAMPLE2 help cp
-EXAMPLE1DESCRIPTION Displays a list of all default commands available.
-EXAMPLE2DESCRIPTION Displays information about the cp command.

halyde/apps/helpdb/help.txt

@@ -0,0 +1,8 @@
+Usage: help [COMMAND]
+Displays info on the command specified, or a list of commands if one is not specified.
+
+  COMMAND*   Command to display information on.
+
+Examples:
+  help      Displays a list of all default commands available.
+  help cp   Displays information about the cp command.

halyde/apps/helpdb/label

@@ -1,24 +0,0 @@
-COMMAND label
-USAGE [ADDRESS] [LABEL]
-DESCRIPTION Get or set a label of a component that supports labelling.
-ARG1 ADDRESS
-ARG1SUB1 eeprom
-ARG1SUB2 halyde
-ARG1SUB3 slotN
-ARG1SUB4 #N
-ARG2 LABEL
-ARG1DESCRIPTION The component to use for getting or setting the label.
-ARG1SUB1DESCRIPTION The computer's EEPROM.
-ARG1SUB2DESCRIPTION The drive where the Halyde installation resides in.
-ARG1SUB3DESCRIPTION The slot number of the drive, in top-to-bottom order (range 7-9)
-ARG1SUB4DESCRIPTION The slot number of the drive, in drive space (range 1-3)
-ARG1SUB5DESCRIPTION The ID of the component, abbreviated. Must have three or more characters.
-ARG2DESCRIPTION The label to set the component to. If not found, the current label will be printed out.
-EXAMPLE1 label #3
-EXAMPLE2 label eeprom
-EXAMPLE3 label slot8 Storage
-EXAMPLE4 label halyde Halyde
-EXAMPLE1DESCRIPTION Get the label of the third drive in the computer.
-EXAMPLE2DESCRIPTION Get the label of the EEPROM inserted in the computer.
-EXAMPLE3DESCRIPTION Set the drive at slot 8 to have the label "Storage"
-EXAMPLE4DESCRIPTION Set the label of the Halyde installation to "Halyde"

halyde/apps/helpdb/label.txt

@@ -0,0 +1,16 @@
+Usage: label [ADDRESS] [LABEL]
+Get or set a label of a component that supports labelling.
+
+  ADDRESS    The component to use for getting or setting the label.
+    eeprom   The computer's EEPROM.
+    halyde   The drive where the Halyde installation resides in.
+    slotN    The slot number of the drive, in top-to-bottom order (range 7-9)
+    #N       The slot number of the drive, in drive space (range 1-3)
+             The ID of the component, abbreviated. Must have three or more characters.
+  LABEL*     The label to set the component to. If not found, the current label will be printed out.
+
+Examples:
+  label #3              Get the label of the third drive in the computer.
+  label eeprom          Get the label of the EEPROM inserted in the computer.
+  label slot8 Storage   Set the drive at slot 8 to have the label "Storage"
+  label halyde Halyde   Set the label of the Halyde installation to "Halyde"

halyde/apps/helpdb/log

@@ -1,19 +0,0 @@
-COMMAND log
-USAGE [OPERATION] [ARGS]
-DESCRIPTION Tool to manage system logs.
-ARG1 OPERATION
-ARG1SUB1 view [LOG]
-ARG1SUB2 list
-ARG1SUB3 clear [LOG]
-ARG1SUB4 info/warn/error [LOG] [TEXT]
-ARG2 ARGS
-ARG1DESCRIPTION Operation to do with the system logs.
-ARG1SUB1DESCRIPTION View a log file.
-ARG1SUB2DESCRIPTION List all logs.
-ARG1SUB3DESCRIPTION Clear a log file, or all if none specified.
-ARG1SUB4DESCRIPTION Create a log entry for the specified log at the specified log level.
-ARG2DESCRIPTION Arguments (specified under OPERATION)
-EXAMPLE1 log view example
-EXAMPLE2 log list
-EXAMPLE3 log clear example
-EXAMPLE4 log info example This is an example.

halyde/apps/helpdb/ls

@@ -1,11 +0,0 @@
-COMMAND ls
-USAGE [PATH]...
-DESCRIPTION Lists all files and directories in the specified path, or in the shell working directory if the path isn't specified. Directories are shown in yellow, executable files are shown in green, and other files are shown in white.
-ARG1 PATH
-ARG1DESCRIPTION Path to the directories to list files and subdirectories from.
-EXAMPLE1 ls
-EXAMPLE2 ls /halyde
-EXAMPLE3 ls apps
-EXAMPLE1DESCRIPTION Lists all files and directories from the current shell working directory.
-EXAMPLE2DESCRIPTION Lists all files and directories from /halyde.
-EXAMPLE3DESCRIPTION Lists all files and directories from the apps directory in the shell working directory.

halyde/apps/helpdb/ls.txt

@@ -0,0 +1,10 @@
+Usage: ls [PATH]
+Lists all files and directories in the specified path, or in the shell working directory if the path isn't specified.
+Directories are shown in yellow, executable files are shown in green, and other files are shown in white.
+
+  PATH*   Path to the folder to list files and directories from.
+
+Examples:
+  ls           Lists all files and directories from the current shell working directory.
+  ls /halyde   Lists all files and directories from /halyde.
+  ls apps      Lists all files and directories from the apps directory in the shell working directory.

halyde/apps/helpdb/lscor

@@ -1,4 +0,0 @@
-COMMAND lscor
-DESCRIPTION Lists every active coroutine by ID and name.
-EXAMPLE1 lscor
-EXAMPLE1DESCRIPTION Lists every active coroutine by ID and name.

halyde/apps/helpdb/lscor.txt

@@ -0,0 +1,5 @@
+Usage: lscor
+Lists every active coroutine by ID and name.
+
+Examples:
+  lscor   Lists every active coroutine by ID and name.

halyde/apps/helpdb/lsdrv

@@ -1,37 +0,0 @@
-COMMAND lsdrv
-USAGE [FLAGS]
-DESCRIPTION Shows all drives that are inserted into the computer.
-ARG1 FLAGS
-ARG1SUB1 -a, --all
-ARG1SUB2 -o, --output [COLS]
-ARG1SUB3 -s, --show [EXPR]
-ARG1SUB4 -S, --sort [EXPR]
-ARG1SUB5 EXPR
-ARG2 PACKAGES
-ARG1DESCRIPTION Specifies extra options when executing the command.
-ARG1SUB1DESCRIPTION Shows every column and every component. Acts the same as '-o all -s all'. Possible columns are: "slot", "capacity", "managed", "readOnly", "id", "mount", "bootable", and "label". If the list of columns start with a "+", the default columns will appear first. Default columns are slots, capacity, the entire ID, the mount point, and the drive label.
-ARG1SUB2DESCRIPTION Specifies the columns to output in the output table.
-ARG1SUB3DESCRIPTION Only list drives when the expression returns 'true'.
-ARG1SUB4DESCRIPTION Sort the output by an expression that returns a number. The higher the number, the lower the drive is displayed, and vice-versa.
-ARG1SUB5DESCRIPTION An expression in Lua, for filtering or sorting output. If this expression contains spaces, make sure to put quotation marks on them!
-ARG1SUB6DESCRIPTION Built-in variables are: "component", "computer", "type", "id", "readonly", "capacity", "managed", "eeprom", "halyde", "tmp", "proxy", "slot", and "all" (true).
-EXAMPLE1 lsdrv
-EXAMPLE2 lsdrv -a
-EXAMPLE3 lsdrv -o +bootable
-EXAMPLE4 lsdrv -o slot,label -s halyde
-EXAMPLE5 lsdrv -o mount,capacity,label -s "not halyde"
-EXAMPLE6 lsdrv -s type=='filesystem'
-EXAMPLE7 lsdrv -s slot==1
-EXAMPLE8 lsdrv -S capacity
-EXAMPLE9 lsdrv -S -capacity
-EXAMPLE10 lsdrv -o +managed -S managed
-EXAMPLE1DESCRIPTION Show regular drives, with the default columns.
-EXAMPLE2DESCRIPTION Show all storage components, with every column.
-EXAMPLE3DESCRIPTION Show drives, with an added "bootable" category.
-EXAMPLE4DESCRIPTION Show the slot and the label of the drive where Halyde is installed.
-EXAMPLE5DESCRIPTION Show the mount points, capacities and labels of all drives other than Halyde.
-EXAMPLE6DESCRIPTION Only show managed drives.
-EXAMPLE7DESCRIPTION Show all drives that aren't physical (Virtual components, tmpfs)
-EXAMPLE8DESCRIPTION Sort the drives by capacity, in ascending order.
-EXAMPLE9DESCRIPTION Sort the drives by capacity, in descending order.
-EXAMPLE10DESCRIPTION Show managed drives first, then unmanaged drives second, with an extra "managed" column.

halyde/apps/helpdb/lsdrv.txt

@@ -0,0 +1,27 @@
+Usage: lsdrv [FLAGS]
+Shows all drives that are inserted into the computer.
+
+  FLAGS                   Specifies extra options when executing the command.
+    -a, --all             Shows every column and every component. Acts the same as '-o all -s all'.
+    -o, --output [COLS]   Specifies the columns to output in the output table.
+                          Possible columns are: "slot", "capacity", "managed", "readOnly", "id", "mount", "bootable", and "label".
+                          If the list of columns start with a "+", the default columns will appear first.
+                          Default columns are slots, capacity, the entire ID, the mount point, and the drive label.
+    -s, --show [EXPR]     Only list drives when the expression returns 'true'.
+    -S, --sort [EXPR]     Sort the output by an expression that returns a number.
+                          The higher the number, the lower the drive is displayed, and vice-versa.
+      EXPR                An expression in Lua, for filtering or sorting output.
+                          If this expression contains spaces, make sure to put quotation marks on them!
+                          Built-in variables are: "component", "computer", "type", "id", "readonly", "capacity", "managed", "eeprom", "halyde", "tmp", "proxy", "slot", and "all" (true).
+
+Examples:
+  lsblk                                          Show regular drives, with the default columns.
+  lsblk -a                                       Show all storage components, with every column.
+  lsblk -o +bootable                             Show drives, with an added "bootable" category.
+  lsblk -o slot,label -s halyde                  Show the slot and the label of the drive where Halyde is installed.
+  lsblk -o mount,capacity,label -s "not halyde"  Show the mount points, capacities and labels of all drives other than Halyde.
+  lsblk -s type=='filesystem'                    Only show managed drives.
+  lsblk -s slot==1                               Show all drives that aren't physical (Virtual components, tmpfs)
+  lsblk -S capacity                              Sort the drives by capacity, in ascending order.
+  lsblk -S -capacity                             Sort the drives by capacity, in descending order.
+  lsblk -o +managed -S managed                   Show managed drives first, then unmanaged drives second, with an extra "managed" column.

halyde/apps/helpdb/lua

@@ -1,4 +0,0 @@
-COMMAND lua
-DESCRIPTION Starts the Lua shell, where you can type commands to interpret them in real time.
-EXAMPLE1 lua
-EXAMPLE1DESCRIPTION Starts the Lua shell.

halyde/apps/helpdb/lua.txt

@@ -0,0 +1,5 @@
+Usage: lua
+Starts the Lua shell, where you can type commands to interpret them in real time.
+
+Examples:
+  lua   Starts the Lua shell.

halyde/apps/helpdb/maindrv

@@ -1,2 +0,0 @@
-COMMAND maindrv
-DESCRIPTION Shows the entire ID of the drive where Halyde is installed to.

halyde/apps/helpdb/maindrv.txt

@@ -0,0 +1,2 @@
+Usage: maindrv
+Shows the entire ID of the drive where Halyde is installed to.

halyde/apps/helpdb/mkdir

@@ -1,7 +0,0 @@
-COMMAND mkdir
-USAGE [PATH]...
-DESCRIPTION Makes a directory.
-ARG1 PATH
-ARG1DESCRIPTION Specifies the path to create the directory in.
-EXAMPLE1 mkdir a
-EXAMPLE1DESCRIPTION Creates a directory named a in the current shell working directory.

halyde/apps/helpdb/mkdir.txt

@@ -0,0 +1,7 @@
+Usage: mkdir [PATH]
+Makes a directory.
+
+  PATH   Specifies the path to create the directory in.
+
+Examples:
+  mkdir a   Creates a directory named a in the current shell working directory.

halyde/apps/helpdb/mv

@@ -1,11 +0,0 @@
-COMMAND mv
-USAGE [SOURCE].. [DESTINATION]
-DESCRIPTION Moves/renames a file.
-ARG1 SOURCE
-ARG2 DESTINATION
-ARG1DESCRIPTION Specifies the files and directories to be moved.
-ARG2DESCRIPTION Specifies the path or a directory to copy to.
-EXAMPLE1 mv /home/a.txt /b.txt
-EXAMPLE2 mv ../c.lua /halyde/apps .
-EXAMPLE1DESCRIPTION Moves the file at /home/a.txt to /b.txt.
-EXAMPLE2DESCRIPTION Moves c.lua from a subdirectory and /halyde/apps to the shell working directory.

halyde/apps/helpdb/mv.txt

@@ -0,0 +1,11 @@
+Usage: mv [FLAGS] [SOURCE] [DESTINATION]
+Moves/renames a file.
+
+  FLAGS               Specifies extra options when executing the command.
+    -o, --overwrite   Allows any file that might be at the destination to be overwritten.
+  SOURCE              Specifies the file to be moved/renamed.
+  DESTINATION         Specifies the path/filename to move/rename the file to.
+
+Examples:
+  mv /home/a.txt /b.txt   Moves the file at /home/a.txt to /b.txt.
+  mv -o c.lua d.txt       Renames the file c.lua to another file called d.txt in the shell working directory, overwriting any file that might be there.

halyde/apps/helpdb/reboot

@@ -1,4 +0,0 @@
-COMMAND reboot
-DESCRIPTION Reboots the computer.
-EXAMPLE1 reboot
-EXAMPLE1DESCRIPTION Reboots the computer.

halyde/apps/helpdb/reboot.txt

@@ -0,0 +1,5 @@
+Usage: reboot
+Reboots the computer.
+
+Examples:
+  reboot   Reboots the computer.

halyde/apps/helpdb/res

@@ -1,11 +0,0 @@
-COMMAND res
-USAGE [FLAGS]
-DESCRIPTION Gets or sets the current resolution.
-ARG1 FLAGS
-ARG1SUB1 [no flags]
-ARG1SUB2 -x [number]
-ARG1SUB3 -y [number]
-ARG1DESCRIPTION Specifies extra options when executing the command.
-ARG1SUB1DESCRIPTION Displays the current and maximum resolution.
-ARG1SUB2DESCRIPTION Displays the current and maximum resolution on the x-axis. A new x-axis resolution can be specified as a number.
-ARG1SUB3DESCRIPTION Displays the current and maximum resolution on the y-axis. A new y-axis resolution can be specified as a number.

halyde/apps/helpdb/rm

@@ -1,7 +0,0 @@
-COMMAND rm
-USAGE [PATH]...
-DESCRIPTION Removes files and directories.
-ARG1 PATH
-ARG1DESCRIPTION Specifies the files and directories to be moved/renamed.
-EXAMPLE1 rm a.txt
-EXAMPLE1DESCRIPTION Removes a.txt in the current shell working directory.

halyde/apps/helpdb/rm.txt

@@ -0,0 +1,7 @@
+Usage: rm [PATH]
+Removes files and directories.
+
+  PATH   Specifies the file to be moved/renamed.
+
+Examples:
+  rm a.txt   Removes a.txt in the current shell working directory.

halyde/apps/helpdb/shutdown

@@ -1,4 +0,0 @@
-COMMAND shutdown
-DESCRIPTION Shuts down the computer.
-EXAMPLE1 shutdown
-EXAMPLE1DESCRIPTION Shuts down the computer.

halyde/apps/helpdb/shutdown.txt

@@ -0,0 +1,5 @@
+Usage: shutdown
+Shuts down the computer.
+
+Examples:
+  shutdown   Shuts down the computer.

halyde/apps/helpdb/touch

@@ -1,5 +0,0 @@
-COMMAND touch
-USAGE [FILE]...
-DESCRIPTION Create an empty file.
-ARG1 FILE
-ARG1DESCRIPTION The path of the files to create.

halyde/apps/label.lua

@@ -1,9 +1,9 @@
-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.\x1b[0m") end
+if not args then return print("\x1b[91mCannot get arguments.") end
 if not args[1] then
-  return require("shell").run("help label")
+  return shell.run("help label")
 end
 local inputID = args[1]
 local comp
@@ -29,27 +29,27 @@ elseif inputID:sub(1,1)=="#" and tonumber(inputID:sub(2)) then
   componentFromSlot(slotNum)
 elseif #inputID>=3 then
   local fullID = component.get(inputID)
-  if not fullID then return print("\x1b[91mCould not find entire component ID from \""..inputID.."\".\x1b[0m") end
+  if not fullID then return print("\x1b[91mCould not find entire component ID from \""..inputID.."\".") end
   comp = component.proxy(fullID)
 else
-  print("\x1b[91mAddress must have atleast 3 characters\x1b[0m")
-  return require("shell").run("help label")
+  print("\x1b[91mAddress must have atleast 3 characters")
+  return shell.run("help label")
 end
 if not comp then
-  return print("\x1b[91mCould not find component from \""..inputID.."\".\x1b[0m")
+  return print("\x1b[91mCould not find component from \""..inputID.."\".")
 end
 local compID = comp.address
 
 local function formatID(id)
-  return id:sub(1,8).."\x1b[37m"..id:sub(9).."\x1b[0m"
+  return id:sub(1,8).."\x1b[37m"..id:sub(9).."\x1b[39m"
 end
 
 local function unsupported(act)
-  print("This \x1b[92m"..(comp.type or "unknown").."\x1b[0m component doesn't support "..act.." labels.\nID: "..formatID(compID).."\x1b[0m")
+  print("This \x1b[92m"..(comp.type or "unknown").."\x1b[39m component doesn't support "..act.." labels.\nID: "..formatID(compID))
 end
 
 local function compError(act,reason)
-  print("\x1b[91mAn error occured while "..act.." the label of this component.\nComponent: "..(compID or "unknown id").." ("..((comp or {}).type or "unknown type")..")\n\n"..reason.."\x1b[0m")
+  print("\x1b[91mAn error occured while "..act.." the label of this component.\nComponent: "..(compID or "unknown id").." ("..((comp or {}).type or "unknown type")..")\n\n"..reason)
 end
 
 local function formatLabel(label)
@@ -67,7 +67,7 @@ if type(args[2])~="string" then
     label = comp.getLabel()
   end)
   if success then
-    print("Label of "..formatID(compID)..((comp.type and comp.type~="filesystem") and " ("..comp.type..")" or "")..":\n  \x1b[92m"..formatLabel(label).."\x1b[0m")
+    print("Label of "..formatID(compID)..((comp.type and comp.type~="filesystem") and " ("..comp.type..")" or "")..":\n  \x1b[92m"..formatLabel(label).."\x1b[39m")
   else
     compError("getting",reason)
   end
@@ -85,7 +85,7 @@ else
     label = comp.setLabel(newLabel)
   end)
   if success then
-    print("Successfully set label of "..formatID(compID)..(comp.type and " ("..comp.type..")" or "").." to:\n  \x1b[92m"..formatLabel(label).."\x1b[0m")
+    print("Successfully set label of "..formatID(compID)..(comp.type and " ("..comp.type..")" or "").." to:\n  \x1b[92m"..formatLabel(label).."\x1b[39m")
   else
     compError("setting",reason)
   end

halyde/apps/log.lua

@@ -1,110 +0,0 @@
-local log = require("log")
-local shell = require("shell")
-local fs = require("filesystem")
-
-local args = {...}
-if #args == 0 then
-    shell.run("help log")
-    return
-end
-
-local function viewlog(logname)
-    local logpath = "/halyde/logs/" .. logname .. ".log"
-    if not fs.exists(logpath) then
-        print("Log not found.")
-        return
-    end
-    local handle = fs.open(logpath)
-    local entry = ""
-    local byte
-    while true do
-        byte = handle:read(1)
-        if not byte then return end
-        if string.byte(byte) == 0x0a then --check for newline
-            if string.byte(string.sub(entry, -1, -1)) == 0x0d then --failsafe in case line endings are CRLF
-                entry = string.sub(entry, 1, -2)
-            else
-                entry = string.sub(entry, 1, -1)
-            end
-            if entry:sub(1, 4) == "WARN" then
-                print("\x1b[93m" .. entry .. "\x1b[0m")
-            elseif entry:sub(1, 5) == "ERROR" then
-                print("\x1b[91m" .. entry .. "\x1b[0m")
-            else
-                print(entry)
-            end
-            entry = ""
-        else
-            entry = entry .. byte
-        end
-    end
-end
-
-local function listlogs()
-    local files = fs.list("/halyde/logs")
-    local logs = {}
-    local j = 1
-    for i in ipairs(files) do
-        if not(string.sub(files[i], -1, -1) == "/") and string.sub(files[i], -4, -1) == ".log" then
-            logs[j] = string.sub(files[i], 1, -5)
-            j = j + 1
-        end
-    end
-    return logs
-end
-
-local function listlogs2()
-    local logs = listlogs()
-    print("Found \x1b[93m" .. #logs .. "\x1b[0m logs.")
-    for i in ipairs(logs) do
-        if i == #logs then
-            print("\x1b[93m└ \x1b[0m" .. logs[i] .. "\x1b[90m.log\x1b[0m")
-        else
-            print("\x1b[93m├ \x1b[0m" .. logs[i] .. "\x1b[90m.log\x1b[0m")
-        end
-    end
-end
-
-local function clearlog(logname)
-    if logname then
-        local logpath = "/halyde/logs/" .. logname .. ".log"
-        if not fs.exists(logpath) then
-            print("Log file not found.")
-            return
-        end
-        local success, err = fs.remove(logpath)
-        if not success then
-            print("Failed to remove log file: " .. err)
-            return
-        end
-    else
-        local logs = listlogs()
-        local j
-        for i in ipairs(logs) do
-            local success, err = fs.remove("/halyde/logs/" .. logs[i] .. ".log")
-            if not success then
-                print("Failed to remove log " .. logs[i] .. ": " .. err)
-                print("Removed" .. i - 1 .. "logs.")
-                return
-            end
-            j = i
-        end
-        print("Removed " .. j .. " log(s) successfully.")
-    end
-end
-
-if args[1] == "view" then
-    viewlog(args[2])
-elseif args[1] == "list" then
-    listlogs2()
-elseif args[1] == "clear" then
-    clearlog(args[2])
-elseif args[1] == "info" or args[1] == "warn" or args[1] == "error" then
-    local loglevel = args[1]
-    local logname = args[2]
-    local logtext = args[3]
-    for i = 4, #args do
-        logtext = logtext .. " " .. args[i]
-    end
-    log[logname][loglevel](logtext)
-end

halyde/apps/ls.lua

@@ -1,58 +1,70 @@
-local fs = require("filesystem")
-local shell = require("shell")
-
-local function formatSize(size, isDir)
-  if isDir then return "[DIR]" end
-  if size >= 1024^3 then return string.format("%.1fGiB", size / 1024^3) end
-  if size >= 1024^2 then return string.format("%.1fMiB", size / 1024^2) end
-  if size >= 1024 then return string.format("%.1fKiB", size / 1024) end
-  return size.."B"
-end
-
-local function getFileColor(name, isDir)
-  if isDir then return "\27[93m" end
-  if name:match("%.lua$") then return "\27[92m" end
-  return "\27[0m"
-end
-
 local args = {...}
-if not args[1] then
-  args = {require("shell").getWorkingDirectory()}
+local target = args[1]
+args = nil
+local fs = import("filesystem")
+local unicode = import("unicode")
+local maxLength = 0
+local margin = 2 -- minimum space between filename and size
+local dirTable = {}
+local fileTable = {}
+
+if target then
+  if target:sub(1, 1) ~= "/" then
+    target = fs.concat(shell.workingDirectory, target)
+  end
+else
+  target = shell.workingDirectory
 end
 
-for _, path in pairs(args) do
-  path = shell.resolvePath(path)
-  local files = fs.list(path)
+local files = fs.list(target)
 
-  if not files then
-    terminal.write("\27[91mError: " .. path .. ": No such file or directory\27[0m\n")
-    goto continue
-  end
-
-  local fileList = {}
+if files then
   for _, file in pairs(files) do
-    local isDir = file:sub(-1) == "/"
-    local name = isDir and file:sub(1, -2) or file
-    local size = isDir and 0 or fs.size(fs.concat(path, file))
-    table.insert(fileList, {name = name, isDir = isDir, size = size})
+    if file:sub(-1, -1) == "/" then
+      table.insert(dirTable, file)
+      file = file:sub(1, -2)
+    else
+      table.insert(fileTable, file)
+    end
+    if unicode.wlen(file) > maxLength then
+      maxLength = unicode.wlen(file)
+    end
   end
-  -- directories first
-  -- then files
-  table.sort(fileList, function(a, b)
-  if a.isDir ~= b.isDir then return a.isDir end
-    return a.name < b.name
-  end)
-  local maxSizeLen = 0
-  for _, item in ipairs(fileList) do
-    maxSizeLen = math.max(maxSizeLen, #formatSize(item.size, item.isDir))
+  table.sort(dirTable)
+  table.sort(fileTable)
+  files = {}
+  for _, v in ipairs(dirTable) do
+    table.insert(files, v)
   end
-
-  terminal.write(path.."\n")
-  for _, item in ipairs(fileList) do
-    local sizeStr = formatSize(item.size, item.isDir)
-    sizeStr = string.rep(" ", maxSizeLen - #sizeStr) .. sizeStr
-    local color = getFileColor(item.name, item.isDir)
-    terminal.write(string.format("%s  %s%s\27[0m\n", sizeStr, color, item.name))
+  for _, v in ipairs(fileTable) do
+    table.insert(files, v)
+  end
+  dirTable, fileTable = nil, nil
+  for _, file in ipairs(files) do
+    local dir = false
+    local filetext
+    if file:sub(-1, -1) == "/" then
+      dir = true
+      filetext = "\27[93m"..file:sub(1, -2)
+    elseif file:find(".") and file:match("[^.]+$") == "lua" then
+      filetext = "\27[92m"..file
+    end
+    filetext = (filetext or file)..string.rep(" ", maxLength - unicode.wlen(file) + margin)
+    if dir then
+      print(filetext.." \27[0m[DIR]")
+    else
+      local size = fs.size(fs.concat(target, file))
+      local sizeString
+      if convert(size, "B", "GiB") >= 1 then
+        sizeString = tostring(math.floor(convert(size, "B", "GiB") * 100 + 0.5) / 100).." GiB"
+      elseif convert(size, "B", "MiB") >= 1 then
+        sizeString = tostring(math.floor(convert(size, "B", "MiB") * 100 + 0.5) / 100).." MiB"
+      elseif convert(size, "B", "KiB") >= 1 then
+        sizeString = tostring(math.floor(convert(size, "B", "KiB") * 100 + 0.5) / 100).." KiB"
+      else
+        sizeString = tostring(size).." B"
+      end
+      print(filetext.."\27[0m"..sizeString)
+    end
   end
-  ::continue::
 end

halyde/apps/lscor.lua

@@ -0,0 +1,9 @@
+print("\27[93m"..tostring(#cormgr.corList).."\27[0m coroutines active")
+for i=1, #cormgr.corList do
+    if i==#cormgr.corList then
+        print("\27[93m└ "..i.."\27[0m - "..cormgr.labelList[i].." \27[0m")
+    else
+        print("\27[93m├ "..i.."\27[0m - "..cormgr.labelList[i].." \27[0m")
+    end
+
+end

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()
 
@@ -77,7 +77,7 @@ elseif outArgIdx then
       if headers[word] then
         addHeader(word)
       else
-        print("\x1b[93mCategory \""..word.."\" doesn't exist\x1b[0m")
+        print("\x1b[93mCategory \""..word.."\" doesn't exist\x1b[39m")
       end
     end
   end
@@ -106,7 +106,7 @@ local function formatSize(mem)
 end
 
 local function fileExists(proxy,path)
-  return proxy.exists and proxy.isDirectory and proxy.exists(path) and not proxy.isDirectory(path)
+  return proxy.exists(path) and not proxy.isDirectory(path)
 end
 
 local function getBootCode(proxy)
@@ -140,37 +140,24 @@ local function handleComponent(id,type)
   -- for i=1,#tableOut do table.insert(out,"unknown") end
   local slot,capacity,managed,readOnly,mount,bootable,label
 
-  local virtual,vproc = component.virtual.check(id)
   local cslot = component.slot(id)
-  if virtual then
-    if vproc and vproc.name then
-      slot="Virtual ("..vproc.name..")"
-    else
-      slot="Virtual (unknown)"
-    end
-  elseif cslot==-1 then
-    slot="External"
+  if cslot==-1 then
+    slot="Virtual"
   elseif cslot==9 then
     slot="EEPROM"
-  elseif cslot==5 or cslot==6 then
-    slot="HDD #"..(cslot-4)
-  elseif cslot==7 then
-    slot="Floppy"
   else
     slot="#"..(cslot+2)
   end
 
-  managed="No"
+  managed="Yes"
   readOnly="No"
   if type=="drive" then
+    managed="No"
     capacity=formatSize(proxy.getCapacity())
     mount="/special/drive/"..id:sub(1,3)
   elseif type=="filesystem" then
-    managed="Yes"
-    if proxy.spaceTotal then
-      capacity=formatSize(proxy.spaceTotal())
-    end
-    if not proxy.isReadOnly or proxy.isReadOnly() then
+    capacity=formatSize(proxy.spaceTotal())
+    if proxy.isReadOnly() then
       readOnly="Yes"
     end
     mount="/mnt/"..id:sub(1,3)
@@ -190,7 +177,7 @@ local function handleComponent(id,type)
 
   if proxy.getLabel then
     local clabel = proxy.getLabel()
-    label=clabel and serialize(clabel) or "None"
+    label=clabel and serialize.string(clabel) or "None"
   else
     label="Unsupported"
   end
@@ -266,7 +253,7 @@ if not showAll then
     if func then
       filter(comps,func)
     else
-      return print("\x1b[91mInvalid component filter:\n\n"..tostring(err).."\x1b[0m")
+      return print("\x1b[91mInvalid component filter:\n\n"..tostring(err).."\x1b[39m")
     end
   else
     filter(comps,function(comp)
@@ -286,7 +273,7 @@ if sortArgIdx then
       return (boolToNum(func(a)) or 0)<(boolToNum(func(b)) or 0)
     end)
   else
-    return print("\x1b[91mInvalid sort expression:\n\n"..tostring(err).."\x1b[0m")
+    return print("\x1b[91mInvalid sort expression:\n\n"..tostring(err).."\x1b[39m")
   end
 else
   table.sort(comps,function(a,b)

halyde/apps/lstsk.lua

@@ -1,8 +0,0 @@
-local tasks = tsched.getTasks()
-print("\27[93m"..tostring(#tasks).."\27[0m tasks active")
-for i=1, #tasks do
-    local pipeChar = "├ "
-    if i==#tasks then pipeChar = "└ " end
-    local task = tasks[i]
-    print("\27[93m"..pipeChar..(task.id or i).."\27[0m - "..task.name.."\27[37m "..table.concat(task.args or {}," ").." \27[0m")
-end

halyde/apps/lua.lua

@@ -1,83 +1,31 @@
--- terminal.readHistory["lua"] = {""}
-local fs = require("filesystem")
-local computer = require("computer")
-local log = require("log")
+print("\27[44m".._VERSION.."\27[0m shell")
+print('Type "exit" to exit.')
+termlib.readHistory["lua"] = {""}
+local fs = import("filesystem")
 
-local bootTime = computer.uptime()
-local libList = fs.list("/lib/")
-local failed = false
+local loadedLibraries = ""
+local libList = fs.list("halyde/lib")
 for _, lib in pairs(libList) do
-  local status, err = xpcall(function()
-    if lib:match("(.+)%.lua") then
-      local name = lib:match("(.+)%.lua")
-      _G[name] = require(name)
-    end
-  end, function(errMsg)
-    return errMsg .. "\n\n" .. debug.traceback()
-  end)
-  if not status then
-    local firstLine = tostring(err):match("^[^\n]*")
-    print(
-      string.format(
-        "\x1b[91mLibrary %s has failed loading:\n │ %s\x1b[0m",
-        lib:match("(.+)%.lua") or lib,
-        firstLine or "unknown error"
-      )
-    )
-    log.lua.error(
-      string.format(
-        'The library located at "%s" has failed loading:\n%s',
-        lib,
-        type(err) ~= "nil" and tostring(err) or "unknown error"
-      )
-    )
-    failed = true
+  if lib:match("(.+)%.lua") then
+    loadedLibraries = loadedLibraries .. "local " .. lib:match("(.+)%.lua") .. ' = import("' .. lib:match("(.+)%.lua") .. '")\n'
   end
 end
 
-if failed then
-  print(
-    string.format(
-      '\x1b[93mOne or more libraries failed to load. For more information, check the log entries located at "%s".\x1b[0m',
-      tostring(log.lua.logpath or "[unknown]")
-    )
-  )
-end
-
-print(string.format("\27[37mLoaded %d libraries in %.2f seconds\27[0m", #libList, computer.uptime() - bootTime))
-print(string.format("\27[44m%s\27[0m shell", _VERSION))
-print('Type "exit" to exit.')
-
 while true do
-  local command = terminal.read({readHistoryType = "lua", prefix = "\27[44mlua>\27[0m "})
+  local command = read("lua", "\27[44mlua>\27[0m ")
   if command == "exit" then
-    coroutine.yield()
     return
-  elseif command ~= "" then
+  else
     local function runCommand()
-      local func, err = load("return " .. command, "=stdin")
-      local returns = true
-      if not func then
-        func, err = load(command, "=stdin")
-        returns = false
-      end
-      if not func then
-        return print("\x1b[91msyntax error: " .. (err or "unknown error") .. "\x1b[0m")
-      end
-      local res = { func() }
-      if returns then
-        if res and type(res[1]) ~= "nil" then
-          print(table.unpack(res))
-        elseif res and type(res[2]) ~= "nil" then
-          print("nil", table.unpack(res))
-        end
-      end
+      local func = load(loadedLibraries.."return "..command,"=stdin") or load(loadedLibraries..command,"=stdin")
+      local res = {assert(func)()}
+      if res and (type(res[1])~="nil" or type(res[2])~="nil") then print(table.unpack(res)) end
     end
     local result, reason = xpcall(runCommand, function(errMsg)
       return errMsg .. "\n\n" .. debug.traceback()
     end)
     if not result then
-      print("\27[91m" .. reason .. "\27[0m")
+      print("\27[91m" .. reason)
     end
   end
 end

halyde/apps/maindrv.lua

@@ -1,9 +1,7 @@
--- WTF: What the fuck is this for?? Why does it print the computer library???
--- TODO: Integrate this into lsdrv.
-local computer = require("computer")
+local computer = import("computer")
 
 if type(computer)~="table" then
-  return print("\x1b[91mComputer library returned '"..type(computer).."' type\x1b[0m")
+  return print("\x1b[91mComputer library returned '"..type(computer).."' type\x1b[39m")
 end
 
 local address = computer.getBootAddress()

halyde/apps/mkdir.lua

@@ -1,23 +1,14 @@
-local fs = require("filesystem")
-local shell = require("shell")
+local directory = ...
+local fs = import("filesystem")
 
-local args = {...}
-
-if not args[1] then
-  return shell.run("help mkdir")
+if not directory then
+  shell.run("help mkdir")
+  return
 end
-
-for _, directory in pairs(args) do
-  directory = shell.resolvePath(directory)
-
-  if fs.exists(directory) then
-    terminal.write("\27[91mError: " .. directory ..": An object already exists\27[0m\n")
-    goto continue
-  end
-  local what, err = fs.makeDirectory(directory)
-  if err ~= nil then
-    terminal.write("\27[91mError: " .. err .. "\27[0m\n")
-    goto continue
-  end
-  ::continue::
+if directory:sub(1, 1) ~= "/" then
+  directory = fs.concat(shell.workingDirectory, directory)
 end
+if fs.exists(directory) then
+  print("\27[91mAn object already exists at the specified path.")
+end
+fs.makeDirectory(directory)

halyde/apps/mv.lua

@@ -1,70 +1,24 @@
-local fs = require("filesystem")
-local shell = require("shell")
+local fromFile, toFile = ...
+local fs = import("filesystem")
 
-local args = {...}
-
-if not args[1] then
-  return shell.run("help mv")
-end
-
-if not args[2] then
-  terminal.write("\27[91mError: No destination\27[0m\n")
+if not fromFile or not toFile then
+  shell.run("help mv")
   return
 end
-
-local dest = shell.resolvePath(args[#args])
-
-if fs.isFile(dest) then
-  if #args ~= 2 then
-    terminal.write("\27[91mError: Destination is not a directory\27[0m\n")
-    return
-  end
-  local src = shell.resolvePath(args[1])
-  if not fs.exists(src) then
-    terminal.write("\27[91mError: " .. src .. ": No such file or directory\27[0m\n")
-    return
-  end
-  if fs.isDirectory(src) then
-    terminal.write("\27[91mError: Cannot write directory " .. src .. " to file " .. dest .. "\27[0m\n")
-    return
-  end
-  fs.rename(src, dest)
-elseif fs.isDirectory(dest) then
-  for i = 1, #args - 1 do
-    local src = shell.resolvePath(args[i])
-    if src == dest then
-      terminal.write("\27[91mError: Source and destination are the same\27[0m\n")
-      goto continue
-    end
-
-    if not fs.exists(src) then
-      terminal.write("\27[91mError: " .. src .. ": No such file or directory\27[0m\n")
-      goto continue
-    end
-
-    fs.rename(src, fs.concat(dest, fs.basename(src)))
-    ::continue::
-  end
-elseif not fs.exists(dest) then
-  if #args ~= 2 then
-    terminal.write("\27[91mError: " .. dest .. ": No such file or directory\27[0m\n")
-    return
-  end
-  local src = shell.resolvePath(args[1])
-  if not fs.exists(src) then
-    terminal.write("\27[91mError: " .. src .. ": No such file or directory\27[0m\n")
-    return
-  end
-  local destp = fs.parent(dest)
-  if not fs.exists(destp) then
-    terminal.write("\27[91mError: " .. destp .. ": No such file or directory\27[0m\n")
-    return
-  end
-  if not fs.isDirectory(destp) then
-    terminal.write("\27[91mError: " .. destp .. ": Not a directory\27[0m\n")
-    return
-  end
-  fs.rename(src, dest)
-else
-  terminal.write("\27[91mUnknown error\27[0m\n")
+if fromFile:sub(1, 1) ~= "/" then
+  fromFile = fs.concat(shell.workingDirectory, fromFile)
 end
+if toFile:sub(1, 1) ~= "/" then
+  toFile = fs.concat(shell.workingDirectory, toFile)
+end
+if fromFile == toFile then
+  print("\27[91mSource and destination are the same.")
+end
+if not fs.exists(fromFile) then
+  print("\27[91mSource file does not exist.")
+end
+if fs.exists(toFile) and not (table.find({...}, "-o") or table.find({...}, "--overwrite")) then
+  print("\27[91mDestination file already exists. Run this command again with -o to overwrite it.")
+  return
+end
+fs.rename(fromFile, toFile)

halyde/apps/profile.lua

@@ -1,222 +0,0 @@
--- TODO: make it somehow not depend on ESC s and ESC u
-local profiler = require("profiler")
-local PAL = {
-  { fg = "\27[31m", bg = "\27[41m" },
-  { fg = "\27[32m", bg = "\27[42m" },
-  { fg = "\27[33m", bg = "\27[43m" },
-  { fg = "\27[34m", bg = "\27[44m" },
-  { fg = "\27[35m", bg = "\27[45m" },
-  { fg = "\27[36m", bg = "\27[46m" },
-  { fg = "\27[37m", bg = "\27[47m" }
-}
-local function pal(i) return PAL[((i - 1) % #PAL) + 1] end
-
-local results = profiler.results()
-if not results then
-  print("No profiling data")
-  return
-end
-
-local radius
-local W = terminal.getResolution()
-if (W == 160) then radius = 20
-elseif (W == 80) then radius = 6
-else radius = 0; PAL = {{fg = "", bg = ""}} end
-
-local MIN_PC = math.min(3, 100 / (radius * 2))
-
-local total = 0
-for _, r in ipairs(results) do total = total + r.time end
-
-local main = {}
-local other = {}
-local ot = 0
-local on_ = 0
-for _, r in ipairs(results) do
-  if r.time / total * 100 >= MIN_PC then
-    table.insert(main, r)
-  else
-    table.insert(other, r)
-    ot = ot + r.time;
-    on_ = on_ + 1
-  end
-end
-if on_ then
-  table.insert(main, { label = "other (" .. on_ .. ")", time = ot })
-end
-
-local START = -math.pi / 2
-local slices = {}
-local cur = START
-for i, m in ipairs(main) do
-  local sw = m.time / total * 2 * math.pi
-  slices[i] = {
-    label = m.label,
-    time = m.time,
-    pc = ("%.1f%%"):format(m.time / total * 100),
-    color = pal(i),
-    sa = cur,
-    sw = sw
-  }
-  cur = cur + sw
-end
-if on_ then slices[#slices].color={fg = "\27[30m", bg = "\27[40m"} end
-
-local ASP = 2
-local cx = radius * ASP
-local cy = radius
-
-local function slice_at(sx, sy)
-  local dy = sy - cy
-  local dx = (sx - cx) / ASP
-  if dx * dx + dy * dy > radius * radius then return nil end
-  local a = math.atan2(dy, dx)
-  if a < START then a = a + 2 * math.pi end
-  for i, sl in ipairs(slices) do
-    if a >= sl.sa and a < sl.sa + sl.sw then return i end
-  end
-  return #slices
-end
-
-local SUB = {
-  { dx = -0.25, dy = -0.375 },
-  { dx = -0.25, dy = -0.125 },
-  { dx = -0.25, dy =  0.125 },
-  { dx =  0.25, dy = -0.375 },
-  { dx =  0.25, dy = -0.125 },
-  { dx =  0.25, dy =  0.125 },
-  { dx = -0.25, dy =  0.375 },
-  { dx =  0.25, dy =  0.375 },
-}
-
-for y = 0, radius * 2 do
-  local lx, rx = math.ceil(cx - radius * ASP), math.floor(cx + radius * ASP)
-
-  terminal.write(("\27[%dC"):format(lx))
-  for x = lx, rx do
-    local c = {}
-    local n = 0
-    for k = 1, 8 do
-      local s = slice_at(x + SUB[k].dx, y + SUB[k].dy)
-      c[k] = s
-      if s then n = n + 1 end
-    end
-
-    if n == 0 then
-      terminal.write("\27[0m ")
-    else
-      local counts = {}
-      local order = {}
-      for k = 1, 8 do
-        if c[k] then
-          local key = c[k]
-          if not counts[key] then
-            counts[key] = 0
-            table.insert(order, key)
-          end
-          counts[key] = counts[key] + 1
-        end
-      end
-      table.sort(order, function(a, b) return counts[a] > counts[b] end)
-      local dom = order[1]
-      local sub = order[2]
-
-      if n == 8 then
-        terminal.write(slices[dom].color.bg)
-        if sub == nil then
-          terminal.write(" ")
-        else
-          local mask = 0
-          for k = 1, 8 do
-            if c[k] == sub then mask = mask + (1 << (k - 1)) end
-          end
-          terminal.write(slices[sub].color.fg)
-          terminal.write(utf8.char(0x2800 + mask))
-        end
-      else
-        local mask = 0
-        for k = 1, 8 do
-          if c[k] == dom then mask = mask + (1 << (k - 1)) end
-        end
-        terminal.write("\27[0m")
-        terminal.write(slices[dom].color.fg)
-        terminal.write(utf8.char(0x2800 + mask))
-      end
-    end
-  end
-  terminal.write('\n')
-end
-
-terminal.write("\27[" .. radius * 2 + 1 .. "A\27[s")
-local function draw_text(col, row, s)
-  terminal.write("\27[u\27[" .. col .. "C\27[" .. row - 1 .. "B" .. s)
-end
-
-terminal.write("\27[0m")
-if radius == 0 then goto tier1gpu end
-for _, sl in ipairs(slices) do
-  local y = math.floor(cy + radius * 0.62 * math.sin(sl.sa + sl.sw / 2) + 0.5)
-
-  local function in_slice(x, row)
-    local a = math.atan2(row - cy, (x - cx) / ASP)
-    if a < START then
-      a = a + 2 * math.pi
-    end
-    return a >= sl.sa and a < sl.sa + sl.sw
-  end
-  local function centered_draw(row, text)
-    local dy = row - cy
-    local half_w = math.sqrt(radius * radius - dy * dy) * ASP
-    local lx, rx = math.ceil(cx - half_w), math.floor(cx + half_w)
-    while lx <= rx and not in_slice(lx, row) do
-      lx = lx + 1
-    end
-    while rx >= lx and not in_slice(rx, row) do
-      rx = rx - 1
-    end
-    local avail = rx - lx + 1
-    if avail < 3 then
-      return
-    end
-    local t = #text > avail and text:sub(1, avail - 3) .. "..." or text
-    local start_x = lx + math.floor((avail - #t) / 2)
-    draw_text(start_x, row, sl.color.bg .. t)
-  end
-  centered_draw(y, sl.label)
-  centered_draw(y + 1, sl.pc)
-end
-::tier1gpu::
-
-local max_w = 0
-for _, sl in pairs(slices) do
-  max_w = math.max(#sl.label + 1, max_w)
-end
-for _, sl in pairs(other) do
-  max_w = math.max(#sl.label + 3, max_w)
-end
-local x = radius * 2 * ASP + 2
-if radius == 0 then x = 0 end
-local cw = W - x - 1
-local suffix_w = 18
-local max_lbl = math.max(4, cw - suffix_w)
-terminal.write("\27[u\27[" .. x .. "C" .. ("\27[0m%" .. max_w .. "s  %9s   %6s"):format("label", "time", "share"))
-terminal.write("\n")
-for _, sl in ipairs(slices) do
-  local lbl = sl.label
-  if #lbl > max_lbl then
-    lbl = sl.label:sub(1, max_lbl - 1) .. "…"
-  end
-  terminal.write("\n\27[" .. x .. "C" .. ("%s%" .. max_w .. "s\27[0m  %9.4fs  %6s"):format(sl.color.bg, lbl, sl.time, sl.pc))
-end
-for _, sl in ipairs(other) do
-  local lbl = sl.label
-  if #lbl > max_lbl - 2 then
-    lbl = sl.label:sub(1, max_lbl - 3) .. "…"
-  end
-  terminal.write("\n\27[" .. x .. "C" .. ("%s%" .. max_w .. "s\27[0m  %9.4fs  %6s"):format(slices[#slices].color.bg, lbl, sl.time, ("%.1f%%"):format(sl.time / total * 100)))
-end
-
-if radius * 2 + 2 > #slices + #other then
-  terminal.write("\27[" .. radius * 2 + 2 .. "B")
-end
-terminal.write("\n")

halyde/apps/reboot.lua

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

halyde/apps/res.lua

@@ -1,96 +0,0 @@
-local component = require("component")
-local gpu = component.gpu
-local shell = require("shell")
-
-local args = {...}
-
-local maxX, maxY = gpu.maxResolution()
-local curX, curY = gpu.getResolution()
-
-local function setRes()
-    if not(args[1] == "-x" or args[1] == "-y") then
-        print("\x1b[91mUnknown argument. \x1b[0mTry running \x1b[92m\"help res\"\x1b[0m")
-        return
-    end
-
-    local lastarg = ""
-    local x, y
-    for i = 1, 3, 2 do
-        if args[i] == "-x" then
-            if lastarg ~= "x" then
-                x = tonumber(args[i + 1])
-                lastarg = "x"
-            else
-                print("\x1b[91mValue \"x\" was set more than once. \x1b[0mTry running \x1b[92m\"help res\"\x1b[0m")
-                return
-            end
-        elseif args[i] == "-y" then
-            if lastarg ~= "y" then
-                y = tonumber(args[i + 1])
-                lastarg = "y"
-            else
-                print("\x1b[91mValue \"y\" was set more than once. \x1b[0mTry running \x1b[92m\"help res\"\x1b[0m")
-                return
-            end
-        end
-    end
-
-    if x then
-        if x > maxX then
-            print("\x1b[91mGPU does not support x higher than " .. maxX .. "\x1b[0m.")
-            return
-        end
-    end
-    if y then
-        if y > maxY then
-            print("\x1b[91mGPU does not support y higher than " .. maxY .. "\x1b[0m.")
-            return
-        end
-    end
-
-    if x and not(y) then
-        gpu.setResolution(x, curY)
-        print("Successfully set X resolution from \x1b[93m" .. curX .. "\x1b[0m to \x1b[92m" .. x .. "\x1b[0m.")
-        return
-    elseif not(x) and y then
-        gpu.setResolution(curX, y)
-        print("Successfully set Y resolution from \x1b[93m" .. curY .. "\x1b[0m to \x1b[92m" .. y .. "\x1b[0m.")
-        return
-    else
-        gpu.setResolution(x, y)
-        print("Successfully set resolution from \x1b[93m" .. curX .. "x" .. curY .. "\x1b[0m to \x1b[92m" .. x .. "x" .. y .. "\x1b[0m.")
-        return
-    end
-end
-
-local function getRes(val)
-    if val == "x" then
-        print("Current X resolution: \x1b[93m" .. curX .. "\x1b[0m")
-        print("Maximum supported X resolution: \x1b[92m" .. maxX .. "\x1b[0m")
-    elseif val == "y" then
-        print("Current Y resolution: \x1b[93m" .. curY .. "\x1b[0m")
-        print("Maximum supported Y resolution: \x1b[92m" .. maxY .. "\x1b[0m")
-    else
-        print("Current resolution: \x1b[93m" .. curX .. "x" .. curY .. "\x1b[0m")
-        print("Maximum supported resolution: \x1b[92m" .. maxX .. "x" .. maxY .. "\x1b[0m")
-    end
-end
-
-if #args == 0 then
-    getRes()
-    return
-end
-
-if not(#args == 1) then
-    setRes()
-    return
-end
-
-local axis = args[1]
-if axis == "-x" then
-    getRes("x")
-elseif axis == "-y" then
-    getRes("y")
-else
-    print("\x1b[91mUnknown argument. \x1b[0mTry running \x1b[92m\"help res\"\x1b[0m")
-end

halyde/apps/rm.lua

@@ -1,17 +1,15 @@
-local fs = require("filesystem")
-local shell = require("shell")
+local file = ...
+local fs = import("filesystem")
 
-local args = {...}
-
-if not args[1] then
-  return shell.run("help rm")
+if not file then
+  shell.run("help rm")
+  return
 end
-
-for _, file in pairs(args) do
-  file = shell.resolvePath(file)
-
-  local result = fs.remove(file)
-  if result == false then
-    terminal.write("\27[91mError: cannot delete " .. file .. "\27[0m\n")
-  end
+if file:sub(1, 1) ~= "/" then
+  file = fs.concat(shell.workingDirectory, file)
 end
+if not fs.exists(file) then
+  print("\27[91mFile does not exist.")
+  return
+end
+fs.remove(file)

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()
-terminal.clear()
+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()

halyde/apps/touch.lua

@@ -1,23 +0,0 @@
--- TODO: Rename this to something else (while making an alias from the original command).
--- Touch seems kind of a silly name for a command to make a file.
--- Maybe something like mkfile would be better?
-local fs = require("filesystem")
-local shell = require("shell")
-
-local args = {...}
-
-if not args[1] then
-  return shell.run("help touch")
-end
-
-for _, file in pairs(args) do
-  file = shell.resolvePath(file)
-
-  local handle, err = fs.open(file, "a")
-  if err ~= nil then
-    terminal.write("\27[91mError: " .. err .. "\27[0m\n")
-    goto continue
-  end
-  handle:close()
-  ::continue::
-end

halyde/config/generate/shell.json

@@ -1 +1 @@
-{"prompt":"\u001b[92m%s > \u001b[0m","aliases":{"move":"mv","copy":"cp","ag":"argentum","rename":"mv","..":"cd ..","man":"help","del":"rm","delete":"rm","ren":"mv","remove":"rm","list":"ls","wget":"download","dir":"ls","ps":"lscor","poweroff":"shutdown","restart":"reboot","resolution":"res"},"splashMessages":["Made by John Haly- I mean Cerulean Blue.","Welcome! Type \"help\" to get started.","Also try KOCOS!","Welcome back, Commander. We have no idea what we're doing.","99.9% bug-free. The remaining 0.1% are features.","0 days since last error.","Everything is fine. The fire is decorative.","Please don't feed the background processes.","Also has fetch!","Anything red is no man's land. Trust me.","Machine...","Abort, Retry, Fail?","What's the deal with /argentum/store?","So cutting-edge you can't hold it in your hand.","Americans are the reason you see colors on-screen. I'm talking about ANSI escape codes, not politics.","Shoutout to Ponali!"],"path":["/halyde/apps/"],"startupMessage":"\n │\n │ %s\n │ %s\n │\n ","defaultWorkingDirectory":"/home/"}
+{"prompt":"\u001b[92m%s > \u001b[0m","aliases":{"move":"mv","copy":"cp","ag":"argentum","rename":"mv","..":"cd ..","man":"help","del":"rm","delete":"rm","ren":"mv","remove":"rm","list":"ls","wget":"download","dir":"ls","ps":"lscor","poweroff":"shutdown","restart":"reboot"},"splashMessages":["Made by John Haly- I mean Cerulean Blue.","Welcome! Type \"help\" to get started.","Also try KOCOS!","Welcome back, Commander. We have no idea what we're doing.","99.9% bug-free. The remaining 0.1% are features.","0 days since last error.","Everything is fine. The fire is decorative.","Please don't feed the background processes.","Also has fetch!","Anything red is no man's land. Trust me.","Machine...","Abort, Retry, Fail?","What's the deal with /argentum/store?","So cutting-edge you can't hold it in your hand.","Americans are the reason you see colors on-screen. I'm talking about ANSI escape codes, not politics.","Shoutout to Ponali!"],"path":["/halyde/apps/"],"startupMessage":"\n │\n │ %s\n │ %s\n │\n ","defaultWorkingDirectory":"/home/"}

halyde/config/generate/terminal.json

@@ -1 +0,0 @@
-{"palette":{"dark":{"0":"171421","1":"c01c28","2":"26a269","3":"a2734c","4":"12488b","5":"a347ba","6":"2aa1b3","7":"d0cfcc"},"bright":{"0":"5e5c64","1":"f66151","2":"33d17a","3":"e9ad0c","4":"2a7bde","5":"c061cb","6":"33c7de","7":"ffffff"}}}

halyde/config/shell.json

@@ -1 +1 @@
-{"prompt":"\u001b[92m%s > \u001b[0m","aliases":{"move":"mv","copy":"cp","ag":"argentum","rename":"mv","..":"cd ..","man":"help","del":"rm","delete":"rm","ren":"mv","remove":"rm","list":"ls","wget":"download","dir":"ls","ps":"lstsk","poweroff":"shutdown","restart":"reboot","lsblk":"lsdrv","lscor":"lstsk"},"splashMessages":["Made by John Haly- I mean Cerulean Blue.","Welcome! Type \"help\" to get started.","Also try KOCOS!","Welcome back, Commander. We have no idea what we're doing.","99.9% bug-free. The remaining 0.1% are features.","0 days since last error.","Everything is fine. The fire is decorative.","Please don't feed the background processes.","Also has fetch!","Anything red is no man's land. Trust me.","Machine...","Abort, Retry, Fail?","What's the deal with /argentum/store?","So cutting-edge you can't hold it in your hand.","Americans are the reason you see colors on-screen. I'm talking about ANSI escape codes, not politics.","Shoutout to Ponali!","Now i% more secure!"],"path":["/halyde/apps/"],"startupMessage":"\n │\n │ %s\n │ %s\n │\n ","defaultWorkingDirectory":"/home/"}
+{"prompt":"\u001b[92m%s > \u001b[0m","aliases":{"move":"mv","copy":"cp","ag":"argentum","rename":"mv","..":"cd ..","man":"help","del":"rm","delete":"rm","ren":"mv","remove":"rm","list":"ls","wget":"download","dir":"ls","ps":"lscor","poweroff":"shutdown","restart":"reboot","lsblk":"lsdrv"},"splashMessages":["Made by John Haly- I mean Cerulean Blue.","Welcome! Type \"help\" to get started.","Also try KOCOS!","Welcome back, Commander. We have no idea what we're doing.","99.9% bug-free. The remaining 0.1% are features.","0 days since last error.","Everything is fine. The fire is decorative.","Please don't feed the background processes.","Also has fetch!","Anything red is no man's land. Trust me.","Machine...","Abort, Retry, Fail?","What's the deal with /argentum/store?","So cutting-edge you can't hold it in your hand.","Americans are the reason you see colors on-screen. I'm talking about ANSI escape codes, not politics.","Shoutout to Ponali!"],"path":["/halyde/apps/"],"startupMessage":"\n │\n │ %s\n │ %s\n │\n ","defaultWorkingDirectory":"/home/"}

halyde/config/startupapps.json

@@ -1 +1 @@
-["/halyde/scripts/login.lua"]
+["/halyde/core/fullkb.lua","/halyde/core/evmgr.lua","/halyde/core/drvload.lua","/halyde/core/shell.lua"]

halyde/config/terminal.json

@@ -1 +0,0 @@
-{"palette":{"dark":{"0":"171421","1":"c01c28","2":"26a269","3":"a2734c","4":"12488b","5":"a347ba","6":"2aa1b3","7":"d0cfcc"},"bright":{"0":"5e5c64","1":"f66151","2":"33d17a","3":"e9ad0c","4":"2a7bde","5":"c061cb","6":"33c7de","7":"ffffff"}}}

halyde/core/boot.lua

@@ -0,0 +1,98 @@
+local loadfile = ...
+local filesystem = loadfile("/halyde/lib/filesystem.lua")(loadfile)
+
+_G._OSVERSION = "Halyde 2.8.1"
+_G._OSLOGO = ""
+local handle, tmpdata = filesystem.open("/halyde/config/oslogo.ans", "r"), nil
+repeat
+  tmpdata = handle:read(math.huge)
+  _OSLOGO = _OSLOGO .. (tmpdata or "")
+until not tmpdata
+
+_G.package = {["preloaded"] = {}}
+
+loadfile("/halyde/core/datatools.lua")()
+
+function _G.import(module, ...)
+  local args = table.pack(...)
+  if package.preloaded[module] then
+    return package.preloaded[module]
+  end
+  local modulepath
+  if filesystem.exists(module) then
+    modulepath = module
+  elseif filesystem.exists("/halyde/lib/"..module..".lua") then
+    modulepath = "/halyde/lib/"..module..".lua"
+  elseif shell and shell.workingDirectory and filesystem.exists(shell.workingDirectory..module) then
+    modulepath = shell.workingDirectory..module
+  end
+  assert(modulepath, "module not found\npossible locations:\n/halyde/lib/"..module..".lua")
+  local handle, data, tmpdata = filesystem.open(modulepath), "", nil
+  repeat
+    tmpdata = handle:read(math.huge or math.maxinteger)
+    data = data .. (tmpdata or "")
+  until not tmpdata
+  handle:close()
+  return(assert(load(data, "="..modulepath))(table.unpack(args)))
+end
+
+local function preload(module)
+  local handle, data, tmpdata = assert(filesystem.open("/halyde/lib/" .. module .. ".lua", "r")), "", nil
+  repeat
+    tmpdata = handle:read(math.huge or math.maxinteger)
+    data = data .. (tmpdata or "")
+  until not tmpdata
+  package.preloaded[module] = assert(load(data, "="..module))()
+  _G[module] = nil
+end
+
+preload("component")
+preload("computer")
+preload("filesystem")
+
+local component = import("component")
+local gpu = component.gpu
+local screenAddress = component.list("screen")()
+--local screen = component.screen
+
+gpu.bind(screenAddress)
+--local maxWidth, maxHeight = gpu.maxResolution()
+--local aspectX, aspectY = screen.getAspectRatio()
+--local screenRatio = aspectX * 2 / aspectY
+
+-- Calculate potential dimensions
+--local widthLimited = math.floor(maxHeight * screenRatio)
+--local heightLimited = math.floor(maxWidth / screenRatio)
+
+--local targetWidth, targetHeight
+
+--if widthLimited <= maxWidth then
+  -- height is the limiting factor
+--  targetWidth = widthLimited
+--  targetHeight = maxHeight
+--else
+  -- width is the limiting factor
+--  targetWidth = maxWidth
+--  targetHeight = heightLimited
+--end
+
+--targetWidth = math.min(targetWidth, maxWidth)
+--targetHeight = math.min(targetHeight, maxHeight)
+
+--gpu.setResolution(targetWidth, targetHeight)
+gpu.setResolution(gpu.maxResolution())
+
+--local handle = assert(filesystem.open("/bazinga.txt", "w"))
+--assert(handle:write("Bazinga!"))
+--handle:close()
+
+local fs = import("filesystem")
+if not fs.exists("/halyde/config/shell.json") then -- Auto-generate configs
+  fs.copy("/halyde/config/generate/shell.json", "/halyde/config/shell.json")
+end
+if not fs.exists("/halyde/config/startupapps.json") then
+  fs.copy("/halyde/config/generate/startupapps.json", "/halyde/config/startupapps.json")
+end
+fs = nil
+
+import("/halyde/core/cormgr.lua")

halyde/core/cormgr.lua

@@ -0,0 +1,97 @@
+_G.cormgr = {}
+_G.cormgr.corList = {}
+_G.cormgr.labelList = {}
+
+local component = import("component")
+local filesystem = import("filesystem")
+local json = import("json")
+local gpu = component.gpu
+--local ocelot = component.ocelot
+
+function _G.cormgr.loadCoroutine(path,...)
+  local args = {...}
+  local function corFunction()
+    local result, errorMessage = xpcall(function(...)
+      import(...)
+    end, function(errorMessage)
+      return errorMessage .. "\n \n" .. debug.traceback()
+    end, path, table.unpack(args))
+    if not result then
+      if print then
+        gpu.freeAllBuffers()
+        print("\n\27[91m" .. errorMessage)
+      else
+        error(errorMessage)
+      end
+    end
+    --import(path, table.unpack(args))
+  end
+  cormgr.addCoroutine(corFunction, string.match(tostring(path), "([^/]+)%.lua$"))
+end
+
+function _G.cormgr.addCoroutine(func, name)
+  local cor = coroutine.create(func)
+  table.insert(cormgr.corList, cor)
+  table.insert(cormgr.labelList, name)
+  return cor
+end
+
+function _G.cormgr.removeCoroutine(name)
+  local index = table.find(cormgr.labelList, cor)
+  table.remove(cormgr.corList, index)
+  table.remove(cormgr.labelList, index)
+  --coroutine.close(cor)
+end
+
+function handleError(errormsg)
+  if errormsg == nil then
+    error("unknown error")
+  else
+    error(tostring(errormsg).."\n \n"..debug.traceback())
+  end
+end
+
+local function runCoroutines()
+  for i = 1, #_G.cormgr.corList do
+    if cormgr.corList[i] then
+      local result, errorMessage = coroutine.resume(cormgr.corList[i])
+      if cormgr.corList[i] then
+        if not result then
+          handleError(errorMessage)
+        end
+        if coroutine.status(cormgr.corList[i]) == "dead" then
+          table.remove(cormgr.corList, i)
+          table.remove(cormgr.labelList, i)
+          --ocelot.log("Removed coroutine")
+          i = i - 1
+        end
+        --computer.pullSignal(0)
+        --coroutine.yield()
+      end
+    end
+  end
+end
+
+local handle, data, tmpdata = filesystem.open("/halyde/config/startupapps.json", "r"), "", nil
+repeat
+  tmpdata = handle:read(math.huge or math.maxinteger)
+  data = data .. (tmpdata or "")
+until not tmpdata
+handle:close()
+for _, line in ipairs(json.decode(data)) do
+  if line ~= "" then
+    --[[ if _G.print then
+      print(line)
+    end ]]
+    _G.cormgr.loadCoroutine(line)
+    runCoroutines()
+  end
+end
+-- _G.cormgr.loadCoroutine("/halyde/core/shell.lua")
+
+while true do
+  runCoroutines()
+  if #_G.cormgr.corList == 0 then
+    computer.shutdown()
+  end
+end

halyde/core/datatools.lua

@@ -13,7 +13,6 @@ local conversionTables = {
 }
 
 function table.find(tab, item)
-  checkArg(1,tab,"table")
   for k, v in pairs(tab) do
     if v == item then
       return k