bogdan54/Revanced-And-Revanced-Extended-Non-Root
Template
1
0
Fork 0
mirror of https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root.git synced 2025-12-06 08:07:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update

Browse Source
This commit is contained in:
Fioren
2023-05-18 21:14:19 +07:00
parent c30ef7c6d2
commit a86ae44228
4 changed files with 40 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/build/build-rv.sh
View File

@@ -6,7 +6,7 @@ curl -sL -O $(curl -s "https://api.github.com/repos/revanced/revanced-patches/re
ls revanced-patches*.jar >> new.txt ls revanced-patches*.jar >> new.txt
curl -sL -O $(curl -s "https://api.github.com/repos/$repository/releases/latest" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url') curl -sL -O $(curl -s "https://api.github.com/repos/$repository/releases/latest" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url')
if diff -q revanced-version.txt new.txt >/dev/null ; then if diff -q revanced-version.txt new.txt >/dev/null ; then
rm -f revanced-patches*.jar *.txt rm -f ./revanced-patches*.jar ./*.txt
echo "Old patch!!! Not build" echo "Old patch!!! Not build"
exit 0 exit 0
else else
@@ -60,7 +60,7 @@ get_apk_arch "youtube-music" "youtube-music" "google-inc/youtube-music/youtube-m
patch "youtube-music" "youtube-music-revanced" patch "youtube-music" "youtube-music-revanced"
# Patch Twitter # Patch Twitter
rm -f revanced-integrations*.apk rm -f ./revanced-integrations*.apk
dl_gh "revanced-integrations" "revanced" "tags/v0.103.0" dl_gh "revanced-integrations" "revanced" "tags/v0.103.0"
get_patches_key "twitter" get_patches_key "twitter"
version="9.86.0-release.0" version="9.86.0-release.0"
@@ -68,10 +68,10 @@ get_apk "twitter" "twitter" "twitter-inc/twitter/twitter"
patch "twitter" "twitter-revanced" patch "twitter" "twitter-revanced"
# Change architecture # Change architecture
rm -f revanced-cli* rm -f ./revanced-cli*
dl_gh "revanced-cli" "j-hc" "latest" dl_gh "revanced-cli" "j-hc" "latest"
for i in {0..3}; do for i in {0..3}; do
change_arch "youtube-revanced" "youtube-revanced-${archs[i]}" "$(gen_rip_libs ${libs[i]})" change_arch "youtube-revanced" "youtube-revanced-"${archs[i]}"" "$(gen_rip_libs "${libs[i]}")"
done done
ls revanced-patches*.jar >> revanced-version.txt ls revanced-patches*.jar >> revanced-version.txt

6
src/build/build-rve-android-6-7.sh
View File

@@ -6,7 +6,7 @@ curl -sL -O $(curl -s "https://api.github.com/repos/kitadai31/revanced-patches-a
ls revanced-patches*.jar >> new.txt ls revanced-patches*.jar >> new.txt
curl -sL -O $(curl -s "https://api.github.com/repos/$repository/releases/latest" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url') curl -sL -O $(curl -s "https://api.github.com/repos/$repository/releases/latest" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url')
if diff -q revanced-version.txt new.txt >/dev/null ; then if diff -q revanced-version.txt new.txt >/dev/null ; then
rm -f revanced-patches*.jar *.txt rm -f ./revanced-patches*.jar ./*.txt
echo "Old patch!!! Not build" echo "Old patch!!! Not build"
exit 0 exit 0
else else
@@ -22,10 +22,10 @@ get_apk "youtube" "youtube" "google-inc/youtube/youtube"
patch "youtube" "youtube-revanced-extended-android-6-7" patch "youtube" "youtube-revanced-extended-android-6-7"
# Change architecture # Change architecture
rm -f revanced-cli* rm -f ./revanced-cli*
dl_gh "revanced-cli" "j-hc" "latest" dl_gh "revanced-cli" "j-hc" "latest"
for i in {0..3}; do for i in {0..3}; do
change_arch "youtube-revanced-extended-android-6-7" "youtube-revanced-extended-android-6-7-${archs[i]}" "$(gen_rip_libs ${libs[i]})" change_arch "youtube-revanced-extended-android-6-7" "youtube-revanced-extended-android-6-7-"${archs[i]}"" "$(gen_rip_libs "${libs[i]}")"
done done
ls revanced-patches*.jar >> revanced-extended-android-6-7-version.txt ls revanced-patches*.jar >> revanced-extended-android-6-7-version.txt

6
src/build/build-rve.sh
View File

@@ -6,7 +6,7 @@ curl -sL -O $(curl -s "https://api.github.com/repos/inotia00/revanced-patches/re
ls revanced-patches*.jar >> new.txt ls revanced-patches*.jar >> new.txt
curl -sL -O $(curl -s "https://api.github.com/repos/$repository/releases/latest" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url') curl -sL -O $(curl -s "https://api.github.com/repos/$repository/releases/latest" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url')
if diff -q revanced-version.txt new.txt >/dev/null ; then if diff -q revanced-version.txt new.txt >/dev/null ; then
rm -f revanced-patches*.jar *.txt rm -f ./revanced-patches*.jar ./*.txt
echo "Old patch!!! Not build" echo "Old patch!!! Not build"
exit 0 exit 0
else else
@@ -27,10 +27,10 @@ get_apk_arch "youtube-music" "youtube-music" "google-inc/youtube-music/youtube-m
patch "youtube-music" "youtube-music-revanced-extended" patch "youtube-music" "youtube-music-revanced-extended"
# Change architecture # Change architecture
rm -f revanced-cli* rm -f ./revanced-cli*
dl_gh "revanced-cli" "j-hc" "latest" dl_gh "revanced-cli" "j-hc" "latest"
for i in {0..3}; do for i in {0..3}; do
change_arch "youtube-revanced-extended" "youtube-revanced-extended-${archs[i]}" "$(gen_rip_libs ${libs[i]})" change_arch "youtube-revanced-extended" "youtube-revanced-extended-"${archs[i]}"" "$(gen_rip_libs "${libs[i]}")"
done done
ls revanced-patches*.jar >> revanced-extended-version.txt ls revanced-patches*.jar >> revanced-extended-version.txt

59
src/build/tools.sh
View File

@@ -1,21 +1,22 @@
#!/bin/bash
dl_gh() { dl_gh() {
for repo in $1 ; do for repo in "$1" ; do
wget -qO- "https://api.github.com/repos/$2/$repo/releases/$3" \ wget -qO- "https://api.github.com/repos/"$2"/$repo/releases/"$3"" \
| jq -r '.assets[] | "\(.browser_download_url) \(.name)"' \ | jq -r '.assets[] | "\(.browser_download_url) \(.name)"' \
| while read -r url names; do | while read -r url names; do
echo "Downloading $names from $url" echo "Downloading "$names" from "$url""
wget -q -O "$names" $url wget -q -O "$names" "$url"
done done
done done
echo "All assets downloaded" echo "All assets downloaded"
} }
get_patches_key() { get_patches_key() {
EXCLUDE_PATCHES=() EXCLUDE_PATCHES=()
for word in $(cat src/patches/$1/exclude-patches) ; do for word in $(cat src/patches/"$1"/exclude-patches) ; do
EXCLUDE_PATCHES+=("-e $word") EXCLUDE_PATCHES+=("-e $word")
done done
INCLUDE_PATCHES=() INCLUDE_PATCHES=()
for word in $(cat src/patches/$1/include-patches) ; do for word in $(cat src/patches/"$1"/include-patches) ; do
INCLUDE_PATCHES+=("-i $word") INCLUDE_PATCHES+=("-i $word")
done done
} }
@@ -28,13 +29,13 @@ get_apk_vers() {
get_largest_ver() { get_largest_ver() {
local max=0 local max=0
while read -r v || [ -n "$v" ]; do while read -r v || [ -n "$v" ]; do
if [[ ${v//[!0-9]/} -gt ${max//[!0-9]/} ]]; then max=$v; fi if [[ $"{v//[!0-9]/}" -gt $"{max//[!0-9]/}" ]]; then max=$v; fi
done done
if [[ $max = 0 ]]; then echo ""; else echo "$max"; fi if [[ "$max" = 0 ]]; then echo ""; else echo "$max"; fi
} }
dl_apk() { dl_apk() {
local url=$1 regexp=$2 output=$3 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")" url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n "s/href=\"/@/g; s;.*${regexp}.*;\1;p")"
echo "$url" 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')"
@@ -42,31 +43,31 @@ dl_apk() {
req "$url" "$output" req "$url" "$output"
} }
get_apk() { get_apk() {
echo "Downloading $1" echo "Downloading "$1""
local last_ver local last_ver
last_ver="$version" last_ver="$version"
last_ver="${last_ver:-$(get_apk_vers "https://www.apkmirror.com/uploads/?appcategory=$2" | get_largest_ver)}" last_ver="$"{last_ver:-$"(get_apk_vers "https://www.apkmirror.com/uploads/?appcategory="$2"" | get_largest_ver)"}""
echo "Choosing version '${last_ver}'" echo "Choosing version '$"{last_ver}"'"
local base_apk="$1.apk" local base_apk="$1.apk"
dl_url=$(dl_apk "https://www.apkmirror.com/apk/$3-${last_ver//./-}-release/" \ dl_url=$"(dl_apk "https://www.apkmirror.com/apk/"$3"-$"{last_ver//./-}"-release/" \
"APK</span>[^@]*@\([^#]*\)" \ "APK</span>[^@]*@\([^#]*\)" \
"$base_apk") "$base_apk")"
echo "$1 version: ${last_ver}" echo ""$1" version: $"{last_ver}""
echo "downloaded from: [APKMirror - $1]($dl_url)" echo "downloaded from: [APKMirror - "$1"]($"dl_url")"
} }
get_apk_arch() { get_apk_arch() {
echo "Downloading $1 (${arm64-v8a})" echo "Downloading "$1" ($"{arm64-v8a}")"
local last_ver local last_ver
last_ver="$version" last_ver="$version"
last_ver="${last_ver:-$(get_apk_vers "https://www.apkmirror.com/uploads/?appcategory=$2" | get_largest_ver)}" last_ver="${last_ver:-$(get_apk_vers "https://www.apkmirror.com/uploads/?appcategory=$2" | get_largest_ver)}"
echo "Choosing version '${last_ver}'" echo "Choosing version '${last_ver}'"
local base_apk="$1.apk" local base_apk=""$1".apk"
local regexp_arch='arm64-v8a</div>[^@]*@\([^"]*\)' local regexp_arch='arm64-v8a</div>[^@]*@\([^"]*\)'
dl_url=$(dl_apk "https://www.apkmirror.com/apk/$3-${last_ver//./-}-release/" \ dl_url=$(dl_apk "https://www.apkmirror.com/apk/$3-${last_ver//./-}-release/" \
"$regexp_arch" \ "$regexp_arch" \
"$base_apk") "$base_apk")
echo "$1 (${arm64-v8a}) version: ${last_ver}" echo ""$1" (${arm64-v8a}) version: $"{last_ver}""
echo "downloaded from: [APKMirror - $1 ${arm64-v8a}]($dl_url)" echo "downloaded from: [APKMirror - "$1" $"{arm64-v8a}"]($dl_url)"
} }
get_ver() { get_ver() {
@@ -80,15 +81,15 @@ get_ver() {
} }
patch() { patch() {
if [ -f "$1.apk" ]; then if [ -f ""$1".apk" ]; then
java -jar revanced-cli*.jar \ java -jar revanced-cli*.jar \
-m revanced-integrations*.apk \ -m revanced-integrations*.apk \
-b revanced-patches*.jar \ -b revanced-patches*.jar \
-a $1.apk \ -a "$1".apk \
${EXCLUDE_PATCHES[@]} \ ${EXCLUDE_PATCHES[@]} \
${INCLUDE_PATCHES[@]} \ ${INCLUDE_PATCHES[@]} \
--keystore=./src/ks.keystore \ --keystore=./src/ks.keystore \
-o ./build/$2.apk -o ./build/"$2".apk
unset version unset version
unset EXCLUDE_PATCHES unset EXCLUDE_PATCHES
unset INCLUDE_PATCHES unset INCLUDE_PATCHES
@@ -100,18 +101,18 @@ patch() {
archs=("arm64-v8a" "armeabi-v7a" "x86_64" "x86") 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") 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() { gen_rip_libs() {
for lib in $@; do for lib in "$@"; do
echo -n "--rip-lib $lib " echo -n "--rip-lib $lib "
done done
} }
change_arch() { change_arch() {
if [ -f "./build/$1.apk" ]; then if [ -f "./build/"$1".apk" ]; then
java -jar revanced-cli*.jar \ java -jar revanced-cli*.jar \
-b revanced-patches*.jar \ -b revanced-patches*.jar \
-a ./build/$1.apk \ -a ./build/"$1".apk \
--keystore=./src/ks.keystore \ --keystore=./src/ks.keystore \
$3 \ "$3" \
-o ./build/$2.apk -o ./build/"$2".apk
else else
exit 1 exit 1
fi fi