diff options
| author | w0rp <w0rp@users.noreply.github.com> | 2017-05-03 00:27:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-03 00:27:55 +0100 |
| commit | 858c1c47ae623876453760d0a0cbab8bb72e6fef (patch) | |
| tree | 1c656075440aacb5662cf770845ea31c63f1afd6 | |
| parent | 3573975934f12588e431d902bb477429f635c747 (diff) | |
| parent | 768a5e7421e59fb1ceb7ac07d58453e0bfc2e327 (diff) | |
| download | ale-858c1c47ae623876453760d0a0cbab8bb72e6fef.zip | |
Merge pull request #524 from adriaanzon/fix-defaulting-to-fish
shell: Don't default to fish
| -rw-r--r-- | ale_linters/sh/shell.vim | 2 | ||||
| -rw-r--r-- | doc/ale-sh.txt | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ale_linters/sh/shell.vim b/ale_linters/sh/shell.vim index 3b017b0e..1539e8b3 100644 --- a/ale_linters/sh/shell.vim +++ b/ale_linters/sh/shell.vim @@ -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 diff --git a/doc/ale-sh.txt b/doc/ale-sh.txt index 1d9f12fa..e8c29ddc 100644 --- a/doc/ale-sh.txt +++ b/doc/ale-sh.txt @@ -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 |