kevin/vim-plug
1
Fork 0
mirror of https://github.com/junegunn/vim-plug.git synced 2024-12-23 20:45:31 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remove plugin directory on failure during installation (#75)

Browse Source 
If installation process is terminated during `git submodule ...`, the
directory ends up in an inconsistent state. This commit ensures
that the directory is removed on failure.

Fixed Ruby 1.8.7 compatibility.
This commit is contained in:
Junegunn Choi 2014-09-14 13:54:20 +09:00
parent f3e2d214df
commit 7b7778d5ba
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plug.vim
View File

@ -789,7 +789,7 @@ function! s:update_parallel(pull, todo, threads)
logh.call
end
}
bt = proc { |cmd, name, type|
bt = proc { |cmd, name, type, cleanup|
tried = timeout = 0
begin
tried += 1
@ -820,6 +820,7 @@ function! s:update_parallel(pull, todo, threads)
killall fd.pid
fd.close
end
cleanup.call if cleanup
if e.is_a?(Timeout::Error) && tried < tries
3.downto(1) do |countdown|
s = countdown > 1 ? 's' : ''
@ -868,7 +869,7 @@ function! s:update_parallel(pull, todo, threads)
ok, result =
if exists
dir = esc dir
ret, data = bt.call "#{cd} #{dir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url", nil, nil
ret, data = bt.call "#{cd} #{dir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url", nil, nil, nil
current_uri = data.lines.to_a.last
if !ret
if data =~ /^Interrupted|^Timeout/
@ -883,7 +884,7 @@ function! s:update_parallel(pull, todo, threads)
else
if pull
log.call name, 'Updating ...', :update
bt.call "#{cd} #{dir} && git checkout -q #{branch} 2>&1 && (git pull --no-rebase origin #{branch} #{progress} 2>&1 && #{subm})", name, :update
bt.call "#{cd} #{dir} && git checkout -q #{branch} 2>&1 && (git pull --no-rebase origin #{branch} #{progress} 2>&1 && #{subm})", name, :update, nil
else
[true, skip]
end
@ -891,7 +892,9 @@ function! s:update_parallel(pull, todo, threads)
else
d = esc dir.sub(%r{[\\/]+$}, '')
log.call name, 'Installing ...', :install
bt.call "(git clone #{progress} --recursive #{uri} -b #{branch} #{d} 2>&1 && cd #{esc dir} && #{subm})", name, :install
bt.call "(git clone #{progress} --recursive #{uri} -b #{branch} #{d} 2>&1 && cd #{esc dir} && #{subm})", name, :install, proc {
FileUtils.rm_rf dir
}
end
mtx.synchronize { VIM::command("let s:prev_update.new['#{name}'] = 1") } if !exists && ok
log.call name, result, ok