require improvements, remove global Util

sys/extensions/clipboard.lua

@@ -1,3 +1,7 @@
+requireInjector(getfenv(1))
+
+local Util = require('util')
+
 _G.clipboard = { internal, data }
 
 function clipboard.getData()

sys/extensions/device.lua

@@ -1,8 +1,9 @@
-_G.device = { }
+requireInjector(getfenv(1))
 
-require = requireInjector(getfenv(1))
 local Peripheral = require('peripheral')
 
+_G.device = { }
+
 for _,side in pairs(peripheral.getNames()) do
   Peripheral.addDevice(device, side)
 end

sys/extensions/os.lua

@@ -1,172 +0,0 @@
-require = requireInjector(getfenv(1))
-local Config = require('config')
-local SHA1 = require('sha1')
-
-local REGISTRY_DIR = 'usr/.registry'
-
-local config = {
-  enable = false,
-  pocketId = 10,
-  distance = 8,
-}
-
-local lockId
-
-function lockScreen()
-  require = requireInjector(getfenv(1))
-  local UI = require('ui')
-  local Event = require('event')
-
-  local center = math.floor(UI.term.width / 2)
-
-  local page = UI.Page({
-    backgroundColor = colors.blue,
-    prompt = UI.Text({
-      x = center - 9,
-      y = math.floor(UI.term.height / 2),
-      value = 'Password',
-    }),
-    password = UI.TextEntry({
-      x = center,
-      y = math.floor(UI.term.height / 2),
-      width = 8,
-      limit = 8 
-    }),
-    statusBar = UI.StatusBar(),
-    accelerators = {
-      q = 'back',
-    },
-  })
-
-  function page:eventHandler(event)
-    if event.type == 'key' and event.key == 'enter' then
-      Config.load('os', config)
-      if SHA1.sha1(self.password.value) == config.password then
-        os.locked = false
-        Event.exitPullEvents()
-        lockId = false
-        return true
-      else
-        self.statusBar:timedStatus('Invalid Password', 3)
-      end
-    end
-    UI.Page.eventHandler(self, event)
-  end
-
-  UI:setPage(page)
-  Event.pullEvents()
-end
-
-function os.verifyPassword(password)
-  Config.load('os', config)
-  return config.password and password == config.password
-end
-
-function os.getSecretKey()
-  Config.load('os', config)
-  if not config.secretKey then
-    config.secretKey = math.random(100000, 999999)
-    Config.update('os', config)
-  end
-  return config.secretKey
-end
-
-function os.getPublicKey()
-
-  local exchange = {
-    base = 11,
-    primeMod = 625210769
-  }
-
-  local function modexp(base, exponent, modulo)
-    local remainder = base
-
-    for i = 1, exponent-1 do
-      remainder = remainder * remainder
-      if remainder >= modulo then
-        remainder = remainder % modulo
-      end
-    end
-
-    return remainder
-  end
-
-  local secretKey = os.getSecretKey()
-  return modexp(exchange.base, secretKey, exchange.primeMod)
-end
-
-function os.updatePassword(password)
-  Config.load('os', config)
-  config.password = password
-  Config.update('os', config)
-end
-
-function os.getPassword()
-  Config.load('os', config)
-  return config.password
-end
-
-os.lock = function()
-  --os.locked = true
-
-  if not lockId then
-    lockId = multishell.openTab({
-      title = 'Lock',
-      env = getfenv(1),
-      fn = lockScreen,
-      focused = true,
-    })
-  end
-end
-
-os.unlock = function()
-  os.locked = false
-
-  if lockId then
-    multishell.terminate(lockId)
-    lockId = nil
-  end
-end
-
-function os.isTurtle()
-  return not not turtle
-end
-
-function os.isAdvanced()
-  return term.native().isColor()
-end
-
-function os.isPocket()
-  return not not pocket
-end
-
-function os.getVersion()
-  local version
-
-  if _CC_VERSION then
-    version = tonumber(_CC_VERSION:gmatch('[%d]+%.?[%d][%d]', '%1')())
-  end
-  if not version and _HOST then
-    version = tonumber(_HOST:gmatch('[%d]+%.?[%d][%d]', '%1')())
-  end
-
-  return version or 1.7
-end
-
--- move completely into overview
--- just post event from appstore
-function os.registerApp(app, key)
-
-  app.key = SHA1.sha1(key)
-  Util.writeTable(fs.combine(REGISTRY_DIR, app.key), app)
-  os.queueEvent('os_register_app')
-end
-
-function os.unregisterApp(key)
-
-  local filename = fs.combine(REGISTRY_DIR, SHA1.sha1(key))
-  if fs.exists(filename) then
-    fs.delete(filename)
-    os.queueEvent('os_register_app')
-  end
-end

sys/extensions/pathfind.lua

@@ -2,10 +2,11 @@ if not turtle then
 	return
 end
 
-require = requireInjector(getfenv(1))
-local Grid = require ("jumper.grid")
+requireInjector(getfenv(1))
+
+local Grid       = require ("jumper.grid")
 local Pathfinder = require ("jumper.pathfinder")
-local Point = require('point')
+local Point      = require('point')
 
 local WALKABLE = 0
 

sys/extensions/scheduler.lua

@@ -2,6 +2,10 @@ if not turtle then
   return
 end
 
+requireInjector(getfenv(1))
+
+local Util = require('util')
+
 local Scheduler = {
   uid = 0,
   queue = { },

sys/extensions/tgps.lua

@@ -2,7 +2,7 @@ if not turtle then
   return
 end
 
-require = requireInjector(getfenv(1))
+requireInjector(getfenv(1))
 local GPS = require('gps')
 
 function turtle.enableGPS(timeout)

sys/extensions/tl3.lua

@@ -2,6 +2,10 @@ if not turtle then
   return
 end
 
+requireInjector(getfenv(1))
+
+local Util = require('util')
+
 local function noop() end
 
 turtle.point = { x = 0, y = 0, z = 0, heading = 0 }

sys/extensions/vfs.lua

@@ -2,7 +2,9 @@ if fs.native then
   return
 end
 
-require = requireInjector(getfenv(1))
+requireInjector(getfenv(1))
+local Util = require('util')
+
 fs.native = Util.shallowCopy(fs)
 
 local fstypes = { }