moved most of the shutil functions into programs in exec/ to reduce kernel size.

configs/everything.cfg

@@ -15,6 +15,15 @@ modules/net/copper.lua
 modules/util/motd.lua
 modules/lib/readline.lua
 modules/lib/shutil.lua
+fwrap shutil.cat exec/cat.lua
+fwrap shutil.mem exec/free.lua
+fwrap shutil.ls exec/ls.lua
+fwrap shutil.ps exec/ps.lua
+alias shutil.cd fs.cd
+alias shutil.rm fs.rm
+alias shutil.mkdir fs.mkdir
+alias shutil.cp fs.cp
+alias shutil.mv fs.mv
 libwrap sha modules/lib/sha256.lua
 modules/net/net-ext.lua
 modules/applications/login.lua

configs/headless.cfg

@@ -13,6 +13,15 @@ modules/net/copper.lua
 modules/util/motd.lua
 modules/lib/readline.lua
 modules/lib/shutil.lua
+fwrap shutil.cat exec/cat.lua
+fwrap shutil.mem exec/free.lua
+fwrap shutil.ls exec/ls.lua
+fwrap shutil.ps exec/ps.lua
+alias shutil.cd fs.cd
+alias shutil.rm fs.rm
+alias shutil.mkdir fs.mkdir
+alias shutil.cp fs.cp
+alias shutil.mv fs.mv
 modules/lib/sha256.lua
 modules/net/net-ext.lua
 modules/applications/login.lua

exec/cat.lua

@@ -0,0 +1,5 @@
+local tA = {...}
+local p = tA[1]
+local f=io.open(p)
+print(f:read("*a"))
+f:close()

exec/free.lua

@@ -0,0 +1,5 @@
+print(" \tTotal\tFree\tUsed")
+io.write("Mem\t")
+io.write(tostring(math.floor(computer.totalMemory()/1024)).."K\t")
+io.write(tostring(math.floor(computer.freeMemory()/1024)).."K\t")
+print(tostring(math.floor((computer.totalMemory()-computer.freeMemory())/1024)).."K\t")

exec/ls.lua

@@ -0,0 +1,7 @@
+local tA = {...}
+if #tA == 0 then tA[1] = (os.getenv("PWD") or "/") end
+for _, p in ipairs(tA) do
+ for k,v in ipairs(fs.list(p)) do
+  print(v)
+ end
+end

exec/ps.lua

@@ -0,0 +1,9 @@
+local tA = {...}
+local f=tA[1] or ""
+print("PID\tUser\tName")
+for k,v in pairs(os.tasks()) do
+ local _,_,uid = os.taskinfo(k)
+ if v:find(f) then
+  print(tostring(k).."\t"..tostring(uid:sub(1,6)).."\t"..tostring(v))
+ end
+end

modules/applications/genkernel.lua

@@ -26,6 +26,8 @@ function genkernel(modlistf,kname)
    nk=nk.."function "..tw[2].."(...)\n"
    apfile(tw[3])
    nk=nk.."\nend\n_G."..tw[2].." = "..tw[2].."()\n"
+  elseif tw[1] == "alias" then
+   nk=nk..tw[2].."="..tw[3].."\n"
   elseif tw[1] == "include" then
    apfile(tw[2])
   else

modules/lib/shutil.lua

@@ -1,34 +1,4 @@
 local shutil = {}
-shutil.cd=fs.cd
-shutil.rm=fs.rm
-shutil.mkdir=fs.mkdir
-shutil.cp=fs.cp
-shutil.mv=fs.mv
-function shutil.ls(p)
- for k,v in ipairs(fs.list(p)) do print(v) end
-end
-function shutil.cat(p)
- local f=io.open(p)
- print(f:read("*a"))
- f:close()
-end
-function shutil.ps(f)
- local f=f or ""
- print("PID\tUser\tName")
- for k,v in pairs(os.tasks()) do
-  local _,_,uid = os.taskinfo(k)
-  if v:find(f) then
-   print(tostring(k).."\t"..tostring(uid:sub(1,6)).."\t"..tostring(v))
-  end
- end
-end
-function shutil.mem()
- print(" \tTotal\tFree\tUsed")
- io.write("Mem\t")
- io.write(tostring(math.floor(computer.totalMemory()/1024)).."K\t")
- io.write(tostring(math.floor(computer.freeMemory()/1024)).."K\t")
- print(tostring(math.floor((computer.totalMemory()-computer.freeMemory())/1024)).."K\t")
-end
 function shutil.genenv()
  local et = os.genenv()
  for k,v in pairs(shutil) do