Commit ada88bb

authored

Merge pull request #1133 from chrisgrieser/dev

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

2 parents 179a285 + 5164c63 commit ada88bbCopy full SHA for ada88bb

File tree

+12

-2

lines changed

+12

-2

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`# Bash Language Server`
`2`	`2`
	`3`	`+## 5.4.3`
	`4`	`+`
	`5`	+- Do not overwrite user-provided shellcheck `--shell` argument https://github.com/bash-lsp/bash-language-server/pull/1133
	`6`	`+`
`3`	`7`	`## 5.4.2`
`4`	`8`
`5`	`9`	`- Fix wrong pnpm engine version`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`"description": "A language server for Bash",`
`4`	`4`	`"author": "Mads Hartmann",`
`5`	`5`	`"license": "MIT",`
`6`		`- "version": "5.4.2",`
	`6`	`+ "version": "5.4.3",`
`7`	`7`	`"main": "./out/server.js",`
`8`	`8`	`"typings": "./out/server.d.ts",`
`9`	`9`	`"bin": {`

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -120,13 +120,19 @@ export class Linter {`
`120`	`120`	.map((folderName) => `--source-path=${folderName}`)
`121`	`121`
`122`	`122`	`const args = [`
`123`		- `--shell=${shellName}`,
`124`	`123`	`'--format=json1',`
`125`	`124`	`'--external-sources',`
`126`	`125`	`...sourcePathsArgs,`
`127`	`126`	`...additionalArgs,`
`128`	`127`	`]`
`129`	`128`
	`129`	+ // only add `--shell` argument if non is provided by the user in their
	`130`	`+ // config. This allows to the user to override the shell. See #1064.`
	`131`	`+ const userArgs = additionalArgs.join(' ')`
	`132`	`+ if (!(userArgs.includes('--shell') \|\| userArgs.includes('-s '))) {`
	`133`	+ args.unshift(`--shell=${shellName}`)
	`134`	`+ }`
	`135`	`+`
`130`	`136`	logger.debug(`ShellCheck: running "${this.executablePath} ${args.join(' ')}"`)
`131`	`137`
`132`	`138`	`let out = ''`

Comments

(0)