Changeset 28240 for other-projects/nightly-tasks/diffcol
- Timestamp:
- 2013-09-06T22:09:07+12:00 (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
other-projects/nightly-tasks/diffcol/trunk/gen-model-colls.sh
r28227 r28240 285 285 echo "add_col_archives_index: $collection does not exist in model-collect" 286 286 return; 287 fi 288 289 # copy across collect.cfg file if it has been modified 290 `diff collect/$collection/etc/collect.cfg model-collect/$collection/etc/collect.cfg` 291 status=$? 292 if [ "$status" -eq "1" ]; then 293 cp collect/$collection/etc/collect.cfg model-collect/$collection/etc/collect.cfg 287 294 fi 288 295 … … 365 372 echo "update_single_collection: $collection does not exist in model-collect" 366 373 return; 374 fi 375 376 # copy across collect.cfg file if it has been modified 377 `diff collect/$collection/etc/collect.cfg model-collect/$collection/etc/collect.cfg` 378 status=$? 379 if [ "$status" -eq "1" ]; then 380 cp collect/$collection/etc/collect.cfg model-collect/$collection/etc/collect.cfg 367 381 fi 368 382 … … 526 540 cd "$GSDLHOME" 527 541 else 542 echo "** No GS envvars set. Attempting to source the Greenstone setup script" 528 543 if [ -e gs3-setup.sh ]; then 529 544 source ./gs3-setup.sh … … 563 578 # Go into ext and at end popd to get back into the collect folder's parent for the GS installation 564 579 if [ ! -e "$GSDLHOME/ext/pdf-box" ]; then 580 echo "** Getting PDFBox" 565 581 pushd "$GSDLHOME/ext" 566 582 if [ ! -e "$GSDLHOME/ext/pdf-box-java.tar.gz" ]; then … … 575 591 # unless we are adding a new collection to svn, in which case, we'll grab them from whatever collect folder exists 576 592 if [ "x$mode" != "xsvnaddnew" ] && [ -e collect ] && [ ! -e collect_orig ]; then 593 echo "** Moving collect out of the way" 577 594 mv collect collect_orig 578 595 fi … … 583 600 # or svn update just any collections specified in the model-collect folder 584 601 if test -e model-collect; then 602 echo "** SVN updating model-collect" 585 603 if [ "$1" == "" ]; then 586 604 svn up model-collect … … 591 609 fi 592 610 else 611 echo "** Getting the model-collect folder from SVN" 593 612 if [ "$GSDL3SRCHOME" != "" ]; then 594 613 svn co http://svn.greenstone.org/other-projects/nightly-tasks/diffcol/trunk/gs3-model-collect model-collect
Note:
See TracChangeset
for help on using the changeset viewer.