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

Verified Commit 774dbdfe authored by Rohit Sekhar's avatar Rohit Sekhar Committed by Nicolas Gelot
Browse files

store-rom-info.{sh,bat}: s/qssi_user/qssi-user/g

parent da0114c6

flash-scripts/linux/store-rom-info.sh

+2 −2
Original line number Diff line number Diff line
@@ -53,11 +53,11 @@ curl -o $MURENA_ROM_INFO https://images.ecloud.global/stable/FP4/e-latest-FP4.zi 
MURENA__SECURITY_PATCH=`sed -n 's/^ro.build.version.security_patch=//p' $MURENA_ROM_INFO`

echo "MURENA__SECURITY_PATCH=$MURENA__SECURITY_PATCH"



# For FP4 on stock ROM the key [ro.build.flavor] returns [qssi_user].

# For FP4 on stock ROM the key [ro.build.flavor] returns [qssi-user].

# On Murena OS: returns [lineage_FP4-userdebug]

# This seems to be the most sane way to assert if we are on stock ROM

echo "" > $SECURITY_PATCH

if "$ADB_PATH" shell getprop ro.build.flavor 2>&1 | grep "qssi_user"

if "$ADB_PATH" shell getprop ro.build.flavor 2>&1 | grep "qssi-user"

then

	if "$ADB_PATH" shell getprop ro.boot.vbmeta.device_state 2>&1 | grep "unlocked"

	then

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

+2 −2
Original line number Diff line number Diff line
@@ -60,12 +60,12 @@ set MURENA_ROM_INFO=%ARCHIVE_FOLDER_PATH%%device_model%-rom-info" 


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.flavor] returns [qssi_user].

:: For FP4 on stock ROM the key [ro.build.flavor] returns [qssi-user].

:: On Murena OS: returns [lineage_FP4-userdebug]

:: This seems to be the most sane way to assert if we are on stock ROM

copy /y NUL %SECURITY_PATCH% >NUL 



%ADB_PATH% shell getprop ro.build.flavor 2>&1 | findstr  "qssi_user"

%ADB_PATH% shell getprop ro.build.flavor 2>&1 | findstr  "qssi-user"

if errorLevel 1 (

	::We are NOT on a stock ROM let's assume the job (unlock) is done and continue the process.

	echo "Custom ROM case"