aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Harrison <adamdharrison@gmail.com>2023-06-20 17:25:37 -0400
committerAdam Harrison <adamdharrison@gmail.com>2023-06-20 17:25:37 -0400
commitd1dd4cb5fcccafeab672df9ef3bd1f0d7245df3a (patch)
tree1bf1b15d594e1c7e816692372188558f0cd4c481
parent4a0468e9c4c51c258d4f2c1ab8b3d33b29a0f4e4 (diff)
downloadlite-xl-plugin-manager-d1dd4cb5fcccafeab672df9ef3bd1f0d7245df3a.tar.gz
lite-xl-plugin-manager-d1dd4cb5fcccafeab672df9ef3bd1f0d7245df3a.zip
Updated lpm on plugin manager as optional, as we will use the system lpm if available.v1.0.5
-rw-r--r--manifest.json24
-rw-r--r--src/lpm.lua2
2 files changed, 17 insertions, 9 deletions
diff --git a/manifest.json b/manifest.json
index a6b13c7..f673672 100644
--- a/manifest.json
+++ b/manifest.json
@@ -10,42 +10,50 @@
{
"url": "https://github.com/lite-xl/lite-xl-plugin-manager/releases/download/latest/lpm.x86_64-linux",
"arch": "x86_64-linux",
- "checksum": "SKIP"
+ "checksum": "SKIP",
+ "optional": true
},
{
"url": "https://github.com/lite-xl/lite-xl-plugin-manager/releases/download/latest/lpm.x86_64-windows.exe",
"arch": "x86_64-windows",
- "checksum": "SKIP"
+ "checksum": "SKIP",
+ "optional": true
},
{
"url": "https://github.com/lite-xl/lite-xl-plugin-manager/releases/download/latest/lpm.x86_64-darwin",
"arch": "x86_64-darwin",
- "checksum": "SKIP"
+ "checksum": "SKIP",
+ "optional": true
},
{
"url": "https://github.com/lite-xl/lite-xl-plugin-manager/releases/download/latest/lpm.aarch64-darwin",
"arch": "aarch64-darwin",
- "checksum": "SKIP"
+ "checksum": "SKIP",
+ "optional": true
},
{
"url": "https://github.com/lite-xl/lite-xl-plugin-manager/releases/download/latest/lpm.aarch64-android",
"arch": "aarch64-android",
- "checksum": "SKIP"
+ "checksum": "SKIP",
+ "optional": true
},
{
"url": "https://github.com/lite-xl/lite-xl-plugin-manager/releases/download/latest/lpm.arm-android",
"arch": "arm-android",
- "checksum": "SKIP"
+ "checksum": "SKIP",
+ "optional": true
},
{
"url": "https://github.com/lite-xl/lite-xl-plugin-manager/releases/download/latest/lpm.x86-android",
"arch": "x86-android",
- "checksum": "SKIP"
+ "checksum": "SKIP",
+ "optional": true
},
{
"url": "https://github.com/lite-xl/lite-xl-plugin-manager/releases/download/latest/lpm.x86_64-android",
"arch": "x86_64-android",
- "checksum": "SKIP"
+ "checksum": "SKIP",
+ "optional": true
}
],
"dependencies": {
diff --git a/src/lpm.lua b/src/lpm.lua
index 4f5a87b..5be0051 100644
--- a/src/lpm.lua
+++ b/src/lpm.lua
@@ -833,7 +833,7 @@ function Addon:install(bottle, installing)
local file_arch = file.arch and type(file.arch) == "string" and { file.arch } or file.arch
if not file.arch or #common.grep(file_arch, function(e) return e == arch end) > 0 then
if file.arch then has_one_file = true end
- if not file.optional or (not NO_INSTALL_OPTIONAL and prompt(common.basename(file.url) .. " is an optional dependency of " .. self.id .. ". Should we install it?")) then
+ if not file.optional or (not NO_INSTALL_OPTIONAL and prompt(common.basename(file.url) .. " is an optional file for " .. self.id .. ". Should we install it?")) then
if not file.checksum then error("requires a checksum") end
local target_path = install_path .. PATHSEP .. (file.path or common.basename(file.url))
local temporary_path = temporary_install_path .. PATHSEP .. (file.path or common.basename(file.url))