Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit 5a0a2829 authored by frankpreel's avatar frankpreel Committed by Nicolas Gelot
Browse files

Get security path from murena file info (download)

parent c175dd63

flash-scripts/windows/fp4_check_bootloader.bat

+7 −1
Original line number Diff line number Diff line
@@ -47,7 +47,13 @@ call:versionToInt %ORIGINAL_SECURITY_PATCH% 
set I_ORIGINAL_SECURITY_PATCH=%var1%

echo "I_ORIGINAL_SECURITY_PATCH====>%I_ORIGINAL_SECURITY_PATCH%"



set MURENA__SECURITY_PATCH=2021-12-05

set MURENA__SECURITY_PATCH=

set MURENA_ROM_INFO=%ARCHIVE_FOLDER_PATH%%device_model%-rom-info"

for /f %%i in ('findstr /b "ro.build.version.security_patch"  %MURENA_ROM_INFO%') do (

   set MURENA__SECURITY_PATCH=%%i

 )

SET MURENA__SECURITY_PATCH=%MURENA__SECURITY_PATCH:~32%

echo "MURENA__SECURITY_PATCH=%MURENA__SECURITY_PATCH%"

call:versionToInt %MURENA__SECURITY_PATCH%

set I_MURENA__SECURITY_PATCH=%var1%

echo "I_MURENA__SECURITY_PATCH====>%I_MURENA__SECURITY_PATCH%"

flash-scripts/windows/fp4_lock.bat

+7 −1
Original line number Diff line number Diff line
@@ -49,7 +49,13 @@ call:versionToInt %ORIGINAL_SECURITY_PATCH% 
set I_ORIGINAL_SECURITY_PATCH=%var1%

echo "I_ORIGINAL_SECURITY_PATCH====>%I_ORIGINAL_SECURITY_PATCH%"



set MURENA__SECURITY_PATCH=2021-12-05

set MURENA__SECURITY_PATCH=

set MURENA_ROM_INFO=%ARCHIVE_FOLDER_PATH%%device_model%-rom-info"

for /f %%i in ('findstr /b "ro.build.version.security_patch"  %MURENA_ROM_INFO%') do (

   set MURENA__SECURITY_PATCH=%%i

 )

SET MURENA__SECURITY_PATCH=%MURENA__SECURITY_PATCH:~32%

echo "MURENA__SECURITY_PATCH=%MURENA__SECURITY_PATCH%"

call:versionToInt %MURENA__SECURITY_PATCH%

set I_MURENA__SECURITY_PATCH=%var1%

echo "I_MURENA__SECURITY_PATCH====>%I_MURENA__SECURITY_PATCH%"

flash-scripts/windows/fp4_lock_critical.bat

+7 −1
Original line number Diff line number Diff line
@@ -50,7 +50,13 @@ call:versionToInt %ORIGINAL_SECURITY_PATCH% 
set I_ORIGINAL_SECURITY_PATCH=%var1%

echo "I_ORIGINAL_SECURITY_PATCH====>%I_ORIGINAL_SECURITY_PATCH%"



set MURENA__SECURITY_PATCH=2021-12-05

set MURENA__SECURITY_PATCH=

set MURENA_ROM_INFO=%ARCHIVE_FOLDER_PATH%%device_model%-rom-info"

for /f %%i in ('findstr /b "ro.build.version.security_patch"  %MURENA_ROM_INFO%') do (

   set MURENA__SECURITY_PATCH=%%i

 )

SET MURENA__SECURITY_PATCH=%MURENA__SECURITY_PATCH:~32%

echo "MURENA__SECURITY_PATCH=%MURENA__SECURITY_PATCH%"

call:versionToInt %MURENA__SECURITY_PATCH%

set I_MURENA__SECURITY_PATCH=%var1%

echo "I_MURENA__SECURITY_PATCH====>%I_MURENA__SECURITY_PATCH%"

flash-scripts/windows/store-rom-info.bat

+8 −3
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 


@echo OFF







set FASTBOOT_FOLDER_PATH="%~1"

set ADB_PATH=%FASTBOOT_FOLDER_PATH%adb
@@ -36,7 +38,7 @@ echo "adb command=%ADB_PATH%"" 
set ARCHIVE_PATH=%~2

echo "Archive Path=%ARCHIVE_PATH%"

for %%a in ("%ARCHIVE_PATH%") do (

	set ARCHIVE_FOLDER_PATH="%%~dpa"

	set ARCHIVE_FOLDER_PATH="%%~dpa

)



echo "Archive Folder Path="%ARCHIVE_FOLDER_PATH%
@@ -52,12 +54,15 @@ if errorLevel 1 ( 
    exit /b 1

)



set SECURITY_PATCH=%ARCHIVE_FOLDER_PATH%%device_model%-security-patch

set DEVICE_STATE=%ARCHIVE_FOLDER_PATH%%device_model%-device-state

set SECURITY_PATCH=%ARCHIVE_FOLDER_PATH%%device_model%-security-patch"

set DEVICE_STATE=%ARCHIVE_FOLDER_PATH%%device_model%-device-state"

set MURENA_ROM_INFO=%ARCHIVE_FOLDER_PATH%%device_model%-rom-info"

:: The command below may provide  empty result if the key does not exists

:: In that case the process will use for compare.

%ADB_PATH% shell getprop ro.build.version.security_patch> %SECURITY_PATCH%



bitsadmin.exe /transfer "RomInfo" https://images.ecloud.global/stable/FP4/e-latest-FP4.zip.prop %MURENA_ROM_INFO% > nul



:: For FP4 on stock ROM the key [ro.build.device] is [FP4] let's use this to check if we are on stock ROM:: On Murena OS the return is empty



%ADB_PATH% shell getprop ro.build.device 2>&1 | findstr  "%device_model%"

flash-scripts/windows/wait-fastboot-locked.bat

+7 −1
Original line number Diff line number Diff line
@@ -45,7 +45,13 @@ call:versionToInt %ORIGINAL_SECURITY_PATCH% 
set I_ORIGINAL_SECURITY_PATCH=%var1%

echo "I_ORIGINAL_SECURITY_PATCH====>%I_ORIGINAL_SECURITY_PATCH%"



set MURENA__SECURITY_PATCH=2021-12-05

set MURENA__SECURITY_PATCH=

set MURENA_ROM_INFO=%ARCHIVE_FOLDER_PATH%%device_model%-rom-info"

for /f %%i in ('findstr /b "ro.build.version.security_patch"  %MURENA_ROM_INFO%') do (

   set MURENA__SECURITY_PATCH=%%i

 )

SET MURENA__SECURITY_PATCH=%MURENA__SECURITY_PATCH:~32%

echo "MURENA__SECURITY_PATCH=%MURENA__SECURITY_PATCH%"

call:versionToInt %MURENA__SECURITY_PATCH%

set I_MURENA__SECURITY_PATCH=%var1%

echo "I_MURENA__SECURITY_PATCH====>%I_MURENA__SECURITY_PATCH%"