テキスト比較

2 つのテキストファイルの違いを見つける

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

ツール

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

Untitled Diff

Created 6 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

149 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

156 lines

-- called from /init.lua

local raw_loadfile = ...

_G._OSVERSION = "OpenOS 1.7.5"

local title = "OpenOS Loading"

-- luacheck: globals component computer unicode _OSVERSION

local component = component

local computer = computer

local unicode = unicode

-- Runlevel information.

local function centrize(wi, screenWidth)

_G.runlevel = "S"

return math.floor(screenWidth / 2 - wi / 2)

local shutdown = computer.shutdown

end

computer.runlevel = function() return _G.runlevel end

local runlevel, shutdown = "S", computer.shutdown

computer.runlevel = function() return runlevel end

computer.shutdown = function(reboot)

_G.runlevel = reboot and 6 or 0

runlevel = reboot and 6 or 0

if os.sleep then

computer.pushSignal("shutdown")

os.sleep(0.1) -- Allow shutdown processing.

end

shutdown(reboot)

end

local w, h

local screen = component.list('screen', true)()

local screen = component.list("screen", true)()

for address in component.list('screen', true) do

local gpu = screen and component.list("gpu", true)()

if #component.invoke(address, 'getKeyboards') > 0 then

if gpu then

screen = address

gpu = component.proxy(gpu)

break

if not gpu.getScreen() then

gpu.bind(screen)

end

_G.boot_screen = gpu.getScreen()

end

w, h = gpu.maxResolution()

gpu.setResolution(w, h)

_G.boot_screen = screen

gpu.setBackground(0x000000)

local gpu = component.list("gpu", true)()

gpu.setForeground(0xFFFFFF)

local w, h = 160, 50

gpu.fill(1, 1, w, h, " ")

if gpu and screen then

component.invoke(gpu, "bind", screen)

w, h = component.invoke(gpu, "maxResolution")

component.invoke(gpu, "setResolution", w, h)

component.invoke(gpu, "setBackground", 0xd4d4d4)

component.invoke(gpu, "setForeground", 0x2D2D2D)

component.invoke(gpu, "fill", 1, 1, w, h, " ")

component.invoke(gpu, "set", centrize(#title, w), h/2, title)

component.invoke(gpu, "setForeground", 0xC3C3C3)

component.invoke(gpu, "set", w/2-25,h/2+2,string.rep("─", 50))

end

-- Report boot progress if possible.

local y = 1

local uptime = computer.uptime

-- we actually want to ref the original pullSignal here because /lib/event intercepts it later

-- because of that, we must re-pushSignal when we use this, else things break badly

local pull = computer.pullSignal

local last_sleep = uptime()

local function status(msg)

if gpu then

if gpu and screen then

gpu.set(1, y, msg)

component.invoke(gpu, "setForeground", 0x878787)

if y == h then

if y < 20 then

gpu.copy(1, 2, w, h - 1, 0, -1)

loa = string.rep("─", y*2.5)

gpu.fill(1, h, w, 1, " ")

else

loa = string.rep("─", 50)

y = y + 1

end

component.invoke(gpu, "set", w/2-25,h/2+2,loa)

end

component.invoke(gpu, "fill",1,h,w,h," ")

-- boot can be slow in some environments, protect from timeouts

component.invoke(gpu, "set",1,h,"Status: "..msg)

if uptime() - last_sleep > 1 then

y = y + 1

local signal = table.pack(pull(0))

-- there might not be any signal

if signal.n > 0 then

-- push the signal back in queue for the system to use it

computer.pushSignal(table.unpack(signal, 1, signal.n))

end

last_sleep = uptime()

end

status("Booting " .. _OSVERSION .. "...")

-- Custom low-level dofile implementation reading from our ROM.

local loadfile = function(file)

status("> " .. file)

return raw_loadfile(file)

end

local function dofile(file)

status("> " .. file)

local program, reason = loadfile(file)

local program, reason = raw_loadfile(file)

if program then

local result = table.pack(pcall(program))

if result[1] then

return table.unpack(result, 2, result.n)

else

error(result[2])

end

else

error(reason)

end

status("Initializing package management...")

-- Load file system related libraries we need to load other stuff moree

-- comfortably. This is basically wrapper stuff for the file streams

-- provided by the filesystem components.

local package = dofile("/lib/package.lua")

-- Unclutter global namespace now that we have the package module and a filesystem

_G.component = nil

_G.computer = nil

_G.process = nil

_G.unicode = nil

-- Inject the package modules into the global namespace, as in Lua.

_G.package = package

-- Initialize the package module with some of our own APIs.

package.loaded.component = component

package.loaded.computer = computer

package.loaded.unicode = unicode

package.loaded.buffer = dofile("/lib/buffer.lua")

package.loaded.filesystem = dofile("/lib/filesystem.lua")

-- Inject the io modules

_G.io = dofile("/lib/io.lua")

_G.io = loadfile("/lib/io.lua")

package.delayed["text"] = true

package.delayed["sh"] = true

package.delayed["transforms"] = true

package.delayed["term"] = true

end

status("Initializing file system...")

-- Mount the ROM and temporary file systems to allow working on the file

-- system module from this point on.

require("filesystem").mount(computer.getBootAddress(), "/")

package.preload={}

status("Running boot scripts...")

-- Run library startup scripts. These mostly initialize event handlers.

local function rom_invoke(method, ...)

return component.invoke(computer.getBootAddress(), method, ...)

end

local scripts = {}

for _, file in ipairs(rom_invoke("list", "boot")) do

local path = "boot/" .. file

if not rom_invoke("isDirectory", path) then

table.insert(scripts, path)

end

table.sort(scripts)

for i = 1, #scripts do

dofile(scripts[i])

end

status("Initializing components...")

for c, t in component.list() do

computer.pushSignal("component_added", c, t)

end

status("Initializing system...")

computer.pushSignal("init") -- so libs know components are initialized.

require("event").pull(1, "init") -- Allow init processing.

_G.runlevel = 1

保存された差分

原文

ファイルを開く

-- called from /init.lua
local raw_loadfile = ...

_G._OSVERSION = "OpenOS 1.7.5"

-- luacheck: globals component computer unicode _OSVERSION
local component = component
local computer = computer
local unicode = unicode

-- Runlevel information.
_G.runlevel = "S"
local shutdown = computer.shutdown
computer.runlevel = function() return _G.runlevel end
computer.shutdown = function(reboot)
  _G.runlevel = reboot and 6 or 0
  if os.sleep then
    computer.pushSignal("shutdown")
    os.sleep(0.1) -- Allow shutdown processing.
  end
  shutdown(reboot)
end

local w, h
local screen = component.list("screen", true)()
local gpu = screen and component.list("gpu", true)()
if gpu then
  gpu = component.proxy(gpu)
  if not gpu.getScreen() then
    gpu.bind(screen)
  end
  _G.boot_screen = gpu.getScreen()
  w, h = gpu.maxResolution()
  gpu.setResolution(w, h)
  gpu.setBackground(0x000000)
  gpu.setForeground(0xFFFFFF)
  gpu.fill(1, 1, w, h, " ")
end

-- Report boot progress if possible.
local y = 1
local uptime = computer.uptime
-- we actually want to ref the original pullSignal here because /lib/event intercepts it later
-- because of that, we must re-pushSignal when we use this, else things break badly
local pull = computer.pullSignal
local last_sleep = uptime()
local function status(msg)
  if gpu then
    gpu.set(1, y, msg)
    if y == h then
      gpu.copy(1, 2, w, h - 1, 0, -1)
      gpu.fill(1, h, w, 1, " ")
    else
      y = y + 1
    end
  end
  -- boot can be slow in some environments, protect from timeouts
  if uptime() - last_sleep > 1 then
    local signal = table.pack(pull(0))
    -- there might not be any signal
    if signal.n > 0 then
      -- push the signal back in queue for the system to use it
      computer.pushSignal(table.unpack(signal, 1, signal.n))
    end
    last_sleep = uptime()
  end
end

status("Booting " .. _OSVERSION .. "...")

-- Custom low-level dofile implementation reading from our ROM.
local function dofile(file)
  status("> " .. file)
  local program, reason = raw_loadfile(file)
  if program then
    local result = table.pack(pcall(program))
    if result[1] then
      return table.unpack(result, 2, result.n)
    else
      error(result[2])
    end
  else
    error(reason)
  end
end

status("Initializing package management...")

-- Load file system related libraries we need to load other stuff moree
-- comfortably. This is basically wrapper stuff for the file streams
-- provided by the filesystem components.
local package = dofile("/lib/package.lua")

do
  -- Unclutter global namespace now that we have the package module and a filesystem
  _G.component = nil
  _G.computer = nil
  _G.process = nil
  _G.unicode = nil
  -- Inject the package modules into the global namespace, as in Lua.
  _G.package = package

-- Inject the io modules
  _G.io = dofile("/lib/io.lua")
end

status("Initializing file system...")

-- Mount the ROM and temporary file systems to allow working on the file
-- system module from this point on.
require("filesystem").mount(computer.getBootAddress(), "/")

status("Running boot scripts...")

-- Run library startup scripts. These mostly initialize event handlers.
local function rom_invoke(method, ...)
  return component.invoke(computer.getBootAddress(), method, ...)
end

local scripts = {}
for _, file in ipairs(rom_invoke("list", "boot")) do
  local path = "boot/" .. file
  if not rom_invoke("isDirectory", path) then
    table.insert(scripts, path)
  end
end
table.sort(scripts)
for i = 1, #scripts do
  dofile(scripts[i])
end

status("Initializing components...")

for c, t in component.list() do
  computer.pushSignal("component_added", c, t)
end

status("Initializing system...")

computer.pushSignal("init") -- so libs know components are initialized.
require("event").pull(1, "init") -- Allow init processing.
_G.runlevel = 1

変更されたテキスト

ファイルを開く

-- called from /init.lua
local raw_loadfile = ...

_G._OSVERSION = "OpenOS 1.7.5"

local title = "OpenOS Loading"

-- luacheck: globals component computer unicode _OSVERSION
local component = component
local computer = computer
local unicode = unicode

local function centrize(wi, screenWidth)
	return math.floor(screenWidth / 2 - wi / 2)
end
local runlevel, shutdown = "S", computer.shutdown
computer.runlevel = function() return runlevel end
computer.shutdown = function(reboot)
  runlevel = reboot and 6 or 0
  if os.sleep then
    computer.pushSignal("shutdown")
    os.sleep(0.1) -- Allow shutdown processing.
  end
  shutdown(reboot)
end

local screen = component.list('screen', true)()
for address in component.list('screen', true) do
  if #component.invoke(address, 'getKeyboards') > 0 then
    screen = address
    break
  end
end

_G.boot_screen = screen
local gpu = component.list("gpu", true)()
local w, h = 160, 50
if gpu and screen then
  component.invoke(gpu, "bind", screen)
  w, h = component.invoke(gpu, "maxResolution")
  component.invoke(gpu, "setResolution", w, h)
  component.invoke(gpu, "setBackground", 0xd4d4d4)
  component.invoke(gpu, "setForeground", 0x2D2D2D)
  component.invoke(gpu, "fill", 1, 1, w, h, " ")
  component.invoke(gpu, "set", centrize(#title, w), h/2, title)
  component.invoke(gpu, "setForeground", 0xC3C3C3)
  component.invoke(gpu, "set", w/2-25,h/2+2,string.rep("─", 50))
end

-- Report boot progress if possible.
local y = 1
local function status(msg)
  if gpu and screen then
  	component.invoke(gpu, "setForeground", 0x878787)
  	if y < 20 then
  		loa = string.rep("─", y*2.5)
  	else
  		loa = string.rep("─", 50)
  	end
  	component.invoke(gpu, "set", w/2-25,h/2+2,loa)
  	component.invoke(gpu, "fill",1,h,w,h," ")
  	component.invoke(gpu, "set",1,h,"Status: "..msg)
  	y = y + 1
  end
end

status("Booting " .. _OSVERSION .. "...")

local loadfile = function(file)
  status("> " .. file)
  return raw_loadfile(file)
end
 
local function dofile(file)
  local program, reason = loadfile(file)
  if program then
    local result = table.pack(pcall(program))
    if result[1] then
      return table.unpack(result, 2, result.n)
    else
      error(result[2])
    end
  else
    error(reason)
  end
end

status("Initializing package management...")

-- Initialize the package module with some of our own APIs.
  package.loaded.component = component
  package.loaded.computer = computer
  package.loaded.unicode = unicode
  package.loaded.buffer = dofile("/lib/buffer.lua")	
  package.loaded.filesystem = dofile("/lib/filesystem.lua")
  
  -- Inject the io modules
  _G.io = loadfile("/lib/io.lua")
  
  package.delayed["text"] = true
  package.delayed["sh"] = true
  package.delayed["transforms"] = true
  package.delayed["term"] = true
end

status("Initializing file system...")

-- Mount the ROM and temporary file systems to allow working on the file
-- system module from this point on.
require("filesystem").mount(computer.getBootAddress(), "/")
package.preload={}

status("Running boot scripts...")

-- Run library startup scripts. These mostly initialize event handlers.
local function rom_invoke(method, ...)
  return component.invoke(computer.getBootAddress(), method, ...)
end

status("Initializing components...")

for c, t in component.list() do
  computer.pushSignal("component_added", c, t)
end

status("Initializing system...")

computer.pushSignal("init") -- so libs know components are initialized.
require("event").pull(1, "init") -- Allow init processing.
_G.runlevel = 1