Build-depend on libmagickcore-6.q16-2-extra | libmagickcore-extra so we can thumbnail...

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

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index 1c9f256bd5a7b3b65a2b21073c5a35f93db9ae78..c3a13c214330e32fe9473f6891608b6b53872f85 100755 (executable)
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -6,8 +6,8 @@ srcdir="$2"
 repository="$3"
 
 usage () {
-       echo "usage: ikiwiki-makerepo svn|git|monotone|darcs srcdir repository" >&2
-       echo "       ikiwiki-makerepo bzr|mercurial|darcs srcdir" >&2
+       echo "usage: ikiwiki-makerepo svn|git|svn|monotone|darcs|cvs srcdir repository" >&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
@@ -29,7 +29,7 @@ if [ "$rcs" != mercurial ] && [ "$rcs" != bzr ] && [ "$rcs" != darcs ]; then
                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
@@ -39,6 +39,30 @@ fi
 echo "Importing $srcdir into $rcs"
 
 case "$rcs" in
+cvs)
+       if [ -e "$srcdir/CVS" ]; then
+               echo "$srcdir already seems to be a cvs working copy" >&2
+               exit 1
+       fi
+       cvs -Q -d "$repository" init
+       cd "$srcdir"/..
+       cvs -Q -d "$repository" get -P CVSROOT
+       cd CVSROOT
+       echo .ikiwiki >> cvsignore
+       cvs -Q add cvsignore
+       echo "^ikiwiki $repository/CVSROOT/post-commit %{sVv} &" >> loginfo
+       cvs -Q commit -m "ikiwiki-makerepo setup" cvsignore loginfo
+       cd ..
+       rm -rf CVSROOT
+       cd "$srcdir"
+       cvs -Q -d "$repository" import -m "initial import" ikiwiki IKIWIKI PRE_CVS
+       cd ..
+       mv "$srcdir" "$srcdir.orig"
+       cvs -Q -d "$repository" get -P -d "$(basename "$srcdir")" ikiwiki
+       [ -d "$srcdir.orig/.ikiwiki" ] && mv "$srcdir.orig/.ikiwiki" "$srcdir"
+       rm -rf "$srcdir.orig"
+       echo "Directory $srcdir is now a checkout of $rcs repository $repository"
+;;
 svn)
        if [ -e "$srcdir/.svn" ]; then
                echo "$srcdir already seems to be a svn working copy" >&2
@@ -62,7 +86,6 @@ git)
        cd "$srcdir"
        git init
        echo /.ikiwiki > .gitignore
-       echo /recentchanges >> .gitignore
        git add .
        git commit -m "initial commit"
        git remote add origin "$repository"
@@ -127,18 +150,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 +165,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"
 ;;
 *)