heavpoot/packages1
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add capability for package manager lib to install to other directories

Browse Source
This commit is contained in:
v 2020-12-29 10:19:29 +00:00
parent 441e2a3fdb
commit cba35c2197
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pkgm/lib/pkgm.lua
View File

@ -1,4 +1,5 @@
local mfs=dofile("/lib/mfs.lua")
local local_pkg_files=false
local pkg_url="https://git.osmarks.tk/heavpoot/packages1/raw/branch/master/"
local res={}
local cache={}
@ -10,6 +11,18 @@ function res.get_pkg_url()
return pkg_url
end
function res.set_local(x)
local_pkg_files=x
end
function res.set_install_dir(x)
return mfs.setcd(x)
end
function res.get_install_dir()
return mfs.getcd()
end
function hget(x)
local f=http.get(x)
if not f then return nil end
@ -18,8 +31,20 @@ function hget(x)
return i
end
function res.pkgfile(p,x)
if local_pkg_files then
local cd=mfs.getcd()
mfs.setcd("")
local i=mfs.read(pkg_url.."/"..p.."/"..x)
mfs.setcd(cd)
return i
else
return hget(pkg_url..p.."/"..x)
end
end
function res.pkgmeta(p)
local mt=hget(pkg_url..p.."/pkgmeta.ltn")
local mt=res.pkgfile(p,"pkgmeta.ltn")
if not mt then error("Package "..p.." does not have a pkgmeta.ltn!") end
return textutils.unserialize(mt)
end
@ -34,7 +59,7 @@ function res.pkginst(p)
for i,thing in pairs(mt.files) do
mfs.mmkdir("/"..i)
for _,v in pairs(thing) do
mfs.write("/"..i.."/"..v,hget(pkg_url..p.."/"..i.."/"..v))
mfs.write(i.."/"..v,res.pkgfile(p,i.."/"..v))
end
end
end
@ -49,7 +74,7 @@ function res.pkguinst(p)
if mt.files then
for i,thing in pairs(mt.files) do
for _,v in pairs(thing) do
fs.delete("/"..i.."/"..v)
mfs.rm(i.."/"..v)
end
end
end

2
pkgm/pkgmeta.ltn
View File

@ -1,5 +1,5 @@
{
["version"] = "0.1.0",
["version"] = "0.1.1",
["dependencies"] = {
"mfs",
},