mirror of
https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root.git
synced 2025-12-06 16:17:40 +00:00
Fix bugs
This commit is contained in:
Fioren
@@ -16,9 +16,13 @@ exit 0
|
||||
else
|
||||
rm -f *.txt
|
||||
|
||||
#################################################
|
||||
|
||||
dl_gh "revanced-patches-android6-7 revanced-integrations" "kitadai31" "latest"
|
||||
dl_gh "revanced-cli" "inotia00" "latest"
|
||||
|
||||
#################################################
|
||||
|
||||
# Patch YouTube Extended:
|
||||
get_patches_key "youtube-revanced-extended-6-7"
|
||||
version="17.34.36"
|
||||
@@ -26,6 +30,8 @@ version="17.34.36"
|
||||
get_apk "youtube" "youtube" "google-inc/youtube/youtube"
|
||||
patch "youtube" "youtube-revanced-extended-android-6-7"
|
||||
|
||||
#################################################
|
||||
|
||||
# Split architecture:
|
||||
rm -f revanced-cli*
|
||||
dl_gh "revanced-cli" "j-hc" "latest"
|
||||
@@ -34,5 +40,7 @@ for i in {0..3}; do
|
||||
split_arch "youtube-revanced-extended-android-6-7" "youtube-${archs[i]}-revanced-extended-android-6-7" "$(gen_rip_libs ${libs[i]})"
|
||||
done
|
||||
|
||||
#################################################
|
||||
|
||||
ls revanced-patches*.jar >> revanced-extended-android-6-7-version.txt
|
||||
fi
|
||||
@@ -16,17 +16,25 @@ exit 0
|
||||
else
|
||||
rm -f *.txt
|
||||
|
||||
#################################################
|
||||
|
||||
dl_gh "revanced-patches revanced-cli revanced-integrations" "inotia00" "latest"
|
||||
|
||||
#################################################
|
||||
|
||||
# Patch YouTube Music Extended:
|
||||
# Arm64-v8a
|
||||
get_patches_key "youtube-music-revanced-extended"
|
||||
version="6.01.55"
|
||||
get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
|
||||
patch "youtube-music-arm64-v8a" "youtube-music/youtube-music-arm64-v8a-revanced-extended"
|
||||
patch "youtube-music-arm64-v8a" "youtube-music-arm64-v8a-revanced-extended"
|
||||
# Armeabi-v7a
|
||||
get_patches_key "youtube-music-revanced-extended"
|
||||
version="6.01.55"
|
||||
get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
|
||||
patch "youtube-music-armeabi-v7a" "youtube-music/youtube-music-armeabi-v7a-revanced-extended"
|
||||
patch "youtube-music-armeabi-v7a" "youtube-music-armeabi-v7a-revanced-extended"
|
||||
|
||||
#################################################
|
||||
|
||||
# Patch YouTube Extended:
|
||||
get_patches_key "youtube-revanced-extended"
|
||||
@@ -35,7 +43,9 @@ version="18.17.43"
|
||||
get_apk "youtube" "youtube" "google-inc/youtube/youtube"
|
||||
patch "youtube" "youtube-revanced-extended"
|
||||
|
||||
# Split architecture Youtube:
|
||||
#################################################
|
||||
|
||||
# Split architecture:
|
||||
rm -f revanced-cli*
|
||||
dl_gh "revanced-cli" "j-hc" "latest"
|
||||
# Split architecture Youtube:
|
||||
@@ -43,10 +53,7 @@ for i in {0..3}; do
|
||||
split_arch "youtube-revanced-extended" "youtube-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})"
|
||||
done
|
||||
|
||||
# Merge architecture:
|
||||
dl_gh "APKEditor" "REAndroid" "latest"
|
||||
# Merge architecture YouTube Music:
|
||||
merge_arch "youtube-music" "revanced-extended"
|
||||
#################################################
|
||||
|
||||
ls revanced-patches*.jar >> revanced-extended-version.txt
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -16,35 +16,51 @@ exit 0
|
||||
else
|
||||
rm -f *.txt
|
||||
|
||||
#################################################
|
||||
|
||||
dl_gh "revanced-patches revanced-cli revanced-integrations" "revanced" "latest"
|
||||
|
||||
#################################################
|
||||
|
||||
# Patch Instagram:
|
||||
# Arm64-v8a
|
||||
get_patches_key "instagram"
|
||||
version="271.1.0.21.84"
|
||||
get_apk "instagram-arm64-v8a" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "arm64-v8a"
|
||||
patch "instagram-arm64-v8a" "instagram/instagram-arm64-v8a-revanced"
|
||||
patch "instagram-arm64-v8a" "instagram-arm64-v8a-revanced"
|
||||
# Armeabi-v7a
|
||||
get_patches_key "instagram"
|
||||
version="271.1.0.21.84"
|
||||
get_apk "instagram-armeabi-v7a" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "armeabi-v7a"
|
||||
patch "instagram-armeabi-v7a" "instagram/instagram-armeabi-v7a-revanced"
|
||||
patch "instagram-armeabi-v7a" "instagram-armeabi-v7a-revanced"
|
||||
|
||||
#################################################
|
||||
|
||||
# Patch Messenger:
|
||||
# Arm64-v8a
|
||||
get_patches_key "messenger"
|
||||
get_apk "messenger-arm64-v8a" "messenger" "facebook-2/messenger/messenger" "arm64-v8a"
|
||||
patch "messenger-arm64-v8a" "messenger/messenger-arm64-v8a-revanced"
|
||||
patch "messenger-arm64-v8a" "messenger-arm64-v8a-revanced"
|
||||
# Armeabi-v7a
|
||||
get_patches_key "messenger"
|
||||
get_apk "messenger-armeabi-v7a" "messenger" "facebook-2/messenger/messenger" "armeabi-v7a"
|
||||
patch "messenger-armeabi-v7a" "messenger/messenger-armeabi-v7a-revanced"
|
||||
patch "messenger-armeabi-v7a" "messenger-armeabi-v7a-revanced"
|
||||
|
||||
#################################################
|
||||
|
||||
# Patch YouTube Music:
|
||||
# Arm64-v8a
|
||||
get_patches_key "youtube-music-revanced"
|
||||
get_ver "hide-get-premium" "com.google.android.apps.youtube.music"
|
||||
get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
|
||||
patch "youtube-music-arm64-v8a" "youtube-music/youtube-music-arm64-v8a-revanced"
|
||||
patch "youtube-music-arm64-v8a" "youtube-music-arm64-v8a-revanced"
|
||||
# Armeabi-v7a
|
||||
get_ver "hide-get-premium" "com.google.android.apps.youtube.music"
|
||||
get_patches_key "youtube-music-revanced"
|
||||
get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
|
||||
patch "youtube-music-armeabi-v7a" "youtube-music/youtube-music-armeabi-v7a-revanced"
|
||||
patch "youtube-music-armeabi-v7a" "youtube-music-armeabi-v7a-revanced"
|
||||
|
||||
#################################################
|
||||
|
||||
# Patch YouTube:
|
||||
get_patches_key "youtube-revanced"
|
||||
@@ -52,17 +68,15 @@ get_ver "video-ads" "com.google.android.youtube"
|
||||
get_apk "youtube" "youtube" "google-inc/youtube/youtube"
|
||||
patch "youtube" "youtube-revanced"
|
||||
|
||||
#################################################
|
||||
|
||||
# Patch Twitter:
|
||||
get_patches_key "twitter"
|
||||
version="9.86.0-release.0"
|
||||
get_apk "twitter" "twitter" "twitter-inc/twitter/twitter"
|
||||
patch "twitter" "twitter-revanced"
|
||||
|
||||
# Patch Reddit:
|
||||
get_patches_key "reddit"
|
||||
get_ver "general-reddit-ads" "com.reddit.frontpage"
|
||||
get_apk "reddit" "reddit" "redditinc/reddit/reddit"
|
||||
patch "reddit" "reddit-revanced"
|
||||
#################################################
|
||||
|
||||
# Patch Twitch:
|
||||
get_patches_key "twitch"
|
||||
@@ -70,11 +84,22 @@ get_ver "block-video-ads" "tv.twitch.android.app"
|
||||
get_apk "twitch" "twitch" "twitch-interactive-inc/twitch/twitch"
|
||||
patch "twitch" "twitch-revanced"
|
||||
|
||||
#################################################
|
||||
|
||||
# Patch Reddit:
|
||||
get_patches_key "reddit"
|
||||
get_apk "reddit" "reddit" "redditinc/reddit/reddit"
|
||||
patch "reddit" "reddit-revanced"
|
||||
|
||||
#################################################
|
||||
|
||||
# Patch Windy:
|
||||
get_patches_key "windy"
|
||||
get_apk "windy" "windy-wind-weather-forecast" "windy-weather-world-inc/windy-wind-weather-forecast/windy-wind-weather-forecast"
|
||||
patch "windy" "windy-revanced"
|
||||
|
||||
#################################################
|
||||
|
||||
# Patch Tiktok:
|
||||
rm -f patches*.json revanced-patches*.jar revanced-integrations*.apk revanced-cli*.jar
|
||||
dl_gh "revanced-patches" "revanced" "tags/v2.173.0"
|
||||
@@ -85,6 +110,8 @@ version="27.8.3"
|
||||
get_apk "tiktok" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly"
|
||||
patch "tiktok" "tiktok-revanced"
|
||||
|
||||
#################################################
|
||||
|
||||
# Split architecture:
|
||||
rm -f revanced-cli*
|
||||
dl_gh "revanced-cli" "j-hc" "latest"
|
||||
@@ -92,31 +119,8 @@ dl_gh "revanced-cli" "j-hc" "latest"
|
||||
for i in {0..3}; do
|
||||
split_arch "youtube-revanced" "youtube-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})"
|
||||
done
|
||||
# Split architecture Reddit:
|
||||
#for i in 0 1; do
|
||||
# split_arch "reddit-revanced" "reddit-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})"
|
||||
#done
|
||||
# Split architecture Twitch:
|
||||
#for i in 0 1; do
|
||||
# split_arch "twitch-revanced" "twitch-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})"
|
||||
#done
|
||||
# Split architecture Tiktok:
|
||||
#for i in 0 1; do
|
||||
# split_arch "tiktok-revanced" "tiktok-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})"
|
||||
#done
|
||||
# Split architecture Twitter:
|
||||
#for i in 0 1; do
|
||||
# split_arch "twitter-revanced" "twitter-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})"
|
||||
#done
|
||||
|
||||
# Merge architecture:
|
||||
dl_gh "APKEditor" "REAndroid" "latest"
|
||||
# Merge architecture Messenger:
|
||||
merge_arch "messenger" "revanced"
|
||||
# Merge architecture Instagram:
|
||||
merge_arch "instagram" "revanced"
|
||||
# Merge architecture YouTube Music:
|
||||
merge_arch "youtube-music" "revanced"
|
||||
#################################################
|
||||
|
||||
ls revanced-patches*.jar >> revanced-version.txt
|
||||
fi
|
||||
fi
|
||||
|
||||
@@ -1,127 +1,133 @@
|
||||
#!/bin/bash
|
||||
|
||||
#################################################
|
||||
|
||||
dl_gh() {
|
||||
for repo in $1 ; do
|
||||
wget -qO- "https://api.github.com/repos/$2/$repo/releases/$3" \
|
||||
| jq -r '.assets[] | "\(.browser_download_url) \(.name)"' \
|
||||
| while read -r url names; do
|
||||
echo "Downloading $names from $url"
|
||||
wget -q -O "$names" $url
|
||||
done
|
||||
done
|
||||
for repo in $1 ; do
|
||||
wget -qO- "https://api.github.com/repos/$2/$repo/releases/$3" \
|
||||
| jq -r '.assets[] | "\(.browser_download_url) \(.name)"' \
|
||||
| while read -r url names; do
|
||||
echo "Downloading $names from $url"
|
||||
wget -q -O "$names" $url
|
||||
done
|
||||
done
|
||||
echo "All assets downloaded"
|
||||
}
|
||||
|
||||
#################################################
|
||||
|
||||
get_patches_key() {
|
||||
EXCLUDE_PATCHES=()
|
||||
for word in $(cat src/patches/$1/exclude-patches) ; do
|
||||
EXCLUDE_PATCHES+=("-e $word")
|
||||
done
|
||||
INCLUDE_PATCHES=()
|
||||
for word in $(cat src/patches/$1/include-patches) ; do
|
||||
INCLUDE_PATCHES+=("-i $word")
|
||||
done
|
||||
EXCLUDE_PATCHES=()
|
||||
for word in $(cat src/patches/$1/exclude-patches) ; do
|
||||
EXCLUDE_PATCHES+=("-e $word")
|
||||
done
|
||||
INCLUDE_PATCHES=()
|
||||
for word in $(cat src/patches/$1/include-patches) ; do
|
||||
INCLUDE_PATCHES+=("-i $word")
|
||||
done
|
||||
}
|
||||
|
||||
#################################################
|
||||
|
||||
get_ver() {
|
||||
version=$(jq -r --arg patch_name "$1" --arg pkg_name "$2" '
|
||||
.[]
|
||||
| select(.name == $patch_name)
|
||||
| .compatiblePackages[]
|
||||
| select(.name == $pkg_name)
|
||||
| .versions[-1]
|
||||
' patches.json)
|
||||
}
|
||||
|
||||
#################################################
|
||||
|
||||
req() {
|
||||
wget -nv -O "$2" -U "Mozilla/5.0 (X11; Linux x86_64; rv:111.0) Gecko/20100101 Firefox/111.0" "$1"
|
||||
wget -nv -O "$2" -U "Mozilla/5.0 (X11; Linux x86_64; rv:111.0) Gecko/20100101 Firefox/111.0" "$1"
|
||||
}
|
||||
|
||||
get_apk_vers() {
|
||||
req "$1" - | sed -n 's;.*Version:</span><span class="infoSlide-value">\(.*\) </span>.*;\1;p'
|
||||
req "$1" - | sed -n 's;.*Version:</span><span class="infoSlide-value">\(.*\) </span>.*;\1;p'
|
||||
}
|
||||
|
||||
get_largest_ver() {
|
||||
local max=0
|
||||
while read -r v || [ -n "$v" ]; do
|
||||
if [[ ${v//[!0-9]/} -gt ${max//[!0-9]/} ]]; then max=$v; fi
|
||||
done
|
||||
if [[ $max = 0 ]]; then echo ""; else echo "$max"; fi
|
||||
local max=0
|
||||
while read -r v || [ -n "$v" ]; do
|
||||
if [[ ${v//[!0-9]/} -gt ${max//[!0-9]/} ]]; then max=$v; fi
|
||||
done
|
||||
if [[ $max = 0 ]]; then echo ""; else echo "$max"; fi
|
||||
}
|
||||
|
||||
dl_apk() {
|
||||
local url=$1 regexp=$2 output=$3
|
||||
url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n "s/href=\"/@/g; s;.*${regexp}.*;\1;p")"
|
||||
echo "$url"
|
||||
url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')"
|
||||
url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')"
|
||||
req "$url" "$output"
|
||||
local url=$1 regexp=$2 output=$3
|
||||
url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n "s/href=\"/@/g; s;.*${regexp}.*;\1;p")"
|
||||
echo "$url"
|
||||
url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')"
|
||||
url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')"
|
||||
req "$url" "$output"
|
||||
}
|
||||
|
||||
get_apk() {
|
||||
if [[ -z $4 ]]; then
|
||||
url_regexp='APK</span>[^@]*@\([^#]*\)'
|
||||
else
|
||||
case $4 in
|
||||
arm64-v8a) url_regexp='arm64-v8a</div>[^@]*@\([^"]*\)' ;;
|
||||
armeabi-v7a) url_regexp='armeabi-v7a</div>[^@]*@\([^"]*\)' ;;
|
||||
x86) url_regexp='x86</div>[^@]*@\([^"]*\)' ;;
|
||||
x86_64) url_regexp='x86_64</div>[^@]*@\([^"]*\)' ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
fi
|
||||
export version="$version"
|
||||
if [[ -z $version ]]; then
|
||||
version=${version:-$(get_apk_vers "https://www.apkmirror.com/uploads/?appcategory=$2" | get_largest_ver)}
|
||||
fi
|
||||
local base_apk="$1.apk"
|
||||
local dl_url=$(dl_apk "https://www.apkmirror.com/apk/$3-${version//./-}-release/" \
|
||||
"$url_regexp" \
|
||||
"$base_apk")
|
||||
if [[ -z $4 ]]; then
|
||||
url_regexp='APK</span>[^@]*@\([^#]*\)'
|
||||
else
|
||||
case $4 in
|
||||
arm64-v8a) url_regexp='arm64-v8a</div>[^@]*@\([^"]*\)' ;;
|
||||
armeabi-v7a) url_regexp='armeabi-v7a</div>[^@]*@\([^"]*\)' ;;
|
||||
x86) url_regexp='x86</div>[^@]*@\([^"]*\)' ;;
|
||||
x86_64) url_regexp='x86_64</div>[^@]*@\([^"]*\)' ;;
|
||||
*) return 1 ;;
|
||||
esac
|
||||
fi
|
||||
export version="$version"
|
||||
if [[ -z $version ]]; then
|
||||
version=${version:-$(get_apk_vers "https://www.apkmirror.com/uploads/?appcategory=$2" | get_largest_ver)}
|
||||
fi
|
||||
local base_apk="$1.apk"
|
||||
local dl_url=$(dl_apk "https://www.apkmirror.com/apk/$3-${version//./-}-release/" \
|
||||
"$url_regexp" \
|
||||
"$base_apk")
|
||||
}
|
||||
|
||||
get_ver() {
|
||||
version=$(jq -r --arg patch_name "$1" --arg pkg_name "$2" '
|
||||
.[]
|
||||
| select(.name == $patch_name)
|
||||
| .compatiblePackages[]
|
||||
| select(.name == $pkg_name)
|
||||
| .versions[-1]
|
||||
' patches.json)
|
||||
}
|
||||
#################################################
|
||||
|
||||
patch() {
|
||||
if [ -f "$1.apk" ]; then
|
||||
java -jar revanced-cli*.jar \
|
||||
-m revanced-integrations*.apk \
|
||||
-b revanced-patches*.jar \
|
||||
-a $1.apk \
|
||||
${EXCLUDE_PATCHES[@]} \
|
||||
${INCLUDE_PATCHES[@]} \
|
||||
--keystore=./src/ks.keystore \
|
||||
-o ./build/$2.apk
|
||||
if grep -q "/" <<< "$2"; then
|
||||
local name=$(basename “$2”)
|
||||
cp ./build/$2.apk ./build/$name.apk
|
||||
fi
|
||||
unset version
|
||||
unset EXCLUDE_PATCHES
|
||||
unset INCLUDE_PATCHES
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
if [ -f "$1.apk" ]; then
|
||||
java -jar revanced-cli*.jar \
|
||||
-m revanced-integrations*.apk \
|
||||
-b revanced-patches*.jar \
|
||||
-a $1.apk \
|
||||
${EXCLUDE_PATCHES[@]} \
|
||||
${INCLUDE_PATCHES[@]} \
|
||||
--keystore=./src/ks.keystore \
|
||||
-o ./build/$2.apk
|
||||
unset version
|
||||
unset EXCLUDE_PATCHES
|
||||
unset INCLUDE_PATCHES
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
merge_arch() {
|
||||
java -jar APKEditor*.jar m \
|
||||
-i ./build/$1
|
||||
mv -i ./build/"$1"_merged.apk ./build/"$1"-"$2".apk
|
||||
}
|
||||
#################################################
|
||||
|
||||
archs=("arm64-v8a" "armeabi-v7a" "x86_64" "x86")
|
||||
libs=("x86_64 x86 armeabi-v7a" "x86_64 x86 arm64-v8a" "x86 armeabi-v7a arm64-v8a" "x86_64 armeabi-v7a arm64-v8a")
|
||||
gen_rip_libs() {
|
||||
for lib in $@; do
|
||||
echo -n "--rip-lib $lib "
|
||||
done
|
||||
for lib in $@; do
|
||||
echo -n "--rip-lib $lib "
|
||||
done
|
||||
}
|
||||
split_arch() {
|
||||
if [ -f "./build/$1.apk" ]; then
|
||||
java -jar revanced-cli*.jar \
|
||||
-b revanced-patches*.jar \
|
||||
-a ./build/$1.apk \
|
||||
--keystore=./src/ks.keystore \
|
||||
$3 \
|
||||
-o ./build/$2.apk
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
if [ -f "./build/$1.apk" ]; then
|
||||
java -jar revanced-cli*.jar \
|
||||
-b revanced-patches*.jar \
|
||||
-a ./build/$1.apk \
|
||||
--keystore=./src/ks.keystore \
|
||||
$3 \
|
||||
-o ./build/$2.apk
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
#################################################
|
||||
Reference in New Issue
Block a user