Merge branch 'master-MC1.8' of github.com:MightyPirates/OpenComputers into OC1.5-MC1.8

src/main/resources/assets/opencomputers/loot/OpenOS/bin/cat.lua

@@ -12,8 +12,8 @@ else
   for i = 1, #args do
     local file, reason = io.open(shell.resolve(args[i]))
     if not file then
-      io.stderr:write(reason)
+      io.stderr:write(tostring(reason) .. "\n")
-      return
+      os.exit(false)
     end
     repeat
       local line = file:read("*L")

src/main/resources/assets/opencomputers/loot/OpenOS/bin/sh.lua

@@ -17,9 +17,6 @@ function memoryStream:close()
 end
 
 function memoryStream:seek()
-  if self.closed then
-    error("attempt to use a closed stream")
-  end
   return nil, "bad file descriptor"
 end
 
@@ -28,7 +25,7 @@ function memoryStream:read(n)
     if self.buffer == "" and self.redirect.read then
       return self.redirect.read:read(n)
     else
-      error("attempt to use a closed stream")
+      return nil -- eof
     end
   end
   if self.buffer == "" then

src/main/resources/assets/opencomputers/loot/OpenOS/bin/yes.lua

@@ -23,20 +23,17 @@ end
 
 -- If there are no arguments, print 'y' and new line, if there is print it.
 if #args == 0 then
-  while ( true )
+  while pcall(io.write, "y\n") do
-  do
-    io.write("y\n")
     os.sleep(0)
   end
 else
-  while ( true )
+  repeat
-  do
+    local ok = true
-    for i=1, #args, 1
+    for i=1, #args, 1 do
-    do
+      ok = ok and pcall(io.write, args[i], " ")
-      io.write(args[i], " ")
     end
-    io.write("\n")
+    pcall(io.write, "\n")
     os.sleep(0)
-  end
+  until not ok
 end
 return 0

src/main/resources/assets/opencomputers/loot/OpenOS/lib/buffer.lua

@@ -25,7 +25,7 @@ function buffer.new(mode, stream)
 end
 
 function buffer:close()
-  if not self.closed and (self.mode.w or self.mode.a) then
+  if self.mode.w or self.mode.a then
     self:flush()
   end
   self.closed = true
@@ -33,14 +33,16 @@ function buffer:close()
 end
 
 function buffer:flush()
-  local result, reason = self.stream:write(self.bufferWrite)
+  if #self.bufferWrite > 0 then
-  if result then
+    local result, reason = self.stream:write(self.bufferWrite)
-    self.bufferWrite = ""
+    if result then
-  else
+      self.bufferWrite = ""
-    if reason then
-      return nil, reason
     else
-      return nil, "bad file descriptor"
+      if reason then
+        return nil, reason
+      else
+        return nil, "bad file descriptor"
+      end
     end
   end