unifying code

This commit is contained in:
gmarik 2011-08-09 16:49:56 -05:00
parent 3284414c6a
commit 3052422f50

View File

@ -4,17 +4,42 @@ func! vundle#installer#new(bang, ...) abort
\ map(copy(a:000), 'vundle#config#init_bundle(v:val, {})') \ map(copy(a:000), 'vundle#config#init_bundle(v:val, {})')
let names = map(copy(bundles), 'v:val.name_spec') let names = map(copy(bundles), 'v:val.name_spec')
call vundle#scripts#view('Installer',['" Installing'], names) call vundle#scripts#view('Installer',['" Installing'], copy(names))
redraw! redraw!
sleep 1m sleep 1m
for l in range(1,len(names)) for n in names
redraw! redraw!
exec ':norm '.(a:bang ? 'I' : 'i')
echo 'Processing '.n
call s:sign('active')
sleep 1m sleep 1m
let status = call('vundle#installer#install', [a:bang, n])
call s:sign(status)
if 'updated' == status
echo n.' installed'
elseif 'todate' == status
echo n.' already installed'
elseif 'deleted' == status
echo n.' deleted'
elseif 'error' == status
echohl Error
echo 'Error processing '.n
echohl None
sleep 1
else
throw 'whoops, unknown status:'.status
endif
" goto next one " goto next one
exec ':+1' exec ':+1'
setl nomodified
endfor endfor
redraw! redraw!
@ -38,27 +63,7 @@ func! vundle#installer#install(bang, name) abort
let b = vundle#config#init_bundle(a:name, {}) let b = vundle#config#init_bundle(a:name, {})
echo 'Installing '.b.name return s:sync(a:bang, b)
call s:sign('active')
sleep 1m
let status = s:sync(a:bang, b)
call s:sign(status)
if 'updated' == status
echo b.name.' installed'
elseif 'todate' == status
echo b.name.' already installed'
elseif 'error' == status
echohl Error
echo 'Error installing '.b.name_spec
echohl None
sleep 1
else
throw 'whoops, unknown status:'.status
endif
set nomodified
endf endf
func! vundle#installer#helptags(bundles) abort func! vundle#installer#helptags(bundles) abort
@ -123,10 +128,8 @@ func! vundle#installer#delete(bang, dir_name) abort
call s:log('> '.out) call s:log('> '.out)
if 0 != v:shell_error if 0 != v:shell_error
call s:sign('error')
return 'error' return 'error'
else else
call s:sign('deleted')
return 'deleted' return 'deleted'
endif endif
endf endf