From 3b9f279a8fc00b7551589fe530a0d2c9204d768a Mon Sep 17 00:00:00 2001 From: Fioren <102145692+FiorenMas@users.noreply.github.com> Date: Thu, 18 May 2023 21:20:05 +0700 Subject: [PATCH] Update --- src/build/build-rv.sh | 2 +- src/build/build-rve-android-6-7.sh | 2 +- src/build/build-rve.sh | 2 +- src/build/tools.sh | 71 +++++++++++++++--------------- 4 files changed, 38 insertions(+), 39 deletions(-) diff --git a/src/build/build-rv.sh b/src/build/build-rv.sh index a9f7e83..a4991bc 100644 --- a/src/build/build-rv.sh +++ b/src/build/build-rv.sh @@ -71,7 +71,7 @@ patch "twitter" "twitter-revanced" rm -f ./revanced-cli* dl_gh "revanced-cli" "j-hc" "latest" 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 ls revanced-patches*.jar >> revanced-version.txt diff --git a/src/build/build-rve-android-6-7.sh b/src/build/build-rve-android-6-7.sh index 1a1b26e..8f066d4 100644 --- a/src/build/build-rve-android-6-7.sh +++ b/src/build/build-rve-android-6-7.sh @@ -25,7 +25,7 @@ patch "youtube" "youtube-revanced-extended-android-6-7" rm -f ./revanced-cli* dl_gh "revanced-cli" "j-hc" "latest" 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 ls revanced-patches*.jar >> revanced-extended-android-6-7-version.txt diff --git a/src/build/build-rve.sh b/src/build/build-rve.sh index 973c20f..00e5d00 100644 --- a/src/build/build-rve.sh +++ b/src/build/build-rve.sh @@ -30,7 +30,7 @@ patch "youtube-music" "youtube-music-revanced-extended" rm -f ./revanced-cli* dl_gh "revanced-cli" "j-hc" "latest" 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 ls revanced-patches*.jar >> revanced-extended-version.txt diff --git a/src/build/tools.sh b/src/build/tools.sh index c3f22f7..972c186 100644 --- a/src/build/tools.sh +++ b/src/build/tools.sh @@ -1,22 +1,21 @@ -#!/bin/bash dl_gh() { - for repo in "$1" ; do - wget -qO- "https://api.github.com/repos/"$2"/$repo/releases/"$3"" \ + 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" + 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 + 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 + for word in $(cat src/patches/$1/include-patches) ; do INCLUDE_PATCHES+=("-i $word") done } @@ -29,13 +28,13 @@ get_apk_vers() { 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 + if [[ ${v//[!0-9]/} -gt ${max//[!0-9]/} ]]; then max=$v; fi done - if [[ "$max" = 0 ]]; then echo ""; else echo "$max"; fi + if [[ $max = 0 ]]; then echo ""; else echo "$max"; fi } 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")" echo "$url" url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')" @@ -43,31 +42,31 @@ dl_apk() { req "$url" "$output" } get_apk() { - echo "Downloading "$1"" - local last_ver - last_ver="$version" - last_ver="$"{last_ver:-$"(get_apk_vers "https://www.apkmirror.com/uploads/?appcategory="$2"" | get_largest_ver)"}"" - echo "Choosing version '$"{last_ver}"'" - local base_apk="$1.apk" - dl_url=$"(dl_apk "https://www.apkmirror.com/apk/"$3"-$"{last_ver//./-}"-release/" \ - "APK[^@]*@\([^#]*\)" \ - "$base_apk")" - echo ""$1" version: $"{last_ver}"" - echo "downloaded from: [APKMirror - "$1"]($"dl_url")" -} -get_apk_arch() { - echo "Downloading "$1" ($"{arm64-v8a}")" + echo "Downloading $1" local last_ver last_ver="$version" last_ver="${last_ver:-$(get_apk_vers "https://www.apkmirror.com/uploads/?appcategory=$2" | get_largest_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/" \ + "APK[^@]*@\([^#]*\)" \ + "$base_apk") + echo "$1 version: ${last_ver}" + echo "downloaded from: [APKMirror - $1]($dl_url)" +} +get_apk_arch() { + echo "Downloading $1 (${arm64-v8a})" + local last_ver + last_ver="$version" + last_ver="${last_ver:-$(get_apk_vers "https://www.apkmirror.com/uploads/?appcategory=$2" | get_largest_ver)}" + echo "Choosing version '${last_ver}'" + local base_apk="$1.apk" local regexp_arch='arm64-v8a[^@]*@\([^"]*\)' dl_url=$(dl_apk "https://www.apkmirror.com/apk/$3-${last_ver//./-}-release/" \ "$regexp_arch" \ "$base_apk") - echo ""$1" (${arm64-v8a}) version: $"{last_ver}"" - echo "downloaded from: [APKMirror - "$1" $"{arm64-v8a}"]($dl_url)" + echo "$1 (${arm64-v8a}) version: ${last_ver}" + echo "downloaded from: [APKMirror - $1 ${arm64-v8a}]($dl_url)" } get_ver() { @@ -81,15 +80,15 @@ get_ver() { } patch() { - if [ -f ""$1".apk" ]; then + if [ -f "$1.apk" ]; then java -jar revanced-cli*.jar \ -m revanced-integrations*.apk \ -b revanced-patches*.jar \ - -a "$1".apk \ + -a $1.apk \ ${EXCLUDE_PATCHES[@]} \ ${INCLUDE_PATCHES[@]} \ --keystore=./src/ks.keystore \ - -o ./build/"$2".apk + -o ./build/$2.apk unset version unset EXCLUDE_PATCHES unset INCLUDE_PATCHES @@ -101,18 +100,18 @@ patch() { 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 + for lib in $@; do echo -n "--rip-lib $lib " done } change_arch() { - if [ -f "./build/"$1".apk" ]; then + 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 + -a ./build/$1.apk \ + --keystore=./src/ks.keystore \ + $3 \ + -o ./build/$2.apk else exit 1 fi