diff --git a/Bootstrap.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate b/Bootstrap.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate index 476c3fd0..acd42bfc 100644 Binary files a/Bootstrap.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate and b/Bootstrap.xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Bootstrap/ViewController.m b/Bootstrap/ViewController.m index f354988d..9ffdc27d 100644 --- a/Bootstrap/ViewController.m +++ b/Bootstrap/ViewController.m @@ -460,11 +460,15 @@ - (IBAction)unbootstrap:(id)sender { [AppDelegate dismissHud]; - if(status == 0) { - [AppDelegate showMesage:@"" title:@"bootstrap uninstalled"]; - } else { - [AppDelegate showMesage:[NSString stringWithFormat:@"%@\n\nstderr:\n%@",log,err] title:[NSString stringWithFormat:@"code(%d)",status]]; - } + NSString* msg = (status==0) ? @"bootstrap uninstalled" : [NSString stringWithFormat:@"code(%d)\n%@\n\nstderr:\n%@",status,log,err]; + + UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"" message:msg preferredStyle:UIAlertControllerStyleAlert]; + [alert addAction:[UIAlertAction actionWithTitle:Localized(@"OK") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action){ + exit(0); + }]]; + + [AppDelegate showAlert:alert]; + }); }]]; diff --git a/Bootstrap/basebin/bootstrap.dylib b/Bootstrap/basebin/bootstrap.dylib index 11ce4d52..4bed209c 100755 Binary files a/Bootstrap/basebin/bootstrap.dylib and b/Bootstrap/basebin/bootstrap.dylib differ diff --git a/Bootstrap/basebin/bootstrapd b/Bootstrap/basebin/bootstrapd index 4f7f6e08..e1c39be4 100755 Binary files a/Bootstrap/basebin/bootstrapd and b/Bootstrap/basebin/bootstrapd differ diff --git a/Bootstrap/basebin/devtest b/Bootstrap/basebin/devtest index 71ad30c0..743f854d 100755 Binary files a/Bootstrap/basebin/devtest and b/Bootstrap/basebin/devtest differ diff --git a/Bootstrap/basebin/preload b/Bootstrap/basebin/preload index 21c97e6f..8e5adbcd 100755 Binary files a/Bootstrap/basebin/preload and b/Bootstrap/basebin/preload differ diff --git a/Bootstrap/basebin/preload.dylib b/Bootstrap/basebin/preload.dylib index 199a8547..5890d807 100755 Binary files a/Bootstrap/basebin/preload.dylib and b/Bootstrap/basebin/preload.dylib differ diff --git a/Bootstrap/basebin/rebuildapp b/Bootstrap/basebin/rebuildapp index 62a63cc3..30c311d4 100755 Binary files a/Bootstrap/basebin/rebuildapp and b/Bootstrap/basebin/rebuildapp differ diff --git a/Bootstrap/basebin/uicache b/Bootstrap/basebin/uicache index bc8f3305..04e848bb 100755 Binary files a/Bootstrap/basebin/uicache and b/Bootstrap/basebin/uicache differ diff --git a/Bootstrap/bootstrap.m b/Bootstrap/bootstrap.m index 13ad7810..337e98a7 100644 --- a/Bootstrap/bootstrap.m +++ b/Bootstrap/bootstrap.m @@ -367,6 +367,11 @@ int unbootstrap() { STRAPLOG("unbootstrap..."); + //try + spawnRoot(jbroot(@"/basebin/bootstrapd"), @[@"exit"], nil, nil); + + //jbroot unavailable now + NSFileManager* fm = NSFileManager.defaultManager; NSString* dirpath = @"/var/containers/Bundle/Application/"; @@ -398,8 +403,6 @@ int unbootstrap() SYSLOG("bootstrap uninstalled!"); - spawnRoot(jbroot(@"/basebin/bootstrapd"), @[@"exit"], nil, nil); - [LSApplicationWorkspace.defaultWorkspace _LSPrivateRebuildApplicationDatabasesForSystemApps:YES internal:YES user:YES]; AppList* tsapp = [AppList appWithBundleIdentifier:@"com.opa334.TrollStore"];