diff options
| author | William Boman <william@redwill.se> | 2021-09-29 19:50:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-29 19:50:21 +0200 |
| commit | aa052c3e50fa0271573c442446d3b0abc96e844f (patch) | |
| tree | 734087761ea313ef4d8c988c94ef639d75fd0a1d /lua | |
| parent | ci: don't run stylua on all branches (diff) | |
| download | mason-aa052c3e50fa0271573c442446d3b0abc96e844f.tar mason-aa052c3e50fa0271573c442446d3b0abc96e844f.tar.gz mason-aa052c3e50fa0271573c442446d3b0abc96e844f.tar.bz2 mason-aa052c3e50fa0271573c442446d3b0abc96e844f.tar.lz mason-aa052c3e50fa0271573c442446d3b0abc96e844f.tar.xz mason-aa052c3e50fa0271573c442446d3b0abc96e844f.tar.zst mason-aa052c3e50fa0271573c442446d3b0abc96e844f.zip | |
don't assume bash location (#108)
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/nvim-lsp-installer/installers/shell.lua | 16 | ||||
| -rw-r--r-- | lua/nvim-lsp-installer/installers/std.lua | 2 | ||||
| -rw-r--r-- | lua/nvim-lsp-installer/servers/hls/init.lua | 2 |
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 = { |