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 2b196b89c4eb79cad4abf9d1056da2b4ecb2a5cd..8df58455cd6c281dfe0f6171776c09771c366818 100644 (file)
--- 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 9ef448047ab7527090427db47af936537ff3880a..82bf336e5c39adb81c80fc74275a44a783eb9048 100644 (file)
--- 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.