From a10dbd84d23dc944ab0b45b2738ed6e2e734ae8d Mon Sep 17 00:00:00 2001 From: daboynb <106079917+daboynb@users.noreply.github.com> Date: Wed, 15 Jan 2025 21:19:11 +0100 Subject: [PATCH] v1.11 --- Readme.md | 6 +++--- action.sh | 14 ++++++++++---- changelog.md | 2 +- customize.sh | 10 ++++++---- module.prop | 8 ++++---- service.sh | 6 +++--- system/bin/fp | 7 +++++-- system/bin/fpd | 7 +++++-- update.json | 6 +++--- 9 files changed, 40 insertions(+), 26 deletions(-) diff --git a/Readme.md b/Readme.md index 85b3dca..55454ba 100644 --- a/Readme.md +++ b/Readme.md @@ -19,13 +19,13 @@ https://t.me/playfixnext # How to configure extra settings 1) You can set your own check interval by specifying the number of minutes inside the file: - `/data/adb/modules/playcurl_NEXT/minutes.txt` + `/data/adb/modules/playcurlNEXT/minutes.txt` (minimum 1 minute, maximum 1400 minutes) Reboot to apply. 2) You can set whether you want to use a random beta FP from the last month (since multiple are available) or the latest one. - Follow these steps to configure: - a) Open the file: `/data/adb/modules/playcurl_NEXT/mode.txt` + a) Open the file: `/data/adb/modules/playcurlNEXT/mode.txt` b) Write `random` in the file if you want to use a random FP. c) Write `normal` or leave the file empty if you want to use the latest one. @@ -39,7 +39,7 @@ Reboot to apply. Instructions for device integrity : - Download play integrity fix - - Download playcurl_NEXT + - Download playcurlNEXT - Install both - Reboot - Open Spic and check for integrity diff --git a/action.sh b/action.sh index 6143262..db4fef6 100644 --- a/action.sh +++ b/action.sh @@ -44,8 +44,8 @@ key() { # Default to 'main' branch branch="main" - if [ -f "/data/adb/modules/playcurl_NEXT/mode.txt" ]; then - mode_value=$(cat /data/adb/modules/playcurl_NEXT/mode.txt) + if [ -f "/data/adb/modules/playcurlNEXT/mode.txt" ]; then + mode_value=$(cat /data/adb/modules/playcurlNEXT/mode.txt) # If the value in mode.txt is "random", use the random branch if [ "$mode_value" = "random" ]; then @@ -83,6 +83,9 @@ key() { # Download chiteroman.json from the selected branch if /system/bin/curl -L "https://raw.githubusercontent.com/daboynb/autojson/$branch/chiteroman.json" -o /data/adb/pif.json >/dev/null 2>&1; then echo "[+] Successfully downloaded chiteroman.json from $branch branch." + sdk_version="$(getprop ro.build.version.sdk)" + sdk_version="${sdk_version:-25}" + "$busybox_path" sed -E -i "s/\"DEVICE_INITIAL_SDK_INT\": *\"[0-9]+\"/\"DEVICE_INITIAL_SDK_INT\": \"${sdk_version}\"/g" "/data/adb/pif.json" else echo "[-] Failed to download chiteroman.json from $branch branch." fi @@ -123,8 +126,8 @@ key() { # Default to 'main' branch branch="main" - if [ -f "/data/adb/modules/playcurl_NEXT/mode.txt" ]; then - mode_value=$(cat /data/adb/modules/playcurl_NEXT/mode.txt) + if [ -f "/data/adb/modules/playcurlNEXT/mode.txt" ]; then + mode_value=$(cat /data/adb/modules/playcurlNEXT/mode.txt) # If the value in mode.txt is "random", use the random branch if [ "$mode_value" = "random" ]; then @@ -163,6 +166,9 @@ key() { # Download chiteroman.json from the selected branch if /system/bin/curl -L "https://raw.githubusercontent.com/daboynb/autojson/$branch/chiteroman.json" -o /data/adb/pif.json >/dev/null 2>&1; then echo "[+] Successfully downloaded chiteroman.json from $branch branch." + sdk_version="$(getprop ro.build.version.sdk)" + sdk_version="${sdk_version:-25}" + "$busybox_path" sed -E -i "s/\"DEVICE_INITIAL_SDK_INT\": *\"[0-9]+\"/\"DEVICE_INITIAL_SDK_INT\": \"${sdk_version}\"/g" "/data/adb/pif.json" else echo "[-] Failed to download chiteroman.json from $branch branch." fi diff --git a/changelog.md b/changelog.md index ed8fa08..cfb6d51 100644 --- a/changelog.md +++ b/changelog.md @@ -1 +1 @@ -V1.10 -> Fix an error copying thr fp.sh to tmp. \ No newline at end of file +V1.11 -> Update chiteroman json field parsing. \ No newline at end of file diff --git a/customize.sh b/customize.sh index a85cb89..56e5fb6 100644 --- a/customize.sh +++ b/customize.sh @@ -24,7 +24,7 @@ rm -rf $MODPATH/system/bin/x86_64 ################################################################### # Install playcurl ################################################################### -echo "Installing playcurl" +echo "Installing playcurlNEXT" ################################################################### # Removing old app if exists @@ -40,11 +40,13 @@ if [ -d "/data/adb/modules/playcurl" ]; then touch "/data/adb/modules/playcurl/remove" fi -# Remove old playcurlNEXT module if it exists -if [ -d "/data/adb/modules/playcurlNEXT" ]; then - touch "/data/adb/modules/playcurlNEXT/remove" +# Remove old playcurl_NEXT module if it exists +if [ -d "/data/adb/modules/playcurl_NEXT" ]; then + touch "/data/adb/modules/playcurl_NEXT/remove" fi +# The actual one is playcurlNEXT + ################################################################### # Allow all the scripts to be executable ################################################################### diff --git a/module.prop b/module.prop index efc6503..6187a14 100644 --- a/module.prop +++ b/module.prop @@ -1,7 +1,7 @@ -id=playcurl_NEXT -name=playcurl_NEXT -version=v1.10 -versionCode=110 +id=playcurlNEXT +name=playcurlNEXT +version=v1.11 +versionCode=111 author=daboynb description=Automatic fingerprint downloader for play integrity fix. updateJson=https://raw.githubusercontent.com/daboynb/playcurlNEXT/main/update.json \ No newline at end of file diff --git a/service.sh b/service.sh index af968af..a38af44 100644 --- a/service.sh +++ b/service.sh @@ -32,7 +32,7 @@ fi # Copy and set up cron script ################################################################### # Copy the cron script and set execute permission -cp /data/adb/modules/playcurl_NEXT/system/bin/fp /data/local/tmp/fp.sh +cp /data/adb/modules/playcurlNEXT/system/bin/fp /data/local/tmp/fp.sh chmod +x /data/local/tmp/fp.sh # Ensure crontab directory exists @@ -44,8 +44,8 @@ mkdir -p /data/cron ################################################################### # Read minutes from the file (default to 60 minutes if the file doesn't exist or has an invalid value) minutes=60 -if [ -f "/data/adb/modules/playcurl_NEXT/minutes.txt" ]; then - read_minutes=$(cat /data/adb/modules/playcurl_NEXT/minutes.txt) +if [ -f "/data/adb/modules/playcurlNEXT/minutes.txt" ]; then + read_minutes=$(cat /data/adb/modules/playcurlNEXT/minutes.txt) # Ensure it's a valid positive integer if [ "$read_minutes" -ge 1 ] 2>/dev/null; then diff --git a/system/bin/fp b/system/bin/fp index 81a85fd..86c073c 100644 --- a/system/bin/fp +++ b/system/bin/fp @@ -21,8 +21,8 @@ fi # Default to 'main' branch branch="main" -if [ -f "/data/adb/modules/playcurl_NEXT/mode.txt" ]; then - mode_value=$(cat /data/adb/modules/playcurl_NEXT/mode.txt) +if [ -f "/data/adb/modules/playcurlNEXT/mode.txt" ]; then + mode_value=$(cat /data/adb/modules/playcurlNEXT/mode.txt) # If the value in mode.txt is "random", use the random branch if [ "$mode_value" = "random" ]; then @@ -60,6 +60,9 @@ else # Download chiteroman.json from the selected branch if /system/bin/curl -L "https://raw.githubusercontent.com/daboynb/autojson/$branch/chiteroman.json" -o /data/adb/pif.json >/dev/null 2>&1; then echo "[+] Successfully downloaded chiteroman.json from $branch branch." + sdk_version="$(getprop ro.build.version.sdk)" + sdk_version="${sdk_version:-25}" + "$busybox_path" sed -E -i "s/\"DEVICE_INITIAL_SDK_INT\": *\"[0-9]+\"/\"DEVICE_INITIAL_SDK_INT\": \"${sdk_version}\"/g" "/data/adb/pif.json" else echo "[-] Failed to download chiteroman.json from $branch branch." fi diff --git a/system/bin/fpd b/system/bin/fpd index 2d573d5..85b8486 100644 --- a/system/bin/fpd +++ b/system/bin/fpd @@ -21,8 +21,8 @@ fi # Default to 'main' branch branch="main" -if [ -f "/data/adb/modules/playcurl_NEXT/mode.txt" ]; then - mode_value=$(cat /data/adb/modules/playcurl_NEXT/mode.txt) +if [ -f "/data/adb/modules/playcurlNEXT/mode.txt" ]; then + mode_value=$(cat /data/adb/modules/playcurlNEXT/mode.txt) # If the value in mode.txt is "random", use the random branch if [ "$mode_value" = "random" ]; then @@ -61,6 +61,9 @@ else # Download chiteroman.json from the selected branch if /system/bin/curl -L "https://raw.githubusercontent.com/daboynb/autojson/$branch/chiteroman.json" -o /data/adb/pif.json >/dev/null 2>&1; then echo "[+] Successfully downloaded chiteroman.json from $branch branch." + sdk_version="$(getprop ro.build.version.sdk)" + sdk_version="${sdk_version:-25}" + "$busybox_path" sed -E -i "s/\"DEVICE_INITIAL_SDK_INT\": *\"[0-9]+\"/\"DEVICE_INITIAL_SDK_INT\": \"${sdk_version}\"/g" "/data/adb/pif.json" else echo "[-] Failed to download chiteroman.json from $branch branch." fi diff --git a/update.json b/update.json index 86f0762..178f0e3 100644 --- a/update.json +++ b/update.json @@ -1,6 +1,6 @@ { - "version": "v1.10", - "versionCode": 110, - "zipUrl": "https://github.com/daboynb/playcurlNEXT/releases/download/v1.10/playcurlNEXT.zip", + "version": "v1.11", + "versionCode": 111, + "zipUrl": "https://github.com/daboynb/playcurlNEXT/releases/download/v1.11/playcurlNEXT.zip", "changelog": "https://raw.githubusercontent.com/daboynb/playcurlNEXT/main/changelog.md" } \ No newline at end of file