Fix issue Tiktok

- Fix crash on startup
- Fix warning old tiktok version
This commit is contained in:
siritami
2025-01-03 07:57:58 +07:00
parent 4e0a24e86e
commit 354b75bbb0
4 changed files with 27 additions and 12 deletions

View File

@@ -259,15 +259,15 @@ get_apk() {
patch() {
green_log "[+] Patching $1:"
if [ -f "./download/$1.apk" ]; then
local p b m ks a pu opt
local p b m ks a pu opt force
if [ "$3" = inotia ]; then
p="patch " b="-p *.rvp" m="" a="" ks="_ks" pu="--purge=true" opt="--legacy-options=./src/options/$2.json"
p="patch " b="-p *.rvp" m="" a="" ks="_ks" pu="--purge=true" opt="--legacy-options=./src/options/$2.json" force=" --force"
echo "Patching with Revanced-cli inotia"
else
if [[ $(ls revanced-cli-*.jar) =~ revanced-cli-([0-9]+) ]]; then
num=${BASH_REMATCH[1]}
if [ $num -ge 5 ]; then
p="patch " b="-p *.rvp" m="" a="" ks="ks" pu="--purge=true" opt=""
p="patch " b="-p *.rvp" m="" a="" ks="ks" pu="--purge=true" opt="" force=" --force"
echo "Patching with Revanced-cli version 5+"
elif [ $num -eq 4 ]; then
p="patch " b="--patch-bundle *patch*.jar" m="--merge *integration*.apk " a="" ks="ks" pu="--purge=true" opt="--options=./src/options/$2.json "
@@ -284,7 +284,7 @@ patch() {
if [ "$3" = inotia ]; then
unset CI GITHUB_ACTION GITHUB_ACTIONS GITHUB_ACTOR GITHUB_ENV GITHUB_EVENT_NAME GITHUB_EVENT_PATH GITHUB_HEAD_REF GITHUB_JOB GITHUB_REF GITHUB_REPOSITORY GITHUB_RUN_ID GITHUB_RUN_NUMBER GITHUB_SHA GITHUB_WORKFLOW GITHUB_WORKSPACE RUN_ID RUN_NUMBER
fi
eval java -jar *cli*.jar $p$b $m$opt --out=./release/$1-$2.apk$excludePatches$includePatches --keystore=./src/$ks.keystore $pu $a./download/$1.apk
eval java -jar *cli*.jar $p$b $m$opt --out=./release/$1-$2.apk$excludePatches$includePatches --keystore=./src/$ks.keystore $pu$force $a./download/$1.apk
unset version
unset lock_version
unset excludePatches