From f648a6271f405fc8d73797c5a815118dbb2da4b8 Mon Sep 17 00:00:00 2001
From: Josh <JoshTheEnder@users.noreply.github.com>
Date: Tue, 17 Feb 2015 20:04:20 +0000
Subject: [PATCH 1/3] Update robot.names

Eh, got bored
---
 src/main/resources/assets/opencomputers/robot.names | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/resources/assets/opencomputers/robot.names b/src/main/resources/assets/opencomputers/robot.names
index 2587ce8c5..a14f0a57c 100644
--- a/src/main/resources/assets/opencomputers/robot.names
+++ b/src/main/resources/assets/opencomputers/robot.names
@@ -51,6 +51,7 @@ Kilobyte           # Contributor
 KITT               # Knight Rider
 Kodos              # Contributor
 Laire              # Perry Rhodan
+Loader 1340        # Borderlands 2
 LordFokas          # Contributor
 Marvin             # Hitchhiker's Guide to the Galaxy
 Michiyo            # Contributor

From 9e4b29b4cf9334281f22d31a8941a748ce32e28a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 19 Feb 2015 00:42:50 +0100
Subject: [PATCH 2/3] Added basic hostname mechanism to OpenOS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
---
 .../opencomputers/loot/OpenOS/bin/hostname.lua     | 14 ++++++++++++++
 .../opencomputers/loot/OpenOS/boot/94_shell.lua    | 11 ++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/assets/opencomputers/loot/OpenOS/bin/hostname.lua

diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/hostname.lua b/src/main/resources/assets/opencomputers/loot/OpenOS/bin/hostname.lua
new file mode 100644
index 000000000..c3be4d110
--- /dev/null
+++ b/src/main/resources/assets/opencomputers/loot/OpenOS/bin/hostname.lua
@@ -0,0 +1,14 @@
+local args = {...}
+if args[1] then
+  local file = io.open("/etc/hostname", "w")
+  file:write(args[1])
+  file:close()
+  os.setenv("HOSTNAME", args[1])
+  os.setenv("PS1", "$HOSTNAME:$PWD# ")
+else
+  local file = io.open("/etc/hostname")
+  if file then
+    io.write(file:read("*l"))
+    file:close()
+  end
+end
diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/94_shell.lua b/src/main/resources/assets/opencomputers/loot/OpenOS/boot/94_shell.lua
index e754143d7..1527af1ad 100644
--- a/src/main/resources/assets/opencomputers/loot/OpenOS/boot/94_shell.lua
+++ b/src/main/resources/assets/opencomputers/loot/OpenOS/boot/94_shell.lua
@@ -13,4 +13,13 @@ shell.setAlias("rs", "redstone")
 shell.setAlias("view", "edit -r")
 shell.setAlias("help", "man")
 shell.setAlias("?", "man")
-shell.setAlias("cp", "cp -i")
\ No newline at end of file
+shell.setAlias("cp", "cp -i")
+
+event.listen("init", function()
+  local file = io.open("/etc/hostname")
+  if file then
+    os.setenv("HOSTNAME", file:read("*l"))
+    os.setenv("PS1", "$HOSTNAME:$PWD# ")
+    file:close()
+  end
+end)

From cba88c7066065fd5b23e25891c3e7e43d1b322ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Thu, 19 Feb 2015 17:12:23 +0100
Subject: [PATCH 3/3] Improved hostname, added manpage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
---
 .../opencomputers/loot/OpenOS/bin/hostname.lua | 18 ++++++++++++------
 .../opencomputers/loot/OpenOS/usr/man/hostname | 12 ++++++++++++
 2 files changed, 24 insertions(+), 6 deletions(-)
 create mode 100644 src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/hostname

diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/hostname.lua b/src/main/resources/assets/opencomputers/loot/OpenOS/bin/hostname.lua
index c3be4d110..f8ff68205 100644
--- a/src/main/resources/assets/opencomputers/loot/OpenOS/bin/hostname.lua
+++ b/src/main/resources/assets/opencomputers/loot/OpenOS/bin/hostname.lua
@@ -1,14 +1,20 @@
 local args = {...}
 if args[1] then
-  local file = io.open("/etc/hostname", "w")
-  file:write(args[1])
-  file:close()
-  os.setenv("HOSTNAME", args[1])
-  os.setenv("PS1", "$HOSTNAME:$PWD# ")
+  local file, reason = io.open("/etc/hostname", "w")
+  if not file then
+    io.stderr:write(reason .. "\n")
+  else
+    file:write(args[1])
+    file:close()
+    os.setenv("HOSTNAME", args[1])
+    os.setenv("PS1", "$HOSTNAME:$PWD# ")
+  end
 else
   local file = io.open("/etc/hostname")
   if file then
-    io.write(file:read("*l"))
+    io.write(file:read("*l"), "\n")
     file:close()
+  else
+    io.stderr:write("Hostname not set\n")
   end
 end
diff --git a/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/hostname b/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/hostname
new file mode 100644
index 000000000..ae853e58a
--- /dev/null
+++ b/src/main/resources/assets/opencomputers/loot/OpenOS/usr/man/hostname
@@ -0,0 +1,12 @@
+NAME
+  hostname - Display and modify hostname
+
+SYNOPIS
+  hostname [NEW NAME]
+
+EXAMPLES
+  hostname
+    Prints currently set hostname
+
+  hostname test
+    Sets hostname of this computer to test