[PC-BSD Commits] r3315 - in pbibuild/modules/fwbuilder: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Thu Jan 22 08:49:53 PST 2009


Author: kris
Date: 2009-01-22 08:49:53 -0800 (Thu, 22 Jan 2009)
New Revision: 3315

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

Updated fwbuilder, now 100% self-contained



Modified: pbibuild/modules/fwbuilder/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/fwbuilder/overlay-dir/PBI.RemoveScript.sh	2009-01-22 15:24:54 UTC (rev 3314)
+++ pbibuild/modules/fwbuilder/overlay-dir/PBI.RemoveScript.sh	2009-01-22 16:49:53 UTC (rev 3315)
@@ -6,15 +6,7 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/fwbuilder
 
-cd /Programs/${PROGDIR}/share/
-SHAREDIR="`ls -d fwbuilder-*`"
-rm /usr/local/share/${SHAREDIR}
-
-SHAREDIR2="`ls -d libfwbuilder-*`"
-rm /usr/local/share/${SHAREDIR2}
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/fwbuilder/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/fwbuilder/overlay-dir/PBI.SetupScript.sh	2009-01-22 15:24:54 UTC (rev 3314)
+++ pbibuild/modules/fwbuilder/overlay-dir/PBI.SetupScript.sh	2009-01-22 16:49:53 UTC (rev 3315)
@@ -14,13 +14,14 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.sbin/fwbuilder /usr/local/bin/fwbuilder
 
-cd /Programs/${PROGDIR}/share/
-SHAREDIR="`ls -d fwbuilder-*`"
-ln -s /Programs/${PROGDIR}/share/${SHAREDIR} /usr/local/share/${SHAREDIR}
+# Check which font config we want to link to
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
 
-SHAREDIR2="`ls -d libfwbuilder-*`"
-ln -s /Programs/${PROGDIR}/share/${SHAREDIR2} /usr/local/share/${SHAREDIR2}
 
-echo "LAUNCHCLOSE: /usr/local/bin/fwbuilder"
+echo "LAUNCHCLOSE: /Programs/bin/fwbuilder"

Modified: pbibuild/modules/fwbuilder/pbi.conf
===================================================================
--- pbibuild/modules/fwbuilder/pbi.conf	2009-01-22 15:24:54 UTC (rev 3314)
+++ pbibuild/modules/fwbuilder/pbi.conf	2009-01-22 16:49:53 UTC (rev 3315)
@@ -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="02"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list