aboutsummaryrefslogtreecommitdiffstats
path: root/lua/nvim-lsp-installer
diff options
context:
space:
mode:
Diffstat (limited to 'lua/nvim-lsp-installer')
-rw-r--r--lua/nvim-lsp-installer/installers/shell.lua16
-rw-r--r--lua/nvim-lsp-installer/installers/std.lua2
-rw-r--r--lua/nvim-lsp-installer/servers/hls/init.lua2
3 files changed, 17 insertions, 3 deletions
diff --git a/lua/nvim-lsp-installer/installers/shell.lua b/lua/nvim-lsp-installer/installers/shell.lua
index 8cb263ef..2d0ccf6f 100644
--- a/lua/nvim-lsp-installer/installers/shell.lua
+++ b/lua/nvim-lsp-installer/installers/shell.lua
@@ -29,7 +29,21 @@ function M.bash(raw_script, opts)
opts = vim.tbl_deep_extend("force", default_opts, opts or {})
return shell {
- shell = "/bin/bash",
+ shell = "bash",
+ cmd = (opts.prefix or "") .. raw_script,
+ env = opts.env,
+ }
+end
+
+function M.sh(raw_script, opts)
+ local default_opts = {
+ prefix = "set -euo pipefail;",
+ env = {},
+ }
+ opts = vim.tbl_deep_extend("force", default_opts, opts or {})
+
+ return shell {
+ shell = "sh",
cmd = (opts.prefix or "") .. raw_script,
env = opts.env,
}
diff --git a/lua/nvim-lsp-installer/installers/std.lua b/lua/nvim-lsp-installer/installers/std.lua
index 08bed2f2..92957fb7 100644
--- a/lua/nvim-lsp-installer/installers/std.lua
+++ b/lua/nvim-lsp-installer/installers/std.lua
@@ -10,7 +10,7 @@ function M.download_file(url, out_file)
return installers.when {
unix = function(server, callback, context)
process.spawn("wget", {
- args = { "-nv", "-O", out_file, url },
+ args = { "-O", out_file, url },
cwd = server.root_dir,
stdio_sink = context.stdio_sink,
}, callback)
diff --git a/lua/nvim-lsp-installer/servers/hls/init.lua b/lua/nvim-lsp-installer/servers/hls/init.lua
index 940deb1a..b3197ed7 100644
--- a/lua/nvim-lsp-installer/servers/hls/init.lua
+++ b/lua/nvim-lsp-installer/servers/hls/init.lua
@@ -24,7 +24,7 @@ return function(name, root_dir)
end),
installers.on {
-- we can't use std.chmod because of shell wildcard expansion
- unix = shell.bash [[ chmod +x haskell*]],
+ unix = shell.sh [[ chmod +x haskell*]],
},
},
default_options = {