No more wrapper wrapper.

master
Amitai Schlair 2009-08-22 02:05:59 -04:00
parent 524de4db26
commit 8f15311597
1 changed files with 1 additions and 27 deletions

View File

@ -45,38 +45,12 @@ cvs)
exit 1 exit 1
fi fi
cvs -Q -d "$repository" init 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"/.. cd "$srcdir"/..
cvs -Q -d "$repository" get -P CVSROOT cvs -Q -d "$repository" get -P CVSROOT
cd CVSROOT cd CVSROOT
echo .ikiwiki >> cvsignore echo .ikiwiki >> cvsignore
cvs -Q add 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 cvs -Q commit -m "ikiwiki-makerepo setup" cvsignore loginfo
cd .. cd ..
rm -rf CVSROOT rm -rf CVSROOT