transition tot kernel

sys/boot/opus.boot

@@ -2,6 +2,8 @@
 local colors = _G.colors
 local fs     = _G.fs
 local http   = _G.http
+local os     = _G.os
+local shell  = _ENV.shell
 local term   = _G.term
 
 local w, h = term.getSize()
@@ -32,7 +34,7 @@ term.setCursorPos((w - 18) / 2, h)
 term.write('Loading Opus...')
 term.setCursorPos(w, h)
 
-local GIT_REPO = 'kepler155c/opus/develop'
+local GIT_REPO = 'kepler155c/opus/develop-1.8'
 local BASE     = 'https://raw.githubusercontent.com/' .. GIT_REPO
 
 local sandboxEnv = setmetatable({ }, { __index = _G })
@@ -53,7 +55,10 @@ end
 local function run(file, ...)
   local s, m = loadfile(file, makeEnv())
   if s then
-    return s(...)
+    s, m = pcall(s, ...)
+    if s then
+      return m
+    end
   end
   error('Error loading ' .. file .. '\n' .. m)
 end
@@ -80,13 +85,70 @@ if fs.exists('sys/apis/injector.lua') then
 else
   -- not local, run the file system directly from git
   _G.requireInjector = runUrl('/sys/apis/injector.lua')
-  runUrl('/sys/extensions/vfs.lua')
+  runUrl('sys/extensions/vfs.lua')
 
   -- install file system
   fs.mount('', 'gitfs', GIT_REPO)
 end
 
-run('sys/kernel.lua')
+_G.requireInjector()
+local Util = require('util')
+
+-- Default label
+if not os.getComputerLabel() then
+  local id = os.getComputerID()
+  if _G.turtle then
+    os.setComputerLabel('turtle_' .. id)
+  elseif _G.pocket then
+    os.setComputerLabel('pocket_' .. id)
+  elseif _G.commands then
+    os.setComputerLabel('command_' .. id)
+  else
+    os.setComputerLabel('computer_' .. id)
+  end
+end
+
+-- user environment
+if not fs.exists('usr/apps') then
+  fs.makeDir('usr/apps')
+end
+if not fs.exists('usr/autorun') then
+  fs.makeDir('usr/autorun')
+end
+if not fs.exists('usr/etc/fstab') then
+  Util.writeFile('usr/etc/fstab', 'usr gitfs kepler155c/opus-apps/develop-1.8')
+end
+if not fs.exists('usr/config/shell') then
+  Util.writeTable('usr/config/shell', {
+    aliases  = shell.aliases(),
+    path     = 'usr/apps:sys/apps:' .. shell.path(),
+    lua_path = '/sys/apis:/usr/apis',
+  })
+end
+
+-- shell environment
+local config = Util.readTable('usr/config/shell')
+if config.aliases then
+  for k in pairs(shell.aliases()) do
+    shell.clearAlias(k)
+  end
+  for k,v in pairs(config.aliases) do
+    shell.setAlias(k, v)
+  end
+end
+shell.setPath(config.path)
+sandboxEnv.LUA_PATH = config.lua_path
+
+Util.run(makeEnv(), 'sys/kernel.lua')
+
+-- extensions
+local dir = 'sys/extensions'
+for _,file in ipairs(fs.list(dir)) do
+  local s, m = Util.run(makeEnv(), 'sys/apps/shell', fs.combine(dir, file))
+  if not s then
+    error(m)
+  end
+end
 
 -- install user file systems
 fs.loadTab('usr/etc/fstab')
@@ -97,7 +159,25 @@ if args[1] then
   term.clear()
   term.setCursorPos(1, 1)
 end
+
+local cterm = term.current()
+
 args[1] = args[1] or 'sys/apps/multishell'
-run('sys/apps/shell', table.unpack(args))
+local routine = kernel.newRoutine({
+  path = 'sys/apps/shell',
+  args = args
+  })
+kernel.run(routine)
+local s, m = pcall(kernel.start)
+
+term.redirect(cterm)
+term.setBackgroundColor(colors.black)
+term.setTextColor(colors.white)
+term.clear()
+term.setCursorPos(1, 1)
+if not s then
+  print('\nCrash detected\n')
+  _G.printError(m)
+end
 
 fs.restore()