From: Fred Hamster <fred@banshee.(none)>
Date: Sat, 4 Feb 2012 20:08:26 +0000 (-0500)
Subject: fred vars updated to include an EDITOR setting.
X-Git-Tag: 2.140.90~1641
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=e93b155f95a019775a27f2b3ad03484e1bacfcdf;p=feisty_meow.git

fred vars updated to include an EDITOR setting.
java profile updated to include standard oracle java 7 on linux.
---

diff --git a/scripts/examples/custom_overrides/fred/fred_variables.sh b/scripts/examples/custom_overrides/fred/fred_variables.sh
index 2b196b89..8df58455 100644
--- a/scripts/examples/custom_overrides/fred/fred_variables.sh
+++ b/scripts/examples/custom_overrides/fred/fred_variables.sh
@@ -38,6 +38,8 @@ export VISUAL=$(which vim)
 # special settings for win32 and svn.
 if [ "$OS" == "Windows_NT" ]; then
   export EDITOR=$(which gvim)
+else
+  export EDITOR=$(which vi)
 fi
 
 # this hideous mess is necessitated by our not having found the source of the
diff --git a/scripts/examples/custom_overrides/fred/java_profile.sh b/scripts/examples/custom_overrides/fred/java_profile.sh
index 9ef44804..82bf336e 100644
--- a/scripts/examples/custom_overrides/fred/java_profile.sh
+++ b/scripts/examples/custom_overrides/fred/java_profile.sh
@@ -30,6 +30,9 @@ if [ ! -d "$JAVA_HOME" ]; then
   # first try a recent linux version.
   export JAVA_HOME=/usr/lib/jvm/java-6-sun/jre
 fi
+if [ ! -d "$JAVA_HOME" ]; then
+  export JAVA_HOME=/usr/lib/jvm/java-7-oracle/jre
+fi
 if [ ! -d "$JAVA_HOME" ]; then
   # try using a windows version.
 #note: this logic is untested.