X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a..4cf70291bcc4fbeeb2a6233a121b5d9f9c00344d:/ikiwiki-makerepo diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo index 1c9f256bd..8d590f0c2 100755 --- a/ikiwiki-makerepo +++ b/ikiwiki-makerepo @@ -7,7 +7,7 @@ repository="$3" usage () { echo "usage: ikiwiki-makerepo svn|git|monotone|darcs srcdir repository" >&2 - echo " ikiwiki-makerepo bzr|mercurial|darcs srcdir" >&2 + echo " ikiwiki-makerepo bzr|mercurial srcdir" >&2 exit 1 } @@ -20,7 +20,7 @@ if [ ! -d "$srcdir" ]; then exit 1 fi -if [ "$rcs" != mercurial ] && [ "$rcs" != bzr ] && [ "$rcs" != darcs ]; then +if [ "$rcs" != mercurial ] && [ "$rcs" != bzr ]; then if [ -z "$repository" ]; then echo "you need to specify both a srcdir and a repository for $rcs" >&2 usage @@ -127,15 +127,6 @@ darcs) exit 1 fi - # if only one arg is given, we turn the given srcdir into the darcs - # master repo with a hidden srcdir inside its _darcs directory. - if [ -z "$repository" ]; then - echo "Turning $srcdir into master repo." - repository="$srcdir" - srcdir="$srcdir/_darcs/srcdir" - echo "The new srcdir is $srcdir - adjust ikiwiki.setup accordingly!" - fi - mkdir -p "$repository" cd "$repository" darcs initialize @@ -152,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" ;; *)