From 0dbd1d5f8c951fb98b73d2d09b06fd62732d02a1 Mon Sep 17 00:00:00 2001
From: XeonSquared <redtailedairways@gmail.com>
Date: Tue, 19 Nov 2019 21:46:51 +1100
Subject: [PATCH] significantly improved the shell; actually forks for
 processes now, shows the hostname, replaces an = at the start with return ...

---
 exec/shell.lua | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/exec/shell.lua b/exec/shell.lua
index 74f7658..6297609 100644
--- a/exec/shell.lua
+++ b/exec/shell.lua
@@ -5,15 +5,25 @@ function shenv.quit()
 end
 shenv.cd = os.chdir
 shenv.mkdir = fs.makeDirectory
+local function findPath(name)
+ path = os.getenv("PATH") or "/boot/exec"
+ for l in path:gmatch("[^\n]+") do
+  if fs.exists(l.."/"..name) then
+   return l.."/"..name
+  elseif fs.exists(l.."/"..name..".lua") then
+   return l.."/"..name..".lua"
+  end
+ end
+end
 setmetatable(shenv,{__index=function(_,k)
+ local fp = findPath(k)
  if _G[k] then
   return _G[k]
- elseif fs.exists("/boot/exec/"..k..".lua") then
-  --[[
+ elseif fp then
   local rqid = string.format("shell-%d",math.random(1,99999))
   return function(...)
    local tA = {...}
-   local pid = os.spawn(function() computer.pushSignal(rqid,pcall(loadfile("/boot/exec/"..k..".lua"),table.unpack(tA))) end,"/boot/exec/"..k..".lua")
+   local pid = os.spawn(function() computer.pushSignal(rqid,pcall(loadfile(fp),table.unpack(tA))) end,fp)
    local tE = {}
    repeat
     tE = {coroutine.yield()}
@@ -24,17 +34,19 @@ setmetatable(shenv,{__index=function(_,k)
      end
      return table.unpack(tE)
     end
-   until tTasks[pid] == nil
+   until not os.taskInfo(pid)
   end
-  ]]--
-  return loadfile("/boot/exec/"..k..".lua")
  end
 end})
 print(_VERSION)
 os.setenv("run",true)
 while os.getenv("run") do
- io.write((os.getenv("PWD") or _VERSION).."> ")
- tResult = {pcall(load(io.read(),"shell","t",shenv))}
+ io.write(string.format("%s:%s> ",os.getenv("HOSTNAME") or "localhost",(os.getenv("PWD") or _VERSION)))
+ local input=io.read()
+ if input:sub(1,1) == "=" then
+  input = "return "..input:sub(2)
+ end
+ tResult = {pcall(load(input,"shell","t",shenv))}
  if tResult[1] == true then table.remove(tResult,1) end
  for k,v in pairs(tResult) do
   print(v)