110724 - /usr/bin/mozilla RPM script doesn't locate IBM's JRE properly

Status: RESOLVED FIXED

(SeaMonkey :: Build Config, defect)

Description

[Manfred Hollstein]

The directory structure of the IBM JRE (IBMJava2-JRE-1.3-9.0 on Red Hat Linux
7.2) is different compared to Sun's jre (jre-1.3.1_01-fcs). The start script
/usr/bin/mozilla, which is contained in Mozilla's RPMs for Linux, tries to
locate the "java" script based on where the plugin is stored; while this works
OK for the Sun version, it doesn't for IBM's because IBM have the plugin as
well as the "java" script stored in the *same* directory. This is compensated
by the following patch:

--- ./usr/bin/mozilla.orig      Fri Oct 12 09:01:19 2001
+++ ./usr/bin/mozilla   Thu Nov  8 12:15:32 2001
@@ -81,22 +81,14 @@ function set_jvm_vars() {
 
     JVM_BASE=`basename $JVM_LINK`
     JVM_DIR=`echo $JVM_LINK | sed -e s/$JVM_BASE//g`
-    JVM_DIR=${JVM_DIR}../../../bin/
-
-    # make sure it was found
-    if [ -z "$JVM_DIR" ]; then
-        return
-    fi
-
-    # does it exist?
-    if [ ! -d "$JVM_DIR" ]; then
-        return
-    fi
-
     JVM_COMMAND=$JVM_DIR/java
-    # does the command exist?
-    if [ ! -r "$JVM_COMMAND" ]; then
-       return
+    if [ ! -r $JVM_COMMAND ]; then
+       JVM_DIR=${JVM_DIR}../../../bin/
+       JVM_COMMAND=$JVM_DIR/java
+       # does the command exist?
+       if [ ! -r "$JVM_COMMAND" ]; then
+           return
+       fi
     fi
 
     # export this temporarily - it seems to work with old and new

Comment 1

[Diego Biurrun]

over to the right location

Comment 2

[Igor Nekrestyanov]

Hmm ... This is about mozilla/build/package/rpm/SOURCES/mozilla.sh.
I do not think this relate to OJI. 

Let to move this to "Build config". 

Comment 3

[timeless]

oddly this is not an oji issue.

Comment 4

[Olav Vitters]

Marking new.

Comment 5

[Christopher Blizzard (:blizzard)]

Checked in the patch.  Thanks!