Ignore:
Timestamp:
Nov 7, 2011, 6:54:09 AM (12 years ago)
Author:
jmr@…
Message:

MacPorts_Framework: check for macports1.0 under /opt/local/share/macports/Tcl as well as /Library/Tcl (#27911)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • contrib/MacPorts_Framework/MPInterpreter.m

    r69794 r86927  
    4040#include "MPHelperNotificationsProtocol.h"
    4141static AuthorizationRef internalMacPortsAuthRef;
    42 static NSString* PKGPath = @"/Library/Tcl";
     42static NSString* GenericPKGPath = @"/Library/Tcl";
     43static NSString* PKGPath = @"/opt/local/share/macports/Tcl";
    4344static NSTask* aTask;
    4445
     
    304305#pragma mark API methods
    305306- (id) init {
     307        NSFileManager *fileManager = [NSFileManager defaultManager];
     308        BOOL existsAsDirectory = NO;
     309        BOOL containsMacPortsTcl = NO;
     310        NSString *macportsDir = [PKGPath stringByAppendingPathComponent:@"macports1.0"];
     311        NSString *macportsFile = [macportsDir stringByAppendingPathComponent:@"macports.tcl"];
     312        [fileManager fileExistsAtPath:macportsDir isDirectory:&existsAsDirectory];
     313        if (existsAsDirectory) {
     314                containsMacPortsTcl = [fileManager fileExistsAtPath:macportsFile isDirectory:nil];
     315        }
     316        if (!containsMacPortsTcl) {
     317                return [self initWithPkgPath:GenericPKGPath portOptions:nil];
     318        }
    306319        return [self initWithPkgPath:PKGPath portOptions:nil];
    307320}
Note: See TracChangeset for help on using the changeset viewer.