mirror of
https://github.com/neovim/neovim.git
synced 2025-02-25 18:55:25 -06:00
healtcheck: use g:perl_host_prog if its set instead
using just 'perl' isn't correct as it may not be the version requested. ditto for 'cpanm', rather go through 'App::cpanminus' to find the latest perl version
This commit is contained in:
parent
98dea93ba0
commit
8705fbf77c
@ -689,29 +689,31 @@ function! s:check_perl() abort
|
|||||||
return
|
return
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if !executable('perl') || !executable('cpanm')
|
let [perl_exec, perl_errors] = provider#perl#Detect()
|
||||||
call health#report_warn(
|
if empty(perl_exec)
|
||||||
\ '`perl` and `cpanm` must be in $PATH.',
|
if !empty(perl_errors)
|
||||||
\ ['Install Perl and cpanminus and verify that `perl` and `cpanm` commands work.'])
|
call health#report_error('perl provider error:', perl_errors)
|
||||||
return
|
else
|
||||||
|
call health#report_warn('No usable perl executable found')
|
||||||
|
endif
|
||||||
|
return
|
||||||
endif
|
endif
|
||||||
|
|
||||||
call s:system(['perl', '-e', 'use v5.22'])
|
call health#report_info('perl executable: '. perl_exec)
|
||||||
|
|
||||||
|
" we cannot use cpanm that is on the path, as it may not be for the perl
|
||||||
|
" set with g:perl_host_prog
|
||||||
|
call s:system([perl_exec, '-W', '-MApp::cpanminus', '-e', ''])
|
||||||
if s:shell_error
|
if s:shell_error
|
||||||
call health#report_warn('Perl version is too old, 5.22+ required')
|
return [perl_exec, '"App::cpanminus" module is not installed']
|
||||||
" Skip further checks, they are nonsense if perl is too old.
|
|
||||||
return
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
let host = provider#perl#Detect()
|
let latest_cpan_cmd = [perl_exec,
|
||||||
if empty(host)
|
\ '-MApp::cpanminus::fatscript', '-e',
|
||||||
call health#report_warn('Missing "Neovim::Ext" cpan module.',
|
\ 'my $app = App::cpanminus::script->new;
|
||||||
\ ['Run in shell: cpanm Neovim::Ext'])
|
\ $app->parse_options ("--info", "-q", "Neovim::Ext");
|
||||||
return
|
\ exit $app->doit']
|
||||||
endif
|
|
||||||
call health#report_info('Nvim perl host: '. host)
|
|
||||||
|
|
||||||
let latest_cpan_cmd = 'cpanm --info -q Neovim::Ext'
|
|
||||||
let latest_cpan = s:system(latest_cpan_cmd)
|
let latest_cpan = s:system(latest_cpan_cmd)
|
||||||
if s:shell_error || empty(latest_cpan)
|
if s:shell_error || empty(latest_cpan)
|
||||||
call health#report_error('Failed to run: '. latest_cpan_cmd,
|
call health#report_error('Failed to run: '. latest_cpan_cmd,
|
||||||
@ -735,7 +737,7 @@ function! s:check_perl() abort
|
|||||||
return
|
return
|
||||||
endif
|
endif
|
||||||
|
|
||||||
let current_cpan_cmd = [host, '-W', '-MNeovim::Ext', '-e', 'print $Neovim::Ext::VERSION']
|
let current_cpan_cmd = [perl_exec, '-W', '-MNeovim::Ext', '-e', 'print $Neovim::Ext::VERSION']
|
||||||
let current_cpan = s:system(current_cpan_cmd)
|
let current_cpan = s:system(current_cpan_cmd)
|
||||||
if s:shell_error
|
if s:shell_error
|
||||||
call health#report_error('Failed to run: '. string(current_cpan_cmd),
|
call health#report_error('Failed to run: '. string(current_cpan_cmd),
|
||||||
|
@ -5,21 +5,25 @@ endif
|
|||||||
let s:loaded_perl_provider = 1
|
let s:loaded_perl_provider = 1
|
||||||
|
|
||||||
function! provider#perl#Detect() abort
|
function! provider#perl#Detect() abort
|
||||||
" use g:perl_host_prof if set or check if perl is on the path
|
" use g:perl_host_prog if set or check if perl is on the path
|
||||||
let prog = exepath(get(g:, 'perl_host_prog', 'perl'))
|
let prog = exepath(get(g:, 'perl_host_prog', 'perl'))
|
||||||
if empty(prog)
|
if empty(prog)
|
||||||
return ''
|
return ['', '']
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" if perl is available, make sure we have 5.22+
|
" if perl is available, make sure we have 5.22+
|
||||||
call system([prog, '-e', 'use v5.22'])
|
call system([prog, '-e', 'use v5.22'])
|
||||||
if v:shell_error
|
if v:shell_error
|
||||||
return ''
|
return ['', 'Perl version is too old, 5.22+ required']
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" if perl is available, make sure the required module is available
|
" if perl is available, make sure the required module is available
|
||||||
call system([prog, '-W', '-MNeovim::Ext', '-e', ''])
|
call system([prog, '-W', '-MNeovim::Ext', '-e', ''])
|
||||||
return v:shell_error ? '' : prog
|
if v:shell_error
|
||||||
|
return ['', '"Neovim::Ext" cpan module is not installed']
|
||||||
|
endif
|
||||||
|
|
||||||
|
return [prog, '']
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! provider#perl#Prog() abort
|
function! provider#perl#Prog() abort
|
||||||
@ -64,8 +68,7 @@ function! provider#perl#Call(method, args) abort
|
|||||||
return call('rpcrequest', insert(insert(a:args, 'perl_'.a:method), s:host))
|
return call('rpcrequest', insert(insert(a:args, 'perl_'.a:method), s:host))
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
let s:err = ''
|
let [s:prog, s:err] = provider#perl#Detect()
|
||||||
let s:prog = provider#perl#Detect()
|
|
||||||
let g:loaded_perl_provider = empty(s:prog) ? 1 : 2
|
let g:loaded_perl_provider = empty(s:prog) ? 1 : 2
|
||||||
|
|
||||||
if g:loaded_perl_provider != 2
|
if g:loaded_perl_provider != 2
|
||||||
|
@ -768,9 +768,12 @@ function module.new_pipename()
|
|||||||
end
|
end
|
||||||
|
|
||||||
function module.missing_provider(provider)
|
function module.missing_provider(provider)
|
||||||
if provider == 'ruby' or provider == 'node' or provider == 'perl' then
|
if provider == 'ruby' or provider == 'node' then
|
||||||
local prog = module.funcs['provider#' .. provider .. '#Detect']()
|
local prog = module.funcs['provider#' .. provider .. '#Detect']()
|
||||||
return prog == '' and (provider .. ' not detected') or false
|
return prog == '' and (provider .. ' not detected') or false
|
||||||
|
elseif provider == 'perl' then
|
||||||
|
local errors = module.funcs['provider#'..provider..'#Detect']()[2]
|
||||||
|
return errors ~= '' and errors or false
|
||||||
elseif provider == 'python' or provider == 'python3' then
|
elseif provider == 'python' or provider == 'python3' then
|
||||||
local py_major_version = (provider == 'python3' and 3 or 2)
|
local py_major_version = (provider == 'python3' and 3 or 2)
|
||||||
local errors = module.funcs['provider#pythonx#Detect'](py_major_version)[2]
|
local errors = module.funcs['provider#pythonx#Detect'](py_major_version)[2]
|
||||||
|
Loading…
Reference in New Issue
Block a user