aboutsummaryrefslogtreecommitdiff
path: root/german/citrix_xenapp/files/patch-linuxx86::hinst
blob: 0a5144c2b5a11d7bb886cc2b7c4690eca89e410d (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
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
--- linuxx86/hinst.orig	Tue Oct 31 08:31:50 2006
+++ linuxx86/hinst	Wed Apr 25 08:50:20 2007
@@ -24,7 +24,6 @@
 #	Copyright 1996-2000, 2006 Citrix Systems, Inc. All rights reserved.
 #
 ###############################################################################
-
 # note: the INSTALLER_... strings should be in lowercase. The installer will then
 # accept lowercase or uppercase versions of them as input.
 INSTALLER_YES=ja
@@ -86,7 +85,13 @@
 fi
 
 #  Install in here by default.
-DefaultInstallDir=/usr/lib/ICAClient
+
+DefaultInstallDir=$PREFIX/ICAClient
+
+if [ "$PREFIX/ICAClient" = "/ICAClient" ]
+then
+	DefaultInstallDir=/usr/local/ICAClient
+fi
 
 #  Default CDROM mount point
 DefaultCDSourceDir=/cdrom
@@ -2226,7 +2231,7 @@
 	then
 		:
 	else
-		/bin/false
+		/usr/bin/false
 		return 
 	fi
 
@@ -2272,7 +2277,7 @@
 		fi
 	fi
 
-	/bin/true
+	/usr/bin/true
 }
 
 ###############################################################################
@@ -2397,26 +2402,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" ]
@@ -2425,9 +2423,9 @@
 	else
   		user_echo $integrate_netscape6
 	fi
+	;;
+    esac
     fi
-  fi
-
     # Create utility script files in install root.
     create_wfica_script
     create_wfica_assoc_script
@@ -3063,55 +3061,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 firefox"
-    DIST_BIN_DIR=""
-    STANDARD_DIRS="/usr/local/netscape /usr/local/mozilla /usr/local/firefox /usr/lib/mozilla"
-
-    case $op_system in
-       SunOS) if
-                 /usr/bin/pkginfo -q $SOLARIS_PACKAGE_NAME
-              then
-                 relocation_base=`/usr/bin/pkginfo -r $SOLARIS_PACKAGE_NAME`
-                 STANDARD_DIRS="$STANDARD_DIRS $relocation_base/$SOLARIS_PACKAGE_DIRECTORY"
-
-                 # N.B. the Netscape 7 packages for SOLARIS 9 have an extended installation path built-in!
-                 case `uname -r` in
-                    5.9) STANDARD_DIRS="$STANDARD_DIRS $relocation_base/dt/appconfig/$SOLARIS_PACKAGE_DIRECTORY"
-                         ;;
-                    *)   ;;
-                 esac
-              fi;;
-       *) ;;
-    esac
-
-    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"
 ################################################################################
 #
@@ -3337,13 +3286,16 @@
 XDG_TARGET_DIR="/usr/share/applications"
 TL_MENU_DIR="Vendor_menus/Applications"                    # TurboLinux
 TL_TOP_DIR="/usr/share/applnk/"$TL_MENU_DIR
-DEFAULT_GNOME_TARGET_DIRS="/etc/opt/gnome/SuSE/Internet"
-DEFAULT_KDE_TARGET_DIRS="/usr/share/applnk-redhat/Internet \
-                         /usr/share/applnk-mdk/Networking \
-                         $TL_TOP_DIR/Internet \
-			 /etc/opt/kde3/share/applnk/SuSE/Internet \
-                         /usr/share/applnk/Applications"
-
+DEFAULT_GNOME_TARGET_DIRS="/usr/share/applications \
+                           /usr/local/share/applnk/Internet \
+                           /usr/local/share/applnk/Networking \
+                           /etc/opt/gnome/SuSE/Internet"
+DEFAULT_KDE_TARGET_DIRS="/usr/share/applnk/Applications \
+			/usr/local/share/applnk/Applications \
+			/usr/local/share/applnk/Internet \
+                        /usr/share/applnk-redhat/Internet \
+                        /usr/share/applnk-mdk/Networking \
+                        /etc/opt/kde3/share/applnk/SuSE/Internet"
 DEFAULT_DT_TARGET_DIRS="$XDG_TARGET_DIR $DEFAULT_GNOME_TARGET_DIRS $DEFAULT_KDE_TARGET_DIRS"
 DEFAULT_DT_FOLDER="Applications"