Skip to content
This repository was archived by the owner on Feb 27, 2020. It is now read-only.

"Scan Homebrew" does not recognize php-fpm #10

Merged
merged 3 commits into from
Feb 16, 2014
Merged

"Scan Homebrew" does not recognize php-fpm #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ef7b735
add plist to store special plists
jimbojsb Feb 11, 2014
61bf855
Merge branch 'master' into gh-10
jimbojsb Feb 16, 2014
6c81ad8
add support for specific special case services
jimbojsb Feb 16, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions LaunchRocket.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
039F63F118923AA8004C6696 /* gray.png in Resources */ = {isa = PBXBuildFile; fileRef = 039F63F018923AA8004C6696 /* gray.png */; };
03A8692B189327D900ED639C /* Process.h in Headers */ = {isa = PBXBuildFile; fileRef = 03A86929189327D900ED639C /* Process.h */; };
03A8692C189327D900ED639C /* Process.m in Sources */ = {isa = PBXBuildFile; fileRef = 03A8692A189327D900ED639C /* Process.m */; };
03C5C20618AAC02B00FB25EF /* special-plists.plist in Resources */ = {isa = PBXBuildFile; fileRef = 03C5C20518AAC02B00FB25EF /* special-plists.plist */; };
03D25AA318A35FEF007B253F /* sudo.app in Resources */ = {isa = PBXBuildFile; fileRef = 03D25AA218A35FEF007B253F /* sudo.app */; };
03EE9DA216FFD39900E09197 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03EE9DA116FFD39900E09197 /* Cocoa.framework */; };
03EE9DA416FFD39900E09197 /* PreferencePanes.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 03EE9DA316FFD39900E09197 /* PreferencePanes.framework */; };
Expand Down Expand Up @@ -55,6 +56,7 @@
039F63F018923AA8004C6696 /* gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = gray.png; sourceTree = "<group>"; };
03A86929189327D900ED639C /* Process.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Process.h; sourceTree = "<group>"; };
03A8692A189327D900ED639C /* Process.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Process.m; sourceTree = "<group>"; };
03C5C20518AAC02B00FB25EF /* special-plists.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "special-plists.plist"; sourceTree = "<group>"; };
03D25AA218A35FEF007B253F /* sudo.app */ = {isa = PBXFileReference; lastKnownFileType = wrapper.application; name = sudo.app; path = LaunchRocket/sudo.app; sourceTree = "<group>"; };
03EE9D9E16FFD39900E09197 /* LaunchRocket.prefPane */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = LaunchRocket.prefPane; sourceTree = BUILT_PRODUCTS_DIR; };
03EE9DA116FFD39900E09197 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
Expand Down Expand Up @@ -174,6 +176,7 @@
03EE9DAB16FFD39900E09197 /* LaunchRocket-Info.plist */,
03EE9DAC16FFD39900E09197 /* InfoPlist.strings */,
03EE9DAF16FFD39900E09197 /* LaunchRocket-Prefix.pch */,
03C5C20518AAC02B00FB25EF /* special-plists.plist */,
);
name = "Supporting Files";
sourceTree = "<group>";
Expand Down Expand Up @@ -258,6 +261,7 @@
039F63E51892220F004C6696 /* red.png in Resources */,
03EE9DBE16FFD40200E09197 /* LaunchRocket.tiff in Resources */,
039F63D918920EF2004C6696 /* OpenSans-Light.ttf in Resources */,
03C5C20618AAC02B00FB25EF /* special-plists.plist in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
13 changes: 12 additions & 1 deletion LaunchRocket/ServiceManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,17 @@ -(IBAction) handleHomebrewScanClick:(id)sender {
[self addService:servicePlist];
}
}

//handle special plists, most specifically, josegonzales/php stuff
NSString *specialPlistPath = [[self bundle] pathForResource:@"special-plists" ofType:@"plist"];
NSArray *additionalPlists = [NSArray arrayWithContentsOfFile:specialPlistPath];
for (NSString *plist in additionalPlists) {
NSString *servicePlist = [NSString stringWithFormat:@"%@%@", optPath, plist];
if ([fm fileExistsAtPath:servicePlist]) {
[self addService:servicePlist];
}
}

[self cleanServicesFile];
[self loadServicesFromPlist];
[self renderList];
Expand Down Expand Up @@ -228,7 +239,7 @@ -(void) renderList {
// [runAtLogin setAction:@selector(handleRunAtLoginClick:)];
// [serviceList addSubview:runAtLogin];

NSButton *remove = [[NSButton alloc] initWithFrame:NSMakeRect(430, listOffsetPixels - 1, 70, 30)];
NSButton *remove = [[NSButton alloc] initWithFrame:NSMakeRect(410, listOffsetPixels, 70, 30)];
[remove setBezelStyle:NSTexturedRoundedBezelStyle];
[remove setTitle:@"Remove"];
[remove setTarget:sc];
Expand Down
9 changes: 9 additions & 0 deletions LaunchRocket/special-plists.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array>
<string>php53/homebrew-php.josegonzalez.php53.plist</string>
<string>php54/homebrew-php.josegonzalez.php54.plist</string>
<string>php55/homebrew-php.josegonzalez.php55.plist</string>
</array>
</plist>