From 8f15311597c257eca37c1f20769b80ef8f6c82c0 Mon Sep 17 00:00:00 2001
From: Amitai Schlair <schmonz@magnetic-babysitter.(none)>
Date: Sat, 22 Aug 2009 02:05:59 -0400
Subject: [PATCH] No more wrapper wrapper.
---
ikiwiki-makerepo | 28 +---------------------------
1 file changed, 1 insertion(+), 27 deletions(-)
diff --git a/ikiwiki-makerepo b/ikiwiki-makerepo
index bf33a3a80..aca8da153 100755
--- a/ikiwiki-makerepo
+++ b/ikiwiki-makerepo
@@ -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
--
2.39.5