add ios15 support, fix preferencesBundle settings issue for tweaks.

preferenceBundle's settings storage in jbroot("/var/mobile/Library/Preferences/com.your.tweak.plist")
diego9621 · Dec 29, 2023 · b24a7a5 · b24a7a5
1 parent 8769cb8
commit b24a7a5
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 10 deletions.
diff --git a/Bootstrap/ViewController.m b/Bootstrap/ViewController.m
@@ -57,7 +57,7 @@ - (void)viewDidLoad {
         self.rebuildappsBtn.enabled = NO;
         self.uninstallBtn.hidden = NO;
     }
-    else if(@available(iOS 16.0, *))
+    else if(@available(iOS 15.0, *))
     {
         self.bootstraBtn.enabled = YES;
         [self.bootstraBtn setTitle:Localized(@"Install") forState:UIControlStateNormal];

diff --git a/Bootstrap/basebin/bootstrap.dylib b/Bootstrap/basebin/bootstrap.dylib
diff --git a/Bootstrap/basebin/bootstrap.entitlements b/Bootstrap/basebin/bootstrap.entitlements
@@ -2,12 +2,14 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+<!-- strip these 3 banned entitlements before re-sign
 	<key>com.apple.private.skip-library-validation</key>
 	<false/>
 	<key>com.apple.private.cs.debugger</key>
 	<false/>
 	<key>dynamic-codesigning</key>
 	<false/>
+-->
 	<key>platform-application</key>
 	<true/>
 	<key>get-task-allow</key>

diff --git a/Bootstrap/basebin/bootstrapd b/Bootstrap/basebin/bootstrapd
diff --git a/Bootstrap/basebin/fastPathSign b/Bootstrap/basebin/fastPathSign
diff --git a/Bootstrap/basebin/preload b/Bootstrap/basebin/preload
diff --git a/Bootstrap/basebin/preload.dylib b/Bootstrap/basebin/preload.dylib
diff --git a/Bootstrap/basebin/rebuildapp b/Bootstrap/basebin/rebuildapp
diff --git a/Bootstrap/bootstrap.m b/Bootstrap/bootstrap.m
@@ -81,7 +81,7 @@ int buildPackageSources()
 {
     NSFileManager* fm = NSFileManager.defaultManager;
 
-    ASSERT([[NSString stringWithUTF8String:DEFAULT_SOURCES] writeToFile:jbroot(@"/etc/apt/sources.list.d/default.sources") atomically:YES encoding:NSUTF8StringEncoding error:nil]);
+    ASSERT([[NSString stringWithFormat:@(DEFAULT_SOURCES), getCFMajorVersion()] writeToFile:jbroot(@"/etc/apt/sources.list.d/default.sources") atomically:YES encoding:NSUTF8StringEncoding error:nil]);
 
     //Users in some regions seem to be unable to access github.io
     SYSLOG("locale=%@", [NSUserDefaults.appDefaults valueForKey:@"locale"]);
@@ -95,7 +95,7 @@ int buildPackageSources()
         ASSERT([fm createDirectoryAtPath:jbroot(@"/var/mobile/Library/Application Support/xyz.willy.Zebra") withIntermediateDirectories:YES attributes:attr error:nil]);
     }
 
-    ASSERT([[NSString stringWithUTF8String:ZEBRA_SOURCES] writeToFile:jbroot(@"/var/mobile/Library/Application Support/xyz.willy.Zebra/sources.list") atomically:YES encoding:NSUTF8StringEncoding error:nil]);
+    ASSERT([[NSString stringWithFormat:@(ZEBRA_SOURCES), getCFMajorVersion()] writeToFile:jbroot(@"/var/mobile/Library/Application Support/xyz.willy.Zebra/sources.list") atomically:YES encoding:NSUTF8StringEncoding error:nil]);
 
     return 0;
 }
@@ -150,7 +150,13 @@ int InstallBootstrap(NSString* jbroot_path)
     ASSERT(mkdir(jbroot_path.fileSystemRepresentation, 0755) == 0);
     ASSERT(chown(jbroot_path.fileSystemRepresentation, 0, 0) == 0);
 
-    NSString* bootstrapZstFile = [NSBundle.mainBundle.bundlePath stringByAppendingPathComponent:@"bootstrap.tar.zst"];
+    NSString* bootstrapZstFile = [NSBundle.mainBundle.bundlePath stringByAppendingPathComponent:
+                                  [NSString stringWithFormat:@"strapfiles/bootstrap-%d.tar.zst", getCFMajorVersion()]];
+    if(![fm fileExistsAtPath:bootstrapZstFile]) {
+        STRAPLOG("can not find bootstrap file, maybe this version of the app is not for iOS%d", NSProcessInfo.processInfo.operatingSystemVersion.majorVersion);
+        return -1;
+    }
+
     NSString* bootstrapTarFile = [NSTemporaryDirectory() stringByAppendingPathComponent:@"bootstrap.tar"];
     if([fm fileExistsAtPath:bootstrapTarFile])
         ASSERT([fm removeItemAtPath:bootstrapTarFile error:nil]);

diff --git a/Bootstrap/sources.h b/Bootstrap/sources.h
@@ -24,7 +24,7 @@ Components:\n\
 \n\
 Types: deb\n\
 URIs: https://roothide.github.io/procursus\n\
-Suites: iphoneos-arm64e/1900\n\
+Suites: iphoneos-arm64e/%d\n\
 Components: main\n\
 "
 
@@ -36,7 +36,7 @@ Components:\n\
 \n\
 Types: deb\n\
 URIs: https://iosjb.top/procursus\n\
-Suites: iphoneos-arm64e/1900\n\
+Suites: iphoneos-arm64e/%d\n\
 Components: main\n\
 "
 
@@ -46,7 +46,7 @@ deb https://getzbra.com/repo/ ./\n\
 deb https://repo.chariz.com/ ./\n\
 deb https://havoc.app/ ./\n\
 deb https://roothide.github.io/ ./\n\
-deb https://roothide.github.io/procursus iphoneos-arm64e/1900 main\n\
+deb https://roothide.github.io/procursus iphoneos-arm64e/%d main\n\
 \n\
 "
 

diff --git a/Makefile b/Makefile
@@ -9,8 +9,6 @@ THEOS_PACKAGE_SCHEME = roothide
 
 THEOS_DEVICE_IP = iphone13.local
 
-CFVER ?= 1900
-
 #disable theos auto sign for all mach-o
 TARGET_CODESIGN = echo "don't sign"
 
@@ -35,7 +33,7 @@ clean::
 
 before-package::
 	rm -rf ./packages
-	cp ./bootstrap-$(CFVER).tar.zst ./.theos/_/Applications/Bootstrap.app/bootstrap.tar.zst
+	cp -a ./strapfiles ./.theos/_/Applications/Bootstrap.app/
 	ldid -Sentitlements.plist ./.theos/_/Applications/Bootstrap.app/Bootstrap
 	mkdir -p ./packages/Payload
 	cp -R ./.theos/_/Applications/Bootstrap.app ./packages/Payload

diff --git a/bootstrap-1800.tar.zst → strapfiles/bootstrap-1800.tar.zst b/bootstrap-1800.tar.zst → strapfiles/bootstrap-1800.tar.zst
diff --git a/bootstrap-1900.tar.zst → strapfiles/bootstrap-1900.tar.zst b/bootstrap-1900.tar.zst → strapfiles/bootstrap-1900.tar.zst
diff --git a/strapfiles/bootstrap-2000.tar.zst b/strapfiles/bootstrap-2000.tar.zst
@@ -0,0 +1 @@
+bootstrap-1900.tar.zst