updated to correct some misapprehensions about how well gvim would work as an editor for

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

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 5586ea1680435f2ec1784dadf324b4c85397682a..d71d6a4302c30d4ffded82c7c0e73095a36a7dd7 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -9,6 +9,17 @@
 
 ##############
 
+# this section should always run or bash will reset them on us.
+# these need to be as minimal as possible.
+
+# sets the main prompt to a simple default, with user@host.
+export PS1='\u@\h $ ';
+# sets the history length and max file size so we can get some long history around here.
+export HISTSIZE=1000000
+export HISTFILESIZE=2000000
+  
+##############
+  
 # we'll run this again only if we think it's needed.
 if [ -z "$NECHUNG" ]; then
 
@@ -61,11 +72,6 @@ if [ -z "$NECHUNG" ]; then
   
   ##############
   
-  # include helpful functions.
-  source "$FEISTY_MEOW_SCRIPTS/core/functions.sh"
-  
-  ##############
-  
   # user variables, sort of...  if they haven't given themselves a name yet,
   # then we will make one up for them.
   
@@ -76,11 +82,6 @@ if [ -z "$NECHUNG" ]; then
   
   ##############
   
-  # sets the main prompt to a simple default, with user@host.
-  export PS1='\u@\h $ ';
-  
-  ##############
-  
   # variables for perl.
   
   export PERLLIB
@@ -110,27 +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
-  
-  # sets the history length and max file size so we can get some long history around here.
-  HISTSIZE=1000000
-  HISTFILESIZE=2000000
+  # 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()
   {
@@ -177,22 +165,6 @@ if [ -z "$NECHUNG" ]; then
   
   ##############
   
-  # pull in the custom overrides for feisty_meow scripts.  this is done last,
-  # because we want to set everything up as expected, then let the user
-  # override individual variables and definitions.
-  for i in $FEISTY_MEOW_GENERATED/custom/*.sh; do
-    if [ ! -f "$i" ]; then
-      # skip it if it's not real.
-      continue;
-    fi
-    if [ ! -z "$SHELL_DEBUG" ]; then
-      echo "loading customization: $(basename $(dirname $i))/$(basename $i)"
-    fi
-    source $i
-  done
-  
-  ##############
-  
   # 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:."
@@ -203,12 +175,23 @@ if [ -z "$NECHUNG" ]; then
   
   if [ ! -z "$SHELL_DEBUG" ]; then echo variables initialization ends....; fi
 
-else
-  # we are seeing this lot again, we believe, so make things easier for the
-  # rest of initialization.
-  export LIGHTWEIGHT_INIT=true
-  if [ ! -z "$SHELL_DEBUG" ]; then
- echo skipped var init and put in lightweight mode due to belief in previous existence.; 
-fi
 fi
 
+##############
+
+# pull in the custom overrides for feisty_meow scripts.  this is done last,
+# because we want to set everything up as expected, then let the user
+# override individual variables and definitions.  we also don't guard this
+# to avoid running it again, because we don't know what mix of functions and
+# aliases they want to define in there.
+for i in $FEISTY_MEOW_GENERATED/custom/*.sh; do
+  if [ ! -f "$i" ]; then
+    # skip it if it's not real.
+    continue;
+  fi
+  if [ ! -z "$SHELL_DEBUG" ]; then
+    echo "loading customization: $(basename $(dirname $i))/$(basename $i)"
+  fi
+  source $i
+done
+