[PC-BSD Commits] r775 - pcbsd/trunk/PBIsource

[svn at pcbsd.org]

Author: kris
Date: 2007-10-01 12:51:48 -0700 (Mon, 01 Oct 2007)
New Revision: 775

Modified:
   pcbsd/trunk/PBIsource/pbi.ui.h
Log:

Fixed bug in the -extact option of PBI installer which messed up the
libs directory and set it to use /usr/home instead of /home now



Modified: pcbsd/trunk/PBIsource/pbi.ui.h
===================================================================
--- pcbsd/trunk/PBIsource/pbi.ui.h	2007-10-01 19:43:26 UTC (rev 774)
+++ pcbsd/trunk/PBIsource/pbi.ui.h	2007-10-01 19:51:48 UTC (rev 775)
@@ -1822,12 +1822,17 @@
 	stream << "PBIUpdate: " << ProgUpdateURL << "\n";
 	
 	// Save the package directory
-	stream << "PackageDir: " << "/home/" + RealUserName + "/" + ProgDirName << "\n";
-              stream << "LibDir: " << LibDir << "\n" ;
+	stream << "PackageDir: " << "/usr/home/" + RealUserName + "/" + ProgDirName << "\n";
+        if ( LibDir != "NONE" && LibDir != "Auto" )
+        then
+          stream << "LibDir: /usr/home/" + RealUserName + "/" + ProgDirName << LibDir << "\n" ;
+        else
+          stream << "LibDir: " << LibDir << "\n" ;
+        fi
 
 	 
 	 // Save the default icon, if needed
-	 stream << "DefaultIcon: " << "/home/" + RealUserName + "/" + ProgDirName + "/" + DefaultIcon << "\n";
+	 stream << "DefaultIcon: " << "/usr/home/" + RealUserName + "/" + ProgDirName + "/" + DefaultIcon << "\n";
 	 
 	 // Start saving exe info
                   int i = 0;
@@ -1835,11 +1840,11 @@
                   while (! ExePath[i].isEmpty() )
                  {
 
-	     stream << "ExePath: " << "/home/" + RealUserName + "/" + ProgDirName + "/" + ExePath[i] << "\n" ;
+	     stream << "ExePath: " << "/usr/home/" + RealUserName + "/" + ProgDirName + "/" + ExePath[i] << "\n" ;
 	     if ( ExeIcon[i].isEmpty() ) {
 		stream << "ExeIcon: \n";
 	     } else {
-		stream << "ExeIcon: " <<  "/home/" + RealUserName + "/" + ProgDirName + "/" + ExeIcon[i]  << "\n" ; 
+		stream << "ExeIcon: " <<  "/usr/home/" + RealUserName + "/" + ProgDirName + "/" + ExeIcon[i]  << "\n" ; 
 	     }
 	     
 	     stream << "ExeDescr: " << ExeDescr[i]  << "\n" ;
@@ -1863,7 +1868,7 @@
 	     if ( MimeIcon[i].isEmpty() ) {
 	        stream << "MimeIcon: \n";
 	     } else {
-	        stream << "MimeIcon: " << "/home/" + RealUserName + "/" + ProgDirName + "/" + MimeIcon[i] << "\n";
+	        stream << "MimeIcon: " << "/usr/home/" + RealUserName + "/" + ProgDirName + "/" + MimeIcon[i] << "\n";
 	     }
 	     stream << "MimeProg: " << MimeProg[i] << "\n";
 	     i++;