From e91bd510e9a3943d2992b9b141e8f3c2b8825a17 Mon Sep 17 00:00:00 2001 From: Dakkshesh Date: Tue, 22 Jul 2025 21:40:22 +0530 Subject: [PATCH] feat: add support for Dakkshesh's TrickyStore fork (#93) - This fork is based on qwq233's version and includes both their name and mine in module.prop. - Unlike qwq233's fork, this version aligns more closely with the official implementation and supports security_patch.txt. - Updated the author name check to ensure the module is only classified as qwq233's fork if my name is not present. TrickyStore OSS: https://github.com/beakthoven/TrickyStore Signed-off-by: Dakkshesh --- module/common/get_extra.sh | 6 +++--- module/webui/scripts/security_patch.js | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/module/common/get_extra.sh b/module/common/get_extra.sh index 8432ab1..f7572ef 100644 --- a/module/common/get_extra.sh +++ b/module/common/get_extra.sh @@ -144,7 +144,7 @@ set_security_patch() { if [ -n "$formatted_security_patch" ] && [ "$TODAY" -lt "$security_patch_after_1y" ]; then TS_version=$(grep "versionCode=" "/data/adb/modules/tricky_store/module.prop" | cut -d'=' -f2) # James Clef's TrickyStore fork (GitHub@qwq233/TrickyStore) - if grep -q "James" "/data/adb/modules/tricky_store/module.prop"; then + if grep -q "James" "/data/adb/modules/tricky_store/module.prop" && ! grep -q "beakthoven" "/data/adb/modules/tricky_store/module.prop"; then SECURITY_PATCH_FILE="/data/adb/tricky_store/devconfig.toml" if grep -q "^securityPatch" "$SECURITY_PATCH_FILE"; then sed -i "s/^securityPatch .*/securityPatch = \"$security_patch\"/" "$SECURITY_PATCH_FILE" @@ -155,8 +155,8 @@ set_security_patch() { sed -i "s/^\[deviceProps\]/securityPatch = \"$security_patch\"\n&/" "$SECURITY_PATCH_FILE" fi fi - # Official TrickyStore which supports custom security patch - elif [ "$TS_version" -ge 158 ]; then + # Dakkshesh's fork (GitHub@beakthoven/TrickyStore) or Official TrickyStore which supports custom security patch + elif [ "$TS_version" -ge 158 ] || grep -q "beakthoven" "/data/adb/modules/tricky_store/module.prop"; then SECURITY_PATCH_FILE="/data/adb/tricky_store/security_patch.txt" printf "system=prop\nboot=%s\nvendor=%s\n" "$security_patch" "$security_patch" > "$SECURITY_PATCH_FILE" chmod 644 "$SECURITY_PATCH_FILE" diff --git a/module/webui/scripts/security_patch.js b/module/webui/scripts/security_patch.js index 3a953b2..45755e6 100644 --- a/module/webui/scripts/security_patch.js +++ b/module/webui/scripts/security_patch.js @@ -235,7 +235,7 @@ function isValid8Digit(value) { // Initialize event listeners export function securityPatch() { - exec(`grep -q "James" "/data/adb/modules/tricky_store/module.prop"`) + exec(`grep -q "James" "/data/adb/modules/tricky_store/module.prop" && ! grep -q "beakthoven" "/data/adb/modules/tricky_store/module.prop"`) .then(({ errno }) => { if (errno === 0) { jamesFork = true;