From 20fe17a5612f8c587e7df38faf09d6ebffc9e7c1 Mon Sep 17 00:00:00 2001
From: William Boman <william@redwill.se>
Date: Sun, 4 Jul 2021 22:56:40 +0200
Subject: fix hls installer

---
 lua/nvim-lsp-installer/servers/hls/init.lua    |  2 +-
 lua/nvim-lsp-installer/servers/hls/install.mjs | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

(limited to 'lua')

diff --git a/lua/nvim-lsp-installer/servers/hls/init.lua b/lua/nvim-lsp-installer/servers/hls/init.lua
index 1629fd47..84fe023f 100644
--- a/lua/nvim-lsp-installer/servers/hls/init.lua
+++ b/lua/nvim-lsp-installer/servers/hls/init.lua
@@ -9,6 +9,6 @@ return server.Server:new {
     root_dir = root_dir,
     installer = zx.file("./install.mjs"),
     default_options = {
-        cmd = { path.concat { root_dir, "hls" }, "--lsp" },
+        cmd = { path.concat { root_dir, "hls" } },
     },
 }
diff --git a/lua/nvim-lsp-installer/servers/hls/install.mjs b/lua/nvim-lsp-installer/servers/hls/install.mjs
index be239614..629fd3a3 100644
--- a/lua/nvim-lsp-installer/servers/hls/install.mjs
+++ b/lua/nvim-lsp-installer/servers/hls/install.mjs
@@ -8,14 +8,21 @@ const target = (() => {
             process.exit(1);
         }
         case "darwin":
-            return `haskell-language-server-wrapper-macOS.gz`;
+            return `haskell-language-server-macOS-${VERSION}.tar.gz`;
         default:
-            return `haskell-language-server-wrapper-Linux.gz`;
+            return `haskell-language-server-Linux-${VERSION}.tar.gz`;
     }
 })();
 
 const downloadUrl = `https://github.com/haskell/haskell-language-server/releases/download/${VERSION}/${target}`;
 
-await $`wget -O hls.gz ${downloadUrl}`;
-await $`gunzip hls.gz`;
+await $`wget -O hls.tar.gz ${downloadUrl}`;
+await $`tar -xf hls.tar.gz`;
+await $`rm hls.tar.gz`;
+await $`chmod +x haskell*`;
+
+const scriptContent = `#!/usr/bin/env bash
+PATH="$PATH:${__dirname}" "${__dirname}/haskell-language-server-wrapper" --lsp`;
+
+await fs.writeFile("./hls", scriptContent);
 await $`chmod +x hls`
-- 
cgit v1.2.3-70-g09d2