diff --git a/README.md b/README.md index a40e6d6a036e0a2f85512236a4c054795ae20ff7..3fbf79d25abf816d07edc2e6d43064c3b42a1bca 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Easy Installer -**Current Version:** v0.12.3-beta +**Current Version:** v0.13.0-beta Members: - Gaƫl @@ -36,7 +36,7 @@ developer: [Vincent Bourgmayer](vincent.bourgmayer@e.email) ## Changelogs -### v0.12.4-beta (current - unreleased) +### v0.13.0-beta (current - unreleased) - Download sources in device specific folder (#325) - update Installation step's title for S9 and S9+ (#339) - Update german translation - by F. Wildermuth, Mex Salem, Anonymous, Vincent Bourgmayer @@ -44,6 +44,7 @@ developer: [Vincent Bourgmayer](vincent.bourgmayer@e.email) - Update basque translation - by Porrumentzio - Update dutch translation - by Edoardo Regni - Add new step to make "oem unlock" visible for S9/S9+ (#308) +- Add Teracube 2e support to Easy-installer ### v0.12.3-beta (latest release) - Start italian translation - by Paolo Pantaleo diff --git a/flash-scripts/linux/Teracube_2e-install-from-bootloader.sh b/flash-scripts/linux/Teracube_2e-install-from-bootloader.sh new file mode 100755 index 0000000000000000000000000000000000000000..67e9cf51f555f20e5c3d36eebcdcebe40f6e9b36 --- /dev/null +++ b/flash-scripts/linux/Teracube_2e-install-from-bootloader.sh @@ -0,0 +1,166 @@ +#!/bin/bash + +# Copyright (C) 2021 ECORP SAS - Author: Vincent Bourgmayer +# +# 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 . + +# Parameter +# $1: DEVICE_ID device id +# $2: ARCHIVE_PATH path to archive +# $3: fastboot folder path +# $4: Java folder path + + +# Exit status +# - 0 : device flashed +# - 1 : generic error +# - 10: can't unpack system.img +# - 11: can't wipe data +# - 12: can't flash boot +# - 13: can't flash recovery +# - 14: can't flash vbmeta +# - 15: can't flash vbmeta_system +# - 16: can't flash vbmeta_vendor +# - 17: can't reboot on fastboot +# - 18: can't flash system +# - 19: can't flash product +# - 20: can't flash vendor +# - 101 : DEVICE_ID missing +# - 102 : ARCHIVE_PATH missing +# - 103 : fastboot folder path missing + +DEVICE_ID=$1 +ARCHIVE_PATH=$2 +FASTBOOT_FOLDER_PATH=$3 +JAVA_FOLDER_PATH=$4 + +# Check serial number has been provided +if [ -z "$DEVICE_ID" ] +then + exit 101 +fi + +# check path to rom has been provided +if [ -z "$ARCHIVE_PATH" ] +then + exit 102 +fi + +#check path to adb/fasboot has been provided +if [ -z "$FASTBOOT_FOLDER_PATH" ] +then + exit 103 +fi + +# Check java folder has been provided +if [ -z "$JAVA_FOLDER_PATH" ] +then + exit 104 +fi + + +# Build fastboot path +FASTBOOT_PATH=${FASTBOOT_FOLDER_PATH}"fastboot" + +# Build java jar path +JAR_PATH=${JAVA_FOLDER_PATH}"/bin/jar" + +# Build archive folder path +ARCHIVE_FOLDER_PATH=$(dirname "$ARCHIVE_PATH")"/" + +# unzip for system.img +cd "$ARCHIVE_FOLDER_PATH" || exit 104 + +if ! "$JAR_PATH" -x -v -f "$ARCHIVE_PATH" ; +then + exit 10 +fi + +echo "unpacked archive" + +sleep 1 + +# Wipe user data +if ! "$FASTBOOT_PATH" -w ; +then + exit 11 +fi + +echo "user data wiped" +sleep 5 + +# Flash the device +if ! "$FASTBOOT_PATH" -s "$DEVICE_ID" flash boot boot.img +then + exit 12 +fi +sleep 1 +echo "Flashed boot" + +if ! "$FASTBOOT_PATH" -s "$DEVICE_ID" flash recovery recovery.img +then + exit 13 +fi +sleep 1 +echo "Flashed recovery" + +if ! "$FASTBOOT_PATH" -s "$DEVICE_ID" flash vbmeta vbmeta.img +then + exit 14 +fi +sleep 1 +echo "Flashed vbmeta" + +if ! "$FASTBOOT_PATH" -s "$DEVICE_ID" flash vbmeta_system vbmeta_system.img +then + exit 15 +fi +sleep 1 +echo "Flashed vbmeta_system" + +if ! "$FASTBOOT_PATH" -s "$DEVICE_ID" flash vbmeta_vendor vbmeta_vendor.img +then + exit 16 +fi +sleep 1 +echo "Flashed vbmeta_vendor" + + +if ! "$FASTBOOT_PATH" -s "$DEVICE_ID" reboot fastboot +then + exit 17 +fi +sleep 6 +echo "Rebooted on fastboot" + +if ! "$FASTBOOT_PATH" -s "$DEVICE_ID" flash system system.img +then + exit 18 +fi +sleep 1 +echo "Flashed system" + +if ! "$FASTBOOT_PATH" -s "$DEVICE_ID" flash product product.img +then + exit 19 +fi +sleep 1 +echo "Flashed product" + +if ! "$FASTBOOT_PATH" -s "$DEVICE_ID" flash vendor vendor.img +then + exit 20 +fi +sleep 1 +echo "Flashed vendor" \ No newline at end of file diff --git a/flash-scripts/linux/wait-sideload.sh b/flash-scripts/linux/wait-sideload.sh new file mode 100755 index 0000000000000000000000000000000000000000..3157a3d8d6e1f724766cc00b12d227ffdde22ecb --- /dev/null +++ b/flash-scripts/linux/wait-sideload.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +# Copyright (C) 2019 ECORP SAS - Author: Romain Hunault +# Copyright (C) 2020 ECORP SAS - Author: Vincent Bourgmayer +# +# 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 . + +# TODO: test if a device go from "sideload" mode to recovery + +# Parameter +# $1: DEVICE_ID ID of the device to wait +# $2: ADB_FOLDER_PATH: the path where runnable adb is stored + +# Exit status +# - 0 : success +# - 101 : DEVICE_ID missing +# - 102 : adb wait sideload failed + +DEVICE_ID=$1 +ADB_FOLDER_PATH=$2 +ADB_PATH="" + +if [ -z "$DEVICE_ID" ] +then + exit 101 +fi + +ADB_PATH=${ADB_FOLDER_PATH}"adb" + +echo "waiting for sideload" +if ! "$ADB_PATH" -s "$DEVICE_ID" wait-for-sideload +then + echo "device not detected in sideload" + exit 102 +fi + +sleep 1 +echo "device found in sideload" \ No newline at end of file diff --git a/flash-scripts/windows/Teracube_2e-install-from-bootloader.bat b/flash-scripts/windows/Teracube_2e-install-from-bootloader.bat new file mode 100755 index 0000000000000000000000000000000000000000..2e88f79c7a46c43c992bb620b2d7271870c99b51 --- /dev/null +++ b/flash-scripts/windows/Teracube_2e-install-from-bootloader.bat @@ -0,0 +1,141 @@ +:: Copyright (C) 2021 ECORP SAS - Author: Vincent Bourgmayer +:: +:: 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 . + +:: Parameter +:: $1: DEVICE_ID device id +:: $2: ARCHIVE_PATH path to archive +:: $3: fastboot folder path +:: $4: Java folder path + + +:: Exit status +:: - 0 : device flashed +:: - 1 : generic error +:: - 10: can't unpack system.img +:: - 11: can't wipe data +:: - 12: can't flash boot +:: - 13: can't flash recovery +:: - 14: can't flash vbmeta +:: - 15: can't flash vbmeta_systel +:: - 16: can't flash vbmeta_vendor +:: - 17: can't reboot to fastboot +:: - 18: can't flash system +:: - 19: can't flash product +:: - 20: can't flash vendor +:: - 101 : DEVICE_ID missing +:: - 102 : ARCHIVE_PATH missing +:: - 103 : fastboot folder path missing + +set DEVICE_ID="%1" +set ARCHIVE_PATH=%~2 +set FASTBOOT_FOLDER_PATH=%~3 +set JAVA_FOLDER_PATH=%~4 + +if not defined %DEVICE_ID ( + exit /b 101 +) + +if not defined %ARCHIVE_PATH ( + exit /b 102 +) + +if not defined %FASTBOOT_FOLDER_PATH ( + exit /b 103 +) + +:: Check java folder has been provided +if not defined %JAVA_FOLDER_PATH ( + exit /b 104 +) + +set FASTBOOT_PATH="%FASTBOOT_FOLDER_PATH%fastboot" + + +set JAR_PATH="%JAVA_FOLDER_PATH%/bin/jar" + +:: Build archive folder path +for %%a in ("%ARCHIVE_PATH%") do ( + set ARCHIVE_FOLDER_PATH=%%~dpa" + echo %ARCHIVE_FOLDER_PATH% +) +:: unzip for system.img +cd "%ARCHIVE_FOLDER_PATH%" + +%JAR_PATH% -x -v -f "%ARCHIVE_PATH%" +if errorLevel 1 ( exit /b 10 ) + +echo "unpacked archive" + +ping 127.0.0.1 -n 1 -w 10000 >NUL + +%FASTBOOT_PATH% -w +if errorLevel 1 ( exit /b 11 ) + +echo "user data wiped" + +ping 127.0.0.1 -n 5 -w 10000 >NUL + +%FASTBOOT_PATH% -s %DEVICE_ID% flash boot boot.img +if errorLevel 1 ( exit /b 12 ) + +ping 127.0.0.1 -n 1 -w 10000 >NUL +echo "Flashed boot" + +%FASTBOOT_PATH% -s %DEVICE_ID% flash recovery recovery.img +if errorLevel 1 ( exit /b 13 ) + +ping 127.0.0.1 -n 1 -w 10000 >NUL +echo "Flashed recovery" + +%FASTBOOT_PATH% -s %DEVICE_ID% flash vbmeta vbmeta.img +if errorLevel 1 ( exit /b 14 ) + +ping 127.0.0.1 -n 1 -w 10000 >NUL +echo "Flashed vbmeta" + +%FASTBOOT_PATH% -s %DEVICE_ID% flash vbmeta_system vbmeta_system.img +if errorLevel 1 ( exit /b 15 ) + +ping 127.0.0.1 -n 1 -w 10000 >NUL +echo "Flashed vbmeta_system" + +%FASTBOOT_PATH% -s %DEVICE_ID% flash vbmeta_vendor vbmeta_vendor.img +if errorLevel 1 ( exit /b 16 ) + +ping 127.0.0.1 -n 1 -w 10000 >NUL +echo "Flashed vbmeta_vendor" + +%FASTBOOT_PATH% -s %DEVICE_ID% reboot fastboot +ping 127.0.0.1 -n 6 -w 10000 >NUL +echo "Rebooted on fastboot" + +%FASTBOOT_PATH% -s %DEVICE_ID% flash system system.img +if errorLevel 1 ( exit /b 18 ) + +ping 127.0.0.1 -n 1 -w 10000 >NUL +echo "Flashed vbmeta_vendor" + +%FASTBOOT_PATH% -s %DEVICE_ID% flash product product.img +if errorLevel 1 ( exit /b 19 ) + +ping 127.0.0.1 -n 1 -w 10000 >NUL +echo "Flashed product" + +%FASTBOOT_PATH% -s %DEVICE_ID% flash vendor vendor.img +if errorLevel 1 ( exit /b 20 ) + +ping 127.0.0.1 -n 1 -w 10000 >NUL +echo "Flashed vendor" +exit /b 0 \ No newline at end of file diff --git a/pkg/arch/PKGBUILD b/pkg/arch/PKGBUILD index b8ce9940ff6a3a1cf0abd3c383785c38579b596c..10390db2156f6c2cb9573cdbd671ac305f9f9087 100644 --- a/pkg/arch/PKGBUILD +++ b/pkg/arch/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: efoundation # Maintainer: steadfasterX pkgname=easy-installer -pkgver=0.12.4 +pkgver=0.13.0 pkgrel=4 pkgdesc="The Easy Installer is a desktop application which helps users install Android /e/ (https://doc.e.foundation/what-s-e) on supported devices." arch=('x86_64') diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 3552d6fe72d86b3f6e5c45325eedcef022222a3c..6e2d920b295d86ddd4737fcaebed156223ef2b44 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,5 +1,5 @@ name: easy-installer -version: 'v0.12.4-beta' +version: 'v0.13.0-beta' summary: Easy installation of /e/ OS - the Google-free Android-based mobile OS description: | The /e/ OS Installer has been created to make the installation of diff --git a/src/main/java/ecorp/easy/installer/AppConstants.java b/src/main/java/ecorp/easy/installer/AppConstants.java index 0997bed80c668b54ed63752db93fb2febec0ce4f..b51b6a4468f88cc50f5704bca91aabb1f2e93a56 100644 --- a/src/main/java/ecorp/easy/installer/AppConstants.java +++ b/src/main/java/ecorp/easy/installer/AppConstants.java @@ -26,7 +26,7 @@ import java.nio.file.Paths; */ public abstract class AppConstants { - public final static String APP_VERSION = "v0.12.4-beta"; + public final static String APP_VERSION = "v0.13.0-beta"; 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/java/ecorp/easy/installer/helpers/DeviceHelper.java b/src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java index ffd6cd09e937d004df73720ed2c1461a217a8995..af576980fb310caa82f6ba4de238bc32a9c11c5f 100644 --- a/src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java +++ b/src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java @@ -33,6 +33,7 @@ public class DeviceHelper { put("dreamlte", "0007"); put("FP3", "0008"); put("GS290", "0009"); + put("Teracube_2e", "0011"); }}; diff --git a/src/main/java/ecorp/easy/installer/tasks/DeviceDetectionTask.java b/src/main/java/ecorp/easy/installer/tasks/DeviceDetectionTask.java index 52612bc3ae8fd638e182fbbef98efb5ef96e7183..abfcb3446e43dee0542617b359cdb906625e49d1 100644 --- a/src/main/java/ecorp/easy/installer/tasks/DeviceDetectionTask.java +++ b/src/main/java/ecorp/easy/installer/tasks/DeviceDetectionTask.java @@ -96,7 +96,6 @@ public class DeviceDetectionTask extends Task{ } - /** * Analyse one line from result of "ADB devices -l" command * @param resultLine @@ -129,8 +128,13 @@ public class DeviceDetectionTask extends Task{ logger.debug(" \"model\" keyword has been found"); result.setModel(stringPart.substring("model:".length() )); }else if(stringPart.contains("device:")){ - logger.debug(" \"device\" keyword has been found"); - result.setDevice(stringPart.substring("device:".length() )); + logger.debug(" \"device\" keyword has been found"); + + // temp workaround because on Teracube: /e/ device is "2e" while stock is "teracube_2e" + String device = stringPart.substring("device:".length() ); + if(device.equals("2e")) device ="Teracube_2e"; + + result.setDevice(device); } } } diff --git a/src/main/resources/images/t2e-acceptFlashingUnlock.png b/src/main/resources/images/t2e-acceptFlashingUnlock.png new file mode 100644 index 0000000000000000000000000000000000000000..b6f01d2fd92435cbbff6384ec267e5d7bab0cbc3 Binary files /dev/null and b/src/main/resources/images/t2e-acceptFlashingUnlock.png differ diff --git a/src/main/resources/images/t2e-acceptOemWarning.png b/src/main/resources/images/t2e-acceptOemWarning.png new file mode 100755 index 0000000000000000000000000000000000000000..30d2038f34b0f02b57c834bb2a84fbb479cb3d31 Binary files /dev/null and b/src/main/resources/images/t2e-acceptOemWarning.png differ diff --git a/src/main/resources/images/t2e-enableOemUnlock.png b/src/main/resources/images/t2e-enableOemUnlock.png new file mode 100755 index 0000000000000000000000000000000000000000..eb88fcb1c8509cf5b21db325beb5de478624e296 Binary files /dev/null and b/src/main/resources/images/t2e-enableOemUnlock.png differ diff --git a/src/main/resources/images/t2e-oemUnlocked.png b/src/main/resources/images/t2e-oemUnlocked.png new file mode 100755 index 0000000000000000000000000000000000000000..28b72399ea9c811e2b6ed2e7462393c411c9b674 Binary files /dev/null and b/src/main/resources/images/t2e-oemUnlocked.png differ diff --git a/src/main/resources/images/t2e-searchOEM.png b/src/main/resources/images/t2e-searchOEM.png new file mode 100755 index 0000000000000000000000000000000000000000..ffad88dae611dae1c6b3d4f56aaa19809c9dc3cb Binary files /dev/null and b/src/main/resources/images/t2e-searchOEM.png differ diff --git a/src/main/resources/images/t2e-settings.png b/src/main/resources/images/t2e-settings.png new file mode 100755 index 0000000000000000000000000000000000000000..445523272420ef4f492a4351f1fe7af22eb823a3 Binary files /dev/null and b/src/main/resources/images/t2e-settings.png differ diff --git a/src/main/resources/instructions/imageName_en_EN_0011.properties b/src/main/resources/instructions/imageName_en_EN_0011.properties new file mode 100644 index 0000000000000000000000000000000000000000..76bf117dbcdb70b8360c6a2a4d42d035da904068 --- /dev/null +++ b/src/main/resources/instructions/imageName_en_EN_0011.properties @@ -0,0 +1,22 @@ +# Copyright 2019-2020 - 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 . + +#install_instr_turnOff +install_instr_openSettings=t2e-settings.png +install_instr_searchOEM=t2e-searchOEM.png +install_instr_enableOEMUnlocking=t2e-enableOemUnlock.png +install_instr_acceptOEMUnlockWarning=t2e-acceptOemWarning.png +install_instr_onceDoneThenContinue=t2e-oemUnlocked.png +install_instr_pressVolUpToAcceptOEMUnlocking=t2e-acceptFlashingUnlock.png \ No newline at end of file diff --git a/src/main/resources/lang/translation.properties b/src/main/resources/lang/translation.properties index 0790bbbca40b578ac4900d899922bf1341ab11fc..205dde3b422029ba72358fb39e80b1ca42b2be28 100644 --- a/src/main/resources/lang/translation.properties +++ b/src/main/resources/lang/translation.properties @@ -184,12 +184,22 @@ install_instr_rebootingOnBootloader=Your device will reboot automatically on boo install_instr_pressVolUpToAcceptOEMUnlocking = Press "Volume up" to accept OEM unlocking install_instr_unlockingOem= Easy-installer is unlocking OEM install_instr_waitFastbootmodeDetected = The next step will start automatically once your device in fastboot mode will be detected. If it takes longer than 30 seconds, please check our FAQ by clicking on the "Need help" button + install_instr_openSettingsThenDevOptions = Open "Settings" then "Developer options" install_instr_disableAutoUpdateSystem= Disable "Auto update system" install_instr_openSoftwareUpdate = Get back to "Settings" and open "Software update" install_instr_disableAutomaticDownload = Disable "Auto download over Wi-Fi" install_instr_clickDlAndInstall = Tap on "Download and install" and wait until you get result (a failure is OK) install_instr_rebootDeviceThenContinue= Restart your device then click on continue +install_instr_waitRecoveryInstallStartAuto=Please wait, Installation of the /e/ recovery will start automatically +install_instr_leaveBootloader_holdPower=Hold "Power" button pressed until the phone turn off (~12 seconds) +install_instr_startRec_holdPowerVolUp=Hold "Power" and "Volume up" pressed until a small menu appear on your phone (~2 seconds) +install_instr_selectRecovery_pressVolUp=Press "Volume up" to select Recovery +install_instr_validRecovery_pressVolDown=Press "Volume down" to start in Recovery +install_instr_waitRecoveryStarted=Wait Recovery mode started +install_instr_selectApplyUpdate_pressVol=Select "Apply update" then "Apply from ADB". Use "Volume up/down" to select and "Power" to validate. +install_instr_waitForInstall = Please wait, installation will begin +install_warning_doNotWaitToRestartRecovery=Attention! Please read instructions carefully. You must restart in recovery mode immediately after the phone is turned off. Otherwise the phone will restart on your previous OS and the recovery's installation will not be taken into account. You\u2019ll have to start all over again. script_error_waitDownload_1 = Can't detect device in "Download mode" script_error_waitFastboot_1 = Can't detect device in "fastboot mode" script_error_oemUnlock_10 = Can't allow custom OS installation on your device @@ -289,4 +299,4 @@ stepTitle_checkDeviceUptodate= Check device is up-to-date stepTitle_enableOemUnlock= Enable OEM unlocking stepTitle_beforeInstallation= Before installation stepTitle_rebootDevice= Reboot device -stepTitle_rebootBootloader = "Rebooting in bootloader mode" \ No newline at end of file +stepTitle_rebootBootloader = Rebooting in bootloader mode \ No newline at end of file diff --git a/src/main/resources/yaml/Teracube_2e.yml b/src/main/resources/yaml/Teracube_2e.yml new file mode 100644 index 0000000000000000000000000000000000000000..d5f71fa74dbc55888ef310c1b1ec44686732aa5c --- /dev/null +++ b/src/main/resources/yaml/Teracube_2e.yml @@ -0,0 +1,107 @@ +## Copyright 2019-2020 - 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: Vincent Bourgmayer +--- +name: Teracube_2e +flash: + f1: + script: ~ + parameters: ~ + codes: ~ + output: ~ + succeed: f2 + failed: ~ + f2: + script: reboot-fastboot + parameters: + device_id: ${DEVICE_ID} + fastboot_folder_path: ${ADB_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_unknown + 10: script_error_cantRebootBootloader + 101: script_error_deviceID_missing + 102: script_error_fastbootPath_missing + output: ~ + succeed: f3 + failed: ~ + f3: + script: gs290-flashingUnlock + parameters: + device_id: ${DEVICE_ID} + fastboot_folder_path: ${ADB_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_unknown + 2: script_error_flashingUnlockFailed + 101: script_error_deviceID_missing + 102: script_error_fastbootPath_missing + output: ~ + succeed: f4 + failed: ~ + f4: + script: Teracube_2e-install-from-bootloader + parameters: + device_id: ${DEVICE_ID} + archive_path: ${ARCHIVE_PATH} + fastboot_folder_path: ${ADB_FOLDER_PATH} + java_folder_path: ${JAVA_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_unknown + 10: script_error_cantUnpackSources + 11: script_error_cantWipeData + 12: script_error_cantFlashBoot + 13: script_error_cantFlashRecovery + 14: script_error_cantFlashVbmeta + 15: script_error_cantFlashVbmeta_system + 16: script_error_cantFlashVBmeta_vendor + 17: script_error_cantRebootToFastboot + 18: script_error_cantFlashSystem + 19: script_error_cantFlashproduct + 20: script_error_cantFlashVendor + 101: script_error_deviceID_missing + 102: script_error_installFromFastboot_102 + 103: script_error_fastbootPath_missing + output: ~ + succeed: f5 + failed: ~ + f5: + script: askAccount + parameters: ~ + codes: ~ + output: ~ + succeed: f6 + failed: ~ + f6: + script: gs290-wait-reboot-from-fastboot + parameters: + fastboot_folder_path: ${ADB_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_unknown + 10: script_error_cantrebootFromFasboot + 101: script_error_noDeviceFoundInFastboot + output: ~ + succeed: ~ + failed: ~ \ No newline at end of file diff --git a/src/main/resources/yaml/Teracube_2e_fs.yml b/src/main/resources/yaml/Teracube_2e_fs.yml new file mode 100644 index 0000000000000000000000000000000000000000..b8c6ae3bbeca323850850dd3559a04603ad82f3a --- /dev/null +++ b/src/main/resources/yaml/Teracube_2e_fs.yml @@ -0,0 +1,69 @@ +## Copyright 2019-2020 - 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: Vincent Bourgmayer +--- +sources: + rom: + url: https://images.ecloud.global/stable/2e/IMG-e-latest-2e.zip + filePath: IMG-e-latest-2e.zip +flash: + f1: + ui: + type: action + title: stepTitle_enableOemUnlock + instruction: + - install_instr_openSettings + - install_instr_searchOEM + - install_instr_enableOEMUnlocking + - install_instr_acceptOEMUnlockWarning + - install_instr_onceDoneThenContinue + stepNumber: 1/5 + titleIcon: icon-download.png + f2: + ui: + type: load + title: stepTitle_rebootBootloader + instruction: + - install_instr_rebootingOnBootloader + stepNumber: 2/5 + averageTime: 12 + f3: + ui: + type: action + title: stepTitle_oemUnlock + instruction: + - install_instr_pressVolUpToAcceptOEMUnlocking + - install_instr_waitInstallStartAuto + stepNumber: 3/5 + titleIcon: icon-download.png + f4: + ui: + type: load + title: stepTitle_installOS + instruction: + - install_instr_eosInstall + stepNumber: 4/5 + averageTime: 200 + f5: + ui: + type: askAccount + f6: + ui: + type: action + title: stepTitle_rebootDevice + instruction: + - install_instr_onceDeviceRebootThenContinue + stepNumber: 5/5 + titleIcon: icon-download.png diff --git a/windows-installer-mui.nsi b/windows-installer-mui.nsi index c242877875dff497bb0efba68bdf5921fca1caad..bba478b587536cfdde38c4ab032f8d20288b6812 100644 --- a/windows-installer-mui.nsi +++ b/windows-installer-mui.nsi @@ -9,7 +9,7 @@ #-------------------------------- RequestExecutionLevel admin #if 'user' then it can't install in C:\Program files !define MUI_ICON "buildSrc/windows/easy-installer.ico" -!define appVersion "v0.12.4-beta" +!define appVersion "v0.13.0-beta" Name "Easy-installer ${appVersion}" # define installation directory InstallDir "$PROGRAMFILES64\easy-installer"