aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2018-01-23 15:49:56 +1300
committerTom Ryder <tom@sanctum.geek.nz>2018-01-23 15:49:56 +1300
commitc4dc0fecd7ebed748f59b87da99986ab984b7bdf (patch)
treec27b18c794dc757384e13d28eac7bfd9d0d717e7
parentMerge branch 'release/v0.26.0' into develop (diff)
parentBump version number to 0.26.1 (hotfix) (diff)
downloaddotfiles-c4dc0fecd7ebed748f59b87da99986ab984b7bdf.tar.gz
dotfiles-c4dc0fecd7ebed748f59b87da99986ab984b7bdf.zip
Merge branch 'hotfix/v0.26.1' into develop
* hotfix/v0.26.1: Bump version number to 0.26.1 (hotfix) Exclude root-level files from Vim bundles Restore install-vim-autoload target
-rw-r--r--Makefile11
-rw-r--r--VERSION4
2 files changed, 10 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index c4afdac8..13a7db7a 100644
--- a/Makefile
+++ b/Makefile
@@ -497,6 +497,7 @@ install-urxvt: urxvt/ext/select
-exec cp -p -- {} $(HOME)/.urxvt/ext \;
install-vim: install-vim-after \
+ install-vim-autoload \
install-vim-bundle \
install-vim-compiler \
install-vim-config \
@@ -524,11 +525,15 @@ install-vim-after-syntax:
mkdir -p $(HOME)/.vim/after/syntax
cp -p -- vim/after/syntax/*.vim $(HOME)/.vim/after/syntax
+install-vim-autoload:
+ mkdir -p -- $(HOME)/.vim/autoload
+ cp -p -- vim/autoload/*.vim $(HOME)/.vim/autoload
+
install-vim-bundle: install-vim-config
- find vim/bundle -name .git -prune -o \
+ find vim/bundle/*/* \
-type d -exec sh -c \
- 'mkdir -p -- $(HOME)/.vim/"$${1#vim/bundle/*/}"' _ {} \; \
- -o \
+ 'mkdir -p -- $(HOME)/.vim/"$${1#vim/bundle/*/}"' _ {} \;
+ find vim/bundle/*/*/* \
-type f -exec sh -c \
'cp -p -- "$$1" $(HOME)/.vim/"$${1#vim/bundle/*/}"' _ {} \;
diff --git a/VERSION b/VERSION
index 5d5caa1e..78db6a83 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v0.26.0
-Tue Jan 23 02:00:24 UTC 2018
+tejr dotfiles v0.26.1
+Tue Jan 23 02:48:43 UTC 2018