Quellcode durchsuchen

Suppress vim-plug warnings, deprecate zfs-destroy-auto-snaps

Also change `pdv` referring to the `.vim` folder directly.
Weiyi Lou vor 9 Jahren
Ursprung
Commit
a5164315cf
3 geänderte Dateien mit 8 neuen und 2 gelöschten Zeilen
  1. 6 0
      bin/zfs-destroy-auto-snaps
  2. 1 1
      vim/plugins.vim
  3. 1 1
      vim/settings/commenting.vim

+ 6 - 0
bin/zfs-destroy-auto-snaps

@@ -4,6 +4,12 @@
 
 if [ -n "${1}" ]
 then
+  echo "THIS SCRIPT IS DEPRECATED!"
+  echo "You should install and run \`zfsnap\` (http://www.zfsnap.org/) instead."
+  echo "Still run this script? (y/N)"
+  read ANS
+  [[ $ANS != "y" ]] && exit;
+
   echo "This will *RECURSIVELY* destroy all ZFS auto snapshots (not your manually created snaps). "
   echo "Parent and child filesystem snapshots to be destroyed: ${1}"
   echo "Continue? (y/n)"

+ 1 - 1
vim/plugins.vim

@@ -8,7 +8,7 @@
 " - setup.sh
 "
 
-call plug#begin('~/dotfiles/vim/plugged')
+silent! call plug#begin('~/dotfiles/vim/plugged')
 
 " General {{{
 Plug 'Raimondi/delimitMate'

+ 1 - 1
vim/settings/commenting.vim

@@ -3,5 +3,5 @@ nnoremap <silent> cc :call NERDComment("n", "toggle")<CR>
 vnoremap <silent> cc <Esc>:call NERDComment("x", "toggle")<CR>
 
 " Add PHP docblocks.
-let g:pdv_template_dir = expand('~/.vim/plugged/pdv/templates')
+let g:pdv_template_dir = expand('~/dotfiles/vim/plugged/pdv/templates')
 map <Leader>b :call pdv#DocumentCurrentLine()<CR>