From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 12 Nov 2017 15:37:37 +0000 (-0500)
Subject: totally tasty changes for naming
X-Git-Tag: 2.140.98^2~4^2~13^2~1
X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=commitdiff_plain;h=822a6e8843c456f97d69c1db597da5d604176bb7

totally tasty changes for naming
---

diff --git a/scripts/archival/general_updater.sh b/scripts/archival/general_updater.sh
index 3ae2d168..83c97775 100644
--- 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"
@@ -57,9 +57,9 @@ function synch_directory_to_target()
 }
 
 # 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.
@@ -75,7 +75,7 @@ function update_archive_drive()
   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
   
diff --git a/scripts/archival/snarf_feisty_meow.pl b/scripts/archival/snarf_feisty_meow.pl
index c695be73..7f64b96d 100644
--- a/scripts/archival/snarf_feisty_meow.pl
+++ b/scripts/archival/snarf_feisty_meow.pl
@@ -35,7 +35,7 @@ local($snarf_file) = &snarf_name($snarf_file_base, $number);
 local($root) = &canonicalize("$FEISTY_MEOW_APEX");
 
 # grab the top level stuff.
-&backup_files($snarf_file_base, $number, $root, ".", ("*.txt", "make*", ".gitignore"));
+&backup_files($snarf_file_base, $number, $root, ".", ("*.txt", "make*", ".gitignore", "*.yml"));
 
 # snarf up all the important directories.
 # CAK: current as of 2012-05-05.
diff --git a/scripts/core/common.alias b/scripts/core/common.alias
index 44a057be..1242437a 100644
--- a/scripts/core/common.alias
+++ b/scripts/core/common.alias
@@ -124,7 +124,7 @@ define_yeti_alias cputemp='acpi -t'
 # makes root user's home directory's permissions right.
 define_yeti_alias reroot='chown -R root:root /root'
 # yes, these are really helpful...
-define_yeti_alias whoareyou='echo -e "Hello, I am a computer named $(hostname)\nand I'\''m very pleased to meet you."'
+define_yeti_alias whoareyou='echo -e "Hello, I am a computer named $(hostname)\nand I am very pleased to meet you."'
 define_yeti_alias whereami='echo whoa dude, try not to think about it...'
 define_yeti_alias why='echo We all wonder what the point of the universe is at times.  If you figure it all out, please write us.'
 
@@ -136,6 +136,7 @@ define_yeti_alias why='echo We all wonder what the point of the universe is at t
 # the shell scripts twice for users like root that don't always load this
 # stuff.
 unalias fredme &>/dev/null
+unalias feistyme &>/dev/null
 
 ##############
 
diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 351d23c6..7c552cbe 100644
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -226,12 +226,12 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
     REPOSITORY_LIST+="$(find "$HOME/apps" -maxdepth 2 -mindepth 2 -iname "avenger5" -type d) "
   fi
   
-  # the archive collections list is a set of directories that are major
-  # repositories of data which can be synched to backup drives.
-  define_yeti_variable ARCHIVE_COLLECTION_LIST=
+  # the archive list is a set of directories that are major repositories of
+  # data which can be synched to backup drives.
+  define_yeti_variable MAJOR_ARCHIVE_SOURCES=
   # the source collections list is a set of directories that indicate they
   # harbor a lot of source code underneath.
-  define_yeti_variable SOURCE_HIERARCHY_LIST=
+  define_yeti_variable SOURCECODE_HIERARCHY_LIST=
 
   # initializes the feisty meow build variables, if possible.
   function initialize_build_variables()
diff --git a/scripts/customize/fred/fred_variables.sh b/scripts/customize/fred/fred_variables.sh
index aaf83291..87d0dbf2 100644
--- a/scripts/customize/fred/fred_variables.sh
+++ b/scripts/customize/fred/fred_variables.sh
@@ -18,9 +18,9 @@ if [ -z "$USER_CUSTOMIZATIONS_LOADED" ]; then
   REPOSITORY_LIST+=" cloud ebooks web "
 
   # adds our locally relevant archive folders into the list to be synched.
-  ARCHIVE_COLLECTION_LIST+="/z/archons /z/basement /z/imaginations /z/musix /z/toaster /z/walrus"
+  MAJOR_ARCHIVE_SOURCES+="/z/archons /z/basement /z/imaginations /z/musix /z/toaster /z/walrus"
   # our set of known source hierarchy folder names.
-  SOURCE_HIERARCHY_LIST="codebarn extra_brain interbrane"
+  SOURCECODE_HIERARCHY_LIST="codebarn extra_brain interbrane"
 
   # point to our local certificate for ssh usage.
   export SVN_SSH="ssh -i $HOME/.ssh/id_dsa_sourceforge"
diff --git a/scripts/customize/fred/scripts/archival/compare_soapbox.sh b/scripts/customize/fred/scripts/archival/compare_soapbox.sh
index cd02a888..d4893737 100644
--- a/scripts/customize/fred/scripts/archival/compare_soapbox.sh
+++ b/scripts/customize/fred/scripts/archival/compare_soapbox.sh
@@ -10,7 +10,7 @@ function compare_archives_with_target()
 {
   local target="$1"; shift
 
-  for currdir in $ARCHIVE_COLLECTION_LIST; do
+  for currdir in $MAJOR_ARCHIVE_SOURCES; do
     sep
     echo "comparing '$currdir' with target '$target', where 'less thans' are on the target..."
     compare_dirs "$target/$(basename $currdir)" "$currdir"
diff --git a/scripts/customize/fred/scripts/archival/update_fredmusicprime.sh b/scripts/customize/fred/scripts/archival/update_fredmusicprime.sh
index 97f455c2..80bb07ba 100644
--- a/scripts/customize/fred/scripts/archival/update_fredmusicprime.sh
+++ b/scripts/customize/fred/scripts/archival/update_fredmusicprime.sh
@@ -21,7 +21,7 @@ if [ $? -ne 0 ]; then
 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
 
@@ -30,7 +30,7 @@ sep
 # update source code if present.
 echo getting latest fred repositories...
 pushd "$TARGET_FOLDER"
-update_source_folders $SOURCE_HIERARCHY_LIST
+update_source_folders $SOURCECODE_HIERARCHY_LIST
 
 sep
 
diff --git a/scripts/customize/fred/scripts/archival/update_soapbox.sh b/scripts/customize/fred/scripts/archival/update_soapbox.sh
index 5e1b98cc..57e1ba74 100644
--- a/scripts/customize/fred/scripts/archival/update_soapbox.sh
+++ b/scripts/customize/fred/scripts/archival/update_soapbox.sh
@@ -18,7 +18,7 @@ if [ $? -ne 0 ]; then
 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
 
@@ -27,7 +27,7 @@ sep
 # 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 "$curr_dir"
 done
 sep