2.2.2-Nightly.5

ElliesSurviving · Sep 12, 2024 · 5250521 · 5250521
1 parent 7f6ad4c
commit 5250521
Show file tree

Hide file tree

Showing 29 changed files with 41 additions and 31 deletions.
diff --git a/Application/Dopamine/Jailbreak/DOBootstrapper.m b/Application/Dopamine/Jailbreak/DOBootstrapper.m
@@ -669,9 +669,9 @@ - (NSError *)finalizeBootstrap
             NSString *choicyPath = [[NSBundle mainBundle].bundlePath stringByAppendingPathComponent:@"choicy.deb"];
             [self installPackage:choicyPath];
 
-            NSString *abistubPath = [[NSBundle mainBundle].bundlePath stringByAppendingPathComponent:@"abistub.deb"];
-            [self installPackage:abistubPath];
-
+            //NSString *abistubPath = [[NSBundle mainBundle].bundlePath stringByAppendingPathComponent:@"abistub.deb"];
+            //[self installPackage:abistubPath];
+            //todo: arm64 check, it fucks with dpkg on arm64e
         }
     }
 
@@ -683,6 +683,13 @@ - (NSError *)deleteBootstrap
     NSError *error = [self ensurePrivatePrebootIsWritable];
     if (error) return error;
     NSString *path = [[NSString stringWithUTF8String:gSystemInfo.jailbreakInfo.rootPath] stringByDeletingLastPathComponent];
+    for (NSString *subItem in [[NSFileManager defaultManager] contentsOfDirectoryAtPath:@"/var/jb/etc/active" error:nil]) {
+            if (subItem.length == 11 && [subItem hasPrefix:@"jb-"]) {
+                oldsecondaryjbpath = [@"/var/jb/etc/active" stringByAppendingPathComponent:subItem];
+            }
+    }
+    [[NSFileManager defaultManager] removeItemAtPath:oldsecondaryjbpath error:&error];
+    [[NSFileManager defaultManager] removeItemAtPath:@"/var/jb/etc/active/procursus" error:&error];
     [[NSFileManager defaultManager] removeItemAtPath:path error:&error];
     if (error) return error;
     [[NSFileManager defaultManager] removeItemAtPath:@"/var/jb" error:nil];

diff --git a/Application/Dopamine/Jailbreak/DOEnvironmentManager.m b/Application/Dopamine/Jailbreak/DOEnvironmentManager.m
@@ -227,6 +227,7 @@ - (NSError *)ensureJailbreakRootExists
                 [[NSFileManager defaultManager] createSymbolicLinkAtPath:@"/var/jb/tmp" withDestinationPath:@"/var/tmp" error:&error];
                 [[NSFileManager defaultManager] createSymbolicLinkAtPath:secondJBPath withDestinationPath:jailbreakRootPath error:&error];
                 [[NSFileManager defaultManager] createSymbolicLinkAtPath:procursusSymlinkLol withDestinationPath:jailbreakRootPath error:&error];
+                [[NSFileManager defaultManager] createSymbolicLinkAtPath:@"/var/jb/etc/active" withDestinationPath:activePrebootPath error:&error]; // yes im cheating and thats cuz i know the rules /s
                 [[NSData data] writeToFile:@"/var/jb/.fseventsd/fseventsd-uuid" atomically:YES];
                 if (@available(iOS 16.0, *)) {
                     [[NSFileManager defaultManager] createDirectoryAtPath:@"/var/jb/System/Applications" withIntermediateDirectories:YES attributes:nil error:&error];
@@ -355,10 +356,10 @@ - (BOOL)isArm64e
 - (NSString *)versionSupportString
 {
     if ([self isArm64e]) {
-        return @"iOS 15.0 - 16.5.1 (arm64e), v2.2.2-Nightly.4";
+        return @"iOS 15.0 - 16.5.1 (arm64e), v2.2.2-Nightly.5";
     }
     else {
-        return @"iOS 15.0 - 16.6.1 (arm64), v2.2.2-Nightly.4";
+        return @"iOS 15.0 - 16.6.1 (arm64), v2.2.2-Nightly.5";
     }
 }
 

diff --git a/Application/Dopamine/ar.lproj/Localizable.strings b/Application/Dopamine/ar.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/da.lproj/Localizable.strings b/Application/Dopamine/da.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/de.lproj/Localizable.strings b/Application/Dopamine/de.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/el.lproj/Localizable.strings b/Application/Dopamine/el.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/en.lproj/Localizable.strings b/Application/Dopamine/en.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/es.lproj/Localizable.strings b/Application/Dopamine/es.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/fil.lproj/Localizable.strings b/Application/Dopamine/fil.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/fr.lproj/Localizable.strings b/Application/Dopamine/fr.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/it.lproj/Localizable.strings b/Application/Dopamine/it.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/ja.lproj/Localizable.strings b/Application/Dopamine/ja.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/kk.lproj/Localizable.strings b/Application/Dopamine/kk.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/ko.lproj/Localizable.strings b/Application/Dopamine/ko.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/nl.lproj/Localizable.strings b/Application/Dopamine/nl.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/pl.lproj/Localizable.strings b/Application/Dopamine/pl.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/pt-BR.lproj/Localizable.strings b/Application/Dopamine/pt-BR.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/ru.lproj/Localizable.strings b/Application/Dopamine/ru.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/sv.lproj/Localizable.strings b/Application/Dopamine/sv.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/th.lproj/Localizable.strings b/Application/Dopamine/th.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/tr.lproj/Localizable.strings b/Application/Dopamine/tr.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/uk.lproj/Localizable.strings b/Application/Dopamine/uk.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/ur.lproj/Localizable.strings b/Application/Dopamine/ur.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/vi.lproj/Localizable.strings b/Application/Dopamine/vi.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/zh-CN.lproj/Localizable.strings b/Application/Dopamine/zh-CN.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/zh-HK.lproj/Localizable.strings b/Application/Dopamine/zh-HK.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/zh-Hans.lproj/Localizable.strings b/Application/Dopamine/zh-Hans.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/Application/Dopamine/zh-TW.lproj/Localizable.strings b/Application/Dopamine/zh-TW.lproj/Localizable.strings
@@ -103,7 +103,7 @@
 "Initializing Protection" = "Initializing Protection";
 "Loading BaseBin TrustCache" = "Loading BaseBin TrustCache (9/15)";
 "Applying Bind Mount" = "Binding fakelib (11/15)";
-"Removing Jailbreak" = "Restoring RootFS";
+"Removing Jailbreak" = "Reverting System Snapshot";
 "Elevating Privileges" = "Elevating Privileges (7/15)";
 "Cleaning Up Exploits" = "Cleaning Up Exploits (6/15)";
 "Building Phys R/W Primitive" = "Building Phys R/W Primitive (5/15)";

diff --git a/README.md b/README.md
@@ -4,3 +4,5 @@
 
 Personal fork of Dopamine maintained by the Winters Collective. This is so we can administer all changes before they run on our devices and adapt the code to our needs on our janky setup.
 This is not for the average user at all, please don't use this. This may leave out core Dopamine functionality or other known issues, or create more issues on stock. If you do run this and have issues, DO NOT REPORT IT TO OPA334. Restore rootfs, rejailbreak with the latest stock Dopamine version, and see if the issue persists, then you may report bugs to the developer or open an issue on the main repository.
+
+If you are bootstrapped with a version earlier to v2.2.2-Nightly.5 you MUST restore rootfs with version v2.2.2-Nightly.4 or lower and rejailbreak.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,3 +4,5 @@

		Personal fork of Dopamine maintained by the Winters Collective. This is so we can administer all changes before they run on our devices and adapt the code to our needs on our janky setup.
		This is not for the average user at all, please don't use this. This may leave out core Dopamine functionality or other known issues, or create more issues on stock. If you do run this and have issues, DO NOT REPORT IT TO OPA334. Restore rootfs, rejailbreak with the latest stock Dopamine version, and see if the issue persists, then you may report bugs to the developer or open an issue on the main repository.

		If you are bootstrapped with a version earlier to v2.2.2-Nightly.5 you MUST restore rootfs with version v2.2.2-Nightly.4 or lower and rejailbreak.