clangd, rust_analyzer: simplify install script a bit

2 files changed, 20 insertions, 21 deletions

diff --git a/lua/nvim-lsp-installer/servers/clangd/install.mjs b/lua/nvim-lsp-installer/servers/clangd/install.mjs
index ce4ad499..36a7a69d 100644
--- a/lua/nvim-lsp-installer/servers/clangd/install.mjs
+++ b/lua/nvim-lsp-installer/servers/clangd/install.mjs
@@ -1,20 +1,22 @@
 const VERSION = "12.0.0";
 
 const target = (() => {
-  const platform = os.platform();
-  switch (platform) {
-    case "darwin":
-      return `https://github.com/clangd/clangd/releases/download/${VERSION}/clangd-mac-${VERSION}.zip`;
-    case "win32": {
-      console.error(chalk.red(`${platform} is not yet supported.`));
-      process.exit(1);
+    const platform = os.platform();
+    switch (platform) {
+        case "win32": {
+            console.error(chalk.red(`${platform} is not yet supported.`));
+            process.exit(1);
+        }
+        case "darwin":
+            return `clangd-mac-${VERSION}.zip`;
+        default:
+            return `clangd-linux-${VERSION}.zip`;
     }
-    default:
-      return `https://github.com/clangd/clangd/releases/download/${VERSION}/clangd-linux-${VERSION}.zip`;
-  }
 })();
 
-await $`wget -O clangd.zip ${target}`;
+const downloadUrl = `https://github.com/clangd/clangd/releases/download/${VERSION}/${target}`;
+
+await $`wget -O clangd.zip ${downloadUrl}`;
 await $`unzip clangd.zip`;
 await $`rm clangd.zip`;
 await $`mv clangd_${VERSION} clangd`;
diff --git a/lua/nvim-lsp-installer/servers/rust_analyzer/install.mjs b/lua/nvim-lsp-installer/servers/rust_analyzer/install.mjs
index 7d881ac5..7e976850 100644
--- a/lua/nvim-lsp-installer/servers/rust_analyzer/install.mjs
+++ b/lua/nvim-lsp-installer/servers/rust_analyzer/install.mjs
@@ -9,6 +9,10 @@ const exitNotSupported = () => {
 
 const target = (() => {
     switch (os.platform()) {
+        case "win32": {
+            exitNotSupported();
+            break;
+        }
         case "darwin":
             switch (os.arch()) {
                 case "arm64":
@@ -20,10 +24,6 @@ const target = (() => {
                     break;
                 }
             }
-        case "win32": {
-            exitNotSupported();
-            break;
-        }
         default:
             switch (os.arch()) {
                 case "arm64":
@@ -34,11 +34,8 @@ const target = (() => {
     }
 })();
 
-const unpackedTarget = target.replace(/\.gz$/, "");
-
 const downloadUrl = `https://github.com/rust-analyzer/rust-analyzer/releases/download/${VERSION}/${target}`;
 
-await $`wget ${downloadUrl}`;
-await $`gunzip ${target}`;
-await $`chmod +x ${unpackedTarget}`;
-await $`mv ${unpackedTarget} rust-analyzer`;
+await $`wget -O rust-analyzer.gz ${downloadUrl}`;
+await $`gunzip rust-analyzer.gz`;
+await $`chmod +x rust-analyzer`;