setenv and getenv fixes and cleanup

This commit is contained in:
payonel 2017-05-14 16:25:44 -07:00
parent ff2dbc8064
commit defe8c21dd

View File

@ -24,32 +24,23 @@ function os.getenv(varname)
local env = env() local env = env()
if not varname then if not varname then
return env return env
elseif varname == '#' then
return #env
end end
return env[varname] return env[varname]
end end
function os.setenv(varname, value) function os.setenv(varname, value)
checkArg(1, varname, "string", "number") checkArg(1, varname, "string", "number")
if value == nil then if value ~= nil then
env()[varname] = nil value = tostring(value)
else
local success, val = pcall(tostring, value)
if success then
env()[varname] = val
return val
else
return nil, val
end
end end
env()[varname] = value
return value
end end
function os.remove(...) os.remove = fs.remove
return fs.remove(...) os.rename = fs.rename
end
function os.rename(...)
return fs.rename(...)
end
function os.sleep(timeout) function os.sleep(timeout)
checkArg(1, timeout, "number", "nil") checkArg(1, timeout, "number", "nil")