From 4fdf33a8829d29cc8fcb2dca46325e85f1256d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20N=C3=BCcke?= <florian@nuecke.de>
Date: Mon, 7 Apr 2014 18:07:39 +0200
Subject: [PATCH] Fixed a bug in man.lua when help topic wasn't found. Moved
 dig.lua to a loot disk. Added loot disks to creative tab. Won't show in NEI,
 just classic creative tab, but I'm OK with that.

---
 .../{lua/component/robot/bin => loot/TheDig}/dig.lua        | 0
 .../component/robot/usr/man/dig => loot/TheDig/dig.man}     | 0
 .../resources/assets/opencomputers/loot/loot.properties     | 3 ++-
 src/main/resources/assets/opencomputers/lua/rom/bin/man.lua | 2 +-
 .../resources/assets/opencomputers/lua/rom/boot/01_os.lua   | 2 +-
 src/main/scala/li/cil/oc/CreativeTab.scala                  | 6 ++++++
 6 files changed, 10 insertions(+), 3 deletions(-)
 rename src/main/resources/assets/opencomputers/{lua/component/robot/bin => loot/TheDig}/dig.lua (100%)
 rename src/main/resources/assets/opencomputers/{lua/component/robot/usr/man/dig => loot/TheDig/dig.man} (100%)

diff --git a/src/main/resources/assets/opencomputers/lua/component/robot/bin/dig.lua b/src/main/resources/assets/opencomputers/loot/TheDig/dig.lua
similarity index 100%
rename from src/main/resources/assets/opencomputers/lua/component/robot/bin/dig.lua
rename to src/main/resources/assets/opencomputers/loot/TheDig/dig.lua
diff --git a/src/main/resources/assets/opencomputers/lua/component/robot/usr/man/dig b/src/main/resources/assets/opencomputers/loot/TheDig/dig.man
similarity index 100%
rename from src/main/resources/assets/opencomputers/lua/component/robot/usr/man/dig
rename to src/main/resources/assets/opencomputers/loot/TheDig/dig.man
diff --git a/src/main/resources/assets/opencomputers/loot/loot.properties b/src/main/resources/assets/opencomputers/loot/loot.properties
index 7a70450db..ffbbb4865 100644
--- a/src/main/resources/assets/opencomputers/loot/loot.properties
+++ b/src/main/resources/assets/opencomputers/loot/loot.properties
@@ -1,4 +1,5 @@
 # This file contains the list of floppy disks that can be found as loot.
 # Each entry is a mapping of folder name to disk label.
 BetterShell=besh
-OpenIRC=irc
\ No newline at end of file
+OpenIRC=irc
+TheDig=dig
\ No newline at end of file
diff --git a/src/main/resources/assets/opencomputers/lua/rom/bin/man.lua b/src/main/resources/assets/opencomputers/lua/rom/bin/man.lua
index 88ac41518..4a1e805f9 100644
--- a/src/main/resources/assets/opencomputers/lua/rom/bin/man.lua
+++ b/src/main/resources/assets/opencomputers/lua/rom/bin/man.lua
@@ -11,7 +11,7 @@ end
 local topic = args[1]
 for path in string.gmatch(os.getenv("MANPATH"), "[^:]+") do
   path = shell.resolve(fs.concat(path, topic), "man")
-  if fs.exists(path) and not fs.isDirectory(path) then
+  if path and fs.exists(path) and not fs.isDirectory(path) then
     os.execute(os.getenv("PAGER") .. " " .. path)
     os.exit()
   end
diff --git a/src/main/resources/assets/opencomputers/lua/rom/boot/01_os.lua b/src/main/resources/assets/opencomputers/lua/rom/boot/01_os.lua
index 16dd4f241..33f25cd75 100644
--- a/src/main/resources/assets/opencomputers/lua/rom/boot/01_os.lua
+++ b/src/main/resources/assets/opencomputers/lua/rom/boot/01_os.lua
@@ -7,7 +7,7 @@ local unicode = require("unicode")
 local env = {
   EDITOR="/bin/edit",
   HOME="/home",
-  MANPATH="/usr/man",
+  MANPATH="/usr/man:.",
   PAGER="/bin/more",
   PATH="/bin:/usr/bin:/home/bin:.",
   PS1="# ",
diff --git a/src/main/scala/li/cil/oc/CreativeTab.scala b/src/main/scala/li/cil/oc/CreativeTab.scala
index 75a2af441..3234ec222 100644
--- a/src/main/scala/li/cil/oc/CreativeTab.scala
+++ b/src/main/scala/li/cil/oc/CreativeTab.scala
@@ -8,5 +8,11 @@ object CreativeTab extends CreativeTabs(CreativeTabs.getNextID, "OpenComputers")
   @SideOnly(Side.CLIENT)
   override def getTabIconItemIndex = Settings.get.blockId2
 
+  override def displayAllReleventItems(list: java.util.List[_]) = {
+    def add[T](list: java.util.List[T], value: Any) = list.add(value.asInstanceOf[T])
+    super.displayAllReleventItems(list)
+    Loot.disks.foreach(add(list, _))
+  }
+
   override def getTranslatedTabLabel = getTabLabel
 }
\ No newline at end of file