blob: 750ceb4f2af3ec013eead707a7271818e8d5494a (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
|
--- linuxx86/hinst.orig Thu May 22 12:30:28 2003
+++ linuxx86/hinst Mon Aug 11 16:52:05 2003
@@ -2132,10 +2132,34 @@
#
###############################################################################
+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 \
+ /usr/local/lib/linux-mozilla \
+ /usr/local/lib/mozilla \
+ $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
MAILCAP_FILE=mailcap
@@ -2206,36 +2230,29 @@
netscape_integrate()
{
- $ECHO_CMD $integrate_netscape1
if test -z "$SU_INSTALL"
then
set_npui_variables
found_netscape
else
search_ok=0
- EXTRA_BROWSERS=`find_browsers`
-
- if test -d "/usr/lib/netscape"\
- || test -d "/usr/local/netscape"\
- || test -d "/opt/netscape"\
- || test -d "/usr/local/lib/netscape"\
- || test -d "/usr/dt/appconfig/netscape"\
- || test "$MOZILLA_HOME" != "" -a -d "$MOZILLA_HOME"\
- || test "$EXTRA_BROWSERS" != ""
- 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" ]
- then
+ if [ "$ANSWER" = "$INSTALLER_YES" ]; then
found_netscape
else
$ECHO_CMD $integrate_netscape6
fi
- fi
- fi
+ ;;
+ esac
+ fi
# Create utility script files in install root.
create_wfica_script
@@ -2866,37 +2883,6 @@
echo "$BINDIR"
}
-################################################################################
-#
-# find_browsers
-#
-# Returns a list of directories containing new-style mozilla-based browsers
-# that may be launched by files on the $PATH.
-#
-################################################################################
-find_browsers()
-{
- PROGS="netscape mozilla"
- DIST_BIN_DIR=""
- STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla"
- for d in `echo $PATH | sed "s/:/ /g"` $STANDARD_DIRS
- do
- echo $d
- done | sort -u | while read d
- do
- for p in $PROGS
- do
- # Find the each instance of each named browser
- PROG=$d/$p
- if test -f $PROG
- then
- # Where is the installation and what version is it?
- find_extra_bin_dirs $PROG
- fi
- done
- done | sort -u
-}
-
BROWSER_LIST_KEY="BROWSER_DIR"
################################################################################
#
@@ -3119,6 +3105,8 @@
wfcmgr_NAME='Citrix ICA Client'
DEFAULT_DT_TARGET_DIRS="/usr/share/applications \
/usr/share/applnk/Applications \
+ /usr/local/share/applnk/Internet \
+ /usr/local/share/applnk/Networking \
/usr/share/applnk-redhat/Internet \
/usr/share/applnk-mdk/Networking"
DEFAULT_DT_FOLDER="Applications"
|
