pagestats: add `among` parameter, which only counts links from specified pages

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

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index 1c9f256bd5a7b3b65a2b21073c5a35f93db9ae78..7f82e717715ef8f446f941f36a154757d6f106ec 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
 
 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
 }
 
        exit 1
 }
 


@@ -20,7 +20,7 @@ if [ ! -d "$srcdir" ]; then
        exit 1
 fi
 
        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
        if [ -z "$repository" ]; then
                echo "you need to specify both a srcdir and a repository for $rcs" >&2
                usage


@@ -29,7 +29,7 @@ if [ "$rcs" != mercurial ] && [ "$rcs" != bzr ] && [ "$rcs" != darcs ]; 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


@@ -127,18 +127,8 @@ darcs)
                exit 1
        fi
 
                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"
        mkdir -p "$repository"

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

 
        mkdir -p "$srcdir"
        cd "$srcdir"
 
        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!"
        # 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"
 ;;
 *)