projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
89bbd8f
)
also elimininated references to $HOME/feisty_meow
author
Chris Koeritz
<fred@gruntose.com>
Fri, 10 Nov 2017 23:39:46 +0000
(18:39 -0500)
committer
Chris Koeritz
<fred@gruntose.com>
Fri, 10 Nov 2017 23:39:46 +0000
(18:39 -0500)
scripts/core/variables.sh
patch
|
blob
|
history
diff --git
a/scripts/core/variables.sh
b/scripts/core/variables.sh
index 81d80d760e15026486ec54bc2270100b7489f6e1..e743345d94cd70a7b3d4ae473032efae9d2645e7 100644
(file)
--- 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
# 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_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
fi
fi