diff --git a/Bootstrap.xcodeproj/project.pbxproj b/Bootstrap.xcodeproj/project.pbxproj index 9238d023..28aef513 100644 --- a/Bootstrap.xcodeproj/project.pbxproj +++ b/Bootstrap.xcodeproj/project.pbxproj @@ -13,7 +13,6 @@ 843E87572B56E45300CB45C4 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 843E87592B56E45300CB45C4 /* Localizable.strings */; }; 84438D472B26090D00A1E407 /* sileo.deb in Resources */ = {isa = PBXBuildFile; fileRef = 84438D432B26090D00A1E407 /* sileo.deb */; }; 84438D482B26090D00A1E407 /* tar in Resources */ = {isa = PBXBuildFile; fileRef = 84438D442B26090D00A1E407 /* tar */; }; - 84438D4A2B26090D00A1E407 /* zebra.deb in Resources */ = {isa = PBXBuildFile; fileRef = 84438D462B26090D00A1E407 /* zebra.deb */; }; 84438D4C2B2609B200A1E407 /* utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 84438D4B2B2609B200A1E407 /* utils.m */; }; 84438D502B260F8200A1E407 /* libzstd in Frameworks */ = {isa = PBXBuildFile; productRef = 84438D4F2B260F8200A1E407 /* libzstd */; }; 84438D522B260FEB00A1E407 /* zstd_wrapper.m in Sources */ = {isa = PBXBuildFile; fileRef = 84438D512B260FEB00A1E407 /* zstd_wrapper.m */; }; @@ -71,7 +70,6 @@ 843E875B2B57BD5500CB45C4 /* ko */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ko; path = ko.lproj/Localizable.strings; sourceTree = ""; }; 84438D432B26090D00A1E407 /* sileo.deb */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = sileo.deb; sourceTree = ""; }; 84438D442B26090D00A1E407 /* tar */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; path = tar; sourceTree = ""; }; - 84438D462B26090D00A1E407 /* zebra.deb */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = zebra.deb; sourceTree = ""; }; 84438D4B2B2609B200A1E407 /* utils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = utils.m; sourceTree = ""; }; 84438D4D2B2609C600A1E407 /* utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = ""; }; 84438D512B260FEB00A1E407 /* zstd_wrapper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = zstd_wrapper.m; sourceTree = ""; }; @@ -164,7 +162,6 @@ 84438D582B261FBA00A1E407 /* basebin */, 84438D432B26090D00A1E407 /* sileo.deb */, 84438D442B26090D00A1E407 /* tar */, - 84438D462B26090D00A1E407 /* zebra.deb */, 8470999E2B1D868F003FA4ED /* control */, 8470999F2B1D868F003FA4ED /* entitlements.plist */, 847099A02B1D868F003FA4ED /* Makefile */, @@ -340,7 +337,6 @@ files = ( 84438D592B261FBA00A1E407 /* basebin in Resources */, 84438D472B26090D00A1E407 /* sileo.deb in Resources */, - 84438D4A2B26090D00A1E407 /* zebra.deb in Resources */, 84364F472B3C5D4600E90B58 /* libkrw0-dummy.deb in Resources */, 843E87572B56E45300CB45C4 /* Localizable.strings in Resources */, 84438D482B26090D00A1E407 /* tar in Resources */, diff --git a/Bootstrap/ViewController.m b/Bootstrap/ViewController.m index e7e450ec..b0b305ae 100644 --- a/Bootstrap/ViewController.m +++ b/Bootstrap/ViewController.m @@ -219,20 +219,8 @@ void reinstallPackageManager() success = NO; } - [AppDelegate addLogText:Localized(@"Status: Reinstalling Zebra")]; - NSString* zebraDeb = [NSBundle.mainBundle.bundlePath stringByAppendingPathComponent:@"zebra.deb"]; - if(spawnBootstrap((char*[]){"/usr/bin/dpkg", "-i", rootfsPrefix(zebraDeb).fileSystemRepresentation, NULL}, nil, nil) != 0) { - [AppDelegate addLogText:[NSString stringWithFormat:@"failed:%@\nERR:%@", log, err]]; - success = NO; - } - - if(spawnBootstrap((char*[]){"/usr/bin/uicache", "-p", "/Applications/Zebra.app", NULL}, &log, &err) != 0) { - [AppDelegate addLogText:[NSString stringWithFormat:@"failed:%@\nERR:%@", log, err]]; - success = NO; - } - if(success) { - [AppDelegate showMesage:Localized(@"Sileo and Zebra reinstalled!") title:@""]; + [AppDelegate showMesage:Localized(@"Sileo reinstalled!") title:@""]; } [AppDelegate dismissHud]; }); diff --git a/Bootstrap/Views/OptionsView.swift b/Bootstrap/Views/OptionsView.swift index 081f32f8..8e9b7e51 100644 --- a/Bootstrap/Views/OptionsView.swift +++ b/Bootstrap/Views/OptionsView.swift @@ -146,7 +146,7 @@ struct OptionsView: View { reinstallPackageManager() } label: { Label( - title: { Text("Reinstall Sileo & Zebra") }, + title: { Text("Reinstall Sileo") }, icon: { Image(systemName: "shippingbox") } ) .frame(maxWidth: .infinity) diff --git a/Bootstrap/bootstrap.m b/Bootstrap/bootstrap.m index 91849029..a27cde94 100644 --- a/Bootstrap/bootstrap.m +++ b/Bootstrap/bootstrap.m @@ -98,14 +98,6 @@ int buildPackageSources() ASSERT([[NSString stringWithFormat:@(ALT_SOURCES), getCFMajorVersion()] writeToFile:jbroot(@"/etc/apt/sources.list.d/sileo.sources") atomically:YES encoding:NSUTF8StringEncoding error:nil]); } - if(![fm fileExistsAtPath:jbroot(@"/var/mobile/Library/Application Support/xyz.willy.Zebra")]) - { - NSDictionary* attr = @{NSFilePosixPermissions:@(0755), NSFileOwnerAccountID:@(501), NSFileGroupOwnerAccountID:@(501)}; - ASSERT([fm createDirectoryAtPath:jbroot(@"/var/mobile/Library/Application Support/xyz.willy.Zebra") withIntermediateDirectories:YES attributes:attr 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; } @@ -237,10 +229,6 @@ int InstallBootstrap(NSString* jbroot_path) ASSERT(spawnBootstrap((char*[]){"/usr/bin/dpkg", "-i", rootfsPrefix(sileoDeb).fileSystemRepresentation, NULL}, nil, nil) == 0); ASSERT(spawnBootstrap((char*[]){"/usr/bin/uicache", "-p", "/Applications/Sileo.app", NULL}, nil, nil) == 0); - NSString* zebraDeb = [NSBundle.mainBundle.bundlePath stringByAppendingPathComponent:@"zebra.deb"]; - ASSERT(spawnBootstrap((char*[]){"/usr/bin/dpkg", "-i", rootfsPrefix(zebraDeb).fileSystemRepresentation, NULL}, nil, nil) == 0); - ASSERT(spawnBootstrap((char*[]){"/usr/bin/uicache", "-p", "/Applications/Zebra.app", NULL}, nil, nil) == 0); - ASSERT([[NSString stringWithFormat:@"%d",BOOTSTRAP_VERSION] writeToFile:jbroot(@"/.thebootstrapped") atomically:YES encoding:NSUTF8StringEncoding error:nil]); ASSERT([fm copyItemAtPath:jbroot(@"/.thebootstrapped") toPath:[jbroot_secondary stringByAppendingPathComponent:@".thebootstrapped"] error:nil]); diff --git a/Bootstrap/sources.h b/Bootstrap/sources.h index 9b69d821..bd58dade 100644 --- a/Bootstrap/sources.h +++ b/Bootstrap/sources.h @@ -40,14 +40,4 @@ Suites: iphoneos-arm64e/%d\n\ Components: main\n\ " -#define ZEBRA_SOURCES "\ -# Zebra Sources List\n\ -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/%d main\n\ -\n\ -" - #endif /* sources_h */ diff --git a/zebra.deb b/zebra.deb deleted file mode 100644 index 3e7a6279..00000000 Binary files a/zebra.deb and /dev/null differ