added svn projects to checkin list sought for apps

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

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 0628a4f1d017f197bfcc79bb579f652c7c030fb3..8eca55eb6544ad20695e414005c5bbc2c4829e97 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -218,11 +218,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,8 +313,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
-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)"