kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

win: health/provider.vim: check with .exe extension

Browse Source 
Also fix `python_multiple` comparison.
This commit is contained in:
Justin M. Keyes 2017-03-28 01:02:42 +02:00
parent 9d200cd0a3
commit 6fbcbebae0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,6 +8,11 @@ function! s:trim(s) abort
return substitute(a:s, '^\_s*\|\_s*$', '', 'g') return substitute(a:s, '^\_s*\|\_s*$', '', 'g')
endfunction endfunction
" Convert '\' to '/'. Collapse '//' and '/./'.
function! s:normalize_path(s) abort
return substitute(substitute(a:s, '\', '/', 'g'), '/\./\|/\+', '/', 'g')
endfunction
" Simple version comparison. " Simple version comparison.
function! s:version_cmp(a, b) abort function! s:version_cmp(a, b) abort
let a = split(a:a, '\.', 0) let a = split(a:a, '\.', 0)
@ -208,7 +213,7 @@ endfunction
" Check the Python interpreter's usability. " Check the Python interpreter's usability.
function! s:check_bin(bin) abort function! s:check_bin(bin) abort
if !filereadable(a:bin) if !filereadable(a:bin) && (!has('win32') || !filereadable(a:bin.'.exe'))
call health#report_error(printf('"%s" was not found.', a:bin)) call health#report_error(printf('"%s" was not found.', a:bin))
return 0 return 0
elseif executable(a:bin) != 1 elseif executable(a:bin) != 1
@ -287,8 +292,9 @@ function! s:check_python(version) abort
if exists('$PATH') if exists('$PATH')
for path in split($PATH, has('win32') ? ';' : ':') for path in split($PATH, has('win32') ? ';' : ':')
let path_bin = path.'/'.pyname let path_bin = s:normalize_path(path.'/'.pyname)
if path_bin != python_bin && index(python_multiple, path_bin) == -1 if path_bin != s:normalize_path(python_bin)
\ && index(python_multiple, path_bin) == -1
\ && executable(path_bin) \ && executable(path_bin)
call add(python_multiple, path_bin) call add(python_multiple, path_bin)
endif endif