From 1b7ecc1b931498cb6cc3ca16433c39444631bf33 Mon Sep 17 00:00:00 2001 From: Chris Renshaw Date: Fri, 7 Feb 2025 18:55:29 +0800 Subject: [PATCH] upstream autopif2 from PIFork fix broken pif.json --- module/action.sh | 72 +++++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 32 deletions(-) diff --git a/module/action.sh b/module/action.sh index a007138..c3cec9c 100644 --- a/module/action.sh +++ b/module/action.sh @@ -1,7 +1,8 @@ #!/bin/sh + PATH=/data/adb/ap/bin:/data/adb/ksu/bin:/data/adb/magisk:/data/data/com.termux/files/usr/bin:$PATH MODDIR=/data/adb/modules/playintegrityfix -version=$(grep "^version=" $MODDIR/module.prop | sed 's/version=//g' ) +version=$(grep "^version=" $MODDIR/module.prop | sed 's/version=//g') echo "[+] PlayIntegrityFix $version" echo "[+] $(basename "$0")" @@ -9,11 +10,12 @@ printf "\n\n" download_fail() { dl_domain=$(echo "$1" | awk -F[/:] '{print $4}') + echo "$1" | grep -q "\.zip$" && return ping -c 1 -W 5 "$dl_domain" > /dev/null 2>&1 || { echo "[!] Unable to connect to $dl_domain, please check your internet connection and try again" sleep_pause exit 1 - } + } conflict_module=$(ls /data/adb/modules | grep busybox) for i in $conflict_module; do echo "[!] Please remove $conflict_module and try again." @@ -32,21 +34,21 @@ fi sleep_pause() { # APatch and KernelSU needs this if [ -z "$MMRL" ] && { [ "$KSU" = "true" ] || [ "$APATCH" = "true" ]; }; then - sleep 5 + sleep 2 fi } set_random_beta() { - if [ "$(echo "$MODEL_LIST" | wc -l)" -ne "$(echo "$PRODUCT_LIST" | wc -l)" ]; then - echo "Error: MODEL_LIST and PRODUCT_LIST have different lengths." - sleep_pause - exit 1 - fi - count=$(echo "$MODEL_LIST" | wc -l) - rand_index=$(( $$ % count )) - MODEL=$(echo "$MODEL_LIST" | sed -n "$((rand_index + 1))p") - PRODUCT=$(echo "$PRODUCT_LIST" | sed -n "$((rand_index + 1))p") - DEVICE=$(echo "$PRODUCT" | sed 's/_beta//') + if [ "$(echo "$MODEL_LIST" | wc -l)" -ne "$(echo "$PRODUCT_LIST" | wc -l)" ]; then + echo "Error: MODEL_LIST and PRODUCT_LIST have different lengths." + sleep_pause + exit 1 + fi + count=$(echo "$MODEL_LIST" | wc -l) + rand_index=$(( $$ % count )) + MODEL=$(echo "$MODEL_LIST" | sed -n "$((rand_index + 1))p") + PRODUCT=$(echo "$PRODUCT_LIST" | sed -n "$((rand_index + 1))p") + DEVICE=$(echo "$PRODUCT" | sed 's/_beta//') } # lets try to use tmpfs for processing @@ -56,34 +58,40 @@ TEMPDIR="$MODDIR/temp" #fallback mkdir -p "$TEMPDIR" cd "$TEMPDIR" -download https://developer.android.com/topic/generic-system-image/releases PIXEL_GSI_HTML -grep -m1 -o 'li>.*(Beta)' PIXEL_GSI_HTML | cut -d\> -f2 -grep -m1 -o 'Date:.*' PIXEL_GSI_HTML +# Get latest Pixel Beta information +download https://developer.android.com/about/versions PIXEL_VERSIONS_HTML +BETA_URL=$(grep -o 'https://developer.android.com/about/versions/.*[0-9]"' PIXEL_VERSIONS_HTML | sort -ru | cut -d\" -f1 | head -n1) +download "$BETA_URL" PIXEL_LATEST_HTML -current_timestamp=$(date +%s) -threshold_timestamp=1740312000 # Baklava still not name as 16. TODO: Need to know what is the actually time of changeing the name of release. -if [ "$current_timestamp" -lt "$threshold_timestamp" ]; then - RELEASE="Baklava" +# Handle Developer Preview vs Beta +if grep -qE 'Developer Preview|tooltip>.*preview program' PIXEL_LATEST_HTML; then + # Use the second latest version for beta + BETA_URL=$(grep -o 'https://developer.android.com/about/versions/.*[0-9]"' PIXEL_VERSIONS_HTML | sort -ru | cut -d\" -f1 | head -n2 | tail -n1) + download "$BETA_URL" PIXEL_BETA_HTML else - RELEASE="$(grep -m1 'corresponding Google Pixel builds' PIXEL_GSI_HTML | grep -o '/versions/.*' | cut -d/ -f3)" + mv -f PIXEL_LATEST_HTML PIXEL_BETA_HTML fi -ID="$(grep -m1 -o 'Build:.*' PIXEL_GSI_HTML | cut -d' ' -f2)" -INCREMENTAL="$(grep -m1 -o "$ID-.*-" PIXEL_GSI_HTML | cut -d- -f2)" -download "https://developer.android.com$(grep -m1 'corresponding Google Pixel builds' PIXEL_GSI_HTML | grep -o 'href.*' | cut -d\" -f2)" PIXEL_GET_HTML -download "https://developer.android.com$(grep -m1 'Pixel downloads page' PIXEL_GET_HTML | grep -o 'href.*' | cut -d\" -f2)" PIXEL_BETA_HTML +# Get OTA information +OTA_URL="https://developer.android.com$(grep -o 'href=".*download-ota.*"' PIXEL_BETA_HTML | cut -d\" -f2 | head -n1)" +download "$OTA_URL" PIXEL_OTA_HTML -MODEL_LIST="$(grep -A1 'tr id=' PIXEL_BETA_HTML | grep 'td' | sed 's;.*\(.*\);\1;')" -PRODUCT_LIST="$(grep -o 'factory/.*_beta' PIXEL_BETA_HTML | cut -d/ -f2)" - -download https://source.android.com/docs/security/bulletin/pixel PIXEL_SECBULL_HTML - -SECURITY_PATCH="$(grep -A15 "$(grep -m1 -o 'Security patch level:.*' PIXEL_GSI_HTML | cut -d' ' -f4-)" PIXEL_SECBULL_HTML | grep -m1 -B1 '' | grep 'td' | sed 's;.*\(.*\);\1;')" +# Extract device information +MODEL_LIST="$(grep -A1 'tr id=' PIXEL_OTA_HTML | grep 'td' | sed 's;.*\(.*\);\1;')" +PRODUCT_LIST="$(grep -o 'ota/.*_beta' PIXEL_OTA_HTML | cut -d\/ -f2)" +OTA_LIST="$(grep 'ota/.*_beta' PIXEL_OTA_HTML | cut -d\" -f2)" +# Select and configure device echo "- Selecting Pixel Beta device ..." [ -z "$PRODUCT" ] && set_random_beta echo "$MODEL ($PRODUCT)" +# Get device fingerprint and security patch from OTA metadata +(ulimit -f 2; download "$(echo "$OTA_LIST" | grep "$PRODUCT")" PIXEL_ZIP_METADATA) +FINGERPRINT="$(grep -am1 'post-build=' PIXEL_ZIP_METADATA | cut -d= -f2)" +SECURITY_PATCH="$(grep -am1 'security-patch-level=' PIXEL_ZIP_METADATA | cut -d= -f2)" + +# Get device SDK version sdk_version="$(getprop ro.build.version.sdk)" sdk_version="${sdk_version:-25}" echo "Device SDK version: $sdk_version" @@ -91,7 +99,7 @@ echo "Device SDK version: $sdk_version" echo "- Dumping values to pif.json ..." cat <