X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=d8b44bc845aeaa7b2451473caabcb822bc1e83bb;hb=66abd1163765e482f9c11ec50210f44f2d2f06e9;hp=b64b167098c89726696ab05b7edb3ebeddf51ea4;hpb=9c8d6b8ff823b89d7c7a8d652ead56de3d91c8c1;p=feisty_meow.git

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index b64b1670..d8b44bc8 100644
--- 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
 
+  # 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"
@@ -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
-  # add in any site avenger applications that are in the apps folder.
+  # add in any site avenger applications that are in the applications folder.
   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
   
@@ -311,12 +318,10 @@ 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
-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
+# note: the editors for revision control must wait while the document is
+# edited, so gvim and others that launch a separate x window are not
+# going to work well unless they can be prevented from forking the process
+# off.
 if [ -z "$EDITOR" ]; then
   EDITOR="$(which gvim)"
   if [ ! -z "$EDITOR" ]; then
@@ -330,12 +335,18 @@ fi
 if [ -z "$EDITOR" ]; then
   EDITOR="$(which vi)"
 fi
-##
+if [ -z "$EDITOR" ]; then
+  EDITOR="$(which emacs)"
+fi
+####
 # out of ideas about editors at this point.
-##
-# set the VISUAL variable from EDITOR if we found an editor to use.
+####
+# set the VISUAL and other variables from EDITOR if we found an editor to use.
 if [ ! -z "$EDITOR" ]; then
   VISUAL="$EDITOR"
+
+  export GIT_EDITOR="$EDITOR"
+  export SVN_EDITOR="$EDITOR"
 fi
 
 ##############