diff --git a/update b/update index 9b8f01f..7b4c82f 100755 --- a/update +++ b/update @@ -2,14 +2,11 @@ cd "${0%/*}" +[[ $(cat .git/modules/vim/bundle/vim-coloresque/HEAD | grep -c 0c21b1469993e610600e88e734ffe90b9c10a514) = 1 ]] && git checkout -- vim/bundle/vim-coloresque + git pull origin git submodule update --init --recursive -if [ $(cat .git/modules/vim/bundle/vim-coloresque/HEAD | grep -c 0c21b1469993e610600e88e734ffe90b9c10a514) = 1 ]; then - git checkout -- vim/bundle/vim-coloresque - git rm --cached vim/bundle/vim-coloresque -fi - [[ -f .gitmodules ]] && for each in vim/bundle/*; do if [ -d "$each" ]; then if [ -f "${each}/.git" ]; then diff --git a/vimrc b/vimrc index f567107..a8c2b1a 100644 --- a/vimrc +++ b/vimrc @@ -7,7 +7,6 @@ " License: MIT " " " "========================================" -" "USER CONFIG SETTINGS: {{{ "Darkcloud Vim Folder: @@ -44,7 +43,5 @@ "}}} "LOAD USER CONFIG FILE: {{{ - if filereadable($VIMRUNTIME."/vimrc.user") - runtime vimrc.user - endif + runtime vimrc.user "}}}