Restore native 64bit support and make it easier to switch between multilib & non-multilib versions.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

1 files changed, 25 insertions, 4 deletions

diff --git a/media-tv/huludesktop/files/huludesktop b/media-tv/huludesktop/files/huludesktop
index fbfefed23be1..114262473891 100755
--- a/media-tv/huludesktop/files/huludesktop
+++ b/media-tv/huludesktop/files/huludesktop
@@ -1,20 +1,37 @@
 #!/bin/sh
 
+hulu="/opt/bin/huludesktop.bin"
 config_file=$(echo ~/.huludesktop)
 
-# 64bit support is dead ;(
+is_64bit()
+{
+	case $(file -L "$1") in
+		*32-bit*) ;; # fall through
+		*64-bit*) echo 64; return 0 ;;
+		*) echo "unable to detect bitsize of $1" 1>&2 ;;
+	esac
+	echo 32
+	return 1
+}
+
 find_flash()
 {
 	for d in \
 		/usr/lib32/nsbrowser/plugins \
 		/usr/lib/nsbrowser/plugins \
+		/usr/lib64/nsbrowser/plugins \
 	; do
 		f="${d}/libflashplayer.so"
-		[ -e "${f}" ] && echo ${f} && return 0
+		if [ -e "${f}" ] && [ ${bit_hulu} = $(is_64bit "${f}") ] ; then
+			echo ${f}
+			return 0
+		fi
 	done
 	echo ${f}
 }
 
+bit_hulu=$(is_64bit ${hulu})
+
 if [ ! -e ${config_file} ] ; then
 	# Create a stub file for people
 	cat <<-EOF > ${config_file}
@@ -24,8 +41,12 @@ if [ ! -e ${config_file} ] ; then
 else
 	# Update the config file on the fly
 	curr_flash=$(awk '$1 == "flash_location" { print $NF }' ${config_file})
-	if [ ! -e "${curr_flash}" ] ; then
-		sed -i "/^flash_location/s:=.*:= $(find_flash):" ${config_file}
+	if [ ! -e "${curr_flash}" ] || [ ${bit_hulu} != $(is_64bit "${curr_flash}") ] ; then
+		new_flash=$(find_flash)
+		echo "Updating flash path:"
+		echo "  old: ${curr_flash}"
+		echo "  new: ${new_flash}"
+		sed -i "/^flash_location/s:=.*:= ${new_flash}:" ${config_file}
 	fi
 fi