Home site is MIA. Where is it?

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

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index 787611ac1f0b0ccb564f9490f7a195287513a822..7f82e717715ef8f446f941f36a154757d6f106ec 100755 (executable)
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -29,7 +29,7 @@ if [ "$rcs" != mercurial ] && [ "$rcs" != bzr ]; then
                echo "repository $repository already exists, aborting" >&2 
                exit 1
        fi
                echo "repository $repository already exists, aborting" >&2 
                exit 1
        fi

-       repository="$(perl -e 'use Cwd q{abs_path}; $r=shift; $r=~s/\/*$//; print abs_path($r)' "$repository")"
+       repository="$(perl -e 'use Cwd; $r=shift; $r=getcwd.q{/}.$r if $r!~m!^/!; print $r' "$repository")"

        if [ -z "$repository" ]; then
                echo "internal error finding repository abs_path" >&2
                exit 1
        if [ -z "$repository" ]; then
                echo "internal error finding repository abs_path" >&2
                exit 1


@@ -128,8 +128,7 @@ darcs)
        fi
 
        mkdir -p "$repository"
        fi
 
        mkdir -p "$repository"

-       cd "$repository"
-       darcs initialize
+       (cd "$repository" && darcs initialize)

 
        mkdir -p "$srcdir"
        cd "$srcdir"
 
        mkdir -p "$srcdir"
        cd "$srcdir"


@@ -143,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!"
        # 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"
 ;;
 *)
        echo "apply run-posthook" >> "$darcsdefaults"
 ;;
 *)