[PC-BSD Commits] r3311 - in pbibuild/modules/fuse: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-01-21 13:02:25 -0800 (Wed, 21 Jan 2009)
New Revision: 3311

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

Fuse, now 100% self-contained!



Modified: pbibuild/modules/fuse/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/fuse/overlay-dir/PBI.FirstRun.sh	2009-01-21 20:27:23 UTC (rev 3310)
+++ pbibuild/modules/fuse/overlay-dir/PBI.FirstRun.sh	2009-01-21 21:02:25 UTC (rev 3311)
@@ -16,33 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/fuse" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/fuse | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Fuse is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/fuse | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Fuse 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-        else
-          kdialog --sorry "Fuse could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Fuse is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "Fuse is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/fuse/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/fuse/overlay-dir/PBI.RemoveScript.sh	2009-01-21 20:27:23 UTC (rev 3310)
+++ pbibuild/modules/fuse/overlay-dir/PBI.RemoveScript.sh	2009-01-21 21:02:25 UTC (rev 3311)
@@ -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/fuse
-rm -fR /usr/local/man/man1/fuse.1.gz
-rm -fR /usr/local/share/doc/fuse
-rm -fR /usr/local/share/fuse
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/fuse/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/fuse/overlay-dir/PBI.SetupScript.sh	2009-01-21 20:27:23 UTC (rev 3310)
+++ pbibuild/modules/fuse/overlay-dir/PBI.SetupScript.sh	2009-01-21 21:02:25 UTC (rev 3311)
@@ -14,8 +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/fuse /usr/local/bin/fuse
-ln -s /Programs/${PROGDIR}/man/man1/fuse.1.gz /usr/local/man/man1/fuse.1.gz
-ln -s /Programs/${PROGDIR}/share/doc/fuse /usr/local/share/doc/fuse
-ln -s /Programs/${PROGDIR}/share/fuse /usr/local/share/fuse
-echo "LAUNCHCLOSE: /usr/local/bin/fuse"
+
+# 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/fuse"

Modified: pbibuild/modules/fuse/pbi.conf
===================================================================
--- pbibuild/modules/fuse/pbi.conf	2009-01-21 20:27:23 UTC (rev 3310)
+++ pbibuild/modules/fuse/pbi.conf	2009-01-21 21:02:25 UTC (rev 3311)
@@ -25,13 +25,13 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT=""
+OTHERPORT="/usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here
 MAKEOPTS=""
 
 # 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