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=976c7898cbfd20ee14ffda97e0ee4443e9da05e9;hb=2b8c3b9f11123159c7e0c20b550c7bfefd796317;hpb=afff950f497547f99b9df6287c6227868b5cfa3f diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index 976c7898..e743345d 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -56,6 +56,9 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then # start with some simpler things. +#hmmm: this needs to come from some configuration item. especially for installs. +define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org + define_yeti_variable SCRIPT_SYSTEM=feisty_meow # OS variable records the operating system we think we found. @@ -93,9 +96,12 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then # 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