From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 12 Nov 2017 23:26:18 +0000 (-0500)
Subject: nice.  alias issues gone, and updates work well.
X-Git-Tag: 2.140.98^2~8
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=ba59c288c4e31a32f47b2d10f95193e874344bf8;p=feisty_meow.git

nice.  alias issues gone, and updates work well.
---

diff --git a/scripts/archival/general_updater.sh b/scripts/archival/general_updater.sh
index d03307fc..6928aab2 100644
--- a/scripts/archival/general_updater.sh
+++ b/scripts/archival/general_updater.sh
@@ -11,6 +11,7 @@ source "$FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh"
 function update_source_folders()
 {
   folder="$1"; shift
+  sep
   if [ ! -d "$folder" ]; then
     echo "The folder '$folder' does not exist, so skipping repository update there."
     return;
@@ -27,6 +28,7 @@ function update_source_folders()
     return 1
   fi
   popd
+  sep
 }
 
 # this attempts to copy all the contents in a folder called "from" into a folder
@@ -40,12 +42,12 @@ function synch_directory_to_target()
   sep
 
   if [ ! -d "$from" ]; then
-    echo "skipping synch on missing source directory $from; this is not normal!"
-    return 1
+    echo "skipping synch on missing source directory: ${from}"
+    return 0
   fi
   if [ ! -d "$to" ]; then
-    echo "skipping synch into non-existent directory $to"
-    return
+    echo "skipping synch into non-existent target directory $to"
+    return 0
   fi
 
   echo "synching from $from into $to"
@@ -92,6 +94,7 @@ function update_archive_drive()
 
   echo successfully updated all expected portions of the target drive at:
   echo "  $target_folder"
+  echo
 }
 
 
diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index 3a9344ef..fc50921c 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -123,19 +123,13 @@ if [ "$NO_REPAIRS_NEEDED" == "true" ]; then
   
     ##############
 
-echo POINT A
-  
     if [ -z "$ERROR_OCCURRED" ]; then
-
-echo POINT B
       # pull in our generated variables that are the minimal set we need to find
       # the rest of our resources.
       source "$FEISTY_MEOW_VARIABLES_LOADING_FILE"
   
-echo POINT C
       # Set up the temporary directory.
       source "$FEISTY_MEOW_SCRIPTS/core/create_tempdir.sh"
-echo POINT D
     fi
   
   fi
@@ -143,15 +137,11 @@ echo POINT D
   ##############
 
   if [ -z "$ERROR_OCCURRED" ]; then
-
-echo POINT E
-
-    # load the larger body of standard feisty meow variables into the environment.
-    # we actually want this to always run also; it will decide what variables need
-    # to be set again.
+    # no error occurred in our tests above, so load the larger body of standard feisty
+    # meow variables into the environment.  we actually want this to always run also;
+    # it will decide what variables need to be set again.
     source "$FEISTY_MEOW_SCRIPTS/core/variables.sh"
 
-echo POINT F
     ##############
 
     # include helpful functions.  we do this every time rather than making it part
@@ -159,11 +149,9 @@ echo POINT F
     # sub-shells in bash.
     source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
 
-echo POINT G
     # load some helper methods for the terminal which we'll use below.
     source "$FEISTY_MEOW_SCRIPTS/tty/terminal_titler.sh"
 
-echo POINT H
     ##############
 
 #hmmm: abstract this to a twiddle shell options method.
@@ -179,7 +167,6 @@ echo POINT H
     shopt -s checkwinsize
 
     ##############
-echo POINT I
 
     # make history writes immediate to avoid losing history if bash is zapped.
     echo $PROMPT_COMMAND | grep -q history
@@ -194,19 +181,15 @@ echo POINT I
 
     if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then echo "heavyweight init begins..."; fi
 
-echo POINT J
     # set up the aliases for the shell, but only if they are not already set.
     type CORE_ALIASES_LOADED &>/dev/null
     if [ $? -ne 0 ]; then
       if [ ! -z "$DEBUG_FEISTY_MEOW" ]; then
         echo "the aliases were missing, now they are being added..."
       fi
-echo HEEE HAHAHAHAHA
       source "$FEISTY_MEOW_LOADING_DOCK/fmc_core_and_custom_aliases.sh"
-echo HOOOOEY
     fi
 
-echo POINT K
     #echo before the new labelling, terminal titles have:
     #show_terminal_titles