revert change

This commit is contained in:
siritami
2023-10-10 13:25:16 +07:00
parent af88761204
commit 2612cb53b8
2 changed files with 24 additions and 24 deletions

View File

@@ -10,7 +10,8 @@ checker "inotia00/revanced-patches" "revanced-extended"
################################################# #################################################
# Download requirements # Download requirements
dl_gh "revanced-patches revanced-cli revanced-integrations" "inotia00" "latest" dl_gh "revanced-patches revanced-integrations" "inotia00" "latest"
dl_gh "revanced-cli" "revanced" "latest"
################################################# #################################################
@@ -18,7 +19,7 @@ dl_gh "revanced-patches revanced-cli revanced-integrations" "inotia00" "latest"
get_patches_key "youtube-revanced-extended" get_patches_key "youtube-revanced-extended"
get_ver "Hide general ads" "com.google.android.youtube" get_ver "Hide general ads" "com.google.android.youtube"
get_apk "youtube" "youtube" "google-inc/youtube/youtube" get_apk "youtube" "youtube" "google-inc/youtube/youtube"
patch "youtube" "revanced-extended" "rve" patch "youtube" "revanced-extended"
################################################# #################################################
@@ -27,26 +28,26 @@ patch "youtube" "revanced-extended" "rve"
get_patches_key "youtube-music-revanced-extended" get_patches_key "youtube-music-revanced-extended"
get_ver "Hide music ads" "com.google.android.apps.youtube.music" get_ver "Hide music ads" "com.google.android.apps.youtube.music"
get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a"
patch "youtube-music-arm64-v8a" "revanced-extended" "rve" patch "youtube-music-arm64-v8a" "revanced-extended"
# Armeabi-v7a # Armeabi-v7a
get_patches_key "youtube-music-revanced-extended" get_patches_key "youtube-music-revanced-extended"
get_ver "Hide music ads" "com.google.android.apps.youtube.music" get_ver "Hide music ads" "com.google.android.apps.youtube.music"
get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
patch "youtube-music-armeabi-v7a" "revanced-extended" "rve" patch "youtube-music-armeabi-v7a" "revanced-extended"
################################################# #################################################
# Patch Reddit: # Patch Reddit:
get_patches_key "reddit" get_patches_key "reddit"
get_apk "reddit" "reddit" "redditinc/reddit/reddit" get_apk "reddit" "reddit" "redditinc/reddit/reddit"
patch "reddit" "revanced-extended" "rve" patch "reddit" "revanced-extended"
################################################# #################################################
# Split architecture: # Split architecture:
rm -f revanced-cli* revanced-patches*.jar patches.json rm -f revanced-cli* revanced-patches*.jar patches.json
dl_gh "revanced-cli" "j-hc" "latest" dl_gh "revanced-cli" "j-hc" "latest"
dl_gh "revanced-patches" "inotia00" "latest" dl_gh "revanced-patches" "revanced" "latest"
# Split architecture Youtube: # Split architecture Youtube:
for i in {0..3}; do for i in {0..3}; do
split_arch "youtube-revanced-extended" "youtube-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})" split_arch "youtube-revanced-extended" "youtube-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})"

View File

@@ -127,8 +127,8 @@ get_apk() {
# Patching apps with Revanced CLI: # Patching apps with Revanced CLI:
patch() { patch() {
local p b m ks a if [ -f "$1.apk" ]; then
if [[ -z $3 ]]; then local p b m ks a
if [[ $(ls revanced-cli-*.jar) =~ revanced-cli-([0-9]+) ]]; then if [[ $(ls revanced-cli-*.jar) =~ revanced-cli-([0-9]+) ]]; then
num=${BASH_REMATCH[1]} num=${BASH_REMATCH[1]}
if [ $num -ge 4 ]; then if [ $num -ge 4 ]; then
@@ -148,22 +148,21 @@ patch() {
echo "No revanced-cli supported" echo "No revanced-cli supported"
exit 1 exit 1
fi fi
java -jar revanced-cli*.jar $p\
$b revanced-patches*.jar \
$m revanced-integrations*.apk \
${EXCLUDE_PATCHES[@]} \
${INCLUDE_PATCHES[@]} \
--options=./src/options/$2.json \
--out=./release/$1-$2.apk \
--keystore=./src/$ks.keystore \
$a$1.apk
unset version
unset EXCLUDE_PATCHES
unset INCLUDE_PATCHES
else else
echo "Patching with Revanced-cli inotia version 4+" exit 1
p="patch " b="--patch-bundle" m="--merge" a="" ks="_ks"
fi fi
java -jar revanced-cli*.jar $p\
$b revanced-patches*.jar \
$m revanced-integrations*.apk \
${EXCLUDE_PATCHES[@]} \
${INCLUDE_PATCHES[@]} \
--options=./src/options/$2.json \
--out=./release/$1-$2.apk \
--keystore=./src/$ks.keystore \
$a$1.apk
unset version
unset EXCLUDE_PATCHES
unset INCLUDE_PATCHES
} }
################################################# #################################################