support darcs in setup automator

use a consistent name for the ikiwiki wrapper file

diff --git a/IkiWiki/Setup/Automator.pm b/IkiWiki/Setup/Automator.pm
index 7d9eca3afef7f929edfb8a1c4ddc1da2fc3be875..f1ed57b4b9f683bbf9f9e6e50756b1163d67b2bd 100644 (file)
--- 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 7f66d08089b31a7f3ea9b3d7a50864fc5d8217a9..fbb9bcede30706125a159a45a9ce1424e4f7749c 100644 (file)
--- 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 787611ac1f0b0ccb564f9490f7a195287513a822..8d590f0c20e114ff21298ec3f647617d6c41c8cf 100755 (executable)
--- 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"
 ;;
 *)