English.lproj/MoveApplication.strings @@ -24,6 +24,7 @@ static NSString *AlertSuppressKey = @"moveToApplicationsFolderAlertSuppress"; // Helper functions +static NSString *PreferredInstallLocation(void); static BOOL IsInApplicationsFolder(NSString *path); static BOOL IsInDownloadsFolder(NSString *path); static BOOL Trash(NSString *path); @@ -51,43 +52,30 @@ void PFMoveToApplicationsFolderIfNecessary() return; } - // Since we are good to go, get /Applications - NSString *applicationsDirectory = [NSSearchPathForDirectoriesInDomains(NSApplicationDirectory, NSLocalDomainMask, YES) lastObject]; - - // If the user is not an Administrator, that user will not be able to put the app in /Applications. - // So, offer to put in ~/Applications instead if it exists - BOOL useUserApplications = applicationsDirectory == nil || ![fm isWritableFileAtPath:applicationsDirectory]; - BOOL needAuthorization = NO; - - if (useUserApplications) { - NSLog(@"Can't write to /Applications, checking ~/Applications"); - NSString *userApplicationsDirectory = [NSSearchPathForDirectoriesInDomains(NSApplicationDirectory, NSUserDomainMask, YES) lastObject]; - NSLog(@"User applicationsDirectory: %@", userApplicationsDirectory); - - // Require authorization if there's no ~/Applications or if it's not writable - if (userApplicationsDirectory == nil || ![fm isWritableFileAtPath:userApplicationsDirectory]) { - needAuthorization = YES; - useUserApplications = NO; - } - else { - applicationsDirectory = userApplicationsDirectory; - } + // Since we are good to go, get the preferred installation directory. + NSString *applicationsDirectory = PreferredInstallLocation(); + + BOOL useUserApplications = NO; + if ([applicationsDirectory hasPrefix:@"~"]) + { + useUserApplications = YES; + applicationsDirectory = [applicationsDirectory stringByExpandingTildeInPath]; } - + + BOOL needAuthorization = ([fm isWritableFileAtPath:applicationsDirectory] == NO); + // Setup the alert NSAlert *alert = [[[NSAlert alloc] init] autorelease]; { - NSString *informativeText = nil; - - if (!useUserApplications) { - [alert setMessageText:NSLocalizedStringFromTable(@"Move to Applications folder?", @"MoveApplication", nil)]; - informativeText = NSLocalizedStringFromTable(@"I can move myself to the Applications folder if you'd like.", @"MoveApplication", nil); - } - else { - [alert setMessageText:NSLocalizedStringFromTable(@"Move to Applications folder in your Home folder?", @"MoveApplication", nil)]; - informativeText = NSLocalizedStringFromTable(@"You don't have permissions to put me in the main Applications folder, but I can move myself to the Applications folder in your Home folder instead.", @"MoveApplication", nil); + [alert setMessageText:NSLocalizedStringFromTable(@"Move to Applications folder?", @"MoveApplication", nil)]; + + NSString *informativeText = NSLocalizedStringFromTable(@"I can move myself to the Applications folder if you'd like.", @"MoveApplication", nil); + + if (useUserApplications) { + informativeText = [informativeText stringByAppendingString:@" "]; + informativeText = [informativeText stringByAppendingString:NSLocalizedStringFromTable(@"The Applications folder in your Home folder will be used.", @"MoveApplication", nil)]; } - + if (needAuthorization) { informativeText = [informativeText stringByAppendingString:@" "]; informativeText = [informativeText stringByAppendingString:NSLocalizedStringFromTable(@"Note that this will require an administrator password.", @"MoveApplication", nil)]; @@ -97,7 +85,7 @@ void PFMoveToApplicationsFolderIfNecessary() informativeText = [informativeText stringByAppendingString:@" "]; informativeText = [informativeText stringByAppendingString:NSLocalizedStringFromTable(@"This will keep your Downloads folder uncluttered.", @"MoveApplication", nil)]; } - + [alert setInformativeText:informativeText]; // Add buttons @@ -191,6 +179,20 @@ fail: #pragma mark - #pragma mark Helper Functions +static NSString *PreferredInstallLocation(void) +{ + // Builds an array of possible install locations. This assumes + // that if the user has a ~/Applications folder, they'd prefer their + // applications to go there. + + NSMutableArray *paths = [NSMutableArray array]; + + [paths addObjectsFromArray:NSSearchPathForDirectoriesInDomains(NSApplicationDirectory, NSUserDomainMask, NO)]; + [paths addObjectsFromArray:NSSearchPathForDirectoriesInDomains(NSApplicationDirectory, NSLocalDomainMask, NO)]; + + return [paths objectAtIndex:0]; +} + static BOOL IsInApplicationsFolder(NSString *path) { NSEnumerator *e = [NSSearchPathForDirectoriesInDomains(NSApplicationDirectory, NSAllDomainsMask, YES) objectEnumerator]; PFMoveApplication.m 99b8b007411f62d95fee3ba429f644d16e9e3f22 Kevin LaCoste klacoste@zenvilla.com http://github.com/potionfactory/LetsMove/commit/f7ce95f08999db510413ddaa76bf3a6c8e34c636 f7ce95f08999db510413ddaa76bf3a6c8e34c636 2009-10-07T21:59:10-07:00 2009-10-07T21:59:10-07:00 Now prefers installing in the home folder if ~/Applications is present. d4cbe8f6a950ef0212e97dfbf497869be08138e2 Kevin LaCoste klacoste@zenvilla.com