Changeset 28133

Timestamp:

2013-08-26T16:14:27+12:00 (11 years ago)

Author:

ak19

Message:

Some updates to the GS2-only versio of the script before the changes for GS3 are incorporated

File:

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

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

@@ -400 +400 @@
 
     echo "*******************************************"
-    echo "Usage: $0 [--svnupdate|--svndelete] [--debug] [--message 'custom commit message'] [col1, col2, col3,...]"; 
+    echo "Usage: $0 [--svnupdate|--svndelete|--svnaddnew] [--debug] [--message 'custom commit message'] [col1, col2, col3,...]"; 
     echo "If no collections are provided, all collections will be processed.";
     echo "If neither svnupdate nor svndelete are provided, svnupdate is assumed.";
@@ -490 +490 @@
 
 
+# Set up the Greenstone environment, this is mainly for building, 
+# but also for locating a Greenstone installation folder, in case this script doesn't live in one
+# Test for GS3 home env then for GS2 home and if found, cd into the 
+# GS2/GS3 home location and run setup, 
+# else try to find setup.bash/gs3-setup.bash in the current location and 
+# run it.
+# Else print a warning message saying that GSDLHOME is not set.
+if [ "$GSDLHOME" != "" ]; then
+    echo "cd-ing into Greenstone home directory: $GSDLHOME"
+    cd "$GSDLHOME"
+else
+    if [ -e setup.bash ]; then
+    source ./setup.bash
+    else
+    echo "No GSDLHOME set and no setup script found in current folder." 
+    echo "Please source the setup script in a Greenstone installation. Exiting."
+    exit -1
+    fi
+fi
+
+
 # If no mode provided (svndelete|svnupdate) as cmd line arg, then don't modify
 # the svn model-collect folder. Then this script stops after rebuilding the model-copy in collect
@@ -541 +562 @@
     svn co http://svn.greenstone.org/other-projects/nightly-tasks/diffcol/trunk/model-collect
 fi
+
 
 # Not using rsync to copy folders while excluding files/subfolders, since rsync is not available on lsb
@@ -577 +599 @@
 
 
-# Set up the Greenstone environment for building
-source setup.bash
-
 # parse arguments
 # http://stackoverflow.com/questions/12711786/bash-convert-command-line-arguments-into-array