From adc72c23048edc4662935063be761c2d3c2db80e Mon Sep 17 00:00:00 2001 From: tmpvaracc Date: Fri, 30 Jan 2015 11:57:06 +0300 Subject: [PATCH 1/3] Update robot.names Would be nice to see either of these AI names from Deus Ex francize to be implemented into list, haha --- src/main/resources/assets/opencomputers/robot.names | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/assets/opencomputers/robot.names b/src/main/resources/assets/opencomputers/robot.names index 7afc69ab5..3d0d7fa66 100644 --- a/src/main/resources/assets/opencomputers/robot.names +++ b/src/main/resources/assets/opencomputers/robot.names @@ -79,3 +79,6 @@ Watson # IBM Watson Weebo # Flubber Wheatley # Portal Wobbo # Contributor +Icarus # Deus Ex +Daedalus # Deus Ex +Helios # Deus Ex From 4cedbb41e7910921c16b5878afdc9ea904e2d817 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Fri, 13 Feb 2015 19:49:13 +0100 Subject: [PATCH 2/3] Clean io mode for sh.lua MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ɓukasz Magiera --- .../assets/opencomputers/loot/OpenOS/bin/sh.lua | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/sh.lua b/src/main/resources/assets/opencomputers/loot/OpenOS/bin/sh.lua index 156c0f0a9..81330372f 100644 --- a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/sh.lua +++ b/src/main/resources/assets/opencomputers/loot/OpenOS/bin/sh.lua @@ -253,6 +253,23 @@ if #args == 0 and (io.input() == io.stdin or options.i) and not options.c then end end end +elseif #args == 0 and (io.input() ~= io.stdin) then + while true do + io.write(expand(os.getenv("PS1") or "$ ")) + local command = io.read("*l") + if not command then + io:write("exit\n") + end + command = text.trim(command) + if command == "exit" then + return + elseif command ~= "" then + local result, reason = os.execute(command) + if not result then + io.stderr:write((tostring(reason) or "unknown error").. "\n") + end + end + end else -- execute command. local result = table.pack(execute(...)) From 8d4bacd985989bd858d9f9468953fc2e8d99377d Mon Sep 17 00:00:00 2001 From: tmpvaracc Date: Fri, 13 Feb 2015 23:26:05 -0500 Subject: [PATCH 3/3] Update robot.names Fixed alphabet order --- src/main/resources/assets/opencomputers/robot.names | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/resources/assets/opencomputers/robot.names b/src/main/resources/assets/opencomputers/robot.names index 3d0d7fa66..2587ce8c5 100644 --- a/src/main/resources/assets/opencomputers/robot.names +++ b/src/main/resources/assets/opencomputers/robot.names @@ -24,6 +24,7 @@ Clamps # Futurama Clank # Ratchet & Clank Claptrap # Borderlands Crypto # Kodos +Daedalus # Deus Ex Dalek Sec # Doctor Who Deputy ANDY # Eureka Death Trap # Borderlands 2's Mechromancer @@ -40,6 +41,7 @@ HAL 9000 # Space Odyssey Harkness # Fallout 3 Heron # Vexatos Homunk # Perry Rhodan +Icarus # Deus Ex J.A.R.V.I.S # Iron Man JoshTheEnder # Contributor Johnny 5 # Short Circuit @@ -79,6 +81,3 @@ Watson # IBM Watson Weebo # Flubber Wheatley # Portal Wobbo # Contributor -Icarus # Deus Ex -Daedalus # Deus Ex -Helios # Deus Ex