diff options
| author | William Boman <william@redwill.se> | 2022-04-25 15:53:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 15:53:05 +0200 |
| commit | d2c0efd59ec138521c67b2d1133cfcd7e47d3b6a (patch) | |
| tree | 5913fb9e5d7e4966621ba43d3f291942436f3266 /lua | |
| parent | run autogen_metadata.lua (diff) | |
| download | mason-d2c0efd59ec138521c67b2d1133cfcd7e47d3b6a.tar mason-d2c0efd59ec138521c67b2d1133cfcd7e47d3b6a.tar.gz mason-d2c0efd59ec138521c67b2d1133cfcd7e47d3b6a.tar.bz2 mason-d2c0efd59ec138521c67b2d1133cfcd7e47d3b6a.tar.lz mason-d2c0efd59ec138521c67b2d1133cfcd7e47d3b6a.tar.xz mason-d2c0efd59ec138521c67b2d1133cfcd7e47d3b6a.tar.zst mason-d2c0efd59ec138521c67b2d1133cfcd7e47d3b6a.zip | |
fix(ccls): pcall removal of llvm (#628)
Diffstat (limited to 'lua')
| -rw-r--r-- | lua/nvim-lsp-installer/servers/ccls/linux.lua | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/lua/nvim-lsp-installer/servers/ccls/linux.lua b/lua/nvim-lsp-installer/servers/ccls/linux.lua index db4e8a3b..e4410d10 100644 --- a/lua/nvim-lsp-installer/servers/ccls/linux.lua +++ b/lua/nvim-lsp-installer/servers/ccls/linux.lua @@ -24,25 +24,20 @@ local function llvm_installer() local asset_name = coalesce( when( - platform.is_linux, + platform.arch == "x64", coalesce( when( - platform.arch == "x64", - coalesce( - when( - os_dist.id == "ubuntu" and os_dist.version.major >= 20, - "clang+llvm-%s-x86_64-linux-gnu-ubuntu-20.04" - ), - when( - os_dist.id == "ubuntu" and os_dist.version.major >= 16, - "clang+llvm-%s-x86_64-linux-gnu-ubuntu-16.04" - ) - ) + os_dist.id == "ubuntu" and os_dist.version.major >= 20, + "clang+llvm-%s-x86_64-linux-gnu-ubuntu-20.04" ), - when(platform.arch == "arm64", "clang+llvm-%s-aarch64-linux-gnu"), - when(platform.arch == "armv7", "clang+llvm-%s-armv7a-linux-gnueabihf") + when( + os_dist.id == "ubuntu" and os_dist.version.major >= 16, + "clang+llvm-%s-x86_64-linux-gnu-ubuntu-16.04" + ) ) - ) + ), + when(platform.arch == "arm64", "clang+llvm-%s-aarch64-linux-gnu"), + when(platform.arch == "armv7", "clang+llvm-%s-armv7a-linux-gnueabihf") ) local source = github.untarxz_release_file { @@ -67,9 +62,12 @@ return function() Result.run_catching(llvm_installer) :map(function(llvm_dir) ccls_installer { llvm_dir = llvm_dir } + ctx.fs:rmrf "llvm" end) :recover(function() + pcall(function() + ctx.fs:rmrf "llvm" + end) ccls_installer {} end) - ctx.fs:rmrf "llvm" end |