fix: Improve a few server installations (#4388)

Author: jcs090218

clients/lsp-actionscript.el

@@ -78,18 +78,13 @@ See https://github.com/BowlerHatLLC/vscode-as3mxml/wiki/Choose-an-ActionScript-S
   :group 'lsp-actionscript
   :package-version '(lsp-mode . "8.0.0"))
 
-(defun lsp-actionscript--extension-root ()
-  "The path that the downloaded extension will extract to."
-  (f-join lsp-actionscript-server-store-path
-          (format "vscode-nextgenas-%s" lsp-actionscript-version)))
-
 (defun lsp-actionscript--extension-path ()
   "Return full path of the downloaded extension."
   (f-join lsp-actionscript-server-store-path lsp-actionscript-extension-name))
 
 (defun lsp-actionscript--extension-dir ()
   "Return as3mxml extension path."
-  (f-join (lsp-actionscript--extension-root) "extension"))
+  (f-join lsp-actionscript-server-store-path "extension"))
 
 (defun lsp-actionscript--server-command ()
   "Startup command for ActionScript language server."
@@ -101,33 +96,24 @@ See https://github.com/BowlerHatLLC/vscode-as3mxml/wiki/Choose-an-ActionScript-S
                 (lsp-actionscript--extension-dir) (lsp-actionscript--extension-dir))
         "com.as3mxml.vscode.Main"))
 
-(defun lsp-actionscript--extension-path-zip ()
-  "Change extension path from .vsix to .zip."
-  (concat (f-no-ext (lsp-actionscript--extension-path)) ".zip"))
-
 (lsp-dependency
  'as3mxml
  '(:system "as3mxml")
  `(:download :url lsp-actionscript-server-download-url
-             :store-path ,(lsp-actionscript--extension-path-zip)))
+             :decompress :zip
+             :store-path ,(f-no-ext (lsp-actionscript--extension-path))
+             :set-executable? t))
 
 (lsp-register-client
  (make-lsp-client
   :new-connection (lsp-stdio-connection
                    #'lsp-actionscript--server-command
-                   (lambda () (f-exists? (lsp-actionscript--extension-path-zip))))
+                   (lambda () (f-exists? (lsp-actionscript--extension-dir))))
   :major-modes '(actionscript-mode)
   :priority -1
   :server-id 'as3mxml-ls
   :download-server-fn (lambda (_client callback error-callback _update?)
-                        (lsp-package-ensure
-                         'as3mxml
-                         (lambda ()
-                           ;; TODO: Error handling when unzip failed
-                           (lsp-unzip (lsp-actionscript--extension-path-zip)
-                                      (lsp-actionscript--extension-root))
-                           (funcall callback))
-                         error-callback))))
+                        (lsp-package-ensure 'as3mxml callback error-callback))))
 
 (lsp-consistency-check lsp-actionscript)
 

clients/lsp-cobol.el

@@ -97,39 +97,23 @@ This is only for development use."
        (format lsp-cobol-download-url-format
                version "linux" arch version "")))))
 
-(defvar lsp-cobol--server-download-url (lsp-cobol--server-url)
-  "The actual url used to download language server.")
-
-(defvar lsp-cobol--downloaded-file (f-join lsp-cobol-server-store-path "temp.tar")
-  "The full file path after downloading the server zipped file.")
-
-(defun lsp-cobol--extract-compressed-file (callback)
-  "Install COBOL language service."
-  (cond ((file-exists-p lsp-cobol--downloaded-file)
-         ;; Suprisingly, you can just use `tar' to unzip a zip file on Windows.
-         ;; Therefore, just use the same command.
-         (lsp-cobol--execute "tar" "-xvzf" lsp-cobol--downloaded-file "-C" lsp-cobol-server-store-path)
-         ;; Delete the zip file.
-         (ignore-errors (delete-file lsp-cobol--downloaded-file)))
-        (t
-         (error "Can't extract the downloaded file: %s" lsp-cobol--downloaded-file)))
-  (funcall callback))
-
 (defun lsp-cobol--stored-executable ()
   "Return the stored COBOL language service executable."
-  (executable-find
-   (f-join lsp-cobol-server-store-path
-           (concat "extension/server/native/"
-                   (cl-case system-type
-                     ((cygwin windows-nt ms-dos) "engine.exe")
-                     (darwin                     "server-mac")
-                     (gnu/linux                  "server-linux"))))))
+  (f-join lsp-cobol-server-store-path
+          (concat "extension/server/native/"
+                  (cl-case system-type
+                    ((cygwin windows-nt ms-dos) "engine.exe")
+                    (darwin                     "server-mac")
+                    (gnu/linux                  "server-linux")))))
 
 (lsp-dependency
  'cobol-ls
  '(:system "cobol-ls")
- `(:download :url ,lsp-cobol--server-download-url
-             :store-path ,lsp-cobol--downloaded-file))
+ `(:download :url ,(lsp-cobol--server-url)
+             :decompress :zip
+             :store-path ,(f-join lsp-cobol-server-store-path "temp")
+             :set-executable? t)
+ `(:system ,(lsp-cobol--stored-executable)))
 
 ;;
 ;;; Server
@@ -181,9 +165,7 @@ This is only for development use."
   :server-id 'cobol-ls
   :download-server-fn
   (lambda (_client callback error-callback _update?)
-    (lsp-package-ensure 'cobol-ls
-                        (lambda () (lsp-cobol--extract-compressed-file callback))
-                        error-callback))))
+    (lsp-package-ensure 'cobol-ls callback error-callback))))
 
 (lsp-consistency-check lsp-cobol)