fix: failed to eject when inject fails

Lessica · Lessica · commit 6771e40fe13c · 2025-01-17T23:20:02.000+08:00
Signed-off-by: Lessica &lt;82flex@gmail.com&gt;
diff --git a/TrollFools/Execute.swift b/TrollFools/Execute.swift
@@ -20,7 +20,9 @@ enum Execute {
         let receipt = AuxiliaryExecute.spawn(
             command: binary,
             args: arguments,
-            environment: environment,
+            environment: environment.merging([
+                "DISABLE_TWEAKS": "1",
+            ], uniquingKeysWith: { $1 }),
             personaOptions: .init(uid: 0, gid: 0),
             ddlog: ddlog
         )
@@ -42,7 +44,9 @@ enum Execute {
         let receipt = AuxiliaryExecute.spawn(
             command: binary,
             args: arguments,
-            environment: environment,
+            environment: environment.merging([
+                "DISABLE_TWEAKS": "1",
+            ], uniquingKeysWith: { $1 }),
             personaOptions: .init(uid: 0, gid: 0),
             ddlog: ddlog
         )
diff --git a/TrollFools/InjectorV3+Bundle.swift b/TrollFools/InjectorV3+Bundle.swift
@@ -178,7 +178,12 @@ extension InjectorV3 {
             try cmdChangeOwnerToInstalld(markerURL, recursively: false)
 
             try filteredURLs.forEach {
-                try cmdCopy(from: markerURL, to: $0.appendingPathComponent(Self.injectedMarkerName), overwrite: true)
+                try cmdCopy(
+                    from: markerURL,
+                    to: $0.appendingPathComponent(Self.injectedMarkerName),
+                    clone: true,
+                    overwrite: true
+                )
             }
         } else {
             try filteredURLs.forEach {
@@ -286,4 +291,9 @@ extension InjectorV3 {
         let pathExt = target.pathExtension.lowercased()
         return isPackage || (isDirectory && (pathExt == "app" || pathExt == "bundle" || pathExt == "framework"))
     }
+
+    func checkIsDirectory(_ target: URL) -> Bool {
+        let values = try? target.resourceValues(forKeys: [.isDirectoryKey])
+        return values?.isDirectory ?? false
+    }
 }
diff --git a/TrollFools/InjectorV3+Command.swift b/TrollFools/InjectorV3+Command.swift
@@ -44,13 +44,16 @@ extension InjectorV3 {
         }
     }()
 
-    func cmdCopy(from srcURL: URL, to destURL: URL, overwrite: Bool = false) throws {
+    func cmdCopy(from srcURL: URL, to destURL: URL, clone: Bool = false, overwrite: Bool = false) throws {
         if overwrite {
             try? cmdRemove(destURL, recursively: true)
         }
-        let retCode = try Execute.rootSpawn(binary: Self.cpBinaryURL.path, arguments: [
-            "--reflink=auto", "-rfp", srcURL.path, destURL.path,
-        ], ddlog: logger)
+        var args = [String]()
+        if clone {
+            args.append("--reflink=auto")
+        }
+        args += ["-rfp", srcURL.path, destURL.path]
+        let retCode = try Execute.rootSpawn(binary: Self.cpBinaryURL.path, arguments: args, ddlog: logger)
         guard case .exit(let code) = retCode, code == EXIT_SUCCESS else {
             try throwCommandFailure("cp", reason: retCode)
         }
@@ -112,7 +115,7 @@ extension InjectorV3 {
                 "-e", target.path,
             ], ddlog: logger)
 
-            guard case .exit(let code) = receipt.terminationReason, code == 0 else {
+            guard case .exit(let code) = receipt.terminationReason, code == EXIT_SUCCESS else {
                 try throwCommandFailure("ldid", reason: receipt.terminationReason)
             }
 
diff --git a/TrollFools/InjectorV3+Eject.swift b/TrollFools/InjectorV3+Eject.swift
@@ -59,7 +59,7 @@ extension InjectorV3 {
             try targetURLs.forEach {
                 try removeLoadCommandOfAsset(assetURL, from: $0)
             }
-            try? cmdRemove(assetURL, recursively: checkIsBundle(assetURL))
+            try? cmdRemove(assetURL, recursively: checkIsDirectory(assetURL))
         }
 
         try targetURLs.forEach {
diff --git a/TrollFools/InjectorV3+Inject.swift b/TrollFools/InjectorV3+Inject.swift
@@ -50,7 +50,7 @@ extension InjectorV3 {
         for assetURL in assetURLs {
             let targetURL = bundleURL.appendingPathComponent(assetURL.lastPathComponent)
 
-            try cmdCopy(from: assetURL, to: targetURL, overwrite: true)
+            try cmdCopy(from: assetURL, to: targetURL, clone: true, overwrite: true)
             try cmdChangeOwnerToInstalld(targetURL, recursively: true)
         }
     }
@@ -74,15 +74,17 @@ extension InjectorV3 {
 
         DDLogInfo("Best matched Mach-O is \(targetMachO.path)", ddlog: logger)
 
+        let resourceURLs: [URL] = [substrateFwkURL] + assetURLs
         try makeAlternate(targetMachO)
         do {
-            try copyfiles([substrateFwkURL] + assetURLs)
+            try copyfiles(resourceURLs)
             for assetURL in assetURLs {
                 try insertLoadCommandOfAsset(assetURL, to: targetMachO)
             }
             try applyCoreTrustBypass(targetMachO)
         } catch {
             try? restoreAlternate(targetMachO)
+            try? batchRemove(resourceURLs)
             throw error
         }
     }
@@ -179,18 +181,21 @@ extension InjectorV3 {
 
     // MARK: - Path Clone
 
-    @discardableResult
-    fileprivate func copyfiles(_ assetURLs: [URL]) throws -> [URL] {
+    fileprivate func copyfiles(_ assetURLs: [URL]) throws {
         let targetURLs = assetURLs.map {
             frameworksDirectoryURL.appendingPathComponent($0.lastPathComponent)
         }
 
         for (assetURL, targetURL) in zip(assetURLs, targetURLs) {
-            try cmdCopy(from: assetURL, to: targetURL, overwrite: true)
-            try cmdChangeOwnerToInstalld(targetURL, recursively: checkIsBundle(assetURL))
+            try cmdCopy(from: assetURL, to: targetURL, clone: true, overwrite: true)
+            try cmdChangeOwnerToInstalld(targetURL, recursively: checkIsDirectory(assetURL))
         }
+    }
 
-        return targetURLs
+    fileprivate func batchRemove(_ assetURLs: [URL]) throws {
+        try assetURLs.forEach {
+            try cmdRemove($0, recursively: checkIsDirectory($0))
+        }
     }
 
     // MARK: - Path Finder
diff --git a/TrollFools/LogsView.swift b/TrollFools/LogsView.swift
@@ -23,6 +23,7 @@ struct LogsView: UIViewControllerRepresentable {
         viewController.reversed = true
         viewController.allowTrash = false
         viewController.allowSearch = true
+        viewController.allowShare = true
         viewController.allowMultiline = true
         viewController.pullToReload = false
         viewController.tapToCopy = true
diff --git a/TrollFools/StripedTextTableViewController.h b/TrollFools/StripedTextTableViewController.h
@@ -30,6 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, assign) BOOL removeDuplicates;
 @property (nonatomic, assign) BOOL allowTrash;
 @property (nonatomic, assign) BOOL allowSearch;
+@property (nonatomic, assign) BOOL allowShare;
 @property (nonatomic, assign) BOOL pullToReload;
 @property (nonatomic, assign) BOOL tapToCopy;
 @property (nonatomic, assign) BOOL pressToCopy;
diff --git a/TrollFools/StripedTextTableViewController.m b/TrollFools/StripedTextTableViewController.m
@@ -16,6 +16,7 @@ @interface StripedTextTableViewController () <UISearchResultsUpdating>
 @property (nonatomic, strong) NSNumberFormatter *decimalNumberFormatter;
 @property (nonatomic, assign) NSUInteger numberOfTextRowsNotLoaded;
 
+@property (nonatomic, strong) UIBarButtonItem *shareItem;
 @property (nonatomic, strong) UIBarButtonItem *trashItem;
 @property (nonatomic, strong) UISearchController *searchController;
 
@@ -72,10 +73,18 @@ - (void)viewDidLoad {
         });
     }
 
+    NSMutableArray <UIBarButtonItem *> *rightBarButtonItems = [NSMutableArray arrayWithCapacity:2];
+
+    if (self.allowShare) {
+        [rightBarButtonItems addObject:self.shareItem];
+    }
+
     if (self.allowTrash) {
-        self.navigationItem.rightBarButtonItem = self.trashItem;
+        [rightBarButtonItems addObject:self.trashItem];
     }
 
+    self.navigationItem.rightBarButtonItems = rightBarButtonItems;
+
     if (self.allowSearch) {
         self.navigationItem.hidesSearchBarWhenScrolling = YES;
         self.navigationItem.searchController = self.searchController;
@@ -242,6 +251,17 @@ - (void)resetAutoReload {
     dispatch_resume(eventSource);
 }
 
+- (void)shareItemTapped:(UIBarButtonItem *)sender {
+    UIActivityViewController *activityViewController = [[UIActivityViewController alloc] initWithActivityItems:@[[NSURL fileURLWithPath:self.entryPath]] applicationActivities:nil];
+    if (@available(iOS 16.0, *)) {
+        activityViewController.popoverPresentationController.sourceItem = sender;
+    } else {
+        // Fallback on earlier versions
+        activityViewController.popoverPresentationController.barButtonItem = sender;
+    }
+    [self presentViewController:activityViewController animated:YES completion:nil];
+}
+
 - (void)trashItemTapped:(UIBarButtonItem *)sender {
     UIAlertController *alert = [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Confirm", @"StripedTextTableViewController") message:[NSString stringWithFormat:NSLocalizedString(@"Do you want to clear this log file “%@”?", @"StripedTextTableViewController"), [self.entryPath lastPathComponent]] preferredStyle:UIAlertControllerStyleAlert];
     [alert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"Cancel", @"StripedTextTableViewController") style:UIAlertActionStyleCancel handler:^(UIAlertAction *_Nonnull action) {
@@ -398,6 +418,13 @@ - (void)updateSearchResultsForSearchController:(UISearchController *)searchContr
 
 #pragma mark - UIView Getters
 
+- (UIBarButtonItem *)shareItem {
+    if (!_shareItem) {
+        _shareItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemAction target:self action:@selector(shareItemTapped:)];
+    }
+    return _shareItem;
+}
+
 - (UIBarButtonItem *)trashItem {
     if (!_trashItem) {
         _trashItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemTrash target:self action:@selector(trashItemTapped:)];
diff --git a/TrollFools/Version.Debug.xcconfig b/TrollFools/Version.Debug.xcconfig
@@ -8,5 +8,5 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-DEBUG_VERSION = 2.10
-DEBUG_BUILD_NUMBER = 202501142
+DEBUG_VERSION = 2.11
+DEBUG_BUILD_NUMBER = 202501171
diff --git a/TrollFools/Version.xcconfig b/TrollFools/Version.xcconfig
@@ -8,5 +8,5 @@
 // Configuration settings file format documentation can be found at:
 // https://help.apple.com/xcode/#/dev745c5c974
 
-VERSION = 2.10
-BUILD_NUMBER = 23
+VERSION = 2.11
+BUILD_NUMBER = 25
diff --git a/layout/DEBIAN/control b/layout/DEBIAN/control
@@ -1,6 +1,6 @@
 Package: wiki.qaq.trollfools
 Name: TrollFools
-Version: 2.10-23
+Version: 2.11-25
 Section: Applications
 Depends: firmware (>= 14.0)
 Architecture: iphoneos-arm

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ extension InjectorV3 {`
`59`	`59`	`try targetURLs.forEach {`
`60`	`60`	`try removeLoadCommandOfAsset(assetURL, from: $0)`
`61`	`61`	`}`
`62`		`- try? cmdRemove(assetURL, recursively: checkIsBundle(assetURL))`
	`62`	`+ try? cmdRemove(assetURL, recursively: checkIsDirectory(assetURL))`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`try targetURLs.forEach {`