Update of /cvsroot/player/installer/common
In directory cvs-new:/tmp/cvs-serv9690/common

Modified Files:
	postinst.sh 
Log Message:
CR rggammon
fix PR 2538 and 2606
try installing the plugin to some additional browser plugin directories
test for /opt/gnome/share/pixmaps instead of assuming it exists



Index: postinst.sh
===================================================================
RCS file: /cvsroot/player/installer/common/postinst.sh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- postinst.sh	9 Jun 2004 00:16:24 -0000	1.19
+++ postinst.sh	9 Jul 2004 21:35:43 -0000	1.20
@@ -56,10 +56,19 @@
 
 # do root processing
 if [ $LOGNAME = "root" ] ; then
-    # system plugins directory
-    MOZDIR=/usr/lib/mozilla/plugins
-    if [ ! -d $MOZDIR ] ; then
-	echo "$MOZDIR not found."
+    # find system plugins directory
+    MOZFOUND=0
+    for MOZDIR in "/usr/lib/mozilla/plugins" "/usr/lib/browser-plugins" "/opt/mozilla/lib/plugins"; do
+	if [ -d "$MOZDIR" ] ; then
+	    eval_cmd ln -sf "$INSTDIR/mozilla/nphelix.so" "$MOZDIR"
+	    eval_cmd ln -sf "$INSTDIR/mozilla/nphelix.xpt" "$MOZDIR"
+	    MOZFOUND=1
+	fi
+    done
+    unset MOZDIR
+
+    if [ $MOZFOUND -eq 0 ] ; then
+	echo "No Mozilla plugin directory found."
 	echo "Please enter Mozilla's plugins directory to install the Mozilla plug-in,"
 	echo "or leave blank to skip plug-in installation: "
 	read MOZDIR