From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 10 Nov 2017 23:39:46 +0000 (-0500)
Subject: also elimininated references to $HOME/feisty_meow
X-Git-Tag: 2.140.93^2~5
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=29fb56bd4baaa451e2dc75c6fc0469363d95f259;p=feisty_meow.git

also elimininated references to $HOME/feisty_meow
---

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