[PC-BSD Commits] r2554 - in pbibuild/pbi-source: PBIsource PBItext

[svn at pcbsd.org]

Author: kris
Date: 2008-08-07 12:59:21 -0700 (Thu, 07 Aug 2008)
New Revision: 2554

Modified:
   pbibuild/pbi-source/PBIsource/pbi.cpp
   pbibuild/pbi-source/PBItext/main.cpp
Log:

Fixed a few more bugs in the PBI installer format for PC-BSD7, now when a program is started at launch, it is kicked off as background, so that cleanup is immediately performed, to make way for new PBI installs. ALso fixed a bug in the Utilities / Toys categories being used properly, and addressed the kmenu locations being pointed to teh right .sbin/ entries. 



Modified: pbibuild/pbi-source/PBIsource/pbi.cpp
===================================================================
--- pbibuild/pbi-source/PBIsource/pbi.cpp	2008-08-07 19:51:25 UTC (rev 2553)
+++ pbibuild/pbi-source/PBIsource/pbi.cpp	2008-08-07 19:59:21 UTC (rev 2554)
@@ -715,7 +715,7 @@
 	     stream << "[Desktop Entry]\n";
 	     stream << "GenericName=" + ExeDescr[exenum] + "\n";
 	     stream << "Name=" + Binary + "\n";
-	     stream << "Exec=/Programs/bin/" + Binary + "\n";
+	     stream << "Exec=/Programs/" + ProgDirName + "/.sbin/" + Binary + "\n";
 	     stream << "Type=Application\n";
 	     stream << "Path=/Programs/" + ProgDirName + "/\n";
 	     stream << "Icon=" + Icon + "\n";
@@ -899,11 +899,12 @@
 		   }
 		   if ( ExeKdeCat[exenum] == "Toys")
 		   {
-		       ParentCat = "Toys";
+	               ParentCat = "Games";
+		       SubCat = "Toys";
 		   }
 		   if ( ExeKdeCat[exenum] == "Utilities")
 		   {
-		       ParentCat = "Utility";
+		       ParentCat = "Utilities";
 		   }
 
                       QTextStream streamxdg( &xdgfile );
@@ -1050,7 +1051,7 @@
                 QTextStream stream2( &file2 );
 	     stream2 << "[Desktop Entry]\n";
 	     stream2 << "Name=" + ExeDescr[exenum] + "\n";
-	     stream2 << "Exec=/Programs/bin/" + Binary + "\n";
+	     stream2 << "Exec=/Programs/" + ProgDirName + "/.sbin/" + Binary + "\n";
 	     stream2 << "Type=Application\n";
 	     stream2 << "Path=/Programs/" + ProgDirName + "/\n";
 	     stream2 << "Icon=" + Icon + "\n";
@@ -2111,7 +2112,7 @@
          if ( file.open( IO_WriteOnly ) ) {
                QTextStream stream( &file );
 	       stream << "#!/bin/sh\n";
-               stream << "su " + RealUserName + " -c \"" + LaunchClose + "\"";
+               stream << "su " + RealUserName + " -c \"" + LaunchClose + "\" &";
                  file.close();
          }	
 	system("chmod 755 postClose.sh" );

Modified: pbibuild/pbi-source/PBItext/main.cpp
===================================================================
--- pbibuild/pbi-source/PBItext/main.cpp	2008-08-07 19:51:25 UTC (rev 2553)
+++ pbibuild/pbi-source/PBItext/main.cpp	2008-08-07 19:59:21 UTC (rev 2554)
@@ -660,7 +660,7 @@
 	     stream << "[Desktop Entry]\n";
 	     stream << "GenericName=" + ExeDescr[exenum] + "\n";
 	     stream << "Name=" + Binary + "\n";
-	     stream << "Exec=/Programs/bin/" + Binary + "\n";
+	     stream << "Exec=/Programs/" + ProgDirName + "/.sbin/" + Binary + "\n";
 	     stream << "Type=Application\n";
 	     stream << "Path=/Programs/" + ProgDirName + "/\n";
 	     stream << "Icon=" + Icon + "\n";
@@ -844,11 +844,12 @@
 		   }
 		   if ( ExeKdeCat[exenum] == "Toys")
 		   {
-		       ParentCat = "Toys";
+		       ParentCat = "Games";
+		       SubCat = "Toys";
 		   }
 		   if ( ExeKdeCat[exenum] == "Utilities")
 		   {
-		       ParentCat = "Utility";
+		       ParentCat = "Utilities";
 		   }
 
                      QTextStream streamxdg( &xdgfile );
@@ -996,7 +997,7 @@
                 QTextStream stream2( &file2 );
 	     stream2 << "[Desktop Entry]\n";
 	     stream2 << "Name=" + ExeDescr[exenum] + "\n";
-	     stream2 << "Exec=/Programs/bin/" + Binary + "\n";
+	     stream2 << "Exec=/Programs/" + ProgDirName + "/.sbin/" + Binary + "\n";
 	     stream2 << "Type=Application\n";
 	     stream2 << "Path=/Programs/" + ProgDirName + "/\n";
 	     stream2 << "Icon=" + Icon + "\n";