diff --git a/autoload/vundle/installer.vim b/autoload/vundle/installer.vim index 2b69153..7f84fb5 100644 --- a/autoload/vundle/installer.vim +++ b/autoload/vundle/installer.vim @@ -4,7 +4,7 @@ func! vundle#installer#new(bang, ...) abort \ map(copy(a:000), 'vundle#config#init_bundle(v:val, {})') let names = vundle#scripts#bundle_names(map(copy(bundles), 'v:val.name_spec')) - call vundle#scripts#view('Installer',['" Installing bundles'], names + ['Helptags']) + call vundle#scripts#view('Installer',['" Installing bundles to '.expand(g:bundle_dir)], names + ['Helptags']) call s:process(a:bang, (a:bang ? 'I':'i')) @@ -132,8 +132,8 @@ func! vundle#installer#clean(bang) abort call vundle#scripts#view('clean', headers, names) redraw! - if (a:bang || empty(names) || input('Continute ? [ y/n ]:') =~? 'y') - call s:process(a:bang, 'd') + if (a:bang || empty(names) || input('Continue ? [ y/n ]:') =~? 'y') + call s:process(a:bang, 'D') endif endf diff --git a/autoload/vundle/scripts.vim b/autoload/vundle/scripts.vim index 0200a03..e856299 100644 --- a/autoload/vundle/scripts.vim +++ b/autoload/vundle/scripts.vim @@ -23,8 +23,8 @@ func! vundle#scripts#complete(a,c,d) endf func! s:view_log() - if !exists('g:vundle_log_file') - let g:vundle_log_file = expand('$HOME/.vim-vundle/vundle.log') + if !exists('g:vundle_log_file') + let g:vundle_log_file = tempname() endif call writefile(g:vundle_log, g:vundle_log_file) @@ -38,7 +38,7 @@ func vundle#scripts#bundle_names(names) endf func! vundle#scripts#view(title, headers, results) - if exists('g:vundle_view') + if exists('g:vundle_view') && bufloaded(g:vundle_view) exec g:vundle_view.'bd!' endif @@ -69,7 +69,7 @@ func! vundle#scripts#view(title, headers, results) com! -buffer -nargs=0 VundleLog call s:view_log() nnoremap q :silent bd! - nnoremap d :exec 'Delete'.getline('.') + nnoremap D :exec 'Delete'.getline('.') nnoremap i :exec 'Install'.getline('.') nnoremap I :exec 'Install'.substitute(getline('.'), '^Bundle ', 'Bundle! ', '') @@ -115,7 +115,7 @@ func! s:fetch_scripts(to) endf func! s:load_scripts(bang) - let f = expand('$HOME/.vim-vundle/vim-scripts.org.json') + let f = expand(g:bundle_dir.'/.vundle/script-names.vim-scripts.org.json') if a:bang || !filereadable(f) if 0 != s:fetch_scripts(f) return []