From 1994950ca611ac3324d7254fb86af4012515e055 Mon Sep 17 00:00:00 2001
From: hjp <hjp>
Date: Fri, 23 Apr 2004 20:33:46 +0000
Subject: [PATCH] Moved java env stuff to .zjava

---
 .zjava      | 36 ++++++++++++++++++++++++++++++++++++
 .zprofile   |  4 +++-
 .zshenv     | 25 +------------------------
 GNUmakefile |  1 +
 4 files changed, 41 insertions(+), 25 deletions(-)
 create mode 100644 .zjava

diff --git a/.zjava b/.zjava
new file mode 100644
index 0000000..19e9f90
--- /dev/null
+++ b/.zjava
@@ -0,0 +1,36 @@
+for i in /usr/local/j2sdk1.4.2 /usr/local/j2sdk1.4.1 /usr/java/j2sdk1.4.0 \
+    /usr/java/jdk1.3.1_02 /usr/java/jre1.3.1_02 \
+    /usr/local/jdk1.2.2 /usr/java1.2 /usr/local/jdk1.2 \
+    /usr/local/jdk117_v3 /usr/local/jdk1.1.6 \
+    /usr/local/java
+do
+    if [ -d "$i/bin" ]
+    then
+	PATH=$(apppath "$i/bin")
+	export JAVA_HOME=bin
+	break;
+    fi
+done
+
+ALL_PATH=.:/usr/local/java/classes:$ORACLE_HOME/jdbc/lib/classes111.zip:/usr/java1.2/lib/tools.jar:/usr/local/jswdk-1.0.1/lib/servlet.jar:/usr/local/java/lib/Tidy.jar:/usr/local/roxen/2.1/roxen/server/java/classes/servlet.jar
+NEW_PATH=""
+
+for i in ${(s/:/)ALL_PATH}
+do
+	if test -r "$i"
+	then
+		case "$NEW_PATH" in
+		$i:*|*:$i|*:$i:*) ;;
+		*)
+			if test -z "$NEW_PATH"
+			then
+				NEW_PATH=$i
+			else
+				NEW_PATH=$NEW_PATH:$i
+			fi
+		esac
+	fi
+done
+
+export CLASSPATH=$NEW_PATH
+
diff --git a/.zprofile b/.zprofile
index 9636af4..82465f8 100644
--- a/.zprofile
+++ b/.zprofile
@@ -1,5 +1,5 @@
 #
-# $Id: .zprofile,v 1.10 2003-09-10 20:58:13 hjp Exp $
+# $Id: .zprofile,v 1.11 2004-04-23 20:33:46 hjp Exp $
 #
 # this is sourced for login shells after .zshenv but before .zshrc
 #
@@ -30,3 +30,5 @@ fi
 
 unset MAILCHECK
 export EDITOR=vi
+
+. ~/.zjava
diff --git a/.zshenv b/.zshenv
index 1bd4d60..11bee2b 100644
--- a/.zshenv
+++ b/.zshenv
@@ -42,7 +42,6 @@ PRIVATE_PATH=$HOME/bin/scripts:$HOME/bin:$HOME/public_html/bin:$HOME/pgreplica/b
 ETC_PATH=/usr/sbin:/sbin:/opt/omni/sbin:/opt/omni/lbin:/var/qmail/bin:/usr/local/ssl/bin:/usr/adm/acct/wsr/bin:/opt/tusc/bin:/usr/local/pgsql/bin
 LOCAL_PATH=/usr/local/arm-linux/bin:/usr/local/sbin:/usr/local/samba/bin:/usr/local/bin:/usr/local/bin/X11:/usr/local/povray3/bin:/usr/local/majordomo/bin:/usr/lib/majordomo/bin:/usr/local/vnc_x86_linux_2.0:/usr/local/rrdtool-1.0.35/bin:/usr/local/OpenOffice.org1.0.2/program
 BIN_PATH=/usr/bin/X11:/bin:/usr/bin:/usr/ccs/bin:/usr/openwin/bin:/opt/kde/bin:/opt/perl5/bin:/opt/Office51/bin:/usr/games:/usr/contrib/bin
-JAVA_PATH=/usr/local/j2sdk1.4.1/bin:/usr/java/j2sdk1.4.0/bin:/usr/java/jdk1.3.1_02/bin:/usr/java/jre1.3.1_02/bin:/usr/local/jdk1.2.2/bin:/usr/java1.2/bin:/usr/local/jdk1.2/bin:/usr/local/jdk117_v3/bin:/usr/local/jdk1.1.6/bin:/usr/local/java/bin
 ORACLE_PATH=$ORACLE_HOME/bin
 
 if [ -r /etc/PATH ]
@@ -50,7 +49,7 @@ then
 	PATH=`cat /etc/PATH`:$PATH
 fi
 
-ALL_PATH=$PRIVATE_PATH:$LOCAL_PATH:$ETC_PATH:$JAVA_PATH:$BIN_PATH:$ORACLE_PATH:$PATH
+ALL_PATH=$PRIVATE_PATH:$LOCAL_PATH:$ETC_PATH:$BIN_PATH:$ORACLE_PATH:$PATH
 NEW_PATH=""
 
 for i in ${(s/:/)ALL_PATH}
@@ -238,28 +237,6 @@ esac
 
 export TABLE_DELIMITER='|'
 
-ALL_PATH=.:/usr/local/java/classes:$ORACLE_HOME/jdbc/lib/classes111.zip:/usr/java1.2/lib/tools.jar:/usr/local/jswdk-1.0.1/lib/servlet.jar:/usr/local/java/lib/Tidy.jar:/usr/local/roxen/2.1/roxen/server/java/classes/servlet.jar
-NEW_PATH=""
-
-for i in ${(s/:/)ALL_PATH}
-do
-	if test -r "$i"
-	then
-		case "$NEW_PATH" in
-		$i:*|*:$i|*:$i:*) ;;
-		*)
-			if test -z "$NEW_PATH"
-			then
-				NEW_PATH=$i
-			else
-				NEW_PATH=$NEW_PATH:$i
-			fi
-		esac
-	fi
-done
-
-export CLASSPATH=$NEW_PATH
-
 if [ -d /usr/local/pgsql/data/ ]
 then
 	export PGDATA=/usr/local/pgsql/data/
diff --git a/GNUmakefile b/GNUmakefile
index fb6a25f..c3b5c42 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -2,6 +2,7 @@ include GNUmakerules
 include GNUmakevars
 
 ALLSRC = \
+	.zjava \
 	.zlogin \
 	.zlogout \
 	.znewterm \