diff --git a/plug.vim b/plug.vim index fef604f..8640180 100644 --- a/plug.vim +++ b/plug.vim @@ -789,7 +789,7 @@ function! s:update_parallel(pull, todo, threads) logh.call end } - bt = proc { |cmd, name, type, cleanup| + bt = proc { |cmd, name, type| tried = timeout = 0 begin tried += 1 @@ -820,7 +820,6 @@ 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' : '' @@ -869,7 +868,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" + ret, data = bt.call "#{cd} #{dir} && git rev-parse --abbrev-ref HEAD 2>&1 && git config remote.origin.url", nil, nil current_uri = data.lines.to_a.last if !ret if data =~ /^Interrupted|^Timeout/ @@ -892,9 +891,7 @@ 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, proc { - FileUtils.rm_rf dir - } + bt.call "(git clone #{progress} --recursive #{uri} -b #{branch} #{d} 2>&1 && cd #{esc dir} && #{subm})", name, :install end mtx.synchronize { VIM::command("let s:prev_update.new['#{name}'] = 1") } if !exists && ok log.call name, result, ok