adjusted a bit more

[feisty_meow.git] / scripts / archival / general_updater.sh

diff --git a/scripts/archival/general_updater.sh b/scripts/archival/general_updater.sh
index 3ae2d1681839e47959a0380941f19bf1737afbd7..d03307fc018dbce033e4c51d057f4437cd44e39e 100644 (file)
--- a/scripts/archival/general_updater.sh
+++ b/scripts/archival/general_updater.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-# a script that handles synchronization of important assets from the ARCHIVE_COLLECTION_LIST
-# and the SOURCE_HIERARCHY_LIST onto a backup drive of some sort.  it will only copy folders
+# a script that handles synchronization of important assets from the MAJOR_ARCHIVE_SOURCES
+# and the SOURCECODE_HIERARCHY_LIST onto a backup drive of some sort.  it will only copy folders
 # if there is a target folder of the appropriate name already on the backup medium.
 
 source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
@@ -19,12 +19,12 @@ function update_source_folders()
   pushd "$folder"
   if [ $? -ne 0 ]; then
     echo Changing to the folder $folder failed.
-    exit 1
+    return 1
   fi
   bash "$FEISTY_MEOW_SCRIPTS/rev_control/rcheckin.sh"
   if [ $? -ne 0 ]; then
     echo Checking out the latest codes has failed somehow for $folder.
-    exit 1
+    return 1
   fi
   popd
 }
@@ -41,7 +41,7 @@ function synch_directory_to_target()
 
   if [ ! -d "$from" ]; then
     echo "skipping synch on missing source directory $from; this is not normal!"
-    exit 1
+    return 1
   fi
   if [ ! -d "$to" ]; then
     echo "skipping synch into non-existent directory $to"
@@ -52,14 +52,14 @@ function synch_directory_to_target()
   netcp "$from"/* "$to"/
   if [ $? -ne 0 ]; then
     echo "The synchronization of $from into $to has failed."
-    exit 1
+    return 1
   fi
 }
 
 # the uber controller method that does the "hard" work of updating.
-# any items from the ARCHIVE_COLLECTION_LIST that are on the target will be
+# any items from the MAJOR_ARCHIVE_SOURCES that are on the target will be
 # updated.  any items found on the target matching the members of the
-# SOURCE_COLLECTION_LIST will be treated as code hierarchies and updated.
+# SOURCECODE_HIERARCHY_LIST will be treated as code hierarchies and updated.
 function update_archive_drive()
 {
   local target_folder="$1"; shift  # where we're backing up to.
@@ -71,11 +71,11 @@ function update_archive_drive()
   ls "$target_folder"
   if [ $? -ne 0 ]; then
     echo "The target location '$target_folder' is not mounted currently, so cannot be updated."
-    exit 1
+    return 1
   fi
 
   # synch all our targets.
-  for currdir in $ARCHIVE_COLLECTION_LIST; do
+  for currdir in $MAJOR_ARCHIVE_SOURCES; do
     synch_directory_to_target "$currdir" "$target_folder/$(basename $currdir)"/
   done
 
@@ -84,7 +84,7 @@ function update_archive_drive()
   # update source code if present.
   echo getting latest fred repositories...
   pushd "$target_folder"
-  for currdir in $SOURCE_HIERARCHY_LIST; do
+  for currdir in $SOURCECODE_HIERARCHY_LIST; do
     update_source_folders $currdir
   done