summaryrefslogtreecommitdiff
path: root/init.d
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-09-11 16:16:42 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-09-11 16:16:42 -0400
commitc233bd270e29059d660e66120fdca882bff17a5c (patch)
tree7c6e98de64fce30ad776d42ddb17749fb2993405 /init.d
parent0bff9c9ac41f238173661dbeb90617c248e94a8f (diff)
Make etckeeper init -d set up commit hooks that call etckeeper -d.
Note that if you've relied on it setting up such commit hooks for a repo outside of /etc already, it created broken ones that need to be fixed to use -d. Thanks, Wolfgang Karall.
Diffstat (limited to 'init.d')
-rwxr-xr-xinit.d/50vcs-pre-commit-hook8
1 files changed, 4 insertions, 4 deletions
diff --git a/init.d/50vcs-pre-commit-hook b/init.d/50vcs-pre-commit-hook
index 5c63254..de496fe 100755
--- a/init.d/50vcs-pre-commit-hook
+++ b/init.d/50vcs-pre-commit-hook
@@ -5,27 +5,27 @@ case "$VCS" in
git)
if [ -x .git/hooks/pre-commit ]; then
if ! grep -q "etckeeper pre-commit" .git/hooks/pre-commit; then
- echo "etckeeper warning: .git/hooks/pre-commit needs to be manually modified to run: etckeeper pre-commit `pwd`" >&2
+ echo "etckeeper warning: .git/hooks/pre-commit needs to be manually modified to run: etckeeper pre-commit -d `pwd`" >&2
fi
else
cat >.git/hooks/pre-commit <<EOF
#!/bin/sh
# pre-commit hook for etckeeper, to store metadata and do sanity checks
set -e
-etckeeper pre-commit `pwd`
+etckeeper pre-commit -d `pwd`
EOF
chmod +x .git/hooks/pre-commit
fi
;;
hg)
if [ -e .hg/hgrc ] && grep "^\[hooks\]" .hg/hgrc; then
- echo "etckeeper warning: [hooks] section in .hg/hgrc needs to be manually modified to run: etckeeper pre-commit `pwd`" >&2
+ echo "etckeeper warning: [hooks] section in .hg/hgrc needs to be manually modified to run: etckeeper pre-commit -d `pwd`" >&2
else
touch .hg/hgrc
cat >>.hg/hgrc <<EOF
[hooks]
# pre-commit hook for etckeeper, to store metadata and do sanity checks
-precommit = etckeeper pre-commit `pwd`
+precommit = etckeeper pre-commit -d `pwd`
EOF
fi
;;