diff options
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rwxr-xr-x | bundle-update.sh | 25 | ||||
| m--------- | pack/bundle/start/YouCompleteMe | 0 | ||||
| m--------- | pack/bundle/start/airline | 0 | ||||
| m--------- | pack/bundle/start/markdown | 0 | ||||
| m--------- | pack/bundle/start/tabular | 0 |
6 files changed, 17 insertions, 12 deletions
diff --git a/.gitmodules b/.gitmodules index 60039ff..224110e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "bundle/markdown"] path = pack/bundle/start/markdown - url = https://github.com/plasticboy/vim-markdown.git + url = https://github.com/preservim/vim-markdown.git [submodule "bundle/tabular"] path = pack/bundle/start/tabular url = https://github.com/godlygeek/tabular.git @@ -9,7 +9,7 @@ url = https://github.com/mtth/scratch.vim.git [submodule "bundle/airline"] path = pack/bundle/start/airline - url = https://github.com/bling/vim-airline.git + url = https://github.com/vim-airline/vim-airline.git [submodule "bundle/grammarous"] path = pack/bundle/start/grammarous url = https://github.com/rhysd/vim-grammarous.git diff --git a/bundle-update.sh b/bundle-update.sh index 578d1e8..28d7185 100755 --- a/bundle-update.sh +++ b/bundle-update.sh @@ -1,15 +1,20 @@ #!/bin/sh wd=$(dirname $0) -path="pack/bundle/start" -branch=$(git branch --show-current) -for i in $(ls $wd/$path); do - pushd $wd/$path/$i - git pull origin $branch - popd > /dev/null -done +cd "$wd" +echo "Syncing submodules..." +git submodule sync --recursive +echo "Updating submodules to latest upstream..." +git submodule update --init --recursive --remote -cd $wd -git add . -git commit -m "Bundle update `date`" +# Clean YCM to ensure a fresh state if needed +if [ -d "pack/bundle/start/YouCompleteMe" ]; then + echo "Cleaning YouCompleteMe..." + (cd pack/bundle/start/YouCompleteMe && git clean -fdx && git checkout .) +fi + +echo "Staging changes..." +git add .gitmodules bundle-update.sh pack/bundle/start/ +git commit -m "Bundle update $(date)" +echo "Update complete." diff --git a/pack/bundle/start/YouCompleteMe b/pack/bundle/start/YouCompleteMe -Subproject cc9a3ae3efdcc7d038aab0620ea28882533c236 +Subproject 6a52780a22dfd4ddafbe23c0d2c2a2107ceeb39 diff --git a/pack/bundle/start/airline b/pack/bundle/start/airline -Subproject 3b9e149e19ed58dee66e4842626751e329e1bd9 +Subproject 609e5c0ee171c370ad727b0b833e66fd34772ae diff --git a/pack/bundle/start/markdown b/pack/bundle/start/markdown -Subproject 3a9643961233c2812816078af8bd1eaabc530dc +Subproject 1bc9d0cd8e1cc3e901b0a49c2b50a843f1c8939 diff --git a/pack/bundle/start/tabular b/pack/bundle/start/tabular -Subproject 339091ac4dd1f17e225fe7d57b48aff55f99b23 +Subproject 12437cd1b53488e24936ec4b091c9324cafee31 |