From 29fb56bd4baaa451e2dc75c6fc0469363d95f259 Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Fri, 10 Nov 2017 18:39:46 -0500 Subject: [PATCH] also elimininated references to $HOME/feisty_meow --- scripts/core/variables.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index 81d80d76..e743345d 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -96,9 +96,12 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org # this is only used for extreme failure modes, when the values were not # pulled in from our auto-generated config. if [ -z "$FEISTY_MEOW_APEX" ]; then - if [ -d "$HOME/feisty_meow" ]; then + if [ -d "/opt/feistymeow.org/feisty_meow" ]; then + define_yeti_variable FEISTY_MEOW_APEX="/opt/feistymeow.org/feisty_meow" + define_yeti_variable FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_APEX/scripts" + elif [ -d "$HOME/feisty_meow" ]; then define_yeti_variable FEISTY_MEOW_APEX="$HOME/feisty_meow" - define_yeti_variable FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_SCRIPTS" + define_yeti_variable FEISTY_MEOW_SCRIPTS="$FEISTY_MEOW_APEX/scripts" fi fi -- 2.34.1