mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-08 12:28:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

checkhealth: bin directory is Scripts/ on Windows

Browse Source
This commit is contained in:
David Lukes
2020-01-31 11:09:06 +01:00
committed by Justin M. Keyes
parent 1b20014972
commit 370a33a85d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
runtime/autoload/health/provider.vim
View File

@@ -503,7 +503,8 @@ function! s:check_active_virtualenv() abort
" the virtualenv should contain some Python executables, and those " the virtualenv should contain some Python executables, and those
" executables should be first both on Neovim's path and on the path of " executables should be first both on Neovim's path and on the path of
" subshells launched from Neovim " 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) if len(venv_pythonxs)
for venv_pythonx in venv_pythonxs for venv_pythonx in venv_pythonxs
let venv_pythonx = s:normalize_path(venv_pythonx) let venv_pythonx = s:normalize_path(venv_pythonx)
@@ -531,13 +532,14 @@ function! s:check_active_virtualenv() abort
endif endif
endfor endfor
else 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 endif
if len(errors) if len(errors)
call health#report_warn('$VIRTUAL_ENV is set to: ' . $VIRTUAL_ENV) call health#report_warn('$VIRTUAL_ENV is set to: ' . $VIRTUAL_ENV)
if len(venv_pythonxs) 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')"), ', ')) \ . join(map(venv_pythonxs, "fnamemodify(v:val, ':t')"), ', '))
endif endif
let conj = 'However, ' let conj = 'However, '