Fix extra reboot step for OnePlus configs (#120)

closes #115
openandroidinstaller-dev · Mar 27, 2023 · f927280 · f927280
2 parents 916386e + 69f73dd
commit f927280
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 112 deletions.
diff --git a/openandroidinstaller/assets/configs/avicii.yaml b/openandroidinstaller/assets/configs/avicii.yaml
@@ -16,17 +16,13 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
-      content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
+      content: > 
+        The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:
     - type: call_button
       content: >
@@ -35,14 +31,15 @@ steps:
         Make sure your device is turned on. You need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue.
       command: adb_reboot_bootloader
     - type: call_button
-      content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
+      content: >
+        Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
       command: fastboot_boot_recovery
     - type: call_button
-      command: adb_twrp_copy_partitions
       content: >
         In some cases, the inactive slot can be unpopulated or contain much older firmware than the active slot, leading to various issues including a potential hard-brick.
         We can ensure none of that will happen by copying the contents of the active slot to the inactive slot. Press 'confirm and run' to to this. Once you are in the bootloader again, continue.
+      command: adb_twrp_copy_partitions
     - type: call_button
-      command: fastboot_boot_recovery
       content: >
-        Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue.
+        Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue.
+      command: fastboot_boot_recovery
diff --git a/openandroidinstaller/assets/configs/cheeseburger.yaml b/openandroidinstaller/assets/configs/cheeseburger.yaml
@@ -15,17 +15,13 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
-      content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
+      content: > 
+        The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:
     - type: call_button
       content: >
@@ -34,5 +30,6 @@ steps:
         Make sure your device is turned on. You need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue.
       command: adb_reboot_bootloader
     - type: call_button
-      content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
+      content: >
+        Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
       command: fastboot_boot_recovery
diff --git a/openandroidinstaller/assets/configs/dre.yaml b/openandroidinstaller/assets/configs/dre.yaml
@@ -16,17 +16,13 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
-      content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
+      content: > 
+        The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:
     - type: call_button
       content: >
@@ -35,14 +31,15 @@ steps:
         Make sure your device is turned on. You need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue.
       command: adb_reboot_bootloader
     - type: call_button
-      content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
+      content: >
+        Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
       command: fastboot_boot_recovery
     - type: call_button
-      command: adb_twrp_copy_partitions
       content: >
         In some cases, the inactive slot can be unpopulated or contain much older firmware than the active slot, leading to various issues including a potential hard-brick.
         We can ensure none of that will happen by copying the contents of the active slot to the inactive slot. Press 'confirm and run' to to this. Once you are in the bootloader again, continue.
+      command: adb_twrp_copy_partitions
     - type: call_button
-      command: fastboot_boot_recovery
       content: >
-        Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue.
+        Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue.
+      command: fastboot_boot_recovery
diff --git a/openandroidinstaller/assets/configs/dumpling.yaml b/openandroidinstaller/assets/configs/dumpling.yaml
@@ -15,17 +15,13 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
-      content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
+      content: > 
+        The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:
     - type: call_button
       content: >
@@ -34,5 +30,6 @@ steps:
         Make sure your device is turned on. You need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue.
       command: adb_reboot_bootloader
     - type: call_button
-      content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
+      content: >
+        Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
       command: fastboot_boot_recovery
diff --git a/openandroidinstaller/assets/configs/enchilada.yaml b/openandroidinstaller/assets/configs/enchilada.yaml
@@ -16,17 +16,13 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
-      content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
+      content: > 
+        The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:
     - type: call_button
       content: >
@@ -35,14 +31,15 @@ steps:
         Make sure your device is turned on. You need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue.
       command: adb_reboot_bootloader
     - type: call_button
-      content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
+      content: >
+        Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
       command: fastboot_boot_recovery
     - type: call_button
-      command: adb_twrp_copy_partitions
       content: >
         In some cases, the inactive slot can be unpopulated or contain much older firmware than the active slot, leading to various issues including a potential hard-brick.
         We can ensure none of that will happen by copying the contents of the active slot to the inactive slot. Press 'confirm and run' to to this. Once you are in the bootloader again, continue.
+      command: adb_twrp_copy_partitions
     - type: call_button
-      command: fastboot_boot_recovery
       content: >
-        Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue.
+        Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue.
+      command: fastboot_boot_recovery
diff --git a/openandroidinstaller/assets/configs/fajita.yaml b/openandroidinstaller/assets/configs/fajita.yaml
@@ -16,17 +16,13 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
-      content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
+      content: > 
+        The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:
     - type: call_button
       content: >
@@ -35,14 +31,15 @@ steps:
         Make sure your device is turned on. You need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue.
       command: adb_reboot_bootloader
     - type: call_button
-      content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
+      content: >
+        Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
       command: fastboot_boot_recovery
     - type: call_button
-      command: adb_twrp_copy_partitions
       content: >
         In some cases, the inactive slot can be unpopulated or contain much older firmware than the active slot, leading to various issues including a potential hard-brick.
         We can ensure none of that will happen by copying the contents of the active slot to the inactive slot. Press 'confirm and run' to to this. Once you are in the bootloader again, continue.
+      command: adb_twrp_copy_partitions
     - type: call_button
-      command: fastboot_boot_recovery
       content: >
-        Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue.
+        Now we need to boot into recovery again. Press run and when you see the TWRP screen you can continue.
+      command: fastboot_boot_recovery
diff --git a/openandroidinstaller/assets/configs/guacamole.yaml b/openandroidinstaller/assets/configs/guacamole.yaml
@@ -16,17 +16,13 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
-      content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
+      content: > 
+        The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:
     - type: call_button
       content: >
@@ -35,5 +31,6 @@ steps:
         Make sure your device is turned on. You need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue.
       command: adb_reboot_bootloader
     - type: call_button
-      content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
+      content: >
+        Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
       command: fastboot_boot_recovery
diff --git a/openandroidinstaller/assets/configs/guacamoleb.yaml b/openandroidinstaller/assets/configs/guacamoleb.yaml
@@ -16,17 +16,13 @@ steps:
         Press 'Confirm and run' to reboot into the bootloader.
       command: adb_reboot_bootloader
     - type: call_button
-      content: In this step you actually unlock the bootloader. Just press 'Confirm and run' here. Once it's done, press continue here.
-      command: fastboot_oem_unlock
-    - type: confirm_button
       content: >
-        At this point the device may display on-screen prompts which will require interaction to continue the process of unlocking the bootloader.
-        Please take whatever actions the device asks you to to proceed.
-    - type: call_button
-      content: To finish the unlocking, the phone needs to reboot. Just press 'Confirm and run' here to reboot. Then continue.
-      command: fastboot_reboot
+        In this step you actually unlock the bootloader. Just press 'Confirm and run' here. The phone will automatically reboot and reformat.
+        Once it's done, press continue here.
+      command: fastboot_oem_unlock
     - type: confirm_button
-      content: The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
+      content: > 
+        The bootloader is now unlocked. Since the device resets completely, you will need to re-enable Developer Options and USB debugging to continue.
   boot_recovery:
     - type: call_button
       content: >
@@ -35,5 +31,6 @@ steps:
         Make sure your device is turned on. You need to reboot into the bootloader again by pressing 'Confirm and run' here. Then continue.
       command: adb_reboot_bootloader
     - type: call_button
-      content: Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
+      content: >
+        Boot a custom recovery (temporarily) by pressing 'Confirm and run'. Once it's done continue.
       command: fastboot_boot_recovery