mirror of
https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root.git
synced 2026-08-05 02:59:06 +00:00
fix rve addea
This commit is contained in:
siritami
parent
72b5ac3279
commit
620cbfa39b
3 changed files with 89 additions and 66 deletions
|
|
@ -102,43 +102,83 @@ get_patches_key() {
|
|||
includePatches=""
|
||||
excludeLinesFound=false
|
||||
includeLinesFound=false
|
||||
sed -i 's/\r$//' src/patches/$1/include-patches
|
||||
sed -i 's/\r$//' src/patches/$1/exclude-patches
|
||||
if [[ $(ls revanced-cli-*.jar) =~ revanced-cli-([0-9]+) ]]; then
|
||||
num=${BASH_REMATCH[1]}
|
||||
if [ $num -ge 5 ]; then
|
||||
while IFS= read -r line1; do
|
||||
excludePatches+=" -d \"$line1\""
|
||||
excludeLinesFound=true
|
||||
done < src/patches/$1/exclude-patches
|
||||
while IFS= read -r line2; do
|
||||
if [[ "$line2" == *"|"* ]]; then
|
||||
patch_name="${line2%%|*}"
|
||||
options="${line2#*|}"
|
||||
includePatches+=" -e \"${patch_name}\" ${options}"
|
||||
else
|
||||
includePatches+=" -e \"$line2\""
|
||||
fi
|
||||
includeLinesFound=true
|
||||
done < src/patches/$1/include-patches
|
||||
else
|
||||
while IFS= read -r line1; do
|
||||
excludePatches+=" -e \"$line1\""
|
||||
excludeLinesFound=true
|
||||
done < src/patches/$1/exclude-patches
|
||||
|
||||
while IFS= read -r line2; do
|
||||
includePatches+=" -i \"$line2\""
|
||||
includeLinesFound=true
|
||||
done < src/patches/$1/include-patches
|
||||
local patchDir="src/patches/$1"
|
||||
local cliMode=""
|
||||
local patch_name options line1 line2 num
|
||||
|
||||
sed -i 's/\r$//' "$patchDir/include-patches"
|
||||
sed -i 's/\r$//' "$patchDir/exclude-patches"
|
||||
|
||||
if compgen -G "morphe-cli-*.jar" > /dev/null; then
|
||||
cliMode="morphe"
|
||||
elif compgen -G "revanced-cli-*.jar" > /dev/null; then
|
||||
if [[ $(ls revanced-cli-*.jar | head -n1) =~ revanced-cli-([0-9]+) ]]; then
|
||||
num=${BASH_REMATCH[1]}
|
||||
if [ "$num" -ge 5 ]; then
|
||||
cliMode="revanced_new"
|
||||
else
|
||||
cliMode="revanced_old"
|
||||
fi
|
||||
else
|
||||
cliMode="revanced_old"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ "$cliMode" == "morphe" ]]; then
|
||||
while IFS= read -r line1 || [[ -n "$line1" ]]; do
|
||||
[[ -z "$line1" ]] && continue
|
||||
excludePatches+=" -d \"$line1\""
|
||||
excludeLinesFound=true
|
||||
done < "$patchDir/exclude-patches"
|
||||
|
||||
while IFS= read -r line2 || [[ -n "$line2" ]]; do
|
||||
[[ -z "$line2" ]] && continue
|
||||
patch_name="${line2%%|*}" # ignore options part for options.json flow
|
||||
includePatches+=" -e \"$patch_name\""
|
||||
includeLinesFound=true
|
||||
done < "$patchDir/include-patches"
|
||||
|
||||
elif [[ "$cliMode" == "revanced_new" ]]; then
|
||||
while IFS= read -r line1 || [[ -n "$line1" ]]; do
|
||||
[[ -z "$line1" ]] && continue
|
||||
excludePatches+=" -d \"$line1\""
|
||||
excludeLinesFound=true
|
||||
done < "$patchDir/exclude-patches"
|
||||
|
||||
while IFS= read -r line2 || [[ -n "$line2" ]]; do
|
||||
[[ -z "$line2" ]] && continue
|
||||
if [[ "$line2" == *"|"* ]]; then
|
||||
patch_name="${line2%%|*}"
|
||||
options="${line2#*|}"
|
||||
includePatches+=" -e \"${patch_name}\" ${options}"
|
||||
else
|
||||
includePatches+=" -e \"$line2\""
|
||||
fi
|
||||
includeLinesFound=true
|
||||
done < "$patchDir/include-patches"
|
||||
|
||||
elif [[ "$cliMode" == "revanced_old" ]]; then
|
||||
while IFS= read -r line1 || [[ -n "$line1" ]]; do
|
||||
[[ -z "$line1" ]] && continue
|
||||
excludePatches+=" -e \"$line1\""
|
||||
excludeLinesFound=true
|
||||
done < "$patchDir/exclude-patches"
|
||||
|
||||
while IFS= read -r line2 || [[ -n "$line2" ]]; do
|
||||
[[ -z "$line2" ]] && continue
|
||||
includePatches+=" -i \"$line2\""
|
||||
includeLinesFound=true
|
||||
done < "$patchDir/include-patches"
|
||||
fi
|
||||
|
||||
if [ "$excludeLinesFound" = false ]; then
|
||||
excludePatches=""
|
||||
fi
|
||||
if [ "$includeLinesFound" = false ]; then
|
||||
includePatches=""
|
||||
fi
|
||||
|
||||
export excludePatches
|
||||
export includePatches
|
||||
}
|
||||
|
|
@ -359,7 +399,7 @@ patch() {
|
|||
p="patch " b="-p *.rvp" m="" a="" ks=" --keystore=./src/_ks.keystore" pu="--purge=true" opt="--legacy-options=./src/options/$2.json" force=" --force"
|
||||
echo "Patching with Revanced-cli inotia"
|
||||
elif [ "$3" = morphe ]; then
|
||||
p="patch " b="-p *.mpp" m="" a="" ks=" --keystore=./src/morphe.keystore --keystore-password=Morphe --keystore-entry-password=Morphe" pu="--purge=true" opt="" force=" --force"
|
||||
p="patch " b="-p *.mpp" m="" a="" ks=" --keystore=./src/morphe.keystore --keystore-password=Morphe --keystore-entry-password=Morphe" pu="--purge=true" opt="--options-file ./src/options/$2.json" force=" --force"
|
||||
echo "Patching with Morphe"
|
||||
else
|
||||
if [[ $(ls revanced-cli-*.jar) =~ revanced-cli-([0-9]+) ]]; then
|
||||
|
|
@ -382,9 +422,10 @@ patch() {
|
|||
fi
|
||||
fi
|
||||
fi
|
||||
if [ "$3" = inotia ]; then
|
||||
if [[ "$3" = inotia || "$3" = morphe ]]; 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
|
||||
echo "java -jar *cli*.jar $p$b $m$opt --out=./release/$1-$2.apk$excludePatches$includePatches$ks $pu$force $a./download/$1.apk"
|
||||
eval java -jar *cli*.jar $p$b $m$opt --out=./release/$1-$2.apk$excludePatches$includePatches$ks $pu$force $a./download/$1.apk
|
||||
unset version
|
||||
unset lock_version
|
||||
|
|
@ -442,21 +483,16 @@ apk_editor() {
|
|||
(cd "$dir" && zip -qr "../$apk-$keep.apk" .)
|
||||
}
|
||||
|
||||
# Split architectures using Revanced CLI, created by inotia00
|
||||
gen_rip_libs() {
|
||||
for lib in $@; do
|
||||
echo -n "--rip-lib "$lib" "
|
||||
done
|
||||
}
|
||||
# Split architectures using Morphe cli
|
||||
split_arch() {
|
||||
green_log "[+] Splitting $1 to ${archs[i]}:"
|
||||
if [ -f "./release/$1.apk" ]; then
|
||||
eval java -jar revanced-cli*.jar patch \
|
||||
-p *.rvp \
|
||||
$3 \
|
||||
--keystore=./src/_ks.keystore --force \
|
||||
if [ -f "./download/$1.apk" ]; then
|
||||
eval java -jar *cli*.jar patch \
|
||||
-p *.mpp --options-file ./src/options/$2.json \
|
||||
--striplibs ${archs[i]} \
|
||||
--keystore=./src/morphe.keystore --keystore-password=Morphe --keystore-entry-password=Morphe --force \
|
||||
--out=./release/$1-${archs[i]}.apk\
|
||||
./release/$1.apk
|
||||
./download/$1.apk
|
||||
else
|
||||
red_log "[-] Not found $1.apk"
|
||||
exit 1
|
||||
|
|
|
|||
|
|
@ -1,24 +1,12 @@
|
|||
[
|
||||
{
|
||||
"patchName" : "Custom branding name for YouTube",
|
||||
"options" : [ {
|
||||
"key" : "AppName",
|
||||
"value" : "RVX Anddea"
|
||||
} ]
|
||||
}, {
|
||||
"patchName" : "Custom branding name for YouTube Music",
|
||||
"options" : [ {
|
||||
"key" : "AppNameNotification",
|
||||
"value" : "RVX Music Anddea"
|
||||
}, {
|
||||
"key" : "AppNameLauncher",
|
||||
"value" : "RVX Music Anddea"
|
||||
} ]
|
||||
}, {
|
||||
"patchName" : "Spoof streaming data",
|
||||
"options" : [ {
|
||||
"key" : "useMobileWebClient",
|
||||
"value" : true
|
||||
} ]
|
||||
}
|
||||
{
|
||||
"patches": {
|
||||
"Custom branding name for YouTube": {
|
||||
"enabled": true,
|
||||
"options": {
|
||||
"appName": "RVX Anddea"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
]
|
||||
|
|
|
|||
|
|
@ -1,2 +1 @@
|
|||
Custom branding name for YouTube
|
||||
Custom branding icon for YouTube
|
||||
Custom branding
|
||||
|
|
|
|||
Loading…
Reference in a new issue