cleaner approach to hello file

now can be turned off, so not seen repeatedly.  revamp getting better.

diff --git a/scripts/archival/snarf_feisty_meow.pl b/scripts/archival/snarf_feisty_meow.pl
index 7f64b96dc49a4a761ccdf1c9ca2956cb9735c418..e6c54770b2d92693b940f5f267cc06f580b65fd3 100644 (file)
--- a/scripts/archival/snarf_feisty_meow.pl
+++ b/scripts/archival/snarf_feisty_meow.pl
@@ -58,6 +58,7 @@ local($root) = &canonicalize("$FEISTY_MEOW_APEX");
 &backup_hierarchy($snarf_file_base, $number, "$root", "production/assign_bases");
 &backup_hierarchy($snarf_file_base, $number, "$root", "production/check_versions");
 &backup_hierarchy($snarf_file_base, $number, "$root", "production/setup_src");
+&backup_hierarchy($snarf_file_base, $number, "$root", "production/sites");
 
 # now rename the file so only the unpacker can access it.
 &rename_archive($snarf_file);

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 8625babc7f665a6c809ff0ad05da94a6a1a80003..1a061797c6f20175b84dbff3b9129a4bd0f02ca6 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -476,6 +476,10 @@ if [ -z "$skip_all" ]; then
       echo "but that folder does not exist.  Skipping customization."
       return 1
     fi
+
+    # prevent permission foul-ups.
+    chown -R "$(logname):$(logname)" "$FEISTY_MEOW_LOADING_DOCK" "$FEISTY_MEOW_GENERATED_STORE"
+
     regenerate >/dev/null
     pushd "$FEISTY_MEOW_LOADING_DOCK/custom" &>/dev/null
     incongruous_files="$(bash "$FEISTY_MEOW_SCRIPTS/files/list_non_dupes.sh" "$FEISTY_MEOW_SCRIPTS/customize/$custom_user" "$FEISTY_MEOW_LOADING_DOCK/custom")"
@@ -505,6 +509,9 @@ if [ -z "$skip_all" ]; then
     echo
     regenerate
 
+    # prevent permission foul-ups, again.
+    chown -R "$(logname):$(logname)" "$FEISTY_MEOW_LOADING_DOCK" "$FEISTY_MEOW_GENERATED_STORE"
+
     restore_terminal_title
   }
 

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index 55b30a8696d7b3303a0c911acbc51c7c13566e1d..e1f2c9453c89e5d3383bf4c2ab09d76d689a716a 100644 (file)
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -217,8 +217,9 @@ if [ "$NO_REPAIRS_NEEDED" == "true" ]; then
 
   # only run this hello file if the core feisty meow support haven't been loaded already.  this
   # hopefully guarantees we show the info at most once in one shell continuum.
+  # this can also be disabled if the NO_HELLO variable has a non-empty value.
   type CORE_VARIABLES_LOADED &>/dev/null
-  if [ $? -ne 0 ]; then
+  if [ $? -ne 0 -a -z "$NO_HELLO" ]; then
     # print out a personalized hello file if we find one.
     if [ -f ~/hello.txt ]; then
       echo

diff --git a/scripts/site_avenger/revamp_cakelampvm.sh b/scripts/site_avenger/revamp_cakelampvm.sh
index 90a3dfb09dc0d087f3273e8d41314a1052d47ed3..dcc32be5eabd1647aec64f14bad98e670fb5ade7 100644 (file)
--- a/scripts/site_avenger/revamp_cakelampvm.sh
+++ b/scripts/site_avenger/revamp_cakelampvm.sh
@@ -14,6 +14,7 @@ fi
 export WORKDIR="$( \cd "$(\dirname "$0")" && \pwd )"  # obtain the script's working directory.
 export FEISTY_MEOW_APEX="$( \cd "$WORKDIR/../.." && \pwd )"
 
+export NO_HELLO=right
 source "$FEISTY_MEOW_APEX/scripts/core/launch_feisty_meow.sh"
 
 ##############