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 {