From f8b0995b07a6bbe4745c5656ed9c87592233072f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20N=C3=BCcke?= Date: Mon, 29 Jun 2015 21:57:10 +0200 Subject: [PATCH] Get rid of remaining "match start" `component.list` calls in BIOS/OpenOS, fixes #1255. --- .../assets/opencomputers/loot/OpenOS/bin/install.lua | 2 +- .../assets/opencomputers/loot/OpenOS/boot/04_component.lua | 2 +- src/main/resources/assets/opencomputers/loot/OpenOS/init.lua | 4 ++-- .../assets/opencomputers/loot/OpenOS/lib/filesystem.lua | 2 +- 4 files changed, 5 insertions(+), 5 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 25367c286..b147bcc1e 100644 --- a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/install.lua +++ b/src/main/resources/assets/opencomputers/loot/OpenOS/bin/install.lua @@ -9,7 +9,7 @@ local args, options = shell.parse(...) local fromAddress = options.from and component.get(options.from) or filesystem.get(os.getenv("_")).address local candidates = {} -for address in component.list("filesystem") do +for address in component.list("filesystem", true) do local dev = component.proxy(address) if not dev.isReadOnly() and dev.address ~= computer.tmpAddress() and dev.address ~= fromAddress then table.insert(candidates, dev) diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/04_component.lua b/src/main/resources/assets/opencomputers/loot/OpenOS/boot/04_component.lua index 5c084a5ca..a961a9aa5 100644 --- a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/04_component.lua +++ b/src/main/resources/assets/opencomputers/loot/OpenOS/boot/04_component.lua @@ -116,7 +116,7 @@ end ------------------------------------------------------------------------------- -for address in component.list('screen') do +for address in component.list('screen', true) do if #component.invoke(address,'getKeyboards') > 0 then component.setPrimary('screen',address) end diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/init.lua b/src/main/resources/assets/opencomputers/loot/OpenOS/init.lua index 26e719a25..da7148a11 100644 --- a/src/main/resources/assets/opencomputers/loot/OpenOS/init.lua +++ b/src/main/resources/assets/opencomputers/loot/OpenOS/init.lua @@ -28,8 +28,8 @@ do function rom.inits() return ipairs(rom.invoke("list", "boot")) end function rom.isDirectory(path) return rom.invoke("isDirectory", path) end - local screen = component.list('screen')() - for address in component.list('screen') do + local screen = component.list('screen', true)() + for address in component.list('screen', true) do if #component.invoke(address, 'getKeyboards') > 0 then screen = address end diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/filesystem.lua b/src/main/resources/assets/opencomputers/loot/OpenOS/lib/filesystem.lua index 7edda653b..dcbeb1d15 100644 --- a/src/main/resources/assets/opencomputers/loot/OpenOS/lib/filesystem.lua +++ b/src/main/resources/assets/opencomputers/loot/OpenOS/lib/filesystem.lua @@ -242,7 +242,7 @@ end function filesystem.proxy(filter) checkArg(1, filter, "string") local address - for c in component.list("filesystem") do + for c in component.list("filesystem", true) do if component.invoke(c, "getLabel") == filter then address = c break