summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-04-04 18:17:38 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-04-04 18:17:38 -0400
commita9c0d7e288d06a43e4e3d03e3ff8496e99e80962 (patch)
tree6ada7fb62bde52bb82782b190858772675fbe6cb
parent3c17adea550608cde14f54dae5964d55fa3fe79d (diff)
support darcs in setup automator
use a consistent name for the ikiwiki wrapper file
-rw-r--r--IkiWiki/Setup/Automator.pm3
-rw-r--r--doc/rcs/darcs.mdwn2
-rwxr-xr-xikiwiki-makerepo2
3 files changed, 5 insertions, 2 deletions
diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 7d9eca3af..f1ed57b4b 100644
--- a/IkiWiki/Setup/Automator.pm
+++ b/IkiWiki/Setup/Automator.pm
@@ -58,6 +58,9 @@ sub import (@) {
elsif ($config{rcs} eq 'monotone') {
$config{mtn_wrapper}=$config{srcdir}."_MTN/ikiwiki-netsync-hook";
}
+ elsif ($config{rcs} eq 'darcs') {
+ $config{darcs_wrapper}=$config{repository}."_darcs/ikiwiki-wrapper";
+ }
elsif ($config{rcs} eq 'bzr') {
# TODO
}
diff --git a/doc/rcs/darcs.mdwn b/doc/rcs/darcs.mdwn
index 7f66d0808..fbb9bcede 100644
--- a/doc/rcs/darcs.mdwn
+++ b/doc/rcs/darcs.mdwn
@@ -9,7 +9,7 @@ automatically commits edited pages, and uses the Darcs history to generate the
Example for a `_darcs/prefs/defaults` file in `$SRCDIR`:
- apply posthook /path/to/repository/_darcs/ikiwrapper
+ apply posthook /path/to/repository/_darcs/ikiwiki-wrapper
apply run-posthook
See also [[todo/darcs|todo/darcs]]
diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index 787611ac1..8d590f0c2 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -143,7 +143,7 @@ darcs)
# set up master repo's apply hook and tell user to adjust it if desired
darcsdefaults="$repository/_darcs/prefs/defaults"
echo "Preconfiguring apply hook in $darcsdefaults - adjust as desired!"
- echo "apply posthook $repository/_darcs/ikiwrapper" >> "$darcsdefaults"
+ echo "apply posthook $repository/_darcs/ikiwiki-wrapper" >> "$darcsdefaults"
echo "apply run-posthook" >> "$darcsdefaults"
;;
*)