[PC-BSD Commits] r2772 - in pbibuild/modules/firefox3: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2008-09-15 09:59:17 -0700 (Mon, 15 Sep 2008)
New Revision: 2772

Modified:
   pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/firefox3/pbi.conf
Log:

Fixed setting FireFox as teh default browser on KDE4



Modified: pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh	2008-09-15 13:29:27 UTC (rev 2771)
+++ pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh	2008-09-15 16:59:17 UTC (rev 2772)
@@ -30,12 +30,19 @@
   HOMEDIR="/root"
 fi
 
+if [ -e "${HOMEDIR}/.kde4" ]
+then
+   KDEDIR=".kde4"
+else
+   KDEDIR=".kde"
+fi
+
   # Ask if we should make this the default browser application for our user
   kdialog --yesno "Do you want to make Firefox the default browser?" --title "Default browser?"
   if [ "$?" = "0" ]
   then
       # Strip out the old BrowserApplication line to make way for the new
-      cat ${HOMEDIR}/.kde/share/config/kdeglobals | grep -v '^BrowserApplication' > ${HOMEDIR}/.kdeglobals.new
+      cat ${HOMEDIR}/${KDEDIR}/share/config/kdeglobals | grep -v '^BrowserApplication' > ${HOMEDIR}/.kdeglobals.new
 
       touch ${HOMEDIR}/.kdeglobals.new2
       while read line
@@ -44,7 +51,12 @@
          if [ "$line" = "[General]" ]
          then
            echo "$line" >> ${HOMEDIR}/.kdeglobals.new2
-           echo "BrowserApplication=!/usr/local/bin/firefox3" >> ${HOMEDIR}/.kdeglobals.new2
+           if [ "${KDEDIR}" = ".kde4" ]
+           then
+             echo "BrowserApplication[$e]=!/usr/local/bin/firefox3" >> ${HOMEDIR}/.kdeglobals.new2
+           else
+             echo "BrowserApplication=!/usr/local/bin/firefox3" >> ${HOMEDIR}/.kdeglobals.new2
+           fi
     	 else
        	   echo "$line" >> ${HOMEDIR}/.kdeglobals.new2
   	 fi
@@ -53,7 +65,7 @@
       # all finished, now move it back over kdeglobals
       rm ${HOMEDIR}/.kdeglobals.new
       chown ${USERNAME}:${USERNAME} ${HOMEDIR}/.kdeglobals.new2
-      mv ${HOMEDIR}/.kdeglobals.new2 ${HOMEDIR}/.kde/share/config/kdeglobals
+      mv ${HOMEDIR}/.kdeglobals.new2 ${HOMEDIR}/${KDEDIR}/share/config/kdeglobals
   fi
 
 fi

Modified: pbibuild/modules/firefox3/pbi.conf
===================================================================
--- pbibuild/modules/firefox3/pbi.conf	2008-09-15 13:29:27 UTC (rev 2771)
+++ pbibuild/modules/firefox3/pbi.conf	2008-09-15 16:59:17 UTC (rev 2772)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="21"
+BUILDKEY="11"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY