edited fortune.

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

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 0f1ed10d6389776183f38937cd2f6da52ac89d43..1a9d5b396f5418845033bdaa15820c40da676acb 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -111,23 +111,14 @@ if [ -z "$NECHUNG" ]; then
   # set this so nechung can find its data.
   export NECHUNG=$FEISTY_MEOW_DIR/database/fortunes.dat
   
-  # ensure we use the right kind of rsh for security.
-  export CVS_RSH=ssh
+  # ensure we use the right kind of secure shell.
+  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
-  #hmmm: not sure what original reason for having these different was...
-    if [ "$OS"  == "Windows_NT" ]; then
-      export SVN_EDITOR=$(which gvim)
-    else
-      export SVN_EDITOR=$(which vi)
-    fi
-  fi
-  
   # initializes the feisty meow build variables, if possible.
   function initialize_build_variables()
   {
@@ -161,9 +152,6 @@ if [ -z "$NECHUNG" ]; then
     fi
   }
   
-  # load in the build environment.
-  initialize_build_variables
-  
   ##############
   
   # windoze specific patching up missing things.
@@ -174,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:."