X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=f40dfc4f81dc76486b5f320fb4b7bb030e33ac28;hb=dc218f31310e5fa1bec2091c1cd29f6772c40336;hp=48892624f49bf6182a12733126606c1e603cef7a;hpb=822d21fe89e414db3f252501194fb4ca93e3e405;p=feisty_meow.git

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 48892624..f40dfc4f 100644
--- 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()
   {
@@ -139,27 +134,16 @@ if [ -z "$NECHUNG" ]; then
     fi
     # now augment the environment if we found our build variables.
     if [ $found_build_vars == 1 ]; then
-      # the binary directory contains handy programs we use a lot in yeti.  we set up the path to it
-      # here based on the operating system.
-      # note that yeti has recently become more dependent on hoople.  hoople was always the source of
-      # the binaries, but now we don't ship them with yeti any more as pre-built items.  this reduces
-      # the size of the code package a lot and shortens up our possible exposure to compromised
-      # binaries.  people can bootstrap up their own set from hoople now instead.
+      # the binary directory contains handy programs we use a lot.  we set
+      # up the path to it here based on the operating system.
       export BINDIR=$FEISTY_MEOW_DIR/production/binaries
-  
       # add binaries created within build to the path.
-#    export PATH="$(dos_to_msys_path $BUILD_TOP/build/bin):$PATH"
       export PATH="$BINDIR:$PATH"
-  
       # Shared libraries are located via this variable.
-#    export LD_LIBRARY_PATH="$(dos_to_msys_path $LD_LIBRARY_PATH):$(dos_to_msys_path $BINDIR)"
       export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$BINDIR"
     fi
   }
   
-  # load in the build environment.
-  initialize_build_variables
-  
   ##############
   
   # windoze specific patching up missing things.
@@ -170,12 +154,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