projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of feistymeow.org:feisty_meow
[feisty_meow.git]
/
scripts
/
core
/
variables.sh
diff --git
a/scripts/core/variables.sh
b/scripts/core/variables.sh
index 976c7898cbfd20ee14ffda97e0ee4443e9da05e9..b6311dacff8517b02357178abcc4ff9a3f09ab6f 100644
(file)
--- 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.
# 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.
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
# 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
@@
-169,7
+175,6
@@
if [ -z "$CORE_VARIABLES_LOADED" ]; then
# variables for perl.
define_yeti_variable PERLLIB+="/usr/lib/perl5"
# variables for perl.
define_yeti_variable PERLLIB+="/usr/lib/perl5"
- define_yeti_variable PERL5LIB+="/usr/lib/perl5"
if [ "$OS" == "Windows_NT" ]; then
define_yeti_variable PERLIO=:perlio
# choose perl's IO over the ms-windows version so we can handle file
if [ "$OS" == "Windows_NT" ]; then
define_yeti_variable PERLIO=:perlio
# choose perl's IO over the ms-windows version so we can handle file
@@
-184,10
+189,10
@@
if [ -z "$CORE_VARIABLES_LOADED" ]; then
ls $i/*.pl &>/dev/null
if [ $? -eq 0 ]; then
PERLLIB+=":$(dos_to_unix_path $i)"
ls $i/*.pl &>/dev/null
if [ $? -eq 0 ]; then
PERLLIB+=":$(dos_to_unix_path $i)"
- PERL5LIB+=":$(dos_to_unix_path $i)"
fi
fi
done
fi
fi
done
+ define_yeti_variable PERL5LIB=$PERLLIB
#echo PERLLIB is now $PERLLIB
##############
#echo PERLLIB is now $PERLLIB
##############