AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 19:25:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

oh ffs...

Browse Source
This commit is contained in:
Florian Nücke 2014-06-09 17:07:14 +02:00
parent 3fdea0e2f0
commit 9eb445b4aa
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/assets/opencomputers/loot/OpenOS/bin/install.lua
View File

@ -40,14 +40,14 @@ repeat
until choice until choice
choice = candidates[choice] choice = candidates[choice]
local cp = loadfile(shell.resolve("cp",　"lua")) local cp = loadfile(shell.resolve("cp", "lua"))
print("Installing OpenOS to device " .. choice.address) print("Installing OpenOS to device " .. choice.address)
local boot = "/mnt/" .. computer.getBootAddress():sub(1, 3) .. "/" local boot = "/mnt/" .. computer.getBootAddress():sub(1, 3) .. "/"
local mnt = "/mnt/" .. choice.address:sub(1, 3) .. "/" local mnt = "/mnt/" .. choice.address:sub(1, 3) .. "/"
local function install(what, path) local function install(what, path)
print("Installing " .. what .. "...") print("Installing " .. what .. "...")
local result, reason = pcall(cp,　"-vf",　boot .. path,　mnt) local result, reason = pcall(cp, "-vf", boot .. path, mnt)
if not result then if not result then
error(reason, 0) error(reason, 0)
end end

2
src/main/scala/li/cil/oc/server/component/GraphicsCard.scala
View File

@ -81,7 +81,7 @@ abstract class GraphicsCard extends component.ManagedComponent {
screen(s => { screen(s => {
val oldValue = s.getBackgroundColor val oldValue = s.getBackgroundColor
val (oldColor, oldIndex) = val (oldColor, oldIndex) =
if (s.isBackroundFromPalette) { if (s.isBackgroundFromPalette) {
(s.getPaletteColor(oldValue), oldValue) (s.getPaletteColor(oldValue), oldValue)
} }
else { else {