[PC-BSD Commits] r2249 - pbibuild/pbi-source/PBIsource

svn at pcbsd.org svn at pcbsd.org
Wed Jul 2 13:51:20 PDT 2008


Author: kris
Date: 2008-07-02 13:51:20 -0700 (Wed, 02 Jul 2008)
New Revision: 2249

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

Fixed the PBI installer to use mkpath instead of mkdir, since mkdir in QT4
doesn't create *all* directories requested, only the subdir



Modified: pbibuild/pbi-source/PBIsource/pbi.cpp
===================================================================
--- pbibuild/pbi-source/PBIsource/pbi.cpp	2008-07-02 20:43:49 UTC (rev 2248)
+++ pbibuild/pbi-source/PBIsource/pbi.cpp	2008-07-02 20:51:20 UTC (rev 2249)
@@ -515,7 +515,7 @@
     
     // First create the special ".sbin" directory for each script executable
     QDir sbindir;
-    sbindir.mkdir ( "/Programs/" + ProgDirName + "/.sbin", TRUE );
+    sbindir.mkpath ( "/Programs/" + ProgDirName + "/.sbin");
 
     // Now save the new config file
     QString sizestring;
@@ -708,7 +708,7 @@
 	
 	
         QDir LaunchDir;
-        LaunchDir.mkdir("/usr/local/share/applnk/" +SubDir + ProgramName);
+        LaunchDir.mkpath("/usr/local/share/applnk/" +SubDir + ProgramName);
 	
 	QFile diricon("/usr/local/share/applnk/" + SubDir + ProgramName + "/.directory");
                if ( diricon.open( IO_WriteOnly) ) {
@@ -724,7 +724,7 @@
 	if ( ExeLink[exenum] == "0" && ExeWebLink[exenum] == "0" && ExeLink[exenum] == "0" ) {
 	
              QDir bindir;
-       	     bindir.mkdir ( "/Programs/bin", TRUE );
+       	     bindir.mkpath ( "/Programs/bin");
              runCommand("ln -fs /Programs/" + ProgDirName + "/.sbin/" + Binary + " /Programs/bin/" + Binary+ " >/dev/null 2>/dev/null");
 
                if ( file.open( IO_WriteOnly) ) {
@@ -964,7 +964,7 @@
 
 	// Create desktop link
         QDir bindir;
-       	bindir.mkdir ( "/Programs/bin", TRUE );
+       	bindir.mkpath ( "/Programs/bin");
         runCommand("ln -fs /Programs/" + ProgDirName + "/.sbin/" + Binary + " /Programs/bin/" + Binary+ " >/dev/null 2>/dev/null");
 
 	
@@ -1310,8 +1310,8 @@
 	}
 	
         
-        //NewDir.mkdir("/Programs/" + ProgDirName, TRUE);
-        NewDir.mkdir(InstallDirPath, TRUE);
+        //NewDir.mkpath("/Programs/" + ProgDirName);
+        NewDir.mkpath(InstallDirPath);
         system("ln -s '" + InstallDirPath + "' " + "/Programs/" + ProgDirName);
 	
         // If we have update URL, create the file here
@@ -1901,7 +1901,7 @@
 	    exit(1);
         } 
     
-    NewDir.mkdir("/home/" + RealUserName + "/" + ProgDirName, TRUE);
+    NewDir.mkpath("/home/" + RealUserName + "/" + ProgDirName);
     cout << "Made Directory: /home/" + RealUserName.toStdString() + "/" + ProgDirName.toStdString() + "\n";
 	
           // Make the install script now



More information about the Commits mailing list