From 8efd34bd42462f5d043b17cd8f5d55bc21af1e95 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Thu, 12 Oct 2017 17:54:02 -0400 Subject: [PATCH] nice redundancy fix in training this makes sure that if the user happens to have feisty meow in their home directory, then they don't see any double check-ins. mostly relevant to me, since i am the main committer for now. --- scripts/core/variables.sh | 1 - scripts/customize/fred/fred_variables.sh | 4 +--- scripts/rev_control/version_control.sh | 13 ++++++++++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index 3caa2067..97f710b8 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -207,7 +207,6 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then # 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: # define_yeti_variable REPOSITORY_DIR+="muppets configs" -#old: define_yeti_variable REPOSITORY_LIST="$(basename $FEISTY_MEOW_APEX) " define_yeti_variable REPOSITORY_LIST= # initializes the feisty meow build variables, if possible. diff --git a/scripts/customize/fred/fred_variables.sh b/scripts/customize/fred/fred_variables.sh index 35f81ed8..4f380859 100644 --- a/scripts/customize/fred/fred_variables.sh +++ b/scripts/customize/fred/fred_variables.sh @@ -14,9 +14,7 @@ if [ -z "$USER_CUSTOMIZATIONS_LOADED" ]; then export WEBBED_SITES=/var/www fi - # add a bunch of folders to the list for checkin & checkout. these are - # definitely personal, and some of them are fairly dated (the yeti and - # hoople folders, for example). + # add a bunch of personal folders to the list for checkin & checkout. REPOSITORY_LIST+="$(basename $FEISTY_MEOW_APEX) cloud ebooks web active/webwork" # point to our local certificate for ssh usage. diff --git a/scripts/rev_control/version_control.sh b/scripts/rev_control/version_control.sh index c41f7cdd..2506a608 100644 --- a/scripts/rev_control/version_control.sh +++ b/scripts/rev_control/version_control.sh @@ -204,7 +204,18 @@ function do_report_new # checks in all the folders in a specified list. function checkin_list() { - local list=$* +echo list originally was: $* + + # make the list of directories unique. + HOLDIFS="$IFS" + IFS=' ' + local list="$(echo $* | uniq)" + IFS="$HOLDIFS" +echo list became $list + +#hmmm: if above works, then it's needed in other places that +# are passed lists. +#hmmm: in fact, shouldn't it be a handy function of some sort for uniquifying lists? save_terminal_title -- 2.34.1