projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update for new name of cloud = nuage
[feisty_meow.git]
/
scripts
/
core
/
variables.sh
diff --git
a/scripts/core/variables.sh
b/scripts/core/variables.sh
index 0628a4f1d017f197bfcc79bb579f652c7c030fb3..3596c0c4f5ae4141c832487dea8019dde4ba868b 100644
(file)
--- a/
scripts/core/variables.sh
+++ b/
scripts/core/variables.sh
@@
-110,6
+110,11
@@
define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
define_yeti_variable TMP=$HOME/.tmp
fi
define_yeti_variable TMP=$HOME/.tmp
fi
+ # set up our event logging file for any notable situation to be recorded in.
+ if [ -z "$FEISTY_MEOW_EVENT_LOG" ]; then
+ define_yeti_variable FEISTY_MEOW_EVENT_LOG="$TMP/$USER-feisty_meow-events.log"
+ fi
+
# set up the top-level for all build creations and logs and such.
if [ -z "$FEISTY_MEOW_GENERATED_STORE" ]; then
define_yeti_variable FEISTY_MEOW_GENERATED_STORE="$TMP/generated-feisty_meow"
# set up the top-level for all build creations and logs and such.
if [ -z "$FEISTY_MEOW_GENERATED_STORE" ]; then
define_yeti_variable FEISTY_MEOW_GENERATED_STORE="$TMP/generated-feisty_meow"
@@
-218,11
+223,13
@@
define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
if [ -d "$HOME/active" ]; then
REPOSITORY_LIST+="$(find "$HOME/active" -maxdepth 1 -mindepth 1 -type d) "
fi
if [ -d "$HOME/active" ]; then
REPOSITORY_LIST+="$(find "$HOME/active" -maxdepth 1 -mindepth 1 -type d) "
fi
- # add in any site avenger applications that are in the apps folder.
+ # add in any site avenger applications that are in the app
lication
s folder.
if [ -d "$HOME/apps" ]; then
if [ -d "$HOME/apps" ]; then
- # first, simple projects.
- REPOSITORY_LIST+="$(find "$HOME/apps" -iname "avenger5" -type d) "
- # then, site avenger specific projects.
+ # general search for normal project folders in apps.
+ REPOSITORY_LIST+="$(find "$HOME/apps" -maxdepth 2 -mindepth 2 -iname ".git" -type d -exec dirname {} ';') "
+ REPOSITORY_LIST+="$(find "$HOME/apps" -maxdepth 2 -mindepth 2 -iname ".svn" -type d -exec dirname {} ';') "
+
+ # special search for site avenger directories; they have avenger5 as second level.
REPOSITORY_LIST+="$(find "$HOME/apps" -maxdepth 2 -mindepth 2 -iname "avenger5" -type d) "
fi
REPOSITORY_LIST+="$(find "$HOME/apps" -maxdepth 2 -mindepth 2 -iname "avenger5" -type d) "
fi
@@
-311,8
+318,11
@@
done
# a late breaking action is to set the editor, if we can.
# we will fallback to whatever we can find on the host.
export EDITOR
# a late breaking action is to set the editor, if we can.
# we will fallback to whatever we can find on the host.
export EDITOR
-if [ -z "$EDITOR" ]; then
- EDITOR="$(which bluefish)"
+if [ ! -z "$DISPLAY" ]; then
+ # only try to add bluefish, a gui editor, if there is an X display for it.
+ if [ -z "$EDITOR" ]; then
+ EDITOR="$(which bluefish)"
+ fi
fi
if [ -z "$EDITOR" ]; then
EDITOR="$(which gvim)"
fi
if [ -z "$EDITOR" ]; then
EDITOR="$(which gvim)"