[PC-BSD Commits] r3338 - in pbibuild/modules/kb: . kmenu-dir overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-01-26 19:14:01 -0800 (Mon, 26 Jan 2009)
New Revision: 3338

Removed:
   pbibuild/modules/kb/kmenu-dir/uninstall
   pbibuild/modules/kb/overlay-dir/scripts/
Modified:
   pbibuild/modules/kb/build.sh
   pbibuild/modules/kb/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/kb/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/kb/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/kb/pbi.conf
Log:

Updated kb to be 100% self-contained now



Modified: pbibuild/modules/kb/build.sh
===================================================================
--- pbibuild/modules/kb/build.sh	2009-01-27 01:30:59 UTC (rev 3337)
+++ pbibuild/modules/kb/build.sh	2009-01-27 03:14:01 UTC (rev 3338)
@@ -8,8 +8,3 @@
 # 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,GPREDICT${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh

Modified: pbibuild/modules/kb/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/kb/overlay-dir/PBI.FirstRun.sh	2009-01-27 01:30:59 UTC (rev 3337)
+++ pbibuild/modules/kb/overlay-dir/PBI.FirstRun.sh	2009-01-27 03:14:01 UTC (rev 3338)
@@ -15,37 +15,3 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-
-PROG="kb"
-PROGL="kb"
-BINARY="/usr/local/bin/kb"
-
-if [ -e ${BINARY} ]
-then
-    # Looks like ${PROG} is installed, ask if they want to remove the old one
-    ls -al ${BINARY} | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "${PROGL} is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        TODEL="`ls -al ${BINARY} | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo ${TODEL} | grep ${PROG}
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${TODEL}
-        else
-          kdialog --sorry "${PROGL} could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "${PROGL} 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 "${PROGL} is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi

Modified: pbibuild/modules/kb/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/kb/overlay-dir/PBI.RemoveScript.sh	2009-01-27 01:30:59 UTC (rev 3337)
+++ pbibuild/modules/kb/overlay-dir/PBI.RemoveScript.sh	2009-01-27 03:14:01 UTC (rev 3338)
@@ -7,12 +7,6 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/kb
-rm /usr/local/bin/kb_bin
-rm /usr/local/bin/kb_server
-rm /usr/local/share/kb
-rm /usr/local/share/doc/kb
-
 cd /home
 for i in `ls` 
    do 

Modified: pbibuild/modules/kb/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/kb/overlay-dir/PBI.SetupScript.sh	2009-01-27 01:30:59 UTC (rev 3337)
+++ pbibuild/modules/kb/overlay-dir/PBI.SetupScript.sh	2009-01-27 03:14:01 UTC (rev 3338)
@@ -14,10 +14,15 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR}/.bin/kb /usr/local/bin/kb
-ln -s /Programs/${PROGDIR}/bin/kb_bin /usr/local/bin/kb_bin
-ln -s /Programs/${PROGDIR}/bin/kb_server /usr/local/bin/kb_server
-ln -s /Programs/${PROGDIR}/share/kb /usr/local/share/kb
-ln -s /Programs/${PROGDIR}/share/doc/kb /usr/local/share/doc/kb
 
-echo "LAUNCHCLOSE: /usr/local/bin/kb
+# 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/kb

Modified: pbibuild/modules/kb/pbi.conf
===================================================================
--- pbibuild/modules/kb/pbi.conf	2009-01-27 01:30:59 UTC (rev 3337)
+++ pbibuild/modules/kb/pbi.conf	2009-01-27 03:14:01 UTC (rev 3338)
@@ -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="19"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY