more work on FS

data/OpenOS/bin/tree.lua

@@ -269,9 +269,6 @@ local function writeEntry(entry, levelStack)
   if opts.Q then io.write('"') end
 
   if opts.color == "always" then
-	if not entry.extension then
-		print("entry:", entry)
-	end
     io.write("\27[" .. colorize(entry) .. "m")
   end
 

data/OpenOS/boot/89_rc.lua

@@ -7,4 +7,3 @@ require("event").listen("init", function()
   dofile(require("shell").resolve("rc", "lua"))
   return false
 end)
-

data/OpenOS/etc/profile.lua

@@ -40,6 +40,5 @@ shell.setWorkingDirectory(os.getenv("HOME"))
 
 local home_shrc = shell.resolve(".shrc")
 if fs.exists(home_shrc) then
-	local resolved = shell.resolve("source", "lua")
-  assert(loadfile(resolved))(home_shrc)
+  loadfile(shell.resolve("source", "lua"))(home_shrc)
 end

data/OpenOS/lib/core/boot.lua

@@ -73,7 +73,7 @@ local function dofile(file)
   status("> " .. file)
   local program, reason = raw_loadfile(file)
   if program then
-    local result = table.pack(xpcall(program, debug.traceback))
+    local result = table.pack(pcall(program))
     if result[1] then
       return table.unpack(result, 2, result.n)
     else

data/OpenOS/usr/misc/greetings.txt

@@ -16,7 +16,7 @@ Most blocks act as 'cables' - use relays and power distributors to create separa
 Welcome to the dark side - here, have some cookies.
 Screens can display Unicode - paste the special chars or use unicode.char.
 Run `help` or `man programname` for ingame help on programs shipped with OpenOS - start with `man man`.
-For more help, there's a wiki at https://ocdoc.cil.li/ - or find the IRC loot disk and join #oc.
+For more help, there's a wiki at http://ocdoc.cil.li/ - or find the IRC loot disk and join #oc.
 Computers have a very basic, built-in speaker - control it using computer.beep().
 Many component methods have a short documentation - use `=component.componentName.methodName` in the Lua interpreter to see it.
 You can get a list of all attached components using the `components` program.