68 lines
1.6 KiB
Plaintext
68 lines
1.6 KiB
Plaintext
--- linuxx86/hinst.orig Tue Mar 19 17:18:14 2002
|
|
+++ linuxx86/hinst Sat Apr 27 11:33:28 2002
|
|
@@ -1965,10 +1965,32 @@
|
|
#
|
|
###############################################################################
|
|
|
|
+check_for_ns() {
|
|
+ BIN=`/usr/bin/file $1/plugins/libnullplugin.so | /usr/bin/awk '{print $11}'`
|
|
+ case ${BIN} in
|
|
+ \(SYSV\),)
|
|
+ NETSCAPE_DIR="$1"
|
|
+ PLUGIN_PATH="$s/plugins"
|
|
+ FOUND_NS="TRUE"
|
|
+ esac
|
|
+}
|
|
+
|
|
+NSCP="/usr/local/libexec/netscape \
|
|
+ /usr/local/libexec/netscape-linux \
|
|
+ /usr/local/netscape \
|
|
+ /usr/local/netscape-linux \
|
|
+ /usr/local/lib/netscape \
|
|
+ /usr/local/lib/netscape-linux \
|
|
+ $MOZILLA_HOME"
|
|
+
|
|
+for dir in ${NSCP}; do
|
|
+ if [ -e $dir/plugins/libnullplugin.so ]; then
|
|
+ check_for_ns $dir;
|
|
+ fi
|
|
+done
|
|
+
|
|
INST_DIR=$ICAInstDir
|
|
TMP_NAME=/tmp/ICAnetscape.$$
|
|
-NETSCAPE_DIR="/usr/local/lib/netscape"
|
|
-PLUGIN_PATH="/usr/local/netscape/plugins"
|
|
PLUGIN_NAME=npica.so
|
|
PLUGIN_CLASS=ICAClObj.class
|
|
|
|
@@ -2017,15 +2039,12 @@
|
|
$ECHO_CMD $integrate_netscape1
|
|
search_ok=0
|
|
|
|
- if test -d "/usr/lib/netscape"\
|
|
- || test -d "/usr/local/netscape"\
|
|
- || test -d "/opt/netscape"\
|
|
- || test -d "/usr/local/lib/netscape"\
|
|
- || test "$MOZILLA_HOME" != "" -a -d "$MOZILLA_HOME"
|
|
- then
|
|
+ case ${FOUND_NS} in
|
|
+ TRUE)
|
|
$ECHO_CMD $integrate_netscape3
|
|
found_netscape
|
|
- else
|
|
+ ;;
|
|
+ *)
|
|
echo_no_nl $integrate_netscape2
|
|
getyesno $INSTALLER_NO
|
|
if [ "$ANSWER" = "$INSTALLER_YES" ]
|
|
@@ -2034,7 +2053,8 @@
|
|
else
|
|
$ECHO_CMD $integrate_netscape6
|
|
fi
|
|
- fi;
|
|
+ ;;
|
|
+ esac;
|
|
}
|
|
|
|
################################################################################
|