[PC-BSD Commits] r3277 - pbibuild/modules/f1spirit/overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-01-16 10:13:26 -0800 (Fri, 16 Jan 2009)
New Revision: 3277

Modified:
   pbibuild/modules/f1spirit/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/f1spirit/overlay-dir/PBI.SetupScript.sh
Log:

Setup f1spirit, now 100% self-contained



Modified: pbibuild/modules/f1spirit/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/f1spirit/overlay-dir/PBI.RemoveScript.sh	2009-01-16 16:48:25 UTC (rev 3276)
+++ pbibuild/modules/f1spirit/overlay-dir/PBI.RemoveScript.sh	2009-01-16 18:13:26 UTC (rev 3277)
@@ -6,10 +6,6 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -fR /usr/local/bin/f1spirit
-rm -fR /usr/local/bin/f1s
-rm -fR /usr/local/share/doc/f1spirit-remake
-rm -fR /usr/local/share/f1spirit-remake
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/f1spirit/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/f1spirit/overlay-dir/PBI.SetupScript.sh	2009-01-16 16:48:25 UTC (rev 3276)
+++ pbibuild/modules/f1spirit/overlay-dir/PBI.SetupScript.sh	2009-01-16 18:13:26 UTC (rev 3277)
@@ -14,8 +14,13 @@
 # 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/f1spirit /usr/local/bin/f1spirit
-ln -s /Programs/${PROGDIR}/.sbin/f1spirit /usr/local/bin/f1s
-ln -s /Programs/${PROGDIR}/share/doc/f1spirit-remake /usr/local/share/doc/f1spirit-remake
-ln -s /Programs/${PROGDIR}/share/f1spirit-remake /usr/local/share/f1spirit-remake
-echo "LAUNCHCLOSE: /usr/local/bin/f1spirit"
+
+# 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
+
+echo "LAUNCHCLOSE: /Programs/bin/f1spirit"