[PC-BSD Commits] r1308 - in pbibuild/modules/winfirefox: . overlay-dir/bin

[svn at pcbsd.org]

Author: kris
Date: 2008-02-04 06:25:36 -0800 (Mon, 04 Feb 2008)
New Revision: 1308

Modified:
   pbibuild/modules/winfirefox/build.sh
   pbibuild/modules/winfirefox/overlay-dir/bin/winfirefox
   pbibuild/modules/winfirefox/pbi.conf
Log:

Fixed problems with WinFirefox changing the CHANGEME variable and chown command



Modified: pbibuild/modules/winfirefox/build.sh
===================================================================
--- pbibuild/modules/winfirefox/build.sh	2008-02-04 01:18:11 UTC (rev 1307)
+++ pbibuild/modules/winfirefox/build.sh	2008-02-04 14:25:36 UTC (rev 1308)
@@ -8,3 +8,8 @@
 # MODULEDIR = The location of the module directory for this PBI
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
+
+# Save the right version number in the removepbi.sh script
+sed -e "s,CHANGEME,WinFirefox${PORTVER},g" ${PBIDIR}/bin/winfirefox > /tmp/winfirefox
+mv /tmp/winfirefox ${PBIDIR}/bin/winfirefox
+chmod 755 ${PBIDIR}/bin/winfirefox

Modified: pbibuild/modules/winfirefox/overlay-dir/bin/winfirefox
===================================================================
--- pbibuild/modules/winfirefox/overlay-dir/bin/winfirefox	2008-02-04 01:18:11 UTC (rev 1307)
+++ pbibuild/modules/winfirefox/overlay-dir/bin/winfirefox	2008-02-04 14:25:36 UTC (rev 1308)
@@ -1,7 +1,7 @@
 #!/bin/sh
 USER=`who | grep :0 | cut -f 1 -d " "`
 PROGDIR="CHANGEME"
-chmod $USER /Programs/${PROGDIR}/WINFF
+chown -R ${USER}:${USER} /Programs/${PROGDIR}/WINFF
 cd
 export WINEPREFIX="/Programs/${PROGDIR}/WINFF"
 /Programs/${PROGDIR}/bin/wine "/Programs/${PROGDIR}/WINFF/drive_c/Program Files/Mozilla Firefox/firefox.exe" "$@"

Modified: pbibuild/modules/winfirefox/pbi.conf
===================================================================
--- pbibuild/modules/winfirefox/pbi.conf	2008-02-04 01:18:11 UTC (rev 1307)
+++ pbibuild/modules/winfirefox/pbi.conf	2008-02-04 14:25:36 UTC (rev 1308)
@@ -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="01"
+BUILDKEY="31"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY