Merge pull request #1133 from chrisgrieser/dev

fix: do not overwrite user-provided shellcheck `--shell` (#1064)

Author: skovhus

server/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Bash Language Server
 
+## 5.4.3
+
+- Do not overwrite user-provided shellcheck `--shell` argument https://github.com/bash-lsp/bash-language-server/pull/1133
+
 ## 5.4.2
 
 - Fix wrong pnpm engine version

server/package.json

@@ -3,7 +3,7 @@
   "description": "A language server for Bash",
   "author": "Mads Hartmann",
   "license": "MIT",
-  "version": "5.4.2",
+  "version": "5.4.3",
   "main": "./out/server.js",
   "typings": "./out/server.d.ts",
   "bin": {

server/src/shellcheck/index.ts

@@ -120,13 +120,19 @@ export class Linter {
       .map((folderName) => `--source-path=${folderName}`)
 
     const args = [
-      `--shell=${shellName}`,
       '--format=json1',
       '--external-sources',
       ...sourcePathsArgs,
       ...additionalArgs,
     ]
 
+    // only add `--shell` argument if non is provided by the user in their
+    // config. This allows to the user to override the shell. See #1064.
+    const userArgs = additionalArgs.join(' ')
+    if (!(userArgs.includes('--shell') || userArgs.includes('-s '))) {
+      args.unshift(`--shell=${shellName}`)
+    }
+
     logger.debug(`ShellCheck: running "${this.executablePath} ${args.join(' ')}"`)
 
     let out = ''