X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Fvariables.sh;h=1a9d5b396f5418845033bdaa15820c40da676acb;hb=db66dc8a1a99e07deb189b41b126060d7b12e60f;hp=956198d87f5f31304b4af42df760a63dd7d87841;hpb=609955490ac73b6cc566a8c28df0e8683018ee15;p=feisty_meow.git

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 956198d8..1a9d5b39 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/secure/ssh.sh
-  export GIT_SSH=$FEISTY_MEOW_SCRIPTS/secure/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,6 +162,11 @@ 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:."