small fixes
This commit is contained in:
14541
docs/bTemp.lua
14541
docs/bTemp.lua
File diff suppressed because one or more lines are too long
@@ -33,7 +33,7 @@ local getProject = function(subDir)
|
|||||||
end
|
end
|
||||||
]]
|
]]
|
||||||
|
|
||||||
local projectContentEnd = '\n return project["main"]()'
|
local projectContentEnd = '\nreturn project["main"]()'
|
||||||
|
|
||||||
local function split(s, delimiter)
|
local function split(s, delimiter)
|
||||||
local result = {}
|
local result = {}
|
||||||
@@ -437,7 +437,7 @@ function installer.generateCustomBasalt(files, basePath, branch)
|
|||||||
local function downloadFile(url, path)
|
local function downloadFile(url, path)
|
||||||
local folder = split(path, "/")
|
local folder = split(path, "/")
|
||||||
if(#folder>1)then
|
if(#folder>1)then
|
||||||
project[basePath..path] = {content=installer.get(url), folder=folder[1], filename=folder[#folder], url=url}
|
project[basePath..path] = {content=installer.get(url), folder=folder[2], filename=folder[#folder], url=url}
|
||||||
else
|
else
|
||||||
project[basePath..path] = {content=installer.get(url), folder="", filename=path, url=url}
|
project[basePath..path] = {content=installer.get(url), folder="", filename=path, url=url}
|
||||||
end
|
end
|
||||||
@@ -480,12 +480,12 @@ function installer.downloadCustomBasalt(files, version, basePath, branch, minify
|
|||||||
f.close()
|
f.close()
|
||||||
end
|
end
|
||||||
elseif(version=="packed")then
|
elseif(version=="packed")then
|
||||||
local projectContent = projectContentStart.."\nproject = {objects={}, plugins={}, libraries={}}\n"
|
local projectContent = projectContentStart.."\nproject = {objects={}, plugins={}, libraries={}}"
|
||||||
for _,v in pairs(project)do
|
for _,v in pairs(project)do
|
||||||
if(v.folder~="")then
|
if(v.folder~="")then
|
||||||
projectContent = projectContent.."project['"..v.folder.."']['"..v.filename:gsub(".lua", "").."'] =".."function(...) "..v.content.." end\n"
|
projectContent = projectContent.."\nproject['"..v.folder.."']['"..v.filename:gsub(".lua", "").."'] = ".."function(...)\n"..v.content.."\nend"
|
||||||
else
|
else
|
||||||
projectContent = projectContent.."project['"..v.filename:gsub(".lua", "").."'] =".."function(...) "..v.content.." end\n"
|
projectContent = projectContent.."\nproject['"..v.filename:gsub(".lua", "").."'] = ".."function(...)\n"..v.content.."\nend"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
projectContent = projectContent..projectContentEnd
|
projectContent = projectContent..projectContentEnd
|
||||||
|
|||||||
@@ -24,8 +24,8 @@ local function switchPage(id)
|
|||||||
end
|
end
|
||||||
|
|
||||||
local function downloadInstaller()
|
local function downloadInstaller()
|
||||||
if(fs.exists("installer.lua"))then
|
if(fs.exists("install.lua"))then
|
||||||
local f = fs.open("installer.lua", "r")
|
local f = fs.open("install.lua", "r")
|
||||||
if(f~=nil)then
|
if(f~=nil)then
|
||||||
installer = load(f.readAll())()
|
installer = load(f.readAll())()
|
||||||
f.close()
|
f.close()
|
||||||
|
|||||||
Reference in New Issue
Block a user