aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <adamdharrison@gmail.com>2022-10-06 23:13:02 -0400
committerAdam <adamdharrison@gmail.com>2022-10-06 23:13:02 -0400
commit4ff09521381eab14709993c0fb98ff220699f2bd (patch)
treeb9be5572dcb314eb30a03193e5592b4596781462
parent330557fb8587603c160d7ceea5b51b749a344674 (diff)
downloadlite-xl-plugin-manager-4ff09521381eab14709993c0fb98ff220699f2bd.tar.gz
lite-xl-plugin-manager-4ff09521381eab14709993c0fb98ff220699f2bd.zip
Whoops.
-rw-r--r--lpm.lua25
1 files changed, 14 insertions, 11 deletions
diff --git a/lpm.lua b/lpm.lua
index 8d19391..688059e 100644
--- a/lpm.lua
+++ b/lpm.lua
@@ -353,7 +353,6 @@ function json.decode(str)
end
-- End JSON library.
-local HOME, USERDIR, CACHEDIR, JSON, VERBOSE, MOD_VERSION, QUIET, FORCE, AUTO_PULL_REMOTES, ARCH, ASSUME_YES, NO_INSTALL_OPTIONAL, TMPDIR, repositories, lite_xls, system_bottle
local common = {}
function common.merge(dst, src) for k, v in pairs(src) do dst[k] = v end return dst end
@@ -418,16 +417,8 @@ function common.rename(src, dst)
local _, err = os.rename(src, dst)
if err then error("can't rename file " .. src .. " to " .. dst .. ": " .. err) end
end
-function common.get(source, target, checksum)
- if not checksum then return system.get(source, target) end
- if not system.stat(CACHEDIR .. PATHSEP .. "files") then common.mkdirp(CACHEDIR .. PATHSEP .. "files") end
- local cache_path = CACHEDIR .. PATHSEP .. "files" .. PATHSEP .. checksum
- if not system.stat(cache_path) then
- system.get(source, cache_path)
- if system.hash(cache_path, "file") ~= checksum then fatal_warning("checksum doesn't match for " .. source) end
- end
- common.copy(cache_path, target)
-end
+
+local HOME, USERDIR, CACHEDIR, JSON, VERBOSE, MOD_VERSION, QUIET, FORCE, AUTO_PULL_REMOTES, ARCH, ASSUME_YES, NO_INSTALL_OPTIONAL, TMPDIR, repositories, lite_xls, system_bottle
local actions, warnings = {}, {}
local function log_action(message)
@@ -448,6 +439,18 @@ local function prompt(message)
return not response:find("%S") or response:find("^%s*[yY]%s*$")
end
+function common.get(source, target, checksum)
+ if not checksum then return system.get(source, target) end
+ if not system.stat(CACHEDIR .. PATHSEP .. "files") then common.mkdirp(CACHEDIR .. PATHSEP .. "files") end
+ local cache_path = CACHEDIR .. PATHSEP .. "files" .. PATHSEP .. checksum
+ if not system.stat(cache_path) then
+ system.get(source, cache_path)
+ if system.hash(cache_path, "file") ~= checksum then fatal_warning("checksum doesn't match for " .. source) end
+ end
+ common.copy(cache_path, target)
+end
+
+
local function compare_version(a, b) -- compares semver
if not a or not b then return false end
local _, _, majora, minora, revisiona = tostring(a):find("(%d+)%.?(%d*)%.?(%d*)")