From 158558d2172fe1695bd09cafc32002338a980f20 Mon Sep 17 00:00:00 2001 From: Fred Hamster Date: Fri, 13 Feb 2026 21:22:20 -0500 Subject: [PATCH] made the repository list handling more selective we only need things once, on either the pull or commit variables, not double listed, like ever. doesn't hurt, just wastes time. also cleaned up some older code. --- documentation/feisty_meow_command_reference.txt | 6 +++++- scripts/core/variables.sh | 9 +++++---- scripts/customize/fred/fred_variables.sh | 9 +++------ scripts/customize/www-data/web_variables.sh | 5 ++--- scripts/rev_control/checkin.sh | 4 ---- scripts/rev_control/getem.sh | 4 ---- scripts/rev_control/puffer.sh | 5 ----- scripts/rev_control/version_control.sh | 8 +++----- 8 files changed, 18 insertions(+), 32 deletions(-) diff --git a/documentation/feisty_meow_command_reference.txt b/documentation/feisty_meow_command_reference.txt index 690d1b56..457f31c8 100644 --- a/documentation/feisty_meow_command_reference.txt +++ b/documentation/feisty_meow_command_reference.txt @@ -112,6 +112,9 @@ as the set of revision-controlled folders to operate on: the feisty meow scripts automatically add the feisty meow top-level (the apex) to the pull list to ensure that updates are received when available. +(this may not be the right decision for when feisty meow is installed +system-wide, but the scripts will not attempt to check out the code if the +.git folder is not writable.) ======== getem: @@ -124,7 +127,8 @@ apex) to the pull list to ensure that updates are received when available. checkin: first updates all of the items in the REPOSITORY_LIST_TO_PULL list (similar to puffer), but then checks in all changes in the REPOSITORY_LIST_TO_COMMIT - to their remote repositories. + to their remote repositories. note that items on the commit list will be + puffed out first to receive updates before they are checked in. ======== some assorted other revision control commands: diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index 3f8b72e2..2ea1ea4d 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -258,10 +258,11 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org ## define_yeti_variable LESSOPEN="| source-highlight -f esc -o STDOUT -i %s" # the base checkout list is just to update feisty_meow. additional folder - # names can be added in your customized scripts. the space at the end of - # this variable is important and allows users to extend the list like: + # names can be added in your customized scripts. + # NOTE: keeping a space at the end of these variables is important. + # the space character enables users to extend the list like so: # REPOSITORY_DIR+="muppets configs " - # see the customize/fred folder for a live example. + # see the customize/fred folder for a live example of this. define_yeti_variable REPOSITORY_LIST_TO_PULL="$FEISTY_MEOW_APEX " define_yeti_variable REPOSITORY_LIST_TO_COMMIT="" @@ -269,7 +270,7 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org #hmmm: resolve if still using this 'active' folder. if [ -d "$FEISTY_MEOW_PERSONAL_HOME/active" ]; then active_addin+="$(find "$FEISTY_MEOW_PERSONAL_HOME/active" -maxdepth 1 -mindepth 1 -type d) " - REPOSITORY_LIST_TO_PULL+="$active_addin " +#no, redundant. REPOSITORY_LIST_TO_PULL+="$active_addin " REPOSITORY_LIST_TO_COMMIT+="$active_addin " unset active_addin fi diff --git a/scripts/customize/fred/fred_variables.sh b/scripts/customize/fred/fred_variables.sh index 490f9583..9b5d0daa 100644 --- a/scripts/customize/fred/fred_variables.sh +++ b/scripts/customize/fred/fred_variables.sh @@ -18,15 +18,12 @@ if [ -z "$USER_CUSTOMIZATIONS_LOADED" ]; then # The gruntose web site and others are expected to reside below, if any sites exist at all. define_yeti_variable WEBBED_SITES="$FEISTY_MEOW_PERSONAL_HOME/web" - # add a bunch of personal folders to the list for checkin & checkout. - fred_addins="$CLOUD_BASE \ - $WEBBED_SITES " - REPOSITORY_LIST_TO_PULL+="$fred_addins " + # add a bunch of personal folders to the list for checkin. # for fred, we add in a commit of feisty_meow code. this is not something # everyone can do, thus not everyone should use fred's config. - REPOSITORY_LIST_TO_COMMIT+="$fred_addins \ + REPOSITORY_LIST_TO_COMMIT+="$CLOUD_BASE \ + $WEBBED_SITES \ ${FEISTY_MEOW_APEX} " - unset fred_addins # adds our locally relevant archive folders into the list to be synched. MAJOR_ARCHIVE_SOURCES+="/z/archons /z/basement /z/imaginations /z/musix /z/toaster /z/walrus $HOME/brobdingnag" diff --git a/scripts/customize/www-data/web_variables.sh b/scripts/customize/www-data/web_variables.sh index b865d9c5..b4a5cd9e 100644 --- a/scripts/customize/www-data/web_variables.sh +++ b/scripts/customize/www-data/web_variables.sh @@ -7,10 +7,9 @@ if [ -z "$USER_CUSTOMIZATIONS_LOADED" ]; then ############## - # The gruntose web site is expected to reside below, if it exists at all. + # the gruntose web site is expected to reside below, if it exists at all. export WEBBED_SITES="$FEISTY_MEOW_PERSONAL_HOME/web" - - REPOSITORY_LIST_TO_PULL+="$WEBBED_SITES" + # and we do want it checked in when there are updates. REPOSITORY_LIST_TO_COMMIT+="$WEBBED_SITES" ############## diff --git a/scripts/rev_control/checkin.sh b/scripts/rev_control/checkin.sh index 70996de9..49f18d60 100644 --- a/scripts/rev_control/checkin.sh +++ b/scripts/rev_control/checkin.sh @@ -13,10 +13,6 @@ save_terminal_title echo "committing repositories at: $(date)" FULL_LIST_OUT="${REPOSITORY_LIST_TO_PULL}" -#still wrong: FULL_LIST_OUT=" $(dirname $FEISTY_MEOW_APEX) $HOME " -#ack: if [ "$OS" == "Windows_NT" ]; then -# FULL_LIST+=" c:/ d:/ e:/ " -#fi puff_out_list $FULL_LIST_OUT exit_on_error "revision control puffing-out of list: $FULL_LIST_OUT" diff --git a/scripts/rev_control/getem.sh b/scripts/rev_control/getem.sh index 3249cfc2..0cbfc407 100644 --- a/scripts/rev_control/getem.sh +++ b/scripts/rev_control/getem.sh @@ -42,11 +42,7 @@ exit_on_error "removing file: $TMPO_CHK" echo "getting repositories at: $(date)" # perform the checkouts as appropriate per OS. -#wrong: FULL_LIST="$(dirname $FEISTY_MEOW_APEX) $HOME" FULL_LIST="${REPOSITORY_LIST_TO_PULL}" -#argh: if [ "$OS" == "Windows_NT" ]; then -# FULL_LIST+="c:/ d:/ e:/" -#fi checkout_list $FULL_LIST 2>&1 | tee -a "$TMPO_CHK" exit_on_error "checking out list: $FULL_LIST" diff --git a/scripts/rev_control/puffer.sh b/scripts/rev_control/puffer.sh index 83fcf4c2..7f909403 100644 --- a/scripts/rev_control/puffer.sh +++ b/scripts/rev_control/puffer.sh @@ -18,12 +18,7 @@ save_terminal_title echo "puffing out repositories at: $(date)" -#wrong: FULL_LIST=" $(dirname $FEISTY_MEOW_APEX) $HOME " FULL_LIST="${REPOSITORY_LIST_TO_PULL}" -#no, and yuck: if [ "$OS" == "Windows_NT" ]; then -# FULL_LIST+=" c:/ d:/ e:/ " -#fi - puff_out_list $FULL_LIST exit_on_error "puffing out list: $FULL_LIST" diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index b3792753..e5cf37b0 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -234,9 +234,7 @@ function checkin_list() local list="$(uniquify $*)" # turn repo list back into an array. -#no, wtf??? repolist_combined="$(uniquify ${REPOSITORY_LIST_TO_COMMIT[*]} ${REPOSITORY_LIST_TO_PULL[*]})" -# eval "repository_list=( $repolist_combined )" - eval "repository_list=( ${REPOSITORY_LIST_TO_COMMIT[*]} )" + eval "repository_list=( ${REPOSITORY_LIST_TO_COMMIT[@]} )" local outer inner @@ -492,7 +490,7 @@ function checkout_list() local list="$(uniquify $*)" # turn repo list back into an array. - eval "repository_list=( ${REPOSITORY_LIST_TO_PULL[*]} )" + eval "repository_list=( ${REPOSITORY_LIST_TO_PULL[@]} )" local outer inner @@ -525,7 +523,7 @@ function puff_out_list() local list="$(uniquify $*)" # turn repo list back into an array. - eval "repository_list=( ${REPOSITORY_LIST_TO_PULL[*]} )" + eval "repository_list=( ${REPOSITORY_LIST_TO_PULL[@]} )" local outer inner -- 2.43.0