Merge branch 'roothide:main' into main

Pottle · Jan 8, 2024 · 4a59819 · 4a59819
2 parents cb8f344 + 4df3152
commit 4a59819
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 9 deletions.
diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/admin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Bootstrap/Base.lproj/Main.storyboard b/Bootstrap/Base.lproj/Main.storyboard
@@ -52,8 +52,8 @@
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" fixedFrame="YES" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Bootstrap(beta 4)" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mHC-UO-Fsn">
-                                <rect key="frame" x="16" y="34" width="300" height="51"/>
+                            <textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" fixedFrame="YES" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="Bootstrap(beta 4.1)" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mHC-UO-Fsn">
+                                <rect key="frame" x="14" y="34" width="300" height="51"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="42"/>
                                 <textInputTraits key="textInputTraits"/>

diff --git 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
diff --git a/Bootstrap/basebin/bootstrapd b/Bootstrap/basebin/bootstrapd
diff --git a/Bootstrap/basebin/devtest b/Bootstrap/basebin/devtest
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/basebin/uicache b/Bootstrap/basebin/uicache
diff --git 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"];