From 29a9b52a5cf4ddd33ad5a9bed5381a6612e78f52 Mon Sep 17 00:00:00 2001 From: "Fred T. Hamster" Date: Wed, 1 Nov 2023 17:07:23 -0400 Subject: [PATCH] reversed polarity, so now FEISTY_MEOW_REPOS_SCAN instead of FEISTY_MEOW_SCAN_REPOS, in honor of existing S variable FEISTY_MEOW_SCRIPTS, to avoid hatred at new inability to auto-complete. --- scripts/core/variables.sh | 16 ++++++++-------- scripts/site_avenger/config/default.app | 2 +- scripts/site_avenger/revamp_cakelampvm_v002.sh | 4 ++-- scripts/system/add_apache_site.sh | 2 +- scripts/system/remove_apache_site.sh | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index 5a0c0b7b..6172635c 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -246,23 +246,23 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org fi # add in any folders that are under the feisty meow applications folder. - define_yeti_variable FEISTY_MEOW_SCAN_REPOS - if [ -z "$FEISTY_MEOW_SCAN_REPOS" ]; then + define_yeti_variable FEISTY_MEOW_REPOS_SCAN + if [ -z "$FEISTY_MEOW_REPOS_SCAN" ]; then if [ -d "$HOME/apps" ]; then - define_yeti_variable FEISTY_MEOW_SCAN_REPOS="$HOME/apps" + define_yeti_variable FEISTY_MEOW_REPOS_SCAN="$HOME/apps" else -# echo "No value set for FEISTY_MEOW_SCAN_REPOS and no default apps folder found in home." +# echo "No value set for FEISTY_MEOW_REPOS_SCAN and no default apps folder found in home." true fi fi - if [ -d "$FEISTY_MEOW_SCAN_REPOS" ]; then + if [ -d "$FEISTY_MEOW_REPOS_SCAN" ]; then #hmmm: handle the repos as if they are multi value!!! # general search for normal project folders in apps. - REPOSITORY_LIST+="$(find "$FEISTY_MEOW_SCAN_REPOS" -maxdepth 2 -mindepth 2 -iname ".git" -type d -exec dirname {} ';') " - REPOSITORY_LIST+="$(find "$FEISTY_MEOW_SCAN_REPOS" -maxdepth 2 -mindepth 2 -iname ".svn" -type d -exec dirname {} ';') " + REPOSITORY_LIST+="$(find "$FEISTY_MEOW_REPOS_SCAN" -maxdepth 2 -mindepth 2 -iname ".git" -type d -exec dirname {} ';') " + REPOSITORY_LIST+="$(find "$FEISTY_MEOW_REPOS_SCAN" -maxdepth 2 -mindepth 2 -iname ".svn" -type d -exec dirname {} ';') " # special search for site avenger directories; they have avenger5 as second level. - REPOSITORY_LIST+="$(find "$FEISTY_MEOW_SCAN_REPOS" -maxdepth 2 -mindepth 2 -iname "avenger5" -type d) " + REPOSITORY_LIST+="$(find "$FEISTY_MEOW_REPOS_SCAN" -maxdepth 2 -mindepth 2 -iname "avenger5" -type d) " fi # the archive list is a set of directories that are major repositories of diff --git a/scripts/site_avenger/config/default.app b/scripts/site_avenger/config/default.app index 6a2d9a26..9220cce5 100644 --- a/scripts/site_avenger/config/default.app +++ b/scripts/site_avenger/config/default.app @@ -13,7 +13,7 @@ # the top level of the user's application storage. if [ -z "$BASE_APPLICATION_PATH" ]; then - export BASE_APPLICATION_PATH="$FEISTY_MEOW_SCAN_REPOS" + export BASE_APPLICATION_PATH="$FEISTY_MEOW_REPOS_SCAN" #hmmm: fix for multivalue usage! fi # where the code should come from. diff --git a/scripts/site_avenger/revamp_cakelampvm_v002.sh b/scripts/site_avenger/revamp_cakelampvm_v002.sh index 7d50a057..bfbcb194 100644 --- a/scripts/site_avenger/revamp_cakelampvm_v002.sh +++ b/scripts/site_avenger/revamp_cakelampvm_v002.sh @@ -114,8 +114,8 @@ chown -R fred:fred /home/fred /home/archives/stuffing /home/fred/.[a-zA-Z0-9]* exit_on_error "chown fred home" #hmmm: argh, wrong check! can't check a multi-value if it's a directory or not!!! -if [ -d "$FEISTY_MEOW_SCAN_REPOS" ]; then - group_perm $FEISTY_MEOW_SCAN_REPOS +if [ -d "$FEISTY_MEOW_REPOS_SCAN" ]; then + group_perm $FEISTY_MEOW_REPOS_SCAN exit_on_error "group perms on fred's apps" fi harsh_perm /home/fred/.ssh diff --git a/scripts/system/add_apache_site.sh b/scripts/system/add_apache_site.sh index b3703ae0..c8c53a49 100644 --- a/scripts/system/add_apache_site.sh +++ b/scripts/system/add_apache_site.sh @@ -12,7 +12,7 @@ source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh" # some convenient defaults for our current usage. if [ -z "$BASE_APPLICATION_PATH" ]; then - BASE_APPLICATION_PATH="$FEISTY_MEOW_SCAN_REPOS" + BASE_APPLICATION_PATH="$FEISTY_MEOW_REPOS_SCAN" #hmmm: take just first item from the repos list! fi if [ -z "$STORAGE_SUFFIX" ]; then diff --git a/scripts/system/remove_apache_site.sh b/scripts/system/remove_apache_site.sh index 9e21fa31..4465a759 100644 --- a/scripts/system/remove_apache_site.sh +++ b/scripts/system/remove_apache_site.sh @@ -12,7 +12,7 @@ source "$FEISTY_MEOW_SCRIPTS/system/common_sysadmin.sh" # some convenient defaults for our current usage. if [ -z "$BASE_APPLICATION_PATH" ]; then - BASE_APPLICATION_PATH="$FEISTY_MEOW_SCAN_REPOS" + BASE_APPLICATION_PATH="$FEISTY_MEOW_REPOS_SCAN" #hmmm: take just first item! fi if [ -z "$STORAGE_SUFFIX" ]; then -- 2.34.1