[PC-BSD Commits] r882 - in pbibuild/modules/xmule: . kmenu-dir overlay-dir

svn at pcbsd.org svn at pcbsd.org
Sat Nov 10 03:31:12 PST 2007


Author: gonzalo
Date: 2007-11-10 03:31:12 -0800 (Sat, 10 Nov 2007)
New Revision: 882

Modified:
   pbibuild/modules/xmule/build.sh
   pbibuild/modules/xmule/kmenu-dir/xmule
   pbibuild/modules/xmule/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/xmule/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/xmule/pbi.conf
Log:
features added and config files changed

Modified: pbibuild/modules/xmule/build.sh
===================================================================
--- pbibuild/modules/xmule/build.sh	2007-11-10 11:01:06 UTC (rev 881)
+++ pbibuild/modules/xmule/build.sh	2007-11-10 11:31:12 UTC (rev 882)
@@ -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,xMule${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/xmule/kmenu-dir/xmule
===================================================================
--- pbibuild/modules/xmule/kmenu-dir/xmule	2007-11-10 11:01:06 UTC (rev 881)
+++ pbibuild/modules/xmule/kmenu-dir/xmule	2007-11-10 11:31:12 UTC (rev 882)
@@ -9,5 +9,5 @@
 ExeLink: 0
 ExeWebLink: 0
 ExeTaskbar: 0
-ExeOwndir: 2
+ExeOwndir: 1
 ExeKdeCat: Internet

Modified: pbibuild/modules/xmule/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/xmule/overlay-dir/PBI.FirstRun.sh	2007-11-10 11:01:06 UTC (rev 881)
+++ pbibuild/modules/xmule/overlay-dir/PBI.FirstRun.sh	2007-11-10 11:31:12 UTC (rev 882)
@@ -23,26 +23,26 @@
     ls -al /usr/local/bin/xmule | grep Programs 2>/dev/null
     if [ "$?" = "0" ]
     then
-      kdialog --yesno "Xmule is already installed, do you wish to uninstall it?" 
+      kdialog --yesno "xMule is already installed, do you wish to uninstall it?" 
       if [ "$?" = "0" ]
       then
         FF="`ls -al /usr/local/bin/xmule | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Xmule 2>/dev/null
+        echo $FF | grep xMule 2>/dev/null
         if [ "$?" = "0" ]
         then
           PBIdelete -remove ${FF}
         else
-          kdialog --sorry "Xmule could not be automatically removed... Please remove it in Add / Remove Programs and try again."
+          kdialog --sorry "xMule could not be automatically removed... Please remove it in Add / Remove Programs and try again."
           return 2
         fi
       else
-        kdialog --sorry "Xmule is already installed, it must be uninstalled before loading this PBI"
+        kdialog --sorry "xMule 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 "Xmule is already installed, it must be uninstalled before loading this PBI"
+      kdialog --sorry "xMule is already installed, it must be uninstalled before loading this PBI"
       return 2
     fi
 fi 

Modified: pbibuild/modules/xmule/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/xmule/overlay-dir/PBI.RemoveScript.sh	2007-11-10 11:01:06 UTC (rev 881)
+++ pbibuild/modules/xmule/overlay-dir/PBI.RemoveScript.sh	2007-11-10 11:31:12 UTC (rev 882)
@@ -24,7 +24,7 @@
  do 
    if [ -d "/home/${i}/.xMule" ] 
    then 
-     kdialog --title "Uninstalling Xmule!" --yesno "Do you want to delete this PBI completely?\nIf you answer 'Yes', configuration files located in /home/${i}/.xMule will be erased." 
+     kdialog --title "Uninstalling xMule!" --yesno "Do you want to delete this PBI completely?\nIf you answer 'Yes', configuration files located in /home/${i}/.xMule will be erased." 
      if [ "$?" = "0" ] 
      then 
        rm -fR /home/${i}/.xMule

Modified: pbibuild/modules/xmule/pbi.conf
===================================================================
--- pbibuild/modules/xmule/pbi.conf	2007-11-10 11:01:06 UTC (rev 881)
+++ pbibuild/modules/xmule/pbi.conf	2007-11-10 11:31:12 UTC (rev 882)
@@ -4,7 +4,7 @@
 ##############################################################################
 
 # Program Name
-PROGNAME="Xmule"
+PROGNAME="xMule"
 
 # Program Website
 PROGWEB="http://www.xmule.ws"
@@ -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="03"
+BUILDKEY="04"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list