From: Chris Koeritz <fred@gruntose.com>
Date: Sun, 12 Nov 2017 22:36:40 +0000 (-0500)
Subject: fricking unlucky
X-Git-Tag: 2.140.98^2~12
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=e037aa1471e4599560efed3d35fc76ec4df86b2b;p=feisty_meow.git

fricking unlucky

cannot get the simple aliases to load properly.  something got broken about customized aliases recently, but it doesn't even make any sense yet.  the alias itself works now if i set it up manually.
---

diff --git a/scripts/archival/general_updater.sh b/scripts/archival/general_updater.sh
index 83c97775..d03307fc 100644
--- a/scripts/archival/general_updater.sh
+++ b/scripts/archival/general_updater.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,7 +52,7 @@ 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
 }
 
@@ -71,7 +71,7 @@ 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.
diff --git a/scripts/core/generate_aliases.pl b/scripts/core/generate_aliases.pl
index 09885b06..ae7ea3e7 100644
--- a/scripts/core/generate_aliases.pl
+++ b/scripts/core/generate_aliases.pl
@@ -205,7 +205,7 @@ foreach $file (@shell_files) {
       || $file =~ /\/\.\.$/
       || $file =~ /\/\.svn$/
       || $file =~ /\/\.git$/
-      || $file =~ /\/customize\/[a-zA-Z0-9_]+\/[a-zA-Z0-9_.]+$/
+      || $file =~ /\/custom\/[a-zA-Z0-9_]+\/[a-zA-Z0-9_.]+$/
 #hmmm: would be nice to have this name in a symbol somewhere instead of having "customize" everywhere.
       ) {
     # just skip this item; it's a special directory or a file we don't want to include.
diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index a9db25b4..3c3cd691 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -188,7 +188,9 @@ if [ "$NO_REPAIRS_NEEDED" == "true" ]; 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 before the new labelling, terminal titles have:
diff --git a/scripts/customize/fred/fred_common.alias b/scripts/customize/fred/fred_common.alias
index cd4bd5d9..7bd8621e 100644
--- a/scripts/customize/fred/fred_common.alias
+++ b/scripts/customize/fred/fred_common.alias
@@ -2,21 +2,22 @@
 # some aliases that i don't expect very many people to ever want.
 # these are very specific to drives and such that i use but which other people wouldn't.
 
-# pull in any code dependencies.
-source "$FEISTY_MEOW_SCRIPTS/core/general_updater.sh"
+echo "got to alias additions in fred_common.alias!!!"
+
+#### pull in any code dependencies.
+###source "$FEISTY_MEOW_SCRIPTS/archival/general_updater.sh"
 
 # updates the mounted barkuptree drive with stuff on wildmutt.
-define_yeti_alias update_barkuptree='update_archive_drive "/media/fred/barkuptreedrive"'
+define_yeti_alias update_barkuptree='source "$FEISTY_MEOW_SCRIPTS/archival/general_updater.sh"; update_archive_drive "/media/fred/barkuptreedrive"'
 
 # updates local archive drive called catfurnose.
-define_yeti_alias update_catfurnose='update_archive_drive "/media/fred/catfurnose"'
+define_yeti_alias update_catfurnose='source "$FEISTY_MEOW_SCRIPTS/archival/general_updater.sh"; update_archive_drive "/media/fred/catfurnose"'
 
 # updates the fredmusicprime drive with the latest from /z space.
-define_yeti_alias update_fredmusicprime='update_archive_drive "/media/fred/fredmusicprime"'
+define_yeti_alias update_fredmusicprime='source "$FEISTY_MEOW_SCRIPTS/archival/general_updater.sh"; update_archive_drive "/media/fred/fredmusicprime"'
 
 # updates my little 1 TB "soapbox" style usb drive with any appropriate archives and source.
-define_yeti_alias update_soapbox='update_archive_drive "/media/fred/soapboxdrive"'
-
+define_yeti_alias update_soapbox='source "$FEISTY_MEOW_SCRIPTS/archival/general_updater.sh"; update_archive_drive "/media/fred/soapboxdrive"'
 
 
 # moo and unmoo mount the local folders i use most.