Update of /cvsroot/leaf/sourceforge/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16278
Modified Files: doc-build.sh Log Message: robustness changes Index: doc-build.sh =================================================================== RCS file: /cvsroot/leaf/sourceforge/admin/doc-build.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** doc-build.sh 29 Mar 2006 23:58:38 -0000 1.8 --- doc-build.sh 5 Apr 2006 14:04:36 -0000 1.9 *************** *** 26,29 **** --- 26,30 ---- #---------------------------------------- + set -e DATE=`date '+%Y-%m-%d %T %Z'` PROJ_DIR=/home/groups/l/le/leaf *************** *** 33,37 **** DB_XSL_CUST="/tmp/persistent/leaf/doc/docbook" LOCKFILE=leafcron.lock ! export XML_CATALOG_FILES="/home/users/m/mh/mhnoyes/docbook-xml-4.4/catalog.xml /etc/xml/catalog" # export XML_DEBUG_CATALOG= --- 34,38 ---- DB_XSL_CUST="/tmp/persistent/leaf/doc/docbook" LOCKFILE=leafcron.lock ! export XML_CATALOG_FILES="/home/groups/l/le/leaf/admin/docbook-xml-4.4/catalog.xml /etc/xml/catalog" # export XML_DEBUG_CATALOG= *************** *** 41,46 **** cleanup () { ! cd "$TMP_DIR" ! rm -rf doc } --- 42,48 ---- cleanup () { ! if [ -e "$TMP_DIR"/doc ]; then ! rm -rf "$TMP_DIR"/doc ! fi } *************** *** 54,59 **** create_lockfile () { ! lockfile -r 0 -l 72000 $LOCKFILE ! check_errors $? "Lockfile creation failed." echo "Got lock file: $LOCKFILE" } --- 56,62 ---- create_lockfile () { ! trap "rm -f $TMP_DIR/$LOCKFILE; exit" INT TERM EXIT ! lockfile -r 0 -l 72000 $TMP_DIR/$LOCKFILE || \ ! check_errors $? "Lockfile creation failed." echo "Got lock file: $LOCKFILE" } *************** *** 61,66 **** export_documents () { cd "$TMP_DIR" ! cvs "$PSERVER" -q export -D "$DATE" -d doc doc ! check_errors $? "CVS export error." ln -s "$DB_XSL"/images doc/docbook/images echo "Options +Indexes --- 64,69 ---- export_documents () { cd "$TMP_DIR" ! cvs "$PSERVER" -q export -D "$DATE" -d doc doc || \ ! check_errors $? "CVS export error." ln -s "$DB_XSL"/images doc/docbook/images echo "Options +Indexes *************** *** 70,75 **** validate_documents () { cd "$TMP_DIR"/doc ! xmllint --noout --xinclude --postvalid --noent leaf-doc-set.xml ! check_errors $? "Document validation failure!" echo "Document validation success." } --- 73,78 ---- validate_documents () { cd "$TMP_DIR"/doc ! xmllint --noout --xinclude --postvalid --noent leaf-doc-set.xml || \ ! check_errors $? "Document validation failure!" echo "Document validation success." } *************** *** 77,81 **** build_doc () { cd "$TMP_DIR"/doc ! xsltproc --xinclude "$DB_XSL"/xhtml/chunk.xsl leaf-doc-set.xml } --- 80,86 ---- build_doc () { cd "$TMP_DIR"/doc ! xsltproc --xinclude "$DB_XSL"/xhtml/chunk.xsl leaf-doc-set.xml || \ ! check_errors $? "XSLT failure!" ! echo "DocBook XML XSLT complete." } *************** *** 90,93 **** --- 95,105 ---- } + replace_old () { + if [ -e "$PROJ_DIR"/doc ]; then + rm -rf "$PROJ_DIR"/doc + fi + mv "$TMP_DIR"/doc "$PROJ_DIR"/ + } + #---------------------------------------- *************** *** 109,117 **** echo --- echo Converting man pages to html and pdf ! build_man echo --- echo Building Documentation ! build_doc ! rm -f ~/$LOCKFILE --- 121,132 ---- echo --- echo Converting man pages to html and pdf ! # build_man echo --- echo Building Documentation ! # build_doc ! # replace_old ! ! rm -f $TMP_DIR/$LOCKFILE ! trap - INT TERM EXIT \ No newline at end of file ------------------------------------------------------- This SF.Net email is sponsored by xPML, a groundbreaking scripting language that extends applications into web and mobile media. Attend the live webcast and join the prime developer group breaking into this new coding territory! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642 _______________________________________________ leaf-cvs-commits mailing list leaf-cvs-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-cvs-commits