rpms/firefox/FC-6 firefox.sh.in,1.14.2.2,1.14.2.3

[fedora-cvs-commits at redhat.com]

Author: dwmw2

Update of /cvs/dist/rpms/firefox/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv20227

Modified Files:
      Tag: private-firefox-1_5_0_8-multilib-fix-branch
	firefox.sh.in 
Log Message:
Fix firefox script to fall back to other arch


Index: firefox.sh.in
===================================================================
RCS file: /cvs/dist/rpms/firefox/FC-6/firefox.sh.in,v
retrieving revision 1.14.2.2
retrieving revision 1.14.2.3
diff -u -r1.14.2.2 -r1.14.2.3
--- firefox.sh.in	22 Nov 2006 11:08:11 -0000	1.14.2.2
+++ firefox.sh.in	23 Nov 2006 13:00:22 -0000	1.14.2.3
@@ -36,39 +36,32 @@
 ##
 ## Variables
 ##
-MOZ_VERSION=FIREFOX_VERSION
-
-##
-## 10/11/2006. Gilboa Davara <gilboad at gmail dot com>
-## This patch adds multilib support for x86_64/PPC64/s390/IA64.
-## 
-if [ "$1" == "--32" ] || [ "$1" == "--64" ] ; then
-	MOZ_OPTION=$1
-	shift
-fi
-
 MOZ_ARCH=$(uname -m)
 case $MOZ_ARCH in
 	x86_64 | ia64 | s390 )
-		MOZ_LIB_DIR="/usr/lib"
-		if [ "$MOZ_OPTION" != "--32" ] && [ -x "/usr/lib64/firefox-$MOZ_VERSION/firefox-bin" ] ; then
-			MOZ_LIB_DIR="/usr/lib64"
-		fi
-		;;
-
-	ppc64 )
-		MOZ_LIB_DIR="/usr/lib"
-		if [ "$MOZ_OPTION" == "--64" ] && [ -x "/usr/lib64/firefox-$MOZ_VERSION/firefox-bin" ] ; then
-			MOZ_LIB_DIR="/usr/lib64"
-		fi
+		MOZ_LIB_DIR="/usr/lib64"
+		SECONDARY_LIB_DIR="/usr/lib"
 		;;
-
 	* )
 		MOZ_LIB_DIR="/usr/lib"
+		SECONDARY_LIB_DIR="/usr/lib64"
 		;;
 esac
 
-MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-$MOZ_VERSION"
+# This would be easy to support...
+# [ -r /etc/sysconfig/firefox-arch ] && . /etc/sysconfig/firefox-arch
+
+if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin ]; then
+    if [ ! -x $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin ]; then
+	echo "Error: $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin not found"
+	if [ -d $SECONDARY_LIB_DIR ]; then
+	    echo "       $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin not found"
+	fi
+	exit 1
+    fi
+    MOZ_LIB_DIR="$SECONDARY_LIB_DIR"
+fi
+MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
 MOZ_PROGRAM="$MOZ_DIST_BIN/firefox"
 MOZ_CLIENT_PROGRAM="$MOZ_DIST_BIN/mozilla-xremote-client"
 MOZ_CLIENT_PROGRAM_PARAM="-a firefox"