mirror of
https://github.com/CCLeonOS/LeonOS.git
synced 2026-03-03 15:17:01 +00:00
refactor: 将默认路径从/rc更改为/leonos
更新所有相关文件中的路径引用,统一使用/leonos作为系统目录。同时更新版本号至0.1.7。
This commit is contained in:
@@ -6,7 +6,7 @@ local expect = require("cc.expect").expect
|
||||
local completion = require("cc.completion")
|
||||
|
||||
local help = {}
|
||||
help._DEFAULT_PATH = "/rc/help"
|
||||
help._DEFAULT_PATH = "/leonos/help"
|
||||
|
||||
function help.init()
|
||||
local vars = thread.vars()
|
||||
|
||||
@@ -14,7 +14,7 @@ elseif mcver <= 12 or _HOST:match("LeonOS%-PC") then
|
||||
kmap = "lwjgl2"
|
||||
end
|
||||
|
||||
local base = dofile("/rc/keymaps/"..kmap..".lua")
|
||||
local base = dofile("/leonos/keymaps/"..kmap..".lua")
|
||||
local lib = {}
|
||||
|
||||
-- reverse-index it!
|
||||
|
||||
@@ -32,7 +32,7 @@ function shell.init(env)
|
||||
copyIfPresent("aliases", vars)
|
||||
completions[vars.parentShell or 0] = completions[vars.parentShell or 0] or {}
|
||||
|
||||
vars.path = vars.path or ".:/rc/programs"
|
||||
vars.path = vars.path or ".:/leonos/programs"
|
||||
vars.env = env or _ENV or _G
|
||||
end
|
||||
|
||||
|
||||
@@ -87,7 +87,7 @@ local function redraw()
|
||||
end
|
||||
|
||||
local syntax = require("edit.syntax")
|
||||
.new("/rc/modules/main/edit/syntax/lua.lua")
|
||||
.new("/leonos/modules/main/edit/syntax/lua.lua")
|
||||
|
||||
local function rehighlight()
|
||||
local line = {}
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
-- SOFTWARE.
|
||||
--
|
||||
|
||||
local json = { _version = "0.1.2" }
|
||||
local json = { _version = "0.1.7" }
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
-- Encode
|
||||
|
||||
@@ -360,7 +360,7 @@ function api.start()
|
||||
|
||||
local _native = term.native()
|
||||
wrappedNative = window.create(_native, 1, 1, _native.getSize())
|
||||
api.launchTab("/rc/programs/shell.lua", "shell")
|
||||
api.launchTab("/leonos/programs/shell.lua", "shell")
|
||||
|
||||
rc.pushEvent("init")
|
||||
|
||||
|
||||
@@ -53,6 +53,6 @@ function nEnv.os.version()
|
||||
return "LeonOS 1.0 ALpha 1"
|
||||
end
|
||||
|
||||
local func, err = loadfile("/rc/programs/shell.lua", "t", nEnv)
|
||||
local func, err = loadfile("/leonos/programs/shell.lua", "t", nEnv)
|
||||
if not func then error(err, 0) end
|
||||
func()
|
||||
|
||||
@@ -23,7 +23,7 @@ local settings = require("settings")
|
||||
local df = function(f, ...) return assert(loadfile(f))(...) end
|
||||
|
||||
if term.isColor() or settings.get("edit.force_highlight") then
|
||||
df("/rc/editors/advanced.lua", ...)
|
||||
df("/leonos/editors/advanced.lua", ...)
|
||||
else
|
||||
df("/rc/editors/basic.lua", ...)
|
||||
df("/leonos/editors/basic.lua", ...)
|
||||
end
|
||||
|
||||
@@ -74,32 +74,32 @@ for k, v in pairs(aliases) do
|
||||
shell.setAlias(k, v)
|
||||
end
|
||||
|
||||
local completions = "/rc/completions"
|
||||
local completions = "/leonos/completions"
|
||||
for _, prog in ipairs(fs.list(completions)) do
|
||||
dofile(fs.combine(completions, prog))
|
||||
end
|
||||
|
||||
local history = {}
|
||||
while true do
|
||||
if #text > 0 then
|
||||
-- 先清除控制台内容,但保留顶部应用栏
|
||||
local w, h = term.getSize()
|
||||
term.setTextColor(colors.white)
|
||||
term.setBackgroundColor(colors.black)
|
||||
for y=2, h do
|
||||
term.at(1, y).clearLine()
|
||||
end
|
||||
term.at(1, 2)
|
||||
|
||||
term.setTextColor(colors.yellow)
|
||||
rc.write("$ "..shell.dir().." >>> ")
|
||||
term.setTextColor(colors.white)
|
||||
-- 先清除控制台内容,但保留顶部应用栏
|
||||
local w, h = term.getSize()
|
||||
term.setTextColor(colors.white)
|
||||
term.setBackgroundColor(colors.black)
|
||||
for y=2, h do
|
||||
term.at(1, y).clearLine()
|
||||
end
|
||||
term.at(1, 2)
|
||||
|
||||
term.setTextColor(colors.yellow)
|
||||
rc.write("$ "..shell.dir().." >>> ")
|
||||
term.setTextColor(colors.white)
|
||||
|
||||
local text = term.read(nil, history, shell.complete)
|
||||
local text = term.read(nil, history, shell.complete)
|
||||
if #text > 0 then
|
||||
history[#history+1] = text
|
||||
local ok, err = shell.run(text)
|
||||
if not ok and err then
|
||||
io.stderr:write("Application has a error when running and system has stop it. Error:\n", err, "\n")
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -22,7 +22,7 @@ local function expect(...)
|
||||
end
|
||||
|
||||
-- path resolution:
|
||||
-- if the path begins with /rc, then redirect to wherever that actually
|
||||
-- if the path begins with /leonos, then redirect to wherever that actually
|
||||
-- is; otherwise, resolve the path based on the current program's working
|
||||
-- directory
|
||||
-- this is to allow .OS to run from anywhere
|
||||
@@ -72,8 +72,8 @@ function fs.list(path)
|
||||
local _, files = pcall(list, path)
|
||||
if not _ then return nil, files end
|
||||
if path == "/" then
|
||||
-- inject /rc into the root listing
|
||||
if not exists("/rc") then
|
||||
-- inject /leonos into the root listing
|
||||
if not exists("/leonos") then
|
||||
files[#files+1] = "rc"
|
||||
end
|
||||
end
|
||||
|
||||
@@ -6,7 +6,7 @@ _G.package = {}
|
||||
|
||||
package.config = "/\n;\n?\n!\n-"
|
||||
package.cpath = ""
|
||||
package.path = "/rc/apis/?.lua;/rc/modules/main/?.lua;./lib/?.lua;./lib/?/init.lua;./?.lua;./?/init.lua"
|
||||
package.path = "/leonos/apis/?.lua;/leonos/modules/main/?.lua;./lib/?.lua;./lib/?/init.lua;./?.lua;./?/init.lua"
|
||||
|
||||
local function rm(api)
|
||||
local tab = _G[api]
|
||||
@@ -76,7 +76,7 @@ package.searchers = {
|
||||
|
||||
local fs = package.loaded.fs
|
||||
-- require isn't here yet
|
||||
local expect = loadfile("/rc/modules/main/cc/expect.lua")()
|
||||
local expect = loadfile("/leonos/modules/main/cc/expect.lua")()
|
||||
package.loaded["cc.expect"] = expect
|
||||
|
||||
function package.searchpath(name, path, sep, rep)
|
||||
|
||||
Reference in New Issue
Block a user