[PC-BSD Commits] r927 - in pbibuild/modules/firefox: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2007-11-28 11:29:06 -0800 (Wed, 28 Nov 2007)
New Revision: 927

Modified:
   pbibuild/modules/firefox/copy-files
   pbibuild/modules/firefox/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/firefox/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/firefox/overlay-dir/PBI.SetupScript.sh
Log:

Fixed up a bit more with FF build, now the lang packages don't need a symlink
to /usr/local/lib/xpi, they will be self-contained properly, and wont conflict
with thunderbirds



Modified: pbibuild/modules/firefox/copy-files
===================================================================
--- pbibuild/modules/firefox/copy-files	2007-11-28 19:22:36 UTC (rev 926)
+++ pbibuild/modules/firefox/copy-files	2007-11-28 19:29:06 UTC (rev 927)
@@ -41,4 +41,4 @@
 /usr/local/lib/libsoftokn3* autolibs/
 /usr/local/lib/libsssl3* autolibs/
 /usr/local/share/idl/firefox* share/idl/
-/usr/local/lib/xpi/* autolibs/xpi
+/usr/local/lib/xpi/* autolibs/firefox/extensions/

Modified: pbibuild/modules/firefox/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/firefox/overlay-dir/PBI.FirstRun.sh	2007-11-28 19:22:36 UTC (rev 926)
+++ pbibuild/modules/firefox/overlay-dir/PBI.FirstRun.sh	2007-11-28 19:29:06 UTC (rev 927)
@@ -30,6 +30,7 @@
         if [ "$?" = "0" ]
         then
           PBIdelete -remove ${FF}
+          sleep 2
         else
           kdialog --sorry "Firefox could not be automatically removed... Please remove it in Add / Remove Programs and try again."
           return 2

Modified: pbibuild/modules/firefox/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/firefox/overlay-dir/PBI.RemoveScript.sh	2007-11-28 19:22:36 UTC (rev 926)
+++ pbibuild/modules/firefox/overlay-dir/PBI.RemoveScript.sh	2007-11-28 19:29:06 UTC (rev 927)
@@ -7,5 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
+chflags -R noschg /Programs/${1}
+
 rm /usr/local/bin/firefox
-rm /usr/local/lib/xpi

Modified: pbibuild/modules/firefox/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/firefox/overlay-dir/PBI.SetupScript.sh	2007-11-28 19:22:36 UTC (rev 926)
+++ pbibuild/modules/firefox/overlay-dir/PBI.SetupScript.sh	2007-11-28 19:29:06 UTC (rev 927)
@@ -15,5 +15,4 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 ln -s /Programs/${PROGDIR}/.sbin/firefox /usr/local/bin/firefox
-ln -s /Programs/${PROGDIR}/autolibs/xpi /usr/local/lib/xpi
 echo "LAUNCHCLOSE: /usr/local/bin/firefox"