Ignore:
Timestamp:
09/06/13 22:09:07 (7 years ago)
Author:
ak19
Message:
  1. Copying over collect.cfg from rebuilt collect into svn model-collect if doing an svndelete or svnupdate. 2. More messages as to what the script is doing at each stage.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • other-projects/nightly-tasks/diffcol/trunk/gen-model-colls.sh

    r28227 r28240  
    285285    echo "add_col_archives_index: $collection does not exist in model-collect"
    286286    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
    287294    fi
    288295
     
    365372    echo "update_single_collection: $collection does not exist in model-collect"
    366373    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
    367381    fi
    368382
     
    526540    cd "$GSDLHOME"
    527541else
     542    echo "** No GS envvars set. Attempting to source the Greenstone setup script"
    528543    if [ -e gs3-setup.sh ]; then
    529544    source ./gs3-setup.sh
     
    563578# Go into ext and at end popd to get back into the collect folder's parent for the GS installation
    564579if [ ! -e "$GSDLHOME/ext/pdf-box" ]; then
     580    echo "** Getting PDFBox"
    565581    pushd "$GSDLHOME/ext"
    566582    if [ ! -e "$GSDLHOME/ext/pdf-box-java.tar.gz" ]; then
     
    575591# unless we are adding a new collection to svn, in which case, we'll grab them from whatever collect folder exists
    576592if [ "x$mode" != "xsvnaddnew" ] && [ -e collect ] && [ ! -e collect_orig ]; then
     593    echo "** Moving collect out of the way"
    577594    mv collect collect_orig
    578595fi
     
    583600# or svn update just any collections specified in the model-collect folder
    584601if test -e model-collect; then
     602    echo "** SVN updating model-collect"
    585603    if [ "$1" == "" ]; then
    586604    svn up model-collect
     
    591609    fi
    592610else
     611    echo "** Getting the model-collect folder from SVN"
    593612    if [ "$GSDL3SRCHOME" != "" ]; then
    594613    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.