funkman 2003/07/31 08:17:55
Modified: catalina/src/bin setclasspath.sh
Log:
os400 port from 4.1
Revision Changes Path
1.5 +16 -6 jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh
Index: setclasspath.sh
===================================================================
RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/bin/setclasspath.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- setclasspath.sh 17 Jan 2003 10:05:40 -0000 1.4
+++ setclasspath.sh 31 Jul 2003 15:17:55 -0000 1.5
@@ -10,10 +10,18 @@
echo "This environment variable is needed to run this program"
exit 1
fi
-if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/jdb -o ! -r
"$JAVA_HOME"/bin/javac ]; then
- echo "The JAVA_HOME environment variable is not defined correctly"
- echo "This environment variable is needed to run this program"
- exit 1
+if $os400; then
+ if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/javac ]; then
+ echo "The JAVA_HOME environment variable is not defined correctly"
+ echo "This environment variable is needed to run this program"
+ exit 1
+ fi
+else
+ if [ ! -r "$JAVA_HOME"/bin/java -o ! -r "$JAVA_HOME"/bin/jdb -o ! -r
"$JAVA_HOME"/bin/javac ]; then
+ echo "The JAVA_HOME environment variable is not defined correctly"
+ echo "This environment variable is needed to run this program"
+ exit 1
+ fi
fi
if [ -z "$BASEDIR" ]; then
echo "The BASEDIR environment variable is not defined"
@@ -45,5 +53,7 @@
# Set standard commands for invoking Java.
_RUNJAVA="$JAVA_HOME"/bin/java
-_RUNJDB="$JAVA_HOME"/bin/jdb
+if [ ! "$os400" ]; then
+ _RUNJDB="$JAVA_HOME"/bin/jdb
+fi
_RUNJAVAC="$JAVA_HOME"/bin/javac
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
