X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/2b7a003794537ebf8e02f122cc2743834b47a396..efe05d18ae5633d7a186d2cb97377b6e08ea8f4e:/ikiwiki-makerepo?ds=sidebyside

diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index bf33a3a80..f1c44067e 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -6,7 +6,7 @@ srcdir="$2"
 repository="$3"
 
 usage () {
-	echo "usage: ikiwiki-makerepo cvs|svn|git|monotone|darcs srcdir repository" >&2
+	echo "usage: ikiwiki-makerepo svn|git|svn|monotone|darcs|cvs srcdir repository" >&2
 	echo "       ikiwiki-makerepo bzr|mercurial srcdir" >&2
 	exit 1
 }
@@ -45,38 +45,12 @@ cvs)
 		exit 1
 	fi
 	cvs -Q -d "$repository" init
-	cat > "$repository/CVSROOT/post-commit-wrapper" <<EOF
-#!/bin/sh
-
-IKIWIKI_POST_COMMIT_HOOK="$repository/CVSROOT/post-commit"
-
-exists_ikiwiki_post_commit_hook() {
-	[ -x \$IKIWIKI_POST_COMMIT_HOOK ];
-}
-
-called_with_exactly_one_dir() {
-	echo "\$@" | grep 'New directory' >/dev/null 2>&1
-}
-
-main() {
-	exists_ikiwiki_post_commit_hook || exit 0
-	called_with_exactly_one_dir "\$@" && exit 0
-	# Return from commit and relinquish write lock. ikiwiki post-commit
-	# wants to "cvs update", which wants to take a read lock.
-	\$IKIWIKI_POST_COMMIT_HOOK &
-	return 0
-}
-
-main "\$@"
-exit \$?
-EOF
-	chmod +x "$repository/CVSROOT/post-commit-wrapper"
 	cd "$srcdir"/..
 	cvs -Q -d "$repository" get -P CVSROOT
 	cd CVSROOT
 	echo .ikiwiki >> cvsignore
 	cvs -Q add cvsignore
-	echo "^ikiwiki $repository/CVSROOT/post-commit-wrapper %{sVv}" >> loginfo
+	echo "^ikiwiki $repository/CVSROOT/post-commit %{sVv} &" >> loginfo
 	cvs -Q commit -m "ikiwiki-makerepo setup" cvsignore loginfo
 	cd ..
 	rm -rf CVSROOT
@@ -111,8 +85,13 @@ git)
 
 	cd "$srcdir"
 	git init
+	if [ -z "$(git config user.name)" ]; then
+		git config user.name IkiWiki
+	fi
+	if [ -z "$(git config user.email)" ]; then
+		git config user.email ikiwiki.info
+	fi
 	echo /.ikiwiki > .gitignore
-	echo /recentchanges >> .gitignore
 	git add .
 	git commit -m "initial commit"
 	git remote add origin "$repository"