mirrors/opus
1
0
Fork 0
mirror of https://github.com/kepler155c/opus synced 2025-10-14 15:27:40 +00:00
Code Issues Releases Wiki Activity

env cleanup

Browse Source
This commit is contained in:
kepler155c@gmail.com
2018-12-27 03:05:12 -05:00
parent 8cfeaad061
commit e3a8e4e790
5 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
sys/extensions/4.user.lua
View File

@@ -11,25 +11,13 @@ end
if not fs.exists('usr/autorun') then
fs.makeDir('usr/autorun')
end
--if not fs.exists('usr/config/fstab') then
-- Util.writeFile('usr/config/fstab',
-- 'usr gitfs kepler155c/opus-apps/' .. _G.OPUS_BRANCH)
--end
local lua_path = '?;?.lua;?/init.lua'
lua_path = lua_path .. ';/usr/apis/?;/usr/apis/?.lua'
lua_path = lua_path .. ';/sys/apis/?;/sys/apis/?.lua'
lua_path = lua_path .. ';/rom/modules/main/?;/rom/modules/main/?.lua;/rom/modules/main/?/init.lua;'
if _G.turtle then
lua_path = lua_path..';/rom/modules/turtle/?;/rom/modules/turtle/?.lua;/rom/modules/turtle/?/init.lua'
elseif _G.command then
lua_path = lua_path..';/rom/modules/command/?;/rom/modules/command/?.lua;/rom/modules/command/?/init.lua'
end
local lua_path = package.path
if not fs.exists('usr/config/shell') then
Util.writeTable('usr/config/shell', {
aliases = shell.aliases(),
path = 'usr/apps:sys/apps:' .. shell.path(),
path = 'usr/apps',
lua_path = lua_path,
})
end
@@ -54,8 +42,14 @@ if config.aliases then
shell.setAlias(k, v)
end
end
shell.setPath(config.path)
--_G.LUA_PATH = config.lua_path
_G.LUA_PATH = lua_path
local path = config.path and Util.split(config.path, '(.-):') or { }
table.insert(path, 'sys/apps')
for _, v in pairs(Util.split(shell.path(), '(.-):')) do
table.insert(path, v)
end
shell.setPath(table.concat(path, ':'))
_G.LUA_PATH = config.lua_path
fs.loadTab('usr/config/fstab')

2
sys/extensions/6.packages.lua
View File

@@ -7,7 +7,7 @@ local fs = _G.fs
local help = _G.help
local shell = _ENV.shell
local appPaths = Util.split(shell.path(), '(.-);')
local appPaths = Util.split(shell.path(), '(.-):')
local luaPaths = Util.split(_G.LUA_PATH, '(.-);')
local helpPaths = Util.split(help.path(), '(.-):')

2
sys/extensions/6.tl3.lua
View File

@@ -879,7 +879,7 @@ function turtle.condense()
if slots[j].count > 0 and (slots[i].count == 0 or slots[i].key == slots[j].key) then
turtle.select(j)
if turtle.transferTo(i) then
local transferred = turtle.getItemCount(i) - slots[i].qty
local transferred = turtle.getItemCount(i) - slots[i].count
slots[j].count = slots[j].count - transferred
slots[i].count = slots[i].count + transferred
slots[i].key = slots[j].key