From: Chris Koeritz <fred@gruntose.com>
Date: Mon, 13 May 2019 23:59:37 +0000 (-0400)
Subject: fixed bug that was pre-whacking custom item
X-Git-Tag: 2.140.115^2~1
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=52e9a6fa9750f609b6af1ab9b2e355677a0305c7;p=feisty_meow.git

fixed bug that was pre-whacking custom item

my careful code wasn't firing because an overly abusive remove based on find was whacking it; now instead i whack only the expected pieces that start with fmc_ in the loading dock, thus avoiding trashing anyone else's junk that happens to be floating around in there, but more specifically avoiding removing custom regardless of what type of item it is (unless it's the expected link).
---

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 3bac8fea..f13f4afe 100644
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -543,22 +543,23 @@ we will skip recustomization, but these other customizations are available:
       # there's an existing link, so remove it.
       \rm custom
     fi
+    # make sure we cleaned up the area before we re-link.
     if [ -h custom -o -d custom -o -f custom ]; then
       echo "
 Due to an over-abundance of caution, we are not going to remove an unexpected
-'custom' object in the file system.  This is located here:
-  $(pwd)
-and here are the current contents, showing the rogue 'custom' folder:"
-      ls -al .
+'custom' object found in the file system.  This object is located in the
+feisty meow loading dock here: $(pwd)
+And here is a description of the rogue 'custom' object:
+"
+      ls -al custom
       echo "
 If you are pretty sure that this is just a remnant of an older approach in
-feisty meow, where we copied the custom directory rather than linking it,
-and it most likely is just such a bit of cruft of that nature, then please
-remove that old remnant item, for example by saying:
+feisty meow, where we copied the custom directory rather than linking it
+(and it most likely is just such a bit of cruft of that nature), then please
+remove that old remnant 'custom' item, for example by saying:
   /bin/rm -rf \"custom\" ; popd
 Sorry for the interruption, but we want to make sure this removal wasn't
-automatic if there is a small amount of doubt about the issue.
-"
+automatic if there is even a small amount of doubt about the issue."
       return 1
     fi
 
diff --git a/scripts/core/reconfigure_feisty_meow.sh b/scripts/core/reconfigure_feisty_meow.sh
index c0674575..716e97be 100644
--- a/scripts/core/reconfigure_feisty_meow.sh
+++ b/scripts/core/reconfigure_feisty_meow.sh
@@ -52,7 +52,8 @@ PERLLIB=$PERLLIB:"$FEISTY_MEOW_SCRIPTS/core":"$FEISTY_MEOW_SCRIPTS/files":"$FEIS
 PERL5LIB=$PERLLIB
 #echo PERLLIB after modification is $PERLLIB
 # make toast out of generated files right away, but leave any custom scripts.
-find "$FEISTY_MEOW_LOADING_DOCK" -maxdepth 1 -type f -exec perl "$FEISTY_MEOW_SCRIPTS/files/safedel.pl" "{}" ';'
+\rm "$FEISTY_MEOW_LOADING_DOCK"/fmc_*
+#NO! find "$FEISTY_MEOW_LOADING_DOCK" -maxdepth 1 -type f -exec perl "$FEISTY_MEOW_SCRIPTS/files/safedel.pl" "{}" ';'
 # &>/dev/null
 
 ## #no, old: