Here is a patch to update.sh which is designed for the situation where a new version of a book is uploaded (to content/books_cvs/docbookwiki), and you wish to update the version in CVS, but it contains new sections not in the old book. To do this you would run "update.sh $book_id $lang_id workspace".

Normally, update.sh would fail in this case because the new sections have not previously been checked in to CVS, so although they are exploded correctly in content/books/$book_id, the CVS commit that is run there does not pick them up, hence the CVS update later performed in the workspace misses the new sections.

This patch is for the CVS branch of DocBookWiki (cvs-0.7.3) but I imagine the same basic problem applies to the SVN version and that an analogous patch would be required. Someone else can write that patch, though since I am happy to stick with CVS.

--- update.sh.dist      2006-07-06 13:11:41.000000000 +0800
+++ update.sh   2006-07-06 13:12:59.000000000 +0800
@@ -36,11 +36,22 @@
 then
   cd ..
   cd books/$book_id
+  cvs update
+  TMP=/tmp/docbookwiki_$$
+  mkdir $TMP
+ find ../../workspace/books/$book_id -printf %P\\n | sort > $TMP/workspacedir.txt
+  find . -printf %P\\n | sort > $TMP/cvsdir.txt
+ diff -u $TMP/workspacedir.txt $TMP/cvsdir.txt | grep ^+ | sed 's/.//' | grep chapter > $TMP/cvsadd.txt
+  while read i
+    do cvs -Q add -m "update.sh" $i
+  done < $TMP/cvsadd.txt
+  rm -rf $TMP
   cvs -Q commit -m "update.sh"
   cd ../..
   cd workspace/books/$book_id
-  cvs -Q update
+  cvs -Q update -d

--
Jeremy Malcolm LLB (Hons) B Com
Internet and Open Source lawyer, IT consultant, actor
host -t NAPTR 1.0.8.0.3.1.2.9.8.1.6.e164.org|awk -F! '{print $3}'

Attachment: smime.p7s
Description: S/MIME Cryptographic Signature

Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Doc-book-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/doc-book-users

Reply via email to