fixed path for shunit.

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

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 48892624f49bf6182a12733126606c1e603cef7a..3f36b21f1ade30f0b66e23e44e2b17d1cf2228e2 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -112,18 +112,13 @@ if [ -z "$NECHUNG" ]; then
   export NECHUNG=$FEISTY_MEOW_DIR/database/fortunes.dat
   
   # ensure we use the right kind of secure shell.
-  export CVS_RSH=$FEISTY_MEOW_SCRIPTS/tty/ssh.sh
-  export GIT_SSH=$FEISTY_MEOW_SCRIPTS/tty/ssh.sh
+  export CVS_RSH=$FEISTY_MEOW_SCRIPTS/security/ssh.sh
+  export GIT_SSH=$FEISTY_MEOW_SCRIPTS/security/ssh.sh
   
   # the base checkout list is just to update feisty_meow.  additional folder
   # names can be added in your customized scripts.
   export REPOSITORY_LIST="feisty_meow"
   
-  # set the editor for subversion if it hasn't already been set.
-  if [ -z "$SVN_EDITOR" ]; then
-    export SVN_EDITOR=$(which vi)
-  fi
-  
   # initializes the feisty meow build variables, if possible.
   function initialize_build_variables()
   {
@@ -157,9 +152,6 @@ if [ -z "$NECHUNG" ]; then
     fi
   }
   
-  # load in the build environment.
-  initialize_build_variables
-  
   ##############
   
   # windoze specific patching up missing things.
@@ -170,12 +162,22 @@ if [ -z "$NECHUNG" ]; then
   
   ##############
   
+  # load in the build environment.
+  initialize_build_variables
+  
+  ##############
+  
   # set the path for locating applications.  this is done after any
   # potential overrides from the user.
   #export PATH="$(dos_to_msys_path $BINDIR):$(dos_to_msys_path $FEISTY_MEOW_GENERATED):$PATH:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:."
   export PATH="$FEISTY_MEOW_GENERATED:$PATH:/sbin:."
 ###noise! :/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:.
   
+  ##############
+
+  # set the SHUNIT_DIR so our shunit tests can find the codebase.
+  export SHUNIT_DIR="$FEISTY_MEOW_SCRIPTS/shunit"
+  
   ##############
   
   if [ ! -z "$SHELL_DEBUG" ]; then echo variables initialization ends....; fi