[PC-BSD Commits] r4080 - pbibuild/modules/webbrowsers/firefox/overlay-dir

svn at pcbsd.org svn at pcbsd.org
Wed Jun 10 11:12:14 PDT 2009


Author: kris
Date: 2009-06-10 11:12:13 -0700 (Wed, 10 Jun 2009)
New Revision: 4080

Modified:
   pbibuild/modules/webbrowsers/firefox/overlay-dir/PBI.SetupScript.sh
Log:

Update to use .kde4, not .kde



Modified: pbibuild/modules/webbrowsers/firefox/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/webbrowsers/firefox/overlay-dir/PBI.SetupScript.sh	2009-06-10 18:09:16 UTC (rev 4079)
+++ pbibuild/modules/webbrowsers/firefox/overlay-dir/PBI.SetupScript.sh	2009-06-10 18:12:13 UTC (rev 4080)
@@ -16,6 +16,8 @@
 #########################################
 ln -s /Programs/${PROGDIR}/.sbin/firefox /usr/local/bin/firefox
 
+KDEDIR=".kde4"
+
 # Check which font config we want to link to
 mkdir /Programs/${PROGDIR}/etc
 if [ -d "/PCBSD/local/etc/fonts" ]
@@ -41,7 +43,7 @@
   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
@@ -50,7 +52,7 @@
          if [ "$line" = "[General]" ]
          then
            echo "$line" >> ${HOMEDIR}/.kdeglobals.new2
-           echo "BrowserApplication=!/usr/local/bin/firefox" >> ${HOMEDIR}/.kdeglobals.new2
+           echo "BrowserApplication=!/Programs/bin/firefox" >> ${HOMEDIR}/.kdeglobals.new2
     	 else
        	   echo "$line" >> ${HOMEDIR}/.kdeglobals.new2
   	 fi
@@ -59,9 +61,9 @@
       # 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
 
-echo "LAUNCHCLOSE: /usr/local/bin/firefox"
+echo "LAUNCHCLOSE: /Programs/bin/firefox"



More information about the Commits mailing list