Merge pull request #524 from adriaanzon/fix-defaulting-to-fish

shell: Don't default to fish
This commit is contained in:
w0rp 2017-05-03 00:27:55 +01:00 committed by GitHub
commit 858c1c47ae
2 changed files with 3 additions and 2 deletions

View File

@ -11,7 +11,7 @@ endif
if !exists('g:ale_sh_shell_default_shell')
let g:ale_sh_shell_default_shell = fnamemodify($SHELL, ':t')
if g:ale_sh_shell_default_shell ==# ''
if g:ale_sh_shell_default_shell ==# '' || g:ale_sh_shell_default_shell ==# 'fish'
let g:ale_sh_shell_default_shell = 'bash'
endif
endif

View File

@ -8,7 +8,8 @@ shell *ale-sh-shell*
g:ale_sh_shell_default_shell *g:ale_sh_shell_default_shell*
*b:ale_sh_shell_default_shell*
Type: |String|
Default: The current shell (`$SHELL`) or `'bash'` if that cannot be read.
Default: The current shell (`$SHELL`). Falls back to `'bash'` if that cannot be
read or if the current shell is `'fish'`.
When ALE runs the linter for shells with the `-n` flag, it will attempt to
read the shell from the shebang (`#!`) line from the shell script to