From 9bbaf67696555a22a86fcc66ad987315b60128df Mon Sep 17 00:00:00 2001 From: XeonSquared Date: Wed, 13 Sep 2017 13:36:56 +1000 Subject: [PATCH] made sha a require-style lib --- configs/everything.cfg | 2 +- exec/luash.lua | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/everything.cfg b/configs/everything.cfg index 5508bc7..1eba678 100755 --- a/configs/everything.cfg +++ b/configs/everything.cfg @@ -15,7 +15,7 @@ modules/net/copper.lua modules/util/motd.lua modules/lib/readline.lua modules/lib/shutil.lua -modules/lib/sha256.lua +libwrap sha modules/lib/sha256.lua modules/lib/userlib.lua modules/net/net-ext.lua modules/applications/login.lua diff --git a/exec/luash.lua b/exec/luash.lua index 71d3380..3a6fc74 100644 --- a/exec/luash.lua +++ b/exec/luash.lua @@ -1,6 +1,7 @@ local tA = {...} local si = spawn("lua shell",function() + _ENV = shutil.genenv() coroutine.yield() log(login()) print("\f"..MOTD) @@ -38,7 +39,7 @@ spawn("lua shell",function() if inp:sub(1,1) == "=" then inp="return "..inp:sub(2) end - local r={pcall(load(inp))} + local r={pcall(load(inp,_ENV))} if r[1] == true then table.remove(r,1) end