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

Verified Commit 341f19a1 authored by frankpreel's avatar frankpreel Committed by Nicolas Gelot
Browse files

Tune FP4 process scripts for MSWindows

parent 6f469d4f

flash-scripts/windows/fp4_lock.bat

+47 −21
Original line number Diff line number Diff line
@@ -16,43 +16,51 @@ 


:: Parameter

:: $1: The folder where fastboot runnable is stored

:: $2: The device model

:: $2: The archive folder 

:: $3: The device model



:: Exit status

:: - 0 : success

:: - 1 : Error

:: - 102 : locking the bootloader failed



@echo OFF



set FASTBOOT_FOLDER_PATH=%~1

set FASTBOOT_PATH="%FASTBOOT_FOLDER_PATH%fastboot"

echo "FASTBOOT path:"%FASTBOOT_PATH%



::-----------

set ARCHIVE_PATH=%~2

echo "Archive Path=%ARCHIVE_PATH%"

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

	set ARCHIVE_FOLDER_PATH="%%~dpa

)



      ARCHIVE_PATH=$2

      ARCHIVE_FOLDER_PATH=$(dirname "$2")"/"



      echo "Archive Path="$ARCHIVE_FOLDER_PATH



      device_model=$3

echo "Archive Folder Path="%ARCHIVE_FOLDER_PATH%



      echo "Model="$device_model

set device_model=%~3



      SECURITY_PATCH=${ARCHIVE_FOLDER_PATH}""${device_model}"-security-patch"

      ORIGINAL_SECURITY_PATCH=$(cat "$SECURITY_PATCH")

echo "Model=%device_model%"



      # Assuming format is xxxx-yy-zz with otional extra info ..

      function versionToInt { printf "%03d%03d%03d%03d" $(echo "$1" | tr '-' ' '); }

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

set /p ORIGINAL_SECURITY_PATCH=<%SECURITY_PATCH%

call:versionToInt %ORIGINAL_SECURITY_PATCH%

set I_ORIGINAL_SECURITY_PATCH=%var1%

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



      I_ORIGINAL_SECURITY_PATCH=$(versionToInt "$ORIGINAL_SECURITY_PATCH")

      I_MURENA__SECURITY_PATCH=$(versionToInt 2020-12-05)

set MURENA__SECURITY_PATCH=2021-12-05

call:versionToInt %MURENA__SECURITY_PATCH%

set I_MURENA__SECURITY_PATCH=%var1%

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



      if [[ $I_MURENA__SECURITY_PATCH -ge $I_ORIGINAL_SECURITY_PATCH ]]

      then

if %I_MURENA__SECURITY_PATCH% GEQ %I_ORIGINAL_SECURITY_PATCH% (

    echo "GREATER OR EQUALS OR ORIGINAL ROM INFO NOT AVAILABLE => PROCESS"

      else

) else (

	echo "LOWER DO NOT PROCESS"

          exit 0

      fi

    exit /b 0

)

:: ------------------



%FASTBOOT_PATH% flashing lock
@@ -64,3 +72,21 @@ if errorLevel 1 ( 
waitfor /t 10 pause 2>nul



exit /b 0





:: Assuming format is xxxx-yy-zz with otional will return xxyyzz

:versionToInt 

	setlocal enabledelayedexpansion

	set str_sum=

	set version=%~1

	set version=%version:-= %

	

	for %%a in (%version%) do (

		set "formattedValue=000000%%a"

		set str_sum=!str_sum!!formattedValue:~-2!

	)



	( endlocal 

		set "var1=%str_sum%"

	)

	goto:eof
 
 No newline at end of file

flash-scripts/windows/fp4_lock_critical.bat

+55 −2
Original line number Diff line number Diff line
@@ -16,18 +16,52 @@ 


:: Parameter

:: $1: The folder where fastboot runnable is stored

:: $2: The device model

:: $2: The archive folder 

:: $3: The device model



:: Exit status

:: - 0 : success

:: - 1 : Error

:: - 101 : locking the bootloader failed



@echo OFF



set FASTBOOT_FOLDER_PATH=%~1

set FASTBOOT_PATH="%FASTBOOT_FOLDER_PATH%fastboot"

echo "FASTBOOT path:"%FASTBOOT_PATH%



XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX



::-----------

set ARCHIVE_PATH=%~2

echo "Archive Path=%ARCHIVE_PATH%"

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

	set ARCHIVE_FOLDER_PATH="%%~dpa

)



echo "Archive Folder Path="%ARCHIVE_FOLDER_PATH%



set device_model=%~3



echo "Model=%device_model%"



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

set /p ORIGINAL_SECURITY_PATCH=<%SECURITY_PATCH%

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

call:versionToInt %MURENA__SECURITY_PATCH%

set I_MURENA__SECURITY_PATCH=%var1%

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



if %I_MURENA__SECURITY_PATCH% GEQ %I_ORIGINAL_SECURITY_PATCH% (

    echo "GREATER OR EQUALS OR ORIGINAL ROM INFO NOT AVAILABLE => PROCESS"

) else (

	echo "LOWER DO NOT PROCESS"

    exit /b 0

)

:: ------------------



%FASTBOOT_PATH% flashing lock_critical
@@ -44,3 +78,22 @@ if %ERRORLEVEL% EQU 0 ( 
)



exit /b 0







:: Assuming format is xxxx-yy-zz with otional will return xxyyzz

:versionToInt 

	setlocal enabledelayedexpansion

	set str_sum=

	set version=%~1

	set version=%version:-= %

	

	for %%a in (%version%) do (

		set "formattedValue=000000%%a"

		set str_sum=!str_sum!!formattedValue:~-2!

	)



	( endlocal 

		set "var1=%str_sum%"

	)

	goto:eof
 
 No newline at end of file

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

+55 −2
Original line number Diff line number Diff line
@@ -16,13 +16,47 @@ 


:: TODO: What if 2 devices detected?

:: $1: The folder where fastboot runnable is stored

:: $2: The device model

:: $2: The archive folder 

:: $3: The device model



:: Exit status

:: - 0 : Device in fastboot mode detected

:: - 1 : Error



XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX

@echo OFF





::-----------

set ARCHIVE_PATH=%~2

echo "Archive Path=%ARCHIVE_PATH%"

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

	set ARCHIVE_FOLDER_PATH="%%~dpa

)



echo "Archive Folder Path="%ARCHIVE_FOLDER_PATH%



set device_model=%~3



echo "Model=%device_model%"



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

set /p ORIGINAL_SECURITY_PATCH=<%SECURITY_PATCH%

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

call:versionToInt %MURENA__SECURITY_PATCH%

set I_MURENA__SECURITY_PATCH=%var1%

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



if %I_MURENA__SECURITY_PATCH% GEQ %I_ORIGINAL_SECURITY_PATCH% (

    echo "GREATER OR EQUALS OR ORIGINAL ROM INFO NOT AVAILABLE => PROCESS"

) else (

	echo "LOWER DO NOT PROCESS"

    exit /b 0

)

:: ------------------



set FASTBOOT_FOLDER_PATH=%~1

set FASTBOOT_PATH="%FASTBOOT_FOLDER_PATH%fastboot"
@@ -41,3 +75,22 @@ call fastboot_detect 
echo "fastboot mode detected, phone is unlocked"



exit /b 0







:: Assuming format is xxxx-yy-zz with otional will return xxyyzz

:versionToInt 

	setlocal enabledelayedexpansion

	set str_sum=

	set version=%~1

	set version=%version:-= %

	

	for %%a in (%version%) do (

		set "formattedValue=000000%%a"

		set str_sum=!str_sum!!formattedValue:~-2!

	)



	( endlocal 

		set "var1=%str_sum%"

	)

	goto:eof
 
 No newline at end of file

flash-scripts/windows/wait-fastboot-unlocked-critical.bat

+6 −3
Original line number Diff line number Diff line
@@ -16,17 +16,17 @@ 


:: TODO: What if 2 devices detected?

:: $1: The folder where fastboot runnable is stored

:: $2: The device model



:: Exit status

:: - 0 : Device in fastboot mode detected

:: - 1 : Error



@echo Off



set FASTBOOT_FOLDER_PATH=%~1

set ADB_PATH="%FASTBOOT_FOLDER_PATH%adb"

set FASTBOOT_PATH="%FASTBOOT_FOLDER_PATH%fastboot"

echo "FASTBOOT path:"%FASTBOOT_PATH%



XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX



:fastboot_detect

%FASTBOOT_PATH% oem device-info 2>&1 | findstr /c:"critical unlocked: true"
@@ -41,3 +41,6 @@ call fastboot_detect 
echo "fastboot mode detected, phone is critically unlocked"



exit /b 0



	

	
 No newline at end of file