From: Chris Koeritz <fred@gruntose.com>
Date: Fri, 2 Mar 2012 20:21:35 +0000 (-0500)
Subject: cleaned out some gvim vs vi oddity on windows.
X-Git-Tag: 2.140.90~1541
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=a1e68cb2086fa04ea39714ddea2414ed139a86c1;p=feisty_meow.git

cleaned out some gvim vs vi oddity on windows.
---

diff --git a/scripts/core/common.alias b/scripts/core/common.alias
index 82528b4d..03421eb3 100644
--- a/scripts/core/common.alias
+++ b/scripts/core/common.alias
@@ -92,10 +92,6 @@ alias cputemp='acpi -t'
 alias recustomize='regenerate &>/dev/null; echo "copying custom overrides for fred..."; cpdiff $FEISTY_MEOW_DIR/examples/custom_overrides/fred $FEISTY_MEOW_GENERATED/custom; regenerate'
 # makes root user's home directory's permissions right.
 alias reroot='chown -R root:root /root'
-# replace the vi command with a graphical version on windows.
-if [ "$OS" = "Windows_NT" ]; then
-  alias vi='gvim'
-fi
 # yes, these are really helpful...
 alias whereami='echo whoa dude, try not to think about it...'
 alias why='echo just because.'
diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 0f1ed10d..a61b2fa0 100644
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -120,12 +120,7 @@ if [ -z "$NECHUNG" ]; then
   
   # 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
+    export SVN_EDITOR=$(which vi)
   fi
   
   # initializes the feisty meow build variables, if possible.