Changeset 28240 for other-projects/nightly-tasks/diffcol/trunk

Timestamp:

2013-09-06T22:09:07+12:00 (11 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:

• other-projects/nightly-tasks/diffcol/trunk/gen-model-colls.sh (modified) (7 diffs)

other-projects/nightly-tasks/diffcol/trunk/gen-model-colls.sh

@@ -285 +285 @@
     echo "add_col_archives_index: $collection does not exist in model-collect"
     return;
+    fi
+
+    # copy across collect.cfg file if it has been modified
+    `diff collect/$collection/etc/collect.cfg model-collect/$collection/etc/collect.cfg`
+    status=$?
+    if [ "$status" -eq "1" ]; then
+    cp collect/$collection/etc/collect.cfg model-collect/$collection/etc/collect.cfg
     fi
 
@@ -365 +372 @@
     echo "update_single_collection: $collection does not exist in model-collect"
     return;
+    fi
+
+    # copy across collect.cfg file if it has been modified
+    `diff collect/$collection/etc/collect.cfg model-collect/$collection/etc/collect.cfg`
+    status=$?
+    if [ "$status" -eq "1" ]; then
+    cp collect/$collection/etc/collect.cfg model-collect/$collection/etc/collect.cfg
     fi
 
@@ -526 +540 @@
     cd "$GSDLHOME"
 else
+    echo "** No GS envvars set. Attempting to source the Greenstone setup script"
     if [ -e gs3-setup.sh ]; then
     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
 if [ ! -e "$GSDLHOME/ext/pdf-box" ]; then
+    echo "** Getting PDFBox"
     pushd "$GSDLHOME/ext"
     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
 if [ "x$mode" != "xsvnaddnew" ] && [ -e collect ] && [ ! -e collect_orig ]; then
+    echo "** Moving collect out of the way"
     mv collect collect_orig
 fi
@@ -583 +600 @@
 # or svn update just any collections specified in the model-collect folder
 if test -e model-collect; then
+    echo "** SVN updating model-collect"
     if [ "$1" == "" ]; then
     svn up model-collect
@@ -591 +609 @@
     fi
 else
+    echo "** Getting the model-collect folder from SVN"
     if [ "$GSDL3SRCHOME" != "" ]; then
     svn co http://svn.greenstone.org/other-projects/nightly-tasks/diffcol/trunk/gs3-model-collect model-collect