Skip to content

Commit

Permalink
Merge pull request #644 from lindegroup/1.5.3-dev
Browse files Browse the repository at this point in the history
1.5.3 Merge to master
  • Loading branch information
shawnhonsberger authored May 8, 2020
2 parents 987685f + b270bf3 commit cabbac7
Show file tree
Hide file tree
Showing 23 changed files with 121 additions and 92 deletions.
34 changes: 31 additions & 3 deletions AutoPkgr.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
1AC98427195DF6350071CAB3 /* autopkgr.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC98425195DF6350071CAB3 /* autopkgr.png */; };
1AC98429195DF6DE0071CAB3 /* autopkgr_alt.png in Resources */ = {isa = PBXBuildFile; fileRef = 1AC98428195DF6DE0071CAB3 /* autopkgr_alt.png */; };
21041CE6D520C363DBECB902 /* libPods-com.lindegroup.AutoPkgr.helper.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 62DA66B263080B115E0C6E12 /* libPods-com.lindegroup.AutoPkgr.helper.a */; };
291B96B42420162900C446C2 /* autopkgr_slack.png in Resources */ = {isa = PBXBuildFile; fileRef = 291B96B32420162900C446C2 /* autopkgr_slack.png */; };
5EF53CBDA5C7106F3847E9FD /* libPods-AutoPkgrTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B419CA189BE572FD31F74E0 /* libPods-AutoPkgrTests.a */; };
6A53625D1988BE59008A949C /* LGTestPort.m in Sources */ = {isa = PBXBuildFile; fileRef = 6A53625C1988BE59008A949C /* LGTestPort.m */; };
8B1AF8521BED81440013BE37 /* LGFileWaveIntegrationView.m in Sources */ = {isa = PBXBuildFile; fileRef = 8B1AF8501BED81440013BE37 /* LGFileWaveIntegrationView.m */; };
Expand Down Expand Up @@ -309,6 +310,7 @@
1AC9841E195CEC360071CAB3 /* LGConfigurationWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LGConfigurationWindowController.xib; sourceTree = "<group>"; };
1AC98425195DF6350071CAB3 /* autopkgr.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = autopkgr.png; sourceTree = "<group>"; };
1AC98428195DF6DE0071CAB3 /* autopkgr_alt.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = autopkgr_alt.png; sourceTree = "<group>"; };
291B96B32420162900C446C2 /* autopkgr_slack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = autopkgr_slack.png; sourceTree = "<group>"; };
2C6986FE5B41226735CC0A32 /* Pods-AutoPkgr.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AutoPkgr.debug.xcconfig"; path = "Pods/Target Support Files/Pods-AutoPkgr/Pods-AutoPkgr.debug.xcconfig"; sourceTree = "<group>"; };
39CF6FA5E75D62254A994C22 /* libPods-AutoPkgr.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-AutoPkgr.a"; sourceTree = BUILT_PRODUCTS_DIR; };
45E6F02919946C3F73535515 /* Pods-AutoPkgrTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-AutoPkgrTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-AutoPkgrTests/Pods-AutoPkgrTests.release.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -831,6 +833,7 @@
1A2C7FAC19CC9F8300CFF472 /* scripts */,
8BB217F519709A2C00EF8B93 /* AutoPkgrIcon.png */,
1AC98425195DF6350071CAB3 /* autopkgr.png */,
291B96B32420162900C446C2 /* autopkgr_slack.png */,
1AC98428195DF6DE0071CAB3 /* autopkgr_alt.png */,
BED388291A85E2C100DA8970 /* autopkgr_error.png */,
);
Expand Down Expand Up @@ -1386,7 +1389,7 @@
attributes = {
CLASSPREFIX = LG;
LastSwiftUpdateCheck = 0710;
LastUpgradeCheck = 0800;
LastUpgradeCheck = 1130;
ORGANIZATIONNAME = "The Linde Group, Inc.";
TargetAttributes = {
1AC6954C195B59ED00D2BD81 = {
Expand All @@ -1406,7 +1409,7 @@
};
buildConfigurationList = 1AC69548195B59ED00D2BD81 /* Build configuration list for PBXProject "AutoPkgr" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Expand Down Expand Up @@ -1472,6 +1475,7 @@
BE7EF2431B3381A7002037B1 /* LocalizableHelpPopover.strings in Resources */,
8B8654C11CF669A100B0A3FD /* LGVirusTotalAnalyzerIntegrationView.xib in Resources */,
BEC2024B1B600FF100F3BC2A /* LocalizableJSSImporter.strings in Resources */,
291B96B42420162900C446C2 /* autopkgr_slack.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -2381,7 +2385,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PROJECT_DIR}/scripts/helper-tool-codesign-config.py\"";
shellScript = "\"${PROJECT_DIR}/scripts/helper-tool-codesign-config.py\"\n";
};
BECFF2B619CA9854004C2721 /* Run Script: Set build number to commit count */ = {
isa = PBXShellScriptBuildPhase;
Expand Down Expand Up @@ -2961,14 +2965,22 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -3012,14 +3024,22 @@
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand Down Expand Up @@ -3056,6 +3076,7 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = JVY2ZR6SEF;
ENABLE_HARDENED_RUNTIME = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "AutoPkgr/Supporting Files/AutoPkgr-Prefix.pch";
INFOPLIST_FILE = "AutoPkgr/Supporting Files/AutoPkgr-Info.plist";
Expand Down Expand Up @@ -3117,6 +3138,7 @@
CODE_SIGN_IDENTITY = "Developer ID Application";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = JVY2ZR6SEF;
ENABLE_HARDENED_RUNTIME = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "AutoPkgr/Supporting Files/AutoPkgr-Prefix.pch";
Expand Down Expand Up @@ -3231,7 +3253,9 @@
buildSettings = {
CLANG_WARN_UNREACHABLE_CODE = YES;
CODE_SIGN_IDENTITY = "Developer ID Application";
CURRENT_PROJECT_VERSION = 1435;
DEVELOPMENT_TEAM = JVY2ZR6SEF;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_PREFIX_HEADER = "Privileged Helper/Supporting Files/helper-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
Expand Down Expand Up @@ -3272,6 +3296,7 @@
"$(inherited)",
);
OTHER_LIBTOOLFLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.lindegroup.AutoPkgr.helper;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
};
Expand All @@ -3283,7 +3308,9 @@
buildSettings = {
CLANG_WARN_UNREACHABLE_CODE = YES;
CODE_SIGN_IDENTITY = "Developer ID Application";
CURRENT_PROJECT_VERSION = 1435;
DEVELOPMENT_TEAM = JVY2ZR6SEF;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_PREFIX_HEADER = "Privileged Helper/Supporting Files/helper-Prefix.pch";
GCC_PREPROCESSOR_DEFINITIONS = (
Expand Down Expand Up @@ -3324,6 +3351,7 @@
"$(inherited)",
);
OTHER_LIBTOOLFLAGS = "$(inherited)";
PRODUCT_BUNDLE_IDENTIFIER = com.lindegroup.AutoPkgr.helper;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
};
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
8 changes: 8 additions & 0 deletions AutoPkgr.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?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">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
5 changes: 5 additions & 0 deletions AutoPkgr/Models/AutoPkg Task/LGAutoPkgTask.m
Original file line number Diff line number Diff line change
Expand Up @@ -1024,6 +1024,11 @@ + (void)makeOverride:(NSString *)recipe name:(NSString *)name reply:(void (^)(NS
}

+ (void)updateTrustInfo:(NSString *)recipe reply:(void (^)(NSString *, NSError *))reply
{
[[self class] updateTrustInfo:recipe name:nil reply:reply];
}

+ (void)updateTrustInfo:(NSString *)recipe name:(NSString *)name reply:(void (^)(NSString *, NSError *))reply
{
LGAutoPkgTask *task = [[LGAutoPkgTask alloc] init];
NSMutableArray *args = [@[ @"update-trust-info", recipe ] mutableCopy];
Expand Down
7 changes: 1 addition & 6 deletions AutoPkgr/Models/Integrations/LGAbsoluteManageIntegration.m
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,7 @@ + (NSString *)shortName
}
+ (NSString *)credits
{
return @"Copyright 2016 Thomas Burgin\nhttp://www.apache.org/licenses/LICENSE-2.0";
}

+ (NSURL *)homePage
{
return [NSURL URLWithString:@"https://github.com/tburgin/AbsoluteManageExport"];
return @"Thomas Burgin\nhttp://www.apache.org/licenses/LICENSE-2.0\nhttps://github.com/tburgin/AbsoluteManageExport";
}

+ (NSString *)gitHubURL
Expand Down
7 changes: 1 addition & 6 deletions AutoPkgr/Models/Integrations/LGAutoPkgIntegration.m
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,7 @@ + (NSString *)name

+ (NSString *)credits
{
return @"Greg Neagle, Tim Sutton, Per Olofsson\nhttp://www.apache.org/licenses/LICENSE-2.0";
}

+ (NSURL *)homePage
{
return [NSURL URLWithString:@"http://autopkg.github.io/autopkg/"];
return @"Greg Neagle, Tim Sutton, Per Olofsson, Nick McSpadden, Elliot Jordan\nhttp://www.apache.org/licenses/LICENSE-2.0\nhttps://github.com/autopkg/autopkg";
}

+ (NSArray *)components
Expand Down
7 changes: 1 addition & 6 deletions AutoPkgr/Models/Integrations/LGFileWaveIntegration.m
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,14 @@ + (NSString *)name

+ (NSString *)credits
{
return @"Copyright 2015 FileWave (Europe) GmbH\nhttp://www.apache.org/licenses/LICENSE-2.0";
return @"FileWave (Europe) GmbH\nhttp://www.apache.org/licenses/LICENSE-2.0\nhttps://github.com/autopkg/filewave";
}

+ (NSString *)defaultRepository
{
return @"https://github.com/autopkg/filewave.git";
}

+ (NSURL *)homePage
{
return [NSURL URLWithString:@"https://github.com/autopkg/filewave"];
}

+ (BOOL)isUninstallable
{
return YES;
Expand Down
7 changes: 1 addition & 6 deletions AutoPkgr/Models/Integrations/LGGitIntegration.m
Original file line number Diff line number Diff line change
Expand Up @@ -60,12 +60,7 @@ + (NSString *)name

+ (NSString *)credits
{
return @"The GNU General Public License (GPL-2.0)";
}

+ (NSURL *)homePage
{
return [NSURL URLWithString:@"https://git-scm.com"];
return @"The GNU General Public License (GPL-2.0)\nhttps://git-scm.com";
}

+ (NSArray *)components
Expand Down
7 changes: 1 addition & 6 deletions AutoPkgr/Models/Integrations/LGJSSImporterIntegration.m
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,9 @@ + (NSString *)name
return @"JSSImporter";
}

+ (NSURL *)homePage
{
return [NSURL URLWithString:@"https://github.com/jssimporter/JSSImporter"];
}

+ (NSString *)credits
{
return @"Copyright 2014, 2019 Shea Craig and Graham Pugh\nhttp://www.apache.org/licenses/LICENSE-2.0";
return @"Shea Craig, Mosen, Graham Pugh\nhttp://www.apache.org/licenses/LICENSE-2.0\nhttps://github.com/jssimporter/JSSImporter";
}

+ (NSString *)gitHubURL
Expand Down
7 changes: 1 addition & 6 deletions AutoPkgr/Models/Integrations/LGLANrevIntegration.m
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,7 @@ + (NSString *)shortName
}
+ (NSString *)credits
{
return @"Copyright 2016 Jeremy Baker\nhttp://www.apache.org/licenses/LICENSE-2.0";
}

+ (NSURL *)homePage
{
return [NSURL URLWithString:@"https://github.com/jbaker10/LANrevImporter"];
return @"Jeremy Baker\nhttp://www.apache.org/licenses/LICENSE-2.0\nhttps://github.com/jbaker10/LANrevImporter";
}

+ (NSString *)gitHubURL
Expand Down
9 changes: 2 additions & 7 deletions AutoPkgr/Models/Integrations/LGMacPatchIntegration.m
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ + (NSString *)name

+ (NSString *)credits
{
return @"LLNL Mac Development\nGNU GENERAL PUBLIC LICENSE Version 2";
return @"LLNL Mac Development\nThe GNU General Public License (GPL-2.0)\nhttps://github.com/SMSG-MAC-DEV/MacPatch-AutoPKG";
}

+ (NSArray *)components
Expand All @@ -40,11 +40,6 @@ + (NSString *)defaultRepository
return @"https://github.com/SMSG-MAC-DEV/MacPatch-AutoPKG.git";
}

+ (NSURL *)homePage
{
return [NSURL URLWithString:@"https://github.com/SMSG-MAC-DEV/MacPatch-AutoPKG"];
}

+ (BOOL)isUninstallable
{
return YES;
Expand Down Expand Up @@ -113,4 +108,4 @@ - (void)setMP_SSL_VERIFY:(BOOL)MP_SSL_VERIFY
[self setAutoPkgDomainObject:@(MP_SSL_VERIFY) forKey:NSStringFromSelector(@selector(MP_SSL_VERIFY))];
}

@end
@end
7 changes: 1 addition & 6 deletions AutoPkgr/Models/Integrations/LGMunkiIntegration.m
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,14 @@ + (NSString *)name

+ (NSString *)credits
{
return @"Copyright 2008-2014 Greg Neagle.\nhttp://www.apache.org/licenses/LICENSE-2.0";
return @"Greg Neagle\nhttp://www.apache.org/licenses/LICENSE-2.0\nhttps://github.com/munki/munki";
}

+ (NSString *)gitHubURL
{
return @"https://api.github.com/repos/munki/munki/releases";
}

+ (NSURL *)homePage
{
return [NSURL URLWithString:@"https://www.munki.org/"];
}

+ (NSString *)defaultRepository
{
return @"https://github.com/autopkg/recipes.git";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ + (NSString *)name

+ (NSString *)credits
{
return @"Copyright 2016 Hannes Juutilainen\nApache License Version 2.0";
return @"Hannes Juutilainen\nhttp://www.apache.org/licenses/LICENSE-2.0\nhttps://github.com/hjuutilainen/autopkg-virustotalanalyzer";
}

+ (NSArray *)components
Expand All @@ -41,11 +41,6 @@ + (NSString *)defaultRepository
return @"https://github.com/hjuutilainen/autopkg-virustotalanalyzer.git";
}

+ (NSURL *)homePage
{
return [NSURL URLWithString:@"https://github.com/hjuutilainen/autopkg-virustotalanalyzer"];
}

+ (BOOL)isUninstallable
{
return YES;
Expand Down
4 changes: 2 additions & 2 deletions AutoPkgr/Supporting Files/AutoPkgr-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.5.2</string>
<string>1.5.3</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>1415</string>
<string>1435</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>
Expand Down
8 changes: 6 additions & 2 deletions AutoPkgr/Utility/AHHelpPopover.m
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,7 @@ - (void)openPopover

NSDictionary *attributes = @{
NSFontAttributeName : _helpTitleFont,
NSForegroundColorAttributeName : NSColor.controlTextColor,
};

NSAttributedString *title = [[NSAttributedString alloc] initWithString:[_helpTitle stringByAppendingString:@"\n\n"]
Expand Down Expand Up @@ -177,6 +178,7 @@ - (void)openPopover
NSTextView *helpTextView = [[NSTextView alloc] initWithFrame:viewFrame];
helpTextView.editable = NO;
helpTextView.backgroundColor = [NSColor clearColor];
helpTextView.textColor = [NSColor controlTextColor];
helpTextView.alignment = _textAlignment;

[helpTextView.textStorage setAttributedString:textStorage];
Expand Down Expand Up @@ -246,7 +248,9 @@ - (NSAttributedString *)attributedHelpText
{
if (!_attributedHelpText && _helpText) {
_attributedHelpText = [[NSAttributedString alloc] initWithString:_helpText
attributes:@{ NSFontAttributeName : _helpTextFont }];
attributes:@{ NSFontAttributeName : _helpTextFont,
NSForegroundColorAttributeName : NSColor.controlTextColor,
}];
}
return _attributedHelpText;
}
Expand Down Expand Up @@ -353,4 +357,4 @@ - (NSString *)localizedStringValueForIvar:(NSString *)iVar
return iVar;
}

@end
@end
Loading

0 comments on commit cabbac7

Please sign in to comment.