diff options
| author | William Boman <william@redwill.se> | 2021-05-17 20:51:30 +0200 |
|---|---|---|
| committer | William Boman <william@redwill.se> | 2021-05-17 20:51:30 +0200 |
| commit | a4e3b7d09c7b681f0dded1dfdf88b193b12a3b2a (patch) | |
| tree | ebce5cbb704e1d988444477c330fb5781445c2bd /lua | |
| parent | zx: lock major version (diff) | |
| download | mason-a4e3b7d09c7b681f0dded1dfdf88b193b12a3b2a.tar mason-a4e3b7d09c7b681f0dded1dfdf88b193b12a3b2a.tar.gz mason-a4e3b7d09c7b681f0dded1dfdf88b193b12a3b2a.tar.bz2 mason-a4e3b7d09c7b681f0dded1dfdf88b193b12a3b2a.tar.lz mason-a4e3b7d09c7b681f0dded1dfdf88b193b12a3b2a.tar.xz mason-a4e3b7d09c7b681f0dded1dfdf88b193b12a3b2a.tar.zst mason-a4e3b7d09c7b681f0dded1dfdf88b193b12a3b2a.zip | |
installers/shell: add opts arg
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/nvim-lsp-installer/installers/shell.lua | 9 | ||||
| -rw-r--r-- | lua/nvim-lsp-installer/installers/zx.lua | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lua/nvim-lsp-installer/installers/shell.lua b/lua/nvim-lsp-installer/installers/shell.lua index 37d99af9..7ffe007a 100644 --- a/lua/nvim-lsp-installer/installers/shell.lua +++ b/lua/nvim-lsp-installer/installers/shell.lua @@ -1,12 +1,17 @@ local M = {} -function M.raw(raw_script) +local default_opts = { + prefix = "set -euo pipefail;" +} + +function M.raw(raw_script, opts) + opts = opts or {} return function (server, callback) local shell = vim.o.shell vim.o.shell = "/bin/bash" vim.cmd [[new]] vim.fn.termopen( - "set -e;\n" .. raw_script, + opts.prefix or default_opts.prefix .. raw_script, { cwd = server._root_dir, on_exit = function (_, exit_code) diff --git a/lua/nvim-lsp-installer/installers/zx.lua b/lua/nvim-lsp-installer/installers/zx.lua index ba30dbe4..04f8148a 100644 --- a/lua/nvim-lsp-installer/installers/zx.lua +++ b/lua/nvim-lsp-installer/installers/zx.lua @@ -53,7 +53,7 @@ end function M.file(relpath) local script_path = path.realpath(relpath, 3) return installers.compose { - shell.raw(("set -e; %q %q"):format( + shell.raw(("%q %q"):format( ZX_EXECUTABLE, script_path )), |