projects
/
mirror
/
dsa-puppet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade qemu-system-aarch64-wrapper for ganeti 2.16
[mirror/dsa-puppet.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
d3f0af6
..
76f1bd1
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,10
+1,9
@@
SHELL = /bin/bash
.PHONY: all
SHELL = /bin/bash
.PHONY: all
-all: git_hooks
+all: git_hooks
vim_helpers
$(info make git_hooks: set up Git repository hooks)
$(info make git_hooks: set up Git repository hooks)
-
-puppet_parseonly = puppet parser validate
+ $(info make vim_hooks: set up Vim settings for puppet files)
.PHONY: git_hooks
git_hooks:
.PHONY: git_hooks
git_hooks:
@@
-17,8
+16,9
@@
git_hooks:
@if git config --get branch.master.rebase true >/dev/null; then \
git config branch.master.rebase true; \
fi
@if git config --get branch.master.rebase true >/dev/null; then \
git config branch.master.rebase true; \
fi
- @ln -sf ../../tools/git
_
hooks/pre-commit .git/hooks/pre-commit
+ @ln -sf ../../tools/git
-
hooks/pre-commit .git/hooks/pre-commit
@$(RM) .git/hooks/post-commit
@$(RM) .git/hooks/post-commit
+.PHONY: vim_helpers
vim_helpers:
vim_helpers:
-
rsync -a tools/vim
~/.vim/
+
@rsync -a tools/vim/
~/.vim/