Merge branch 'develop' of gitlab.e.foundation:e/devices/web-easy-installer into develop (ec5c1113) · Commits · e / devices / eOS Installer

app/src/static/index.html

+2 −1

Original line number	Diff line number	Diff line
		@@ -179,9 +179,10 @@
		<div id="unlocking" class="card inactive">
		<div class="card-title" data-translate="Unlocking"></div>
		<div class="card-body">
		<button data-translate="next" class="next" onclick="VIEW.executeStep(this, 'unlocking')"></button>
		</div>
		<div class="card-footer">
		<button data-translate="next" class="next" onclick="VIEW.executeStep(this, 'unlocking')"></button>
		<button data-translate="next" class="next" onclick="VIEW.onNext(this)"></button>
		</div>
		</div>
		<div id="reboot-manually-to-bootloader" class="card inactive">

app/src/static/js/controller.manager.js

+4 −3

Original line number	Diff line number	Diff line
		@@ -19,7 +19,7 @@ export class Controller {
		new Step("device-detection", 'connect adb', true),

		];
		this.currentIndex = 0;
		this.currentIndex = 6;
		}


		@@ -67,7 +67,6 @@ export class Controller {
		let res = true;
		for(let i = 0 ; i < current.commands.length && res; i++) {
		res = await this.runCommand(current.commands[i]);
		console.log(res)
		}
		const next = this.steps[this.currentIndex + 1];
		let previous = this.steps[this.currentIndex - 1];
		@@ -78,7 +77,9 @@ export class Controller {
		}
		} else {
		VIEW.onStepFailed(current, previous);
		if(!current.needUserGesture) {
		this.currentIndex--;
		}
		throw Error('command failed');
		}
		} else {

app/src/static/resources/fairphone45g.json

+118 −128

Original line number	Diff line number	Diff line
		@@ -2,159 +2,149 @@
		"steps": [
		{
		"mode": "bootloader",
		"command": "flashing unlock unlocked",
		"instruction": "Select unlock bootloader"
		"id": "connect-bootloader",
		"command": ["connect bootloader", "flashing unlock"],
		"needUserGesture": true
		},
		{
		"command": "flashing unlock_critical"
		"id": "unlocking",
		"needUserGesture": true
		},
		{
		"command": "flash bluetooth_a bluetooth.img"
		"id": "activate-developer-options",
		"needUserGesture": true
		},
		{
		"command": "flash bluetooth_b bluetooth.img"
		"id": "enable-usb-file-transfer",
		"needUserGesture": true
		},
		{
		"command": "flash devcfg_a devcfg.img"
		"id": "device-detection",
		"command": "connect adb",
		"needUserGesture": true
		},
		{
		"command": "flash devcfg_b devcfg.img"
		},
		{
		"command": "flash dsp_a dsp.img"
		},
		{
		"command": "flash dsp_b dsp.img"
		},
		{
		"command": "flash modem_a modem.img"
		},
		{
		"command": "flash modem_b modem.img"
		},
		{
		"command": "flash xbl_a xbl.img"
		},
		{
		"command": "flash xbl_b xbl.img"
		},
		{
		"command": "flash tz_a tz.img"
		},
		{
		"command": "flash tz_b tz.img"
		},
		{
		"command": "flash hyp_a hyp.img"
		},
		{
		"command": "flash hyp_b hyp.img"
		},
		{
		"command": "flash keymaster_a keymaster.img"
		},
		{
		"command": "flash keymaster_b keymaster.img"
		},
		{
		"command": "flash abl_a abl.img"
		},
		{
		"command": "flash abl_b abl.img"
		},
		{
		"command": "flash boot_a boot.img"
		},
		{
		"command": "flash boot_b boot.img"
		},
		{
		"command": "flash recovery_a recovery.img"
		},
		{
		"command": "flash recovery_b recovery.img"
		},
		{
		"command": "flash dtbo_a dtbo.img"
		},
		{
		"command": "flash dtbo_b dtbo.img"
		},
		{
		"command": "flash vbmeta_system_a vbmeta_system.img"
		},
		{
		"command": "flash vbmeta_system_b vbmeta_system.img"
		},
		{
		"command": "flash vbmeta_a vbmeta.img"
		},
		{
		"command": "flash vbmeta_b vbmeta.img"
		},
		{
		"command": "flash super super.img"
		},
		{
		"command": "flash aop_a aop.img"
		},
		{
		"command": "flash aop_b aop.img"
		},
		{
		"command": "flash featenabler_a featenabler.img"
		},
		{
		"command": "flash featenabler_b featenabler.img"
		},
		{
		"command": "flash imagefv_a imagefv.img"
		},
		{
		"command": "flash imagefv_b imagefv.img"
		},
		{
		"command": "flash multiimgoem_a multiimgoem.img"
		},
		{
		"command": "flash multiimgoem_b multiimgoem.img"
		},
		{
		"command": "flash qupfw_a qupfw.img"
		"mode": "bootloader",
		"id": "connect-bootloader",
		"command": ["connect bootloader", "flashing unlock_critical"],
		"needUserGesture": true
		},
		{
		"command": "flash qupfw_b qupfw.img"
		"id": "unlocking",
		"needUserGesture": true
		},
		{
		"command": "flash uefisecapp_a uefisecapp.img"
		"id": "activate-developer-options",
		"needUserGesture": true
		},
		{
		"command": "flash uefisecapp_b uefisecapp.img"
		"id": "enable-usb-file-transfer",
		"needUserGesture": true
		},
		{
		"command": "flash xbl_config_a xbl_config.img"
		"id": "device-detection",
		"command": "connect adb",
		"needUserGesture": true
		},
		{
		"command": "flash xbl_config_b xbl_config.img"
		"mode": "bootloader",
		"id": "connect-bootloader",
		"command": "connect bootloader",
		"needUserGesture": true
		},
		{
		"id": "flashing",
		"command": [
		"flash bluetooth_a bluetooth.img",
		"flash bluetooth_b bluetooth.img",
		"flash devcfg_a devcfg.img",
		"flash devcfg_b devcfg.img",
		"flash dsp_a dsp.img",
		"flash dsp_b dsp.img",
		"flash modem_a modem.img",
		"flash modem_b modem.img",
		"flash xbl_a xbl.img",
		"flash xbl_b xbl.img",
		"flash tz_a tz.img",
		"flash tz_b tz.img",
		"flash hyp_a hyp.img",
		"flash hyp_b hyp.img",
		"flash keymaster_a keymaster.img",
		"flash keymaster_b keymaster.img",
		"flash abl_a abl.img",
		"flash abl_b abl.img",
		"flash boot_a boot.img",
		"flash boot_b boot.img",
		"flash recovery_a recovery.img",
		"flash recovery_b recovery.img",
		"flash dtbo_a dtbo.img",
		"flash dtbo_b dtbo.img",
		"flash vbmeta_system_a vbmeta_system.img",
		"flash vbmeta_system_b vbmeta_system.img",
		"flash vbmeta_a vbmeta.img",
		"flash vbmeta_b vbmeta.img",
		"flash super super.img",
		"flash aop_a aop.img",
		"flash aop_b aop.img",
		"flash featenabler_a featenabler.img",
		"flash featenabler_b featenabler.img",
		"flash imagefv_a imagefv.img",
		"flash imagefv_b imagefv.img",
		"flash multiimgoem_a multiimgoem.img",
		"flash multiimgoem_b multiimgoem.img",
		"flash qupfw_a qupfw.img",
		"flash qupfw_b qupfw.img",
		"flash uefisecapp_a uefisecapp.img",
		"flash uefisecapp_b uefisecapp.img",
		"flash xbl_config_a xbl_config.img",
		"flash xbl_config_b xbl_config.img",
		"flash core_nhlos_b core_nhlos.img",
		"flash core_nhlos_a core_nhlos.img",
		"erase userdata",
		"erase metadata",
		"--set-active=a",
		"flashing lock"]
		},
		{
		"id": "locking",
		"needUserGesture": true
		},
		{
		"id": "activate-developer-options",
		"needUserGesture": true
		},
		{
		"id": "enable-usb-file-transfer",
		"needUserGesture": true
		},
		{
		"id": "device-detection",
		"command": "connect adb",
		"needUserGesture": true
		},
		{
		"command": "flash core_nhlos_a core_nhlos.img"
		"mode": "bootloader",
		"id": "connect-bootloader",
		"command": ["connect bootloader", "flashing lock_critical"],
		"needUserGesture": true
		},
		{
		"command": "flash core_nhlos_b core_nhlos.img"
		"id": "unlocking",
		"needUserGesture": true
		},
		{
		"command": "erase userdata"
		"id": "murena-cloud-account",
		"needUserGesture": true
		},
		{
		"command": "erase metadata"
		"id": "installation-complete"
		}
		],
		"folder": [
		{
		"name": "FP4 installer",
		"unzip": true,
		"path": "assets/sources/fp4/IMG-e-1.14-s-20230816320616-stable-FP4.zip"
		"path": "assets/sources/fp4/IMG-e-2.1-t-20240603406607-stable-FP4.zip"
		}
		]
		}
		No newline at end of file