Resolves an issue where Aperture cannot remember custom command sets.

cormiertyshawn895 · Apr 22, 2020 · 3256857 · 3256857
1 parent ec9ab5c
commit 3256857
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 25 deletions.
diff --git a/Retroactive.xcodeproj/project.pbxproj b/Retroactive.xcodeproj/project.pbxproj
@@ -854,7 +854,7 @@
 				CODE_SIGN_ENTITLEMENTS = Retroactive/Support/Retroactive.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 52;
 				INFOPLIST_FILE = Retroactive/Support/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -875,7 +875,7 @@
 				CODE_SIGN_ENTITLEMENTS = Retroactive/Support/Retroactive.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 48;
+				CURRENT_PROJECT_VERSION = 52;
 				INFOPLIST_FILE = Retroactive/Support/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

diff --git a/Retroactive/Dependencies/ApertureFixer/ApertureFixer.xcodeproj/project.pbxproj b/Retroactive/Dependencies/ApertureFixer/ApertureFixer.xcodeproj/project.pbxproj
@@ -266,7 +266,7 @@
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;
@@ -293,7 +293,7 @@
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEFINES_MODULE = YES;
 				DEVELOPMENT_TEAM = "";
 				DYLIB_COMPATIBILITY_VERSION = 1;

diff --git a/Retroactive/Dependencies/ApertureFixer/ApertureFixer/NSObject+Fixer.m b/Retroactive/Dependencies/ApertureFixer/ApertureFixer/NSObject+Fixer.m
@@ -48,6 +48,9 @@ + (void)load {
     method_exchangeImplementations(class_getInstanceMethod(NSClassFromString(@"RKRedRockApp"), NSSelectorFromString(@"_delayedFinishLaunching")),
                                    class_getInstanceMethod(class, @selector(patched_delayedFinishLaunching)));
 
+    method_exchangeImplementations(class_getInstanceMethod(NSClassFromString(@"RKRedRockApp"), NSSelectorFromString(@"_moveCommandSetsToSandboxLocation")),
+                                   class_getInstanceMethod(class, @selector(patched_moveCommandSetsToSandboxLocation)));
+
     method_exchangeImplementations(class_getInstanceMethod(NSClassFromString(@"NSConcretePrintOperation"), NSSelectorFromString(@"runOperation")),
                                    class_getInstanceMethod(class, @selector(patched_runOperation)));
 
@@ -58,6 +61,10 @@ + (void)load {
                                    class_getInstanceMethod(class, @selector(patched_updatePaperMenu)));
 }
 
+- (void)patched_moveCommandSetsToSandboxLocation {
+    NSLog(@"asked to move command sets to sandbox location, but Aperture is unboxed, skipping it");
+}
+
 - (id)patched_paperWithID:(id)arg1 {
     NSLog(@"patching paperWithID to prevent crashes");
     return nil;

diff --git a/Retroactive/RootViewController.swift b/Retroactive/RootViewController.swift
@@ -26,8 +26,6 @@ class RootViewController: NSViewController, CCNNavigationControllerDelegate, NSW
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        self.alertForOSIncompatibility()
-
         self.navigationController = CCNNavigationController(rootViewController: ChoiceViewController.instantiate())
         self.navigationController.delegate = self
         self.navigationController.view.translatesAutoresizingMaskIntoConstraints = false
@@ -64,6 +62,7 @@ class RootViewController: NSViewController, CCNNavigationControllerDelegate, NSW
     override func viewDidAppear() {
         super.viewDidAppear()
         self.view.window?.delegate = self
+        self.alertForOSIncompatibility()
     }
 
     @IBAction func previousClicked(_ sender: Any) {

diff --git a/Retroactive/Support/ApertureFixer/Versions/A/ApertureFixer b/Retroactive/Support/ApertureFixer/Versions/A/ApertureFixer
diff --git a/Retroactive/Support/ApertureFixer/Versions/A/Resources/Info.plist b/Retroactive/Support/ApertureFixer/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>19B88</string>
+	<string>19F62f</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -23,21 +23,21 @@
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3</string>
+	<string>4</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>11B52</string>
+	<string>11E146</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
-	<string>19B81</string>
+	<string>19E258</string>
 	<key>DTSDKName</key>
 	<string>macosx10.15</string>
 	<key>DTXcode</key>
-	<string>1120</string>
+	<string>1140</string>
 	<key>DTXcodeBuild</key>
-	<string>11B52</string>
+	<string>11E146</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.10</string>
 </dict>

diff --git a/Retroactive/Support/ApertureFixer/Versions/A/_CodeSignature/CodeResources b/Retroactive/Support/ApertureFixer/Versions/A/_CodeSignature/CodeResources
@@ -6,7 +6,7 @@
 	<dict>
 		<key>Resources/Info.plist</key>
 		<data>
-		4mYY/eRtA/9EFIBHKSsxEQu/k10=
+		WbsaUd2QAw8fmxTqLZ5zf/JhSVk=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -37,11 +37,11 @@
 		<dict>
 			<key>hash</key>
 			<data>
-			4mYY/eRtA/9EFIBHKSsxEQu/k10=
+			WbsaUd2QAw8fmxTqLZ5zf/JhSVk=
 			</data>
 			<key>hash2</key>
 			<data>
-			aB1QzOmxaPmMtvJgsf0UkEo+P3yf8P7jCi55q63K7H8=
+			caQNbA+qJJ7xFEeaUCRWzuKX2NwNA1M2KSYUWpxaM3I=
 			</data>
 		</dict>
 	</dict>

diff --git a/Retroactive/Support/SupportPath.plist b/Retroactive/Support/SupportPath.plist
@@ -3,24 +3,27 @@
 <plist version="1.0">
 <dict>
 	<key>NewVersionVisibleTitle</key>
-	<string>Retroactive 1.6 (Build 48) is available for download.</string>
+	<string>Retroactive 1.6 (Build 52) is available for download.</string>
 	<key>NewVersionChangelog</key>
-    <string>• Adds support for unlocking Xcode 11.4.1 on macOS Mojave
+    <string>• Resolves an issue where Aperture cannot remember custom command sets
+• Adds support for unlocking Xcode 11.4.1 on macOS Mojave
 • Includes guidance on downloading iOS apps with Apple Configurator 2</string>
 	<key>NewVersionVisibleTitlezhHans</key>
-	<string>新版本解印 1.6 (版本号 48) 现已提供下载:</string>
+	<string>新版本解印 1.6 (版本号 52) 现已提供下载:</string>
 	<key>NewVersionChangelogzhHans</key>
-    <string>• 支持在 macOS Mojave 下解印并运行 Xcode 11.4.1
+    <string>• 修复了 Aperture 无法保留自定命令集的问题
+• 支持在 macOS Mojave 下解印并运行 Xcode 11.4.1
 • 新增了使用 Apple Configurator 2 下载 iOS 应用程序的指导</string>
 	<key>NewVersionVisibleTitlezhHant</key>
-	<string>新版本解印 1.6 (版本號 48) 現已提供下載:</string>
+	<string>新版本解印 1.6 (版本號 52) 現已提供下載:</string>
 	<key>NewVersionChangelogzhHant</key>
-    <string>• 支持在 macOS Mojave 下解印並運行 Xcode 11.4.1
+    <string>• 修復了 Aperture 無法保留自定命令集的問題
+• 支持在 macOS Mojave 下解印並運行 Xcode 11.4.1
 • 新增了使用 Apple Configurator 2 下載 iOS 應用程序的指導</string>
 	<key>LatestZIP</key>
 	<string>https://github.com/cormiertyshawn895/Retroactive/releases/download/1.6/Retroactive.1.6.zip</string>
 	<key>LatestBuildNumber</key>
-	<integer>48</integer>
+	<integer>52</integer>
 	<key>SupportPathURL</key>
 	<string>https://raw.githubusercontent.com/cormiertyshawn895/Retroactive/master/Retroactive/Support/SupportPath.plist</string>
 	<key>ReleasePage</key>

diff --git a/Retroactive/Support/SupportPathTemplate.xml b/Retroactive/Support/SupportPathTemplate.xml
@@ -5,17 +5,20 @@
 	<key>NewVersionVisibleTitle</key>
 	<string>Retroactive $(VERSION) is available for download.</string>
 	<key>NewVersionChangelog</key>
-    <string>• Adds support for unlocking Xcode 11.4.1 on macOS Mojave
+    <string>• Resolves an issue where Aperture cannot remember custom command sets
+• Adds support for unlocking Xcode 11.4.1 on macOS Mojave
 • Includes guidance on downloading iOS apps with Apple Configurator 2</string>
 	<key>NewVersionVisibleTitlezhHans</key>
 	<string>新版本解印 $(VERSION_HANS) 现已提供下载:</string>
 	<key>NewVersionChangelogzhHans</key>
-    <string>• 支持在 macOS Mojave 下解印并运行 Xcode 11.4.1
+    <string>• 修复了 Aperture 无法保留自定命令集的问题
+• 支持在 macOS Mojave 下解印并运行 Xcode 11.4.1
 • 新增了使用 Apple Configurator 2 下载 iOS 应用程序的指导</string>
 	<key>NewVersionVisibleTitlezhHant</key>
 	<string>新版本解印 $(VERSION_HANT) 現已提供下載:</string>
 	<key>NewVersionChangelogzhHant</key>
-    <string>• 支持在 macOS Mojave 下解印並運行 Xcode 11.4.1
+    <string>• 修復了 Aperture 無法保留自定命令集的問題
+• 支持在 macOS Mojave 下解印並運行 Xcode 11.4.1
 • 新增了使用 Apple Configurator 2 下載 iOS 應用程序的指導</string>
 	<key>LatestZIP</key>
 	<string>https://github.com/cormiertyshawn895/Retroactive/releases/download/$(MARKETING_VERSION)/Retroactive.$(MARKETING_VERSION).zip</string>