X-Git-Url: https://feistymeow.org/gitweb/?p=feisty_meow.git;a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;fp=scripts%2Fcore%2Fvariables.sh;h=e743345d94cd70a7b3d4ae473032efae9d2645e7;hp=81d80d760e15026486ec54bc2270100b7489f6e1;hb=29fb56bd4baaa451e2dc75c6fc0469363d95f259;hpb=89bbd8fff37ad9c060c989b07fb6d2fb87972a7d 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