unified EDITOR variable setup

[feisty_meow.git] / scripts / core / variables.sh

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index f2a0f40187b483682e8e735fd2355c397225593b..d8b44bc845aeaa7b2451473caabcb822bc1e83bb 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -112,7 +112,7 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org
 
   # 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/zz_feisty_meow_events.log"
+    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.
@@ -318,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
@@ -337,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
 
 ##############