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

[svn at pcbsd.org]

Author: kris
Date: 2009-05-19 10:54:40 -0700 (Tue, 19 May 2009)
New Revision: 3966

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

Fixed a regression which was creating circular sym-links again



Modified: pbibuild/pbi-source/PBIsource/pbi.cpp
===================================================================
--- pbibuild/pbi-source/PBIsource/pbi.cpp	2009-05-19 16:56:29 UTC (rev 3965)
+++ pbibuild/pbi-source/PBIsource/pbi.cpp	2009-05-19 17:54:40 UTC (rev 3966)
@@ -1454,9 +1454,12 @@
        }
 	
         
-       //NewDir.mkpath("/Programs/" + ProgDirName);
-       NewDir.mkpath(InstallDirPath);
-       system("ln -s '" + InstallDirPath + "' " + "/Programs/" + ProgDirName);
+       // Check if we are installing on a user-provided path, and sym-link back to Programs
+       QString RegularPath = "/Programs/" + ProgDirName; 
+       if ( InstallDirPath != RegularPath ) 
+       { 
+           system("ln -s '" + InstallDirPath + "' " + "/Programs/" + ProgDirName); 
+       } 
 	
        // If we have update URL, create the file here
        if ( ! ProgUpdateURL.isEmpty() )