From 9eb445b4aa96b6577120dfb03dd7a6a6431d6c12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Mon, 9 Jun 2014 17:07:14 +0200 Subject: [PATCH] oh ffs... --- .../assets/opencomputers/loot/OpenOS/bin/install.lua | 4 ++-- src/main/scala/li/cil/oc/server/component/GraphicsCard.scala | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/install.lua b/src/main/resources/assets/opencomputers/loot/OpenOS/bin/install.lua index cbaf222f2..0f9349d68 100644 --- a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/install.lua +++ b/src/main/resources/assets/opencomputers/loot/OpenOS/bin/install.lua @@ -40,14 +40,14 @@ repeat until 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) local boot = "/mnt/" .. computer.getBootAddress():sub(1, 3) .. "/" local mnt = "/mnt/" .. choice.address:sub(1, 3) .. "/" local function install(what, path) 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 error(reason, 0) end diff --git a/src/main/scala/li/cil/oc/server/component/GraphicsCard.scala b/src/main/scala/li/cil/oc/server/component/GraphicsCard.scala index 0dce1274f..3c5469a0c 100644 --- a/src/main/scala/li/cil/oc/server/component/GraphicsCard.scala +++ b/src/main/scala/li/cil/oc/server/component/GraphicsCard.scala @@ -81,7 +81,7 @@ abstract class GraphicsCard extends component.ManagedComponent { screen(s => { val oldValue = s.getBackgroundColor val (oldColor, oldIndex) = - if (s.isBackroundFromPalette) { + if (s.isBackgroundFromPalette) { (s.getPaletteColor(oldValue), oldValue) } else {