diff options
| author | David Lukes <dafydd.lukes@gmail.com> | 2020-01-31 11:09:06 +0100 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2020-02-02 16:22:07 -0800 |
| commit | 370a33a85dae069d2f8cf40472fed2cf9cee3ea6 (patch) | |
| tree | f7d6c984702477dbe0aa45efb59e59c04ffe1e88 | |
| parent | 1b20014972bb24d60bc16f07e5c4066421bc7e0a (diff) | |
| download | rneovim-370a33a85dae069d2f8cf40472fed2cf9cee3ea6.tar.gz rneovim-370a33a85dae069d2f8cf40472fed2cf9cee3ea6.tar.bz2 rneovim-370a33a85dae069d2f8cf40472fed2cf9cee3ea6.zip | |
checkhealth: bin directory is Scripts/ on Windows
| -rw-r--r-- | runtime/autoload/health/provider.vim | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim index 246bfb5322..abc301c4c3 100644 --- a/runtime/autoload/health/provider.vim +++ b/runtime/autoload/health/provider.vim @@ -503,7 +503,8 @@ function! s:check_active_virtualenv() abort " the virtualenv should contain some Python executables, and those " executables should be first both on Neovim's path and on the path of " subshells launched from Neovim - let venv_pythonxs = glob($VIRTUAL_ENV . '/bin/python*', v:true, v:true) + let bin_dir = has('win32') ? '/Scripts' : '/bin' + let venv_pythonxs = glob($VIRTUAL_ENV . bin_dir . '/python*', v:true, v:true) if len(venv_pythonxs) for venv_pythonx in venv_pythonxs let venv_pythonx = s:normalize_path(venv_pythonx) @@ -531,13 +532,14 @@ function! s:check_active_virtualenv() abort endif endfor else - call add(errors, 'no Python executables were found in the virtualenv''s bin directory.') + call add(errors, 'no Python executables were found in the virtualenv''s ' + \ . bin_dir . ' directory.') endif if len(errors) call health#report_warn('$VIRTUAL_ENV is set to: ' . $VIRTUAL_ENV) if len(venv_pythonxs) - call health#report_warn('And its bin directory contains the following executables: ' + call health#report_warn('And its ' . bin_dir . ' directory contains the following executables: ' \ . join(map(venv_pythonxs, "fnamemodify(v:val, ':t')"), ', ')) endif let conj = 'However, ' |