From 077f310e41b5b0f5cd47fd1b523d9a51c9b6ef0b Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 30 Dec 2016 00:20:22 -0500 Subject: [PATCH] better regeneration skillz --- scripts/core/functions.sh | 2 +- scripts/rev_control/checkin.sh | 10 ++++++++++ scripts/rev_control/getem.sh | 9 +++------ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 94591263..c2f946a8 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -359,7 +359,7 @@ if [ -z "$skip_all" ]; then echo # force a full reload by turning off sentinel variables and methods. unset -v CORE_VARIABLES_LOADED FEISTY_MEOW_LOADING_DOCK USER_CUSTOMIZATIONS_LOADED - unalias CORE_ALIASES_LOADED + unalias CORE_ALIASES_LOADED &>/dev/null unset -f function_sentinel # reload feisty meow environment in current shell. source $FEISTY_MEOW_SCRIPTS/core/launch_feisty_meow.sh diff --git a/scripts/rev_control/checkin.sh b/scripts/rev_control/checkin.sh index 965e67ad..ac0176c7 100644 --- a/scripts/rev_control/checkin.sh +++ b/scripts/rev_control/checkin.sh @@ -5,6 +5,8 @@ source "$FEISTY_MEOW_SCRIPTS/core/functions.sh" source "$FEISTY_MEOW_SCRIPTS/rev_control/version_control.sh" +############## + echo "Committing repositories at: $(date)" if [ "$OS" != "Windows_NT" ]; then @@ -14,3 +16,11 @@ else checkin_list $HOME c:/ d:/ e:/ fi +############## + +# regenerate the scripts after checking in, since this could mean a modified version +# of feisty meow is present. +regenerate + +############## + diff --git a/scripts/rev_control/getem.sh b/scripts/rev_control/getem.sh index 06e9f95f..9da0d4f4 100644 --- a/scripts/rev_control/getem.sh +++ b/scripts/rev_control/getem.sh @@ -32,7 +32,7 @@ export TMPO_CHK=$TMP/zz_chk.log rm -f "$TMPO_CHK" -echo "Getting repositories at: $(date)" +echo "getting repositories at: $(date)" # perform the checkouts as appropriate per OS. if [ "$OS" != "Windows_NT" ]; then @@ -43,11 +43,8 @@ fi ############## -# we now regenerate the scripts after getme, to ensure it's done automatically. -bash "$FEISTY_MEOW_SCRIPTS/core/reconfigure_feisty_meow.sh" -perl "$FEISTY_MEOW_SCRIPTS/core/generate_aliases.pl" -echo -nechung +# regenerate the scripts after getting latest version of feisty meow. +regenerate ############## -- 2.34.1