add a ' ' to prevent autosmiley eating a )

[git.ikiwiki.info.git] / ikiwiki-makerepo

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index 78eea8f537b98df43df51c0bcb1441ee18efeabd..31053503066e493a4638a3d9d514440d40256a5e 100755 (executable)
--- 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
@@ -75,7 +75,7 @@ mercurial)
        hg init "$srcdir"
        cd "$srcdir"
        echo .ikiwiki > .hgignore
-       hg add * .hgignore
+       hg add
        hg commit -m "initial import"
        echo "Directory $srcdir is now set up as a mercurial repository"
 ;;
@@ -83,7 +83,7 @@ bzr)
        bzr init "$srcdir"
        cd "$srcdir"
        echo .ikiwiki > .bzrignore
-       bzr add * .bzrignore
+       bzr add
        bzr commit -m "initial import"
        echo "Directory $srcdir is now set up as a bzr repository"
 ;;
@@ -127,18 +127,8 @@ 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
+       (cd "$repository" && darcs initialize)
 
        mkdir -p "$srcdir"
        cd "$srcdir"
@@ -152,7 +142,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"
 ;;
 *)