From 507d6dbc214092914aa690533efd92e60e373ff1 Mon Sep 17 00:00:00 2001 From: frankpreel Date: Fri, 26 Aug 2022 14:43:58 +0200 Subject: [PATCH 1/2] Working process for MSWindows --- README.md | 4 +- .../ecorp/easy/installer/AppConstants.java | 2 +- src/main/resources/yaml/bramble_flash.yml | 144 ++++++++++++++++++ src/main/resources/yaml/bramble_fs.yml | 23 +++ 4 files changed, 171 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/yaml/bramble_flash.yml create mode 100644 src/main/resources/yaml/bramble_fs.yml diff --git a/README.md b/README.md index f40483b8..b21ca173 100644 --- a/README.md +++ b/README.md @@ -45,8 +45,10 @@ developer: - Israel Yago pereira ## Changelogs +### v0.16.0 (candidate) +- Pixel 4a 5G -### v0.15.0 (candidate) +### v0.15.0 - No shortcut created when installing from a non-admin account on Windows - e-recovery assets - Update German translation - by F. Wildermuth diff --git a/src/main/java/ecorp/easy/installer/AppConstants.java b/src/main/java/ecorp/easy/installer/AppConstants.java index 62497b77..13d86b31 100644 --- a/src/main/java/ecorp/easy/installer/AppConstants.java +++ b/src/main/java/ecorp/easy/installer/AppConstants.java @@ -27,7 +27,7 @@ import java.nio.file.Paths; */ public abstract class AppConstants { - public final static String APP_VERSION = "v0.15.0"; + public final static String APP_VERSION = "v0.16.0-pixel4a5g"; public final static String Separator = FileSystems.getDefault().getSeparator(); public final static String OsName = System.getProperty("os.name"); public final static String JavaHome = System.getProperty("java.home"); diff --git a/src/main/resources/yaml/bramble_flash.yml b/src/main/resources/yaml/bramble_flash.yml new file mode 100644 index 00000000..0677fec9 --- /dev/null +++ b/src/main/resources/yaml/bramble_flash.yml @@ -0,0 +1,144 @@ +## Copyright 2022 - ECORP SAS + +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## Author: Frank Preel +--- +stepsCount: 8 +steps: + f0: + type: custom + stepNumber: 1 + nextStepKey: f1 + titleKey: stepTitle_enableOemUnlock + titleIconName: icon-download.png + instructions: + - install_instr_openSettings + - install_instr_searchOEM + - install_instr_enableOEMUnlocking + - install_instr_acceptOEMUnlockWarning + - install_instr_onceDoneThenContinue + f1: + type: load + stepNumber: 2 + nextStepKey: f2 + titleKey: stepTitle_rebootBootloader + instructions: + - install_instr_rebootingOnBootloader + averageTime: 10 + script: reboot-fastboot + parameters: + device_id: ${DEVICE_ID} + fastboot_folder_path: ${ADB_FOLDER_PATH} + okCodes: + 0: ~ + koCodes: + 1: script_error_unknown + 10: script_error_cantRebootBootloader + 101: script_error_serialNumber_missing + 102: script_error_fastboot_path_missing + f2: + type: custom-executable + stepNumber: 3 + nextStepKey: f3 + titleKey: stepTitle_oemUnlock + titleIconName: icon-download.png + instructions: + - install_instr_unlockingOem + - install_instr_selectUnlockBootloader + - install_instr_unlockBootloader + script: pixel-flashingUnlock + parameters: + device_id: ${DEVICE_ID} + fastboot_folder_path: ${ADB_FOLDER_PATH} + okCodes: + 0: ~ + koCodes: + 1: script_error_unknown + 2: script_error_fastboot_flashingUnlock_failed + 101: script_error_serialNumber_missing + 102: script_error_fastboot_path_missing + f3: + type: load + stepNumber: 4 + nextStepKey: f4 + titleKey: stepTitle4On7 + instructions: + - install_instr_recoveryInstall + averageTime: 3 + script: install-e-recovery-boot + parameters: + fastboot_folder_path: ${ADB_FOLDER_PATH} + twrp_image_path: ${TWRP_IMAGE_PATH} + okCodes: + 0: ~ + koCodes: + 1: script_error_unknown + 101: script_error_installRecovery_101 + f4: + type: custom-executable + stepNumber: 5 + nextStepKey: f5 + titleKey: stepTitle5On7 + instructions: + - install_instr_choose_e_recovery_select + - install_instr_choose_e_recovery_select_details + - install_instr_choose_e_recovery_validate + - install_instr_choose_e_recovery_validate_wait_for_result + - install_instr_e_recovery_factory_reset + - install_instr_e_recovery_factory_reset_format_data + - install_instr_e_recovery_factory_reset_format_data_validate + - install_instr_e_recovery_back + - install_instr_e_recovery_apply_update + - install_instr_e_recovery_apply_update_from_adb + - install_instr_e_recovery_apply_update_from_adb_wait_for_result + titleKeyIconName: icon-download.png + script: wait-e-recovery-sideload + parameters: + device_id: ${DEVICE_ID} + adb_folder_path: ${ADB_FOLDER_PATH} + okCodes: + 0: ~ + koCodes: + 101: script_error_waitSideload_101 + f5: + type: load + stepNumber: 6 + nextStepKey: f6 + titleKey: install_instr_eosInstall + instructions: + - install_instr_eosInstall + averageTime: 200 + script: install-from-e-recovery + parameters: + device_id: ${DEVICE_ID} + archive_path: ${ARCHIVE_PATH} + adb_folder_path: ${ADB_FOLDER_PATH} + okCodes: + 0: ~ + koCodes: + 1: script_error_installFromSideload + f6: + type: askAccount + stepNumber: 7 + nextStepKey: f7 + f7: + type: custom + stepNumber: 8 + nextStepKey: end + titleKey: stepTitle_rebootDevice + instructions: + - install_instr_e_recovery_back + - install_instr_e_recovery_reboot + - eAccount_lbl_alreadyAccount + titleKeyIconName: icon-download.png diff --git a/src/main/resources/yaml/bramble_fs.yml b/src/main/resources/yaml/bramble_fs.yml new file mode 100644 index 00000000..08deee42 --- /dev/null +++ b/src/main/resources/yaml/bramble_fs.yml @@ -0,0 +1,23 @@ +## Copyright 2022 - ECORP SAS + +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## Author: Frank Preel +--- +sources: + rom: + url: https://images.ecloud.global/stable/bramble/e-latest-r-bramble.zip + filePath: e-latest-r-bramble.zip + twrp: + url: https://images.ecloud.global/stable/bramble/recovery-e-latest-r-bramble.img + filePath: recovery-e-latest-r-bramble.img -- GitLab From 5f94361272b17c2a6fe2388695a3c80bb2446092 Mon Sep 17 00:00:00 2001 From: Vincent Bourgmayer Date: Thu, 6 Oct 2022 08:49:28 +0000 Subject: [PATCH 2/2] Version 0.16 --- src/main/java/ecorp/easy/installer/AppConstants.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/ecorp/easy/installer/AppConstants.java b/src/main/java/ecorp/easy/installer/AppConstants.java index 13d86b31..14cb30ca 100644 --- a/src/main/java/ecorp/easy/installer/AppConstants.java +++ b/src/main/java/ecorp/easy/installer/AppConstants.java @@ -27,7 +27,7 @@ import java.nio.file.Paths; */ public abstract class AppConstants { - public final static String APP_VERSION = "v0.16.0-pixel4a5g"; + public final static String APP_VERSION = "v0.16.0"; public final static String Separator = FileSystems.getDefault().getSeparator(); public final static String OsName = System.getProperty("os.name"); public final static String JavaHome = System.getProperty("java.home"); -- GitLab