--- linuxx86/hinst.orig	2017-06-30 17:48:55 UTC
+++ linuxx86/hinst
@@ -1,4 +1,7 @@
 #!/bin/sh
+
+#set -x
+
 ###############################################################################
 #
 #	Name:		util_tr.sh
@@ -105,7 +108,7 @@ then
 fi
 
 #  Install in here by default.
-DefaultInstallDir=/opt/Citrix/ICAClient
+DefaultInstallDir=%%PREFIX%%/ICAClient
 
 #  Default CDROM mount point
 DefaultCDSourceDir=/cdrom
@@ -1485,7 +1488,7 @@ REQUIRE_LICENSE=
 set_require_ICA_license()
 {
     REQUIRE_LICENSE=
-    if [ ! -f /etc/icalicense/clientlicense ]
+    if [ ! -f %%PREFIX%%/etc/icalicense/clientlicense ]
     then
 	TRY1=`"$ECHO_CMD" -l`
 	sleep 1
@@ -1508,14 +1511,14 @@ set_license()
 	# a license file.
 
 	if [ -n "$SU_INSTALL" ] ; then
-	    create_dir /etc/icalicense
+	    create_dir %%PREFIX%%/etc/icalicense
 
-	    if [ ! -f /etc/icalicense/clientlicense ]
+	    if [ ! -f %%PREFIX%%/etc/icalicense/clientlicense ]
 	    then
-		    "$ECHO_CMD" -l >/etc/icalicense/clientlicense
+		    "$ECHO_CMD" -l > %%PREFIX%%/etc/icalicense/clientlicense
 	    fi
-	    chmod 444 /etc/icalicense/clientlicense
-	    chmod 555 /etc/icalicense
+	    chmod 444 %%PREFIX%%/etc/icalicense/clientlicense
+	    chmod 555 %%PREFIX%%/etc/icalicense
 	fi
 }
 ###############################################################################
@@ -1559,7 +1562,7 @@ install_ICA_client()
 
 	echo_no_nl "$instica4"
 
-	getyesno $INSTALLER_NO
+	ANSWER=${INSTALLER_YES}
 	if [ "$ANSWER" != "$INSTALLER_YES" ]
 	then
 		"$ECHO_CMD" $instica5
@@ -1583,9 +1586,8 @@ install_ICA_client()
 
 		if [ "$PORT" != "uclibc" ]
 		then 
-			integrate_ICA_client
+			:
 		fi
-		install_usb "$CDSourceDir" "$ICAInstDir"
 	else
 	   COR_SELECTED=false
 	fi
@@ -1803,7 +1805,7 @@ setCDSourceDir()
 		echo_no_nl "$dirutil1a"
 		echo_no_nl "-i" "$ICAInstDir" 
 		echo_no_nl "] $dirutil1b"
-		read newCDSourceDir
+		newCDSOurceDir=${DefaultInstallDir}
 		if [ "x$newCDSourceDir" != "x" ]
 		then
 			CDSourceDir="$newCDSourceDir"
@@ -1876,7 +1878,7 @@ setICAInstDir()
 		echo_no_nl "$dirutil4a "
 		echo_no_nl "-i" "$ICAInstDir"
 		echo_no_nl "] $dirutil4b"
-		read newICAInstDir
+		newICAInstDir=${DefaultInstallDir}
 		if [ "`echo x$newICAInstDir | tolower`" = "x$INSTALLER_QUIT" ]
 		then
 			FAIL_MSG=$dirutil13
@@ -2468,7 +2470,7 @@ install_packages(){
 	then
 		:
 	else
-		/bin/false
+		/usr/bin/false
 		return 
 	fi
 
@@ -2542,7 +2544,7 @@ install_packages(){
 		fi
 	fi
 
-	/bin/true
+	/usr/bin/true
 }
 
 #!/bin/sh
@@ -2663,26 +2665,18 @@ esac
 
 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" ]
@@ -2691,7 +2685,8 @@ netscape_integrate()
 	else
   		user_echo $integrate_netscape6
 	fi
-    fi
+	;;
+    esac
   fi
 
   # Create utility script files in install root.
@@ -4334,8 +4329,8 @@ main_install_menu(){
 		    "$ECHO_CMD" $menus5
 		    return 0
 		fi
-		while true
-		do
+		#while true
+		#do
 			#
 			# Get the Function the user wants to perform
 			#
@@ -4349,7 +4344,7 @@ main_install_menu(){
 			fi
 			echo_no_nl "$menus2 1-$menuItems [$keyDefault]: "
 			
-			read keynum
+			keynum=1
 
 			if test "x$keynum" = "x"
 			then 
@@ -4414,7 +4409,7 @@ main_install_menu(){
 				# After any action make exit the default
 				keyDefault=3
 			fi
-		done
+		#done
 }