blob: 75e31083db9b223de2d3f73ba5422c841926ca48 (
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
|
--- linuxx86/hinst.orig Tue Oct 31 07:07:08 2006
+++ linuxx86/hinst Mon Mar 5 12:26:02 2007
@@ -86,7 +86,7 @@
fi
# Install in here by default.
-DefaultInstallDir=/usr/lib/ICAClient
+DefaultInstallDir=/usr/local/ICAClient
# Default CDROM mount point
DefaultCDSourceDir=/cdrom
@@ -2217,7 +2217,7 @@
then
:
else
- /bin/false
+ /usr/bin/false
return
fi
@@ -2263,7 +2263,7 @@
fi
fi
- /bin/true
+ /usr/bin/true
}
###############################################################################
@@ -2387,26 +2387,19 @@
netscape_integrate()
{
- user_echo $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)
user_echo $integrate_netscape3
found_netscape
- else
+ ;;
+ *)
user_prompt $integrate_netscape2
getyesno $INSTALLER_NO
if [ "$ANSWER" = "$INSTALLER_YES" ]
@@ -2415,9 +2408,9 @@
else
user_echo $integrate_netscape6
fi
+ ;;
+ esac
fi
- fi
-
# Create utility script files in install root.
create_wfica_script
create_wfica_assoc_script
|
