From 29baffa676733db3acf2b0203f4ecd8b61df549a Mon Sep 17 00:00:00 2001 From: Quinten <55107945+Quinten0508@users.noreply.github.com> Date: Sat, 30 Dec 2023 12:17:06 +0100 Subject: [PATCH] Initial commit --- .github/ISSUE_TEMPLATE/bug_report.md | 11 + .github/workflows/build.yml | 153 ++++ .github/workflows/ci.yml | 49 ++ .gitignore | 10 + CONFIG.md | 45 ++ LICENSE | 674 ++++++++++++++++++ README.md | 53 ++ build-termux.sh | 75 ++ build.sh | 194 +++++ config.toml | 64 ++ ks.keystore | Bin 0 -> 3708 bytes options.json | 1 + .../META-INF/com/google/android/update-binary | 33 + .../com/google/android/updater-script | 1 + scripts/customize.sh | 117 +++ scripts/service.sh | 47 ++ scripts/uninstall.sh | 11 + utils.sh | 557 +++++++++++++++ 18 files changed, 2095 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100755 .github/workflows/build.yml create mode 100755 .github/workflows/ci.yml create mode 100755 .gitignore create mode 100755 CONFIG.md create mode 100755 LICENSE create mode 100755 README.md create mode 100755 build-termux.sh create mode 100755 build.sh create mode 100755 config.toml create mode 100644 ks.keystore create mode 100644 options.json create mode 100755 revanced-magisk/META-INF/com/google/android/update-binary create mode 100755 revanced-magisk/META-INF/com/google/android/updater-script create mode 100755 scripts/customize.sh create mode 100755 scripts/service.sh create mode 100755 scripts/uninstall.sh create mode 100755 utils.sh diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..070f021 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,11 @@ +--- +name: Bug report +about: Bug report +title: '' +labels: '' +assignees: '' + +--- + +**DO NOT REPORT REVANCED BUGS IN THIS REPO** +**Describe the bug of the rvmm builder or the modules** diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100755 index 0000000..266f574 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,153 @@ +name: Build Modules +on: + workflow_call: + inputs: + from_ci: + type: boolean + required: false + default: true + + workflow_dispatch: + +jobs: + run: + permissions: write-all + runs-on: ubuntu-latest + steps: + - uses: actions/setup-java@v3 + with: + distribution: "zulu" + java-version: "17" + + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + submodules: true + + - name: Update config + if: ${{ inputs.from_ci }} + run: | + if git checkout origin/update build.md; then + UPDATE_CFG=$(./build.sh config.toml --config-update) + if [ "$UPDATE_CFG" ]; then + echo "$UPDATE_CFG" > config.toml + fi + fi + + - name: Get next version code + id: next_ver_code + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + TAG=$(gh release list -L 1 | awk -F '\t' '{print $3}') + if [ -z "$TAG" ]; then TAG=0; fi + echo "NEXT_VER_CODE=$((TAG + 1))" >> $GITHUB_OUTPUT + + - name: Build modules/APKs + run: ./build.sh config.toml + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_REPOSITORY: $GITHUB_REPOSITORY + NEXT_VER_CODE: ${{ steps.next_ver_code.outputs.NEXT_VER_CODE }} + + - name: Get output + id: get_output + run: | + DELIM="$(openssl rand -hex 8)" + echo "BUILD_LOG<<${DELIM}" >> "$GITHUB_OUTPUT" + cat build.md >> "$GITHUB_OUTPUT" + echo "${DELIM}" >> "$GITHUB_OUTPUT" + cp -f build.md build.tmp + + - name: Upload modules to release + uses: svenstaro/upload-release-action@v2 + with: + body: ${{ steps.get_output.outputs.BUILD_LOG }} + repo_token: ${{ secrets.GITHUB_TOKEN }} + file: ./build/* + release_name: ReVanced + tag: ${{ steps.next_ver_code.outputs.NEXT_VER_CODE }} + file_glob: true + overwrite: true + + - name: Update changelog and Magisk update json + id: update_config + run: | + git checkout -f update || git switch --discard-changes --orphan update + cp -f build.tmp build.md + get_update_json() { + echo "{ + \"version\": \"$1\", + \"versionCode\": ${{ steps.next_ver_code.outputs.NEXT_VER_CODE}}, + \"zipUrl\": \"$2\", + \"changelog\": \"https://raw.githubusercontent.com/$GITHUB_REPOSITORY/update/build.md\" + }" + } + + cd build || { echo "build folder not found"; exit 1; } + for OUTPUT in *magisk*.zip; do + [ "$OUTPUT" = "*magisk*.zip" ] && continue + ZIP_S=$(unzip -p "$OUTPUT" module.prop) + if ! UPDATE_JSON=$(echo "$ZIP_S" | grep updateJson); then continue; fi + UPDATE_JSON="${UPDATE_JSON##*/}" + VER=$(echo "$ZIP_S" | grep version=) + VER="${VER##*=}" + DLURL="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/releases/download/${{ steps.next_ver_code.outputs.NEXT_VER_CODE }}/${OUTPUT}" + get_update_json "$VER" "$DLURL" >"../$UPDATE_JSON" + done + cd .. + + find . -name "*-update.json" | grep . || : >dummy-update.json + + - uses: stefanzweifel/git-auto-commit-action@v4 + with: + branch: update + skip_checkout: true + file_pattern: build.md *-update.json + commit_message: Bump version ${{ steps.next_ver_code.outputs.NEXT_VER_CODE }} + + - name: Report to Telegram + env: + TG_TOKEN: ${{ secrets.TG_TOKEN }} + if: env.TG_TOKEN != null + run: | + cd build || { echo "build folder not found"; exit 1; } + + TG_CHAT="@rvc_magisk" + NL=$'\n' + APKS="" + MODULES="" + for OUTPUT in *; do + DL_URL="$GITHUB_SERVER_URL/$GITHUB_REPOSITORY/releases/download/${{ steps.next_ver_code.outputs.NEXT_VER_CODE }}/${OUTPUT}" + if [[ $OUTPUT = *.apk ]]; then + APKS+="${NL}📦[${OUTPUT}](${DL_URL})" + elif [[ $OUTPUT = *.zip ]]; then + MODULES+="${NL}📦[${OUTPUT}](${DL_URL})" + fi + done + MODULES=${MODULES#"$NL"} + APKS=${APKS#"$NL"} + + BODY="$(sed 's/^\* \*\*/↪ \*\*/g; s/^\* `/↪ \*\*/g; s/`/\*/g; s/^\* /\↪/g; s/\*\*/\*/g; s/###//g; s/^- /↪ /g; /^==/d;' ../build.md)" + MSG="*New build!* + + ${BODY} + + *▼ Download Links:* + Modules: + ${MODULES} + + APKs: + ${APKS} + " + echo "'$MSG'" + MSG=${MSG:0:9450} + POST="https://api.telegram.org/bot${TG_TOKEN}/sendMessage" + curl -X POST --data-urlencode "parse_mode=Markdown" --data-urlencode "disable_web_page_preview=true" --data-urlencode "text=${MSG}" --data-urlencode "chat_id=${TG_CHAT}" "$POST" + + - uses: actions/upload-artifact@v3 + with: + name: logs + path: logs + if-no-files-found: ignore diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100755 index 0000000..d348b74 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,49 @@ +name: CI +on: + workflow_dispatch: + schedule: + - cron: "0 16 * * *" + +jobs: + check: + permissions: write-all + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - name: Should build? + id: should_build + shell: bash + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + if ! git checkout origin/update build.md; then + echo "first time building!" + echo "SHOULD_BUILD=1" >> $GITHUB_OUTPUT + else + UPDATE_CFG=$(./build.sh config.toml --config-update) + if [ "$UPDATE_CFG" ]; then + echo "SHOULD_BUILD=1" >> $GITHUB_OUTPUT + else + echo "SHOULD_BUILD=0" >> $GITHUB_OUTPUT + fi + fi + + - name: Clear older runs + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh run list -L400 --json databaseId -q '.[].databaseId' | tail -n+10 | xargs -IID gh api "repos/$GITHUB_REPOSITORY/actions/runs/ID" -X DELETE || : + + outputs: + SHOULD_BUILD: ${{ steps.should_build.outputs.SHOULD_BUILD }} + + build: + permissions: write-all + needs: check + uses: ./.github/workflows/build.yml + if: ${{ needs.check.outputs.SHOULD_BUILD == 1 }} + secrets: inherit diff --git a/.gitignore b/.gitignore new file mode 100755 index 0000000..82e39cb --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +*.jar +*.apk +*.zip +/revanced-cache +/temp +/build +test* +/logs +build.md +cmpr diff --git a/CONFIG.md b/CONFIG.md new file mode 100755 index 0000000..31fb00e --- /dev/null +++ b/CONFIG.md @@ -0,0 +1,45 @@ +# Config + +Adding another revanced app is as easy as this: +```toml +[Some-App] +apkmirror-dlurl = "https://www.apkmirror.com/apk/inc/app" +# or uptodown-dlurl = "https://app.en.uptodown.com/android" +# or apkmonk-dlurl = "https://www.apkmonk.com/app/com.app.app/" +``` + +## More about other options: + +There exists an example below with all defaults shown and all the keys explicitly set. +**All keys are optional** (except download urls) and are assigned to their default values if not set explicitly. + +```toml +parallel-jobs = 1 # amount of cores to use for parallel patching, if not set nproc is used +patches-source = "revanced/revanced-patches" # where to fetch patches bundle from. default: "revanced/revanced-patches" +integrations-source = "revanced/revanced-integrations" # where to fetch integrations from. default: "revanced/revanced-integrations" +cli-source = "j-hc/revanced-cli" # where to fetch cli from. default: "j-hc/revanced-cli" +# options like cli-source can also set per app +rv-brand = "ReVanced Extended" # rebrand from 'ReVanced' to something different. default: "ReVanced" + +patches-version = "v2.160.0" # locks the patches version. default: latest available +integrations-version = "v0.95.0" # locks the integrations version. default: latest available + +[Some-App] +app-name = "SomeApp" # if set, release name becomes SomeApp instead of Some-App. default is same as table name, which is 'Some-App' here. +enabled = true # whether to build the app. default: true +version = "auto" # 'auto', 'latest', 'beta' or a custom one e.g. '17.40.41'. default: auto +# 'auto' option gets the latest possible version supported by all the included patches +# 'latest' gets the latest stable without checking patches support. 'beta' gets the latest beta/alpha +include-stock = true # includes stock apk in the module. default: true +build-mode = "apk" # 'both', 'apk' or 'module'. default: apk +excluded-patches = "'Some Patch' 'Some Other Patch'" # whitespace seperated list of patches to exclude. default: "" (empty) +included-patches = "'Patch something'" # whitespace seperated list of patches to include, all default patches are included by default. default: "" (empty) +exclusive-patches = false # exclude all patches by default. default: false +apkmirror-dlurl = "https://www.apkmirror.com/apk/inc/app" +uptodown-dlurl = "https://spotify.en.uptodown.com/android" +apkmonk-dlurl = "https://www.apkmonk.com/app/com.app.app/" +module-prop-name = "some-app-magisk" # magisk module prop name. +merge-integrations = false # set false to never merge even when needed. default: true +apkmirror-dpi = "360-480dpi" # used to select apk variant from apkmirror. default: nodpi +arch = "arm64-v8a" # 'arm64-v8a', 'arm-v7a', 'all', 'both'. 'both' downloads both arm64-v8a and arm-v7a. default: all +``` diff --git a/LICENSE b/LICENSE new file mode 100755 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100755 index 0000000..4591d35 --- /dev/null +++ b/README.md @@ -0,0 +1,53 @@ +#### ⚠️ Do not download modules from 3rd party sources like random websites you found on Google. There are many that uses my modules and impersonates ReVanced. + +# ReVanced Magisk Module +[![Telegram](https://img.shields.io/badge/Telegram-2CA5E0?style=for-the-badge&logo=telegram&logoColor=white)](https://t.me/rvc_magisk) +[![CI](https://github.com/j-hc/revanced-magisk-module/actions/workflows/ci.yml/badge.svg?event=schedule)](https://github.com/j-hc/revanced-magisk-module/actions/workflows/ci.yml) + +Extensive ReVanced builder + +Get the [latest CI release](https://github.com/j-hc/revanced-magisk-module/releases). + +Use [**zygisk-detach**](https://github.com/j-hc/zygisk-detach) to detach YouTube and YT Music from Play Store if you are using magisk modules. + +
Features +
    +
  • Support all present and future ReVanced and ReVanced Extended apps
  • +
  • Can build Magisk modules and non-root APKs
  • +
  • Updated daily with the latest versions of apps and patches
  • +
  • Optimize APKs and modules for size
  • +
  • Modules
  • +
      +
    • recompile invalidated odex for faster usage
    • +
    • receive updates from Magisk app
    • +
    • do not break safetynet or trigger root detections
    • +
    • handle installation of the correct version of the stock app and all that
    • +
    • support Magisk and KernelSU
    • +
    +
+Note that the CI workflow is scheduled to build the modules and APKs everyday using GitHub Actions if there is a change in ReVanced patches. You may want to disable it. +
+ +## To include/exclude patches or patch other apps +[**See the list of patches**](https://j-hc.github.io/rvmm-config-gen/) + + * Star the repo :eyes: + * [Fork the repo](https://github.com/j-hc/revanced-magisk-module/fork) or use it as a template + * Customize [`config.toml`](./config.toml) using [rvmm-config-gen](https://j-hc.github.io/rvmm-config-gen/) + * Run the build [workflow](../../actions/workflows/build.yml) + * Grab your modules and APKs from [releases](../../releases) + +also see here [`CONFIG.md`](./CONFIG.md) + +## Building Locally +### On Termux +```console +bash <(curl -sSf https://raw.githubusercontent.com/j-hc/revanced-magisk-module/main/build-termux.sh) +``` + +### On Desktop +```console +$ git clone https://github.com/j-hc/revanced-magisk-module +$ cd revanced-magisk-module +$ ./build.sh +``` diff --git a/build-termux.sh b/build-termux.sh new file mode 100755 index 0000000..299e0cb --- /dev/null +++ b/build-termux.sh @@ -0,0 +1,75 @@ +#!/usr/bin/env bash + +set -e + +pr() { echo -e "\033[0;32m[+] ${1}\033[0m"; } +ask() { + local y + for ((n = 0; n < 3; n++)); do + pr "$1" + if read -r y; then + if [ "$y" = y ]; then + return 0 + elif [ "$y" = n ]; then + return 1 + fi + fi + pr "Asking again..." + done + return 1 +} + +if [ ! -f ~/.rvmm_"$(date '+%Y%m')" ]; then + pr "Setting up environment..." + yes "" | pkg update -y && pkg install -y openssl git wget jq openjdk-17 zip + : >~/.rvmm_"$(date '+%Y%m')" +fi + +if [ -f build.sh ]; then cd ..; fi +if [ -d revanced-magisk-module ]; then + pr "Checking for revanced-magisk-module updates" + git -C revanced-magisk-module fetch + if git -C revanced-magisk-module status | grep -q 'is behind'; then + pr "revanced-magisk-module already is not synced with upstream." + pr "Cloning revanced-magisk-module. config.toml will be preserved." + cp -f revanced-magisk-module/config.toml . + rm -rf revanced-magisk-module + git clone https://github.com/j-hc/revanced-magisk-module --recurse --depth 1 + mv -f config.toml revanced-magisk-module/config.toml + fi +else + pr "Cloning revanced-magisk-module." + git clone https://github.com/j-hc/revanced-magisk-module --recurse --depth 1 + sed -i '/^enabled.*/d; /^\[.*\]/a enabled = false' revanced-magisk-module/config.toml +fi +cd revanced-magisk-module +chmod +x build.sh build-termux.sh + +if ask "Do you want to open the config.toml for customizations? [y/n]"; then + nano config.toml +fi +if ! ask "Setup is done. Do you want to start building? [y/n]"; then + exit 0 +fi +./build.sh + +cd build +pr "Ask for storage permission" +until + yes | termux-setup-storage >/dev/null 2>&1 + ls /sdcard >/dev/null 2>&1 +do + sleep 1 +done + +PWD=$(pwd) +mkdir -p ~/storage/downloads/revanced-magisk-module +for op in *; do + [ "$op" = "*" ] && continue + mv -f "${PWD}/${op}" ~/storage/downloads/revanced-magisk-module/"${op}" +done + +pr "Outputs are available in /sdcard/Download/revanced-magisk-module folder" +am start -a android.intent.action.VIEW -d file:///sdcard/Download/revanced-magisk-module -t resource/folder +sleep 2 +am start -a android.intent.action.VIEW -d file:///sdcard/Download/revanced-magisk-module -t resource/folder diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..c4040d8 --- /dev/null +++ b/build.sh @@ -0,0 +1,194 @@ +#!/usr/bin/env bash + +set -euo pipefail +trap "rm -rf temp/*tmp.* temp/*/*tmp.*; exit 130" INT + +if [ "${1:-}" = "clean" ]; then + rm -rf temp build logs build.md + exit 0 +fi + +source utils.sh + +vtf() { if ! isoneof "${1}" "true" "false"; then abort "ERROR: '${1}' is not a valid option for '${2}': only true or false is allowed"; fi; } + +toml_prep "$(cat 2>/dev/null "${1:-config.toml}")" || abort "could not find config file '${1:-config.toml}'\n\tUsage: $0 " +# -- Main config -- +main_config_t=$(toml_get_table "") +COMPRESSION_LEVEL=$(toml_get "$main_config_t" compression-level) || COMPRESSION_LEVEL="9" +if ! PARALLEL_JOBS=$(toml_get "$main_config_t" parallel-jobs); then + if [ "$OS" = Android ]; then PARALLEL_JOBS=1; else PARALLEL_JOBS=$(nproc); fi +fi +LOGGING_F=$(toml_get "$main_config_t" logging-to-file) && vtf "$LOGGING_F" "logging-to-file" || LOGGING_F=false +DEF_PATCHES_VER=$(toml_get "$main_config_t" patches-version) || DEF_PATCHES_VER="" +DEF_INTEGRATIONS_VER=$(toml_get "$main_config_t" integrations-version) || DEF_INTEGRATIONS_VER="" +DEF_CLI_VER=$(toml_get "$main_config_t" cli-version) || DEF_CLI_VER="" +DEF_PATCHES_SRC=$(toml_get "$main_config_t" patches-source) || DEF_PATCHES_SRC="ReVanced/revanced-patches" +DEF_INTEGRATIONS_SRC=$(toml_get "$main_config_t" integrations-source) || DEF_INTEGRATIONS_SRC="ReVanced/revanced-integrations" +DEF_CLI_SRC=$(toml_get "$main_config_t" cli-source) || DEF_CLI_SRC="j-hc/revanced-cli" +DEF_RV_BRAND=$(toml_get "$main_config_t" rv-brand) || DEF_RV_BRAND="ReVanced" +mkdir -p $TEMP_DIR $BUILD_DIR + +if [ "${2:-}" = "--config-update" ]; then + config_update + exit 0 +fi + +: >build.md +ENABLE_MAGISK_UPDATE=$(toml_get "$main_config_t" enable-magisk-update) || ENABLE_MAGISK_UPDATE=true +if [ "$ENABLE_MAGISK_UPDATE" = true ] && [ -z "${GITHUB_REPOSITORY:-}" ]; then + pr "You are building locally. Magisk updates will not be enabled." + ENABLE_MAGISK_UPDATE=false +fi +# ----------------- + +if ((COMPRESSION_LEVEL > 9)) || ((COMPRESSION_LEVEL < 0)); then abort "compression-level must be within 0-9"; fi +if [ "$LOGGING_F" = true ]; then mkdir -p logs; fi + +# -- check_deps -- +jq --version >/dev/null || abort "\`jq\` is not installed. install it with 'apt install jq' or equivalent" +java --version >/dev/null || abort "\`openjdk 17\` is not installed. install it with 'apt install openjdk-17-jre' or equivalent" +zip --version >/dev/null || abort "\`zip\` is not installed. install it with 'apt install zip' or equivalent" +# ---------------- +get_prebuilts + +set_prebuilts() { + local integrations_src=$1 patches_src=$2 cli_src=$3 integrations_ver=$4 patches_ver=$5 cli_ver=$6 + local patches_dir=${patches_src%/*} + local integrations_dir=${integrations_src%/*} + local cli_dir=${cli_src%/*} + cli_ver=${cli_ver#v} + integrations_ver="${integrations_ver#v}" + patches_ver="${patches_ver#v}" + app_args[cli]=$(find "${TEMP_DIR}/${cli_dir,,}-rv" -name "revanced-cli-${cli_ver:-*}-all.jar" -type f -print -quit 2>/dev/null) && [ "${app_args[cli]}" ] || return 1 + app_args[integ]=$(find "${TEMP_DIR}/${integrations_dir,,}-rv" -name "revanced-integrations-${integrations_ver:-*}.apk" -type f -print -quit 2>/dev/null) && [ "${app_args[integ]}" ] || return 1 + app_args[ptjar]=$(find "${TEMP_DIR}/${patches_dir,,}-rv" -name "revanced-patches-${patches_ver:-*}.jar" -type f -print -quit 2>/dev/null) && [ "${app_args[ptjar]}" ] || return 1 + app_args[ptjs]=$(find "${TEMP_DIR}/${patches_dir,,}-rv" -name "patches-${patches_ver:-*}.json" -type f -print -quit 2>/dev/null) && [ "${app_args[ptjs]}" ] || return 1 +} + +build_rv_w() { + if [ "$LOGGING_F" = true ]; then + logf=logs/"${table_name,,}.log" + : >"$logf" + { build_rv 2>&1 "$(declare -p app_args)" | tee "$logf"; } & + else + build_rv "$(declare -p app_args)" & + fi +} + +declare -A cliriplib +idx=0 +for table_name in $(toml_get_table_names); do + if [ -z "$table_name" ]; then continue; fi + t=$(toml_get_table "$table_name") + enabled=$(toml_get "$t" enabled) && vtf "$enabled" "enabled" || enabled=true + if [ "$enabled" = false ]; then continue; fi + if ((idx >= PARALLEL_JOBS)); then wait -n; fi + + declare -A app_args + patches_src=$(toml_get "$t" patches-source) || patches_src=$DEF_PATCHES_SRC + patches_ver=$(toml_get "$t" patches-version) || patches_ver=$DEF_PATCHES_VER + integrations_src=$(toml_get "$t" integrations-source) || integrations_src=$DEF_INTEGRATIONS_SRC + integrations_ver=$(toml_get "$t" integrations-version) || integrations_ver=$DEF_INTEGRATIONS_VER + cli_src=$(toml_get "$t" cli-source) || cli_src=$DEF_CLI_SRC + cli_ver=$(toml_get "$t" cli-version) || cli_ver=$DEF_CLI_VER + + if ! set_prebuilts "$integrations_src" "$patches_src" "$cli_src" "$integrations_ver" "$patches_ver" "$cli_ver"; then + if ! RVP="$(get_rv_prebuilts "$integrations_src" "$patches_src" "$integrations_ver" "$patches_ver" "$cli_src" "$cli_ver")"; then + abort "could not download rv prebuilts" + fi + read -r rv_cli_jar rv_integrations_apk rv_patches_jar rv_patches_json <<<"$RVP" + app_args[cli]=$rv_cli_jar + app_args[integ]=$rv_integrations_apk + app_args[ptjar]=$rv_patches_jar + app_args[ptjs]=$rv_patches_json + fi + if [[ -v cliriplib[${app_args[cli]}] ]]; then app_args[riplib]=${cliriplib[${app_args[cli]}]}; else + if [[ $(java -jar "${app_args[cli]}" patch 2>&1) == *rip-lib* ]]; then + cliriplib[${app_args[cli]}]=true + app_args[riplib]=true + else + cliriplib[${app_args[cli]}]=false + app_args[riplib]=false + fi + fi + app_args[rv_brand]=$(toml_get "$t" rv-brand) || app_args[rv_brand]="$DEF_RV_BRAND" + + app_args[excluded_patches]=$(toml_get "$t" excluded-patches) || app_args[excluded_patches]="" + if [ -n "${app_args[excluded_patches]}" ] && [[ "${app_args[excluded_patches]}" != *'"'* ]]; then abort "patch names inside excluded-patches must be quoted"; fi + app_args[included_patches]=$(toml_get "$t" included-patches) || app_args[included_patches]="" + if [ -n "${app_args[included_patches]}" ] && [[ "${app_args[included_patches]}" != *'"'* ]]; then abort "patch names inside included-patches must be quoted"; fi + app_args[exclusive_patches]=$(toml_get "$t" exclusive-patches) && vtf "${app_args[exclusive_patches]}" "exclusive-patches" || app_args[exclusive_patches]=false + app_args[version]=$(toml_get "$t" version) || app_args[version]="auto" + app_args[app_name]=$(toml_get "$t" app-name) || app_args[app_name]=$table_name + app_args[table]=$table_name + app_args[build_mode]=$(toml_get "$t" build-mode) && { + if ! isoneof "${app_args[build_mode]}" both apk module; then + abort "ERROR: build-mode '${app_args[build_mode]}' is not a valid option for '${table_name}': only 'both', 'apk' or 'module' is allowed" + fi + } || app_args[build_mode]=apk + app_args[uptodown_dlurl]=$(toml_get "$t" uptodown-dlurl) && { + app_args[uptodown_dlurl]=${app_args[uptodown_dlurl]%/} + app_args[uptodown_dlurl]=${app_args[uptodown_dlurl]%download} + app_args[uptodown_dlurl]=${app_args[uptodown_dlurl]%/} + app_args[dl_from]=uptodown + } || app_args[uptodown_dlurl]="" + app_args[apkmonk_dlurl]=$(toml_get "$t" apkmonk-dlurl) && { + app_args[apkmonk_dlurl]=${app_args[apkmonk_dlurl]%/} + app_args[dl_from]=apkmonk + } || app_args[apkmonk_dlurl]="" + app_args[apkmirror_dlurl]=$(toml_get "$t" apkmirror-dlurl) && { + app_args[apkmirror_dlurl]=${app_args[apkmirror_dlurl]%/} + app_args[dl_from]=apkmirror + } || app_args[apkmirror_dlurl]="" + app_args[archive_dlurl]=$(toml_get "$t" archive-dlurl) && { + app_args[archive_dlurl]=${app_args[archive_dlurl]%/} + app_args[dl_from]=archive + } || app_args[archive_dlurl]="" + if [ -z "${app_args[dl_from]:-}" ]; then abort "ERROR: no 'apkmirror_dlurl', 'uptodown_dlurl' or 'apkmonk_dlurl' option was set for '$table_name'."; fi + app_args[arch]=$(toml_get "$t" arch) || app_args[arch]="all" + if [ "${app_args[arch]}" != "both" ] && [ "${app_args[arch]}" != "all" ] && [[ "${app_args[arch]}" != "arm64-v8a"* ]] && [[ "${app_args[arch]}" != "arm-v7a"* ]]; then + abort "wrong arch '${app_args[arch]}' for '$table_name'" + fi + + app_args[include_stock]=$(toml_get "$t" include-stock) || app_args[include_stock]=true && vtf "${app_args[include_stock]}" "include-stock" + app_args[merge_integrations]=$(toml_get "$t" merge-integrations) || app_args[merge_integrations]=true && vtf "${app_args[merge_integrations]}" "merge-integrations" + app_args[dpi]=$(toml_get "$t" apkmirror-dpi) || app_args[dpi]="nodpi" + table_name_f=${table_name,,} + table_name_f=${table_name_f// /-} + app_args[module_prop_name]=$(toml_get "$t" module-prop-name) || app_args[module_prop_name]="${table_name_f}-jhc" + + if [ "${app_args[arch]}" = both ]; then + app_args[table]="$table_name (arm64-v8a)" + app_args[module_prop_name]="${app_args[module_prop_name]}-arm64" + app_args[arch]="arm64-v8a" + idx=$((idx + 1)) + build_rv_w + app_args[table]="$table_name (arm-v7a)" + app_args[module_prop_name]="${app_args[module_prop_name]}-arm" + app_args[arch]="arm-v7a" + if ((idx >= PARALLEL_JOBS)); then wait -n; fi + idx=$((idx + 1)) + build_rv_w + else + idx=$((idx + 1)) + build_rv_w + fi +done +wait +rm -rf temp/tmp.* +if [ -z "$(ls -A1 ${BUILD_DIR})" ]; then abort "All builds failed."; fi + +log "\nInstall [Vanced Microg](https://github.com/TeamVanced/VancedMicroG/releases) for non-root YouTube and YT Music" +log "Use [zygisk-detach](https://github.com/j-hc/zygisk-detach) module to detach YouTube and YT Music from Play Store" +log "\n[revanced-magisk-module](https://github.com/j-hc/revanced-magisk-module)" +log "\nChangelog:" +log "$(cat $TEMP_DIR/*-rv/changelog.md)" + +SKIPPED=$(cat $TEMP_DIR/skipped 2>/dev/null || :) +if [ -n "$SKIPPED" ]; then + log "\nSkipped:" + log "$SKIPPED" +fi + +pr "Done" diff --git a/config.toml b/config.toml new file mode 100755 index 0000000..7746323 --- /dev/null +++ b/config.toml @@ -0,0 +1,64 @@ +logging-to-file = true # enables logging of every patch process to a seperate file +enable-magisk-update = true # set this to false if you do not want to receive updates for the module in magisk app + +# add 'enabled = false' for not patching a specific app or remove it from the config +# see https://github.com/j-hc/revanced-magisk-module/blob/main/CONFIG.md for more detailed explanations + +# you can use rvmm-config-gen to generate a config + +[YouTube] +build-mode = "both" +excluded-patches = "" +included-patches = "" +version = "auto" +archive-dlurl = "https://archive.org/download/jhc-apks/apks/com.google.android.youtube" + +[Music] +build-mode = "both" +archive-dlurl = "https://archive.org/download/jhc-apks/apks/com.google.android.apps.youtube.music" +arch = "both" + +[Music-Extended] +app-name = "Music" +patches-source = "inotia00/revanced-patches" +integrations-source = "inotia00/revanced-integrations" +cli-source = "inotia00/revanced-cli" +rv-brand = "ReVanced Extended" +build-mode = "both" +archive-dlurl = "https://archive.org/download/jhc-apks/apks/com.google.android.apps.youtube.music" +arch = "both" + +[YouTube-Extended] +app-name = "YouTube" +patches-source = "inotia00/revanced-patches" +integrations-source = "inotia00/revanced-integrations" +cli-source = "inotia00/revanced-cli" +rv-brand = "ReVanced Extended" +build-mode = "both" +archive-dlurl = "https://archive.org/download/jhc-apks/apks/com.google.android.youtube" + +[Twitter] +build-mode = "apk" +archive-dlurl = "https://archive.org/download/jhc-apks/apks/com.twitter.android" + +[Twitch] +archive-dlurl = "https://archive.org/download/jhc-apks/apks/tv.twitch.android.app" + +[TikTok] +archive-dlurl = "https://archive.org/download/jhc-apks/apks/com.zhiliaoapp.musically" + +[Reddit] +archive-dlurl = "https://archive.org/download/jhc-apks/apks/com.reddit.frontpage" + +[Messenger] +enabled = false +apkmirror-dlurl = "https://www.apkmirror.com/apk/facebook-2/messenger/" +arch = "arm64-v8a" + +[Spotify] +enabled = false +uptodown-dlurl = "https://spotify.en.uptodown.com/android" + +[IconPackStudio] +enabled = false +apkmirror-dlurl = "https://www.apkmirror.com/apk/smart-launcher-team/icon-pack-studio/" diff --git a/ks.keystore b/ks.keystore new file mode 100644 index 0000000000000000000000000000000000000000..b072050d22832e482a9a4177c60e6098290a3a89 GIT binary patch literal 3708 zcmV-?4ukOk00062000!gbf6@qj2A2JOr>^)Nv7Qh-=4Gp00#yH00U}hV*mgFi*^%z zX8-^I0RRP9E;TSY000E4FoFc8FoFV(paTK{0s;tPr+9)oO>sIf4F(A+hDe6@4FLfQ z1pqJ;F%d8i1_MOA1k|dpM^T$cMJINK88(MxFmbuog4>r1*15z`bu#N3j0+rLUG*> z-3sJ>=5z=bpY;V5V6r$WoI#tded#Q>y~e$Tn!?GnroXOw7YR;yv4I+1%u_)8ugq7_WEYBivYLUu)O zd|ReE_JPqa8g+{En$gE;0Ga~%e?$QM3jq3YqJ`FK2C`{{#PzG@g{1=(LN>3TOj?0F z!v5wGP*KT*?zgld4F5u*+E-H%!Lhf%13rqN;dPahP_-f&%zG=)soJ&@gz8z$6T&bP z?g$2=m*8**$_Nce3CV(W)Z#mYniF`j!1EZKYiccHckq6@e#`T{HQGcK^K7!8u<+

jU}>8!$>lP8$d67X^mc3h3jzZH z00A%!1_>&LNQU(IiWgK)P}7#GVC;%K*Ou;vwr^XqV-$5vU_8qg#YB4E zPZ7}I`=c{mYtZ*~D9fu2zOZs(f2)`0tRxZ*(V5v1J{31iTEltTv=-XDRSXHmD5s6T zf~My9icjM=$vXUv`i!Q}*XSSLw67;nkr*8+hAcwE6Zn?ea-l`9WcF8=_B z+m^GNrL~YmLLBpv?Qvg{$8yCC3!09r$Vp@Qq5Qs{crunQkC=&o_0PpG=%kPr1vhOs zG>-n>51+kmB#0oHJSO`+ z62K2>Y{BbF=o^gE1Wddo!df4**~4j1ROkGd}_s^ByqTa>p4x`^x?sfVsj!?Fbr z(kpxas@>6&;Qy!&le=<$N@kPa33JO$H%$=j{VXP~1kn{t)6+lnPPK6X`G>1~jlEn{ zqS3XFs;(KHHYp@?0!l$ieIA*EKnByC>kVP0J3C;4!VM1Tt{2elTg>yI zGk|SO>)>1dKSzh1qKtPTDkShlou6(af)(Z+s*kS+j=l!)W(i7?_9ceEHl34My+~0S z_YFgac7i|EJ4KpYQ3v$-2LUzXT>gppZ+G&8L>bA;CF?+i3qmy~9<;?EH{dWp`8u0S zUo!$Y_2;68pA(&wp>E=J!-rQiA%Rj-9I27g9)j%+3?`-2@%*mh@Q8#CS#(LWt5a|U zM4qDK`n&zQhDeU#Hn@`8SeWA%W4~uVh24oV0pFbS>lZocwI3~=&S>;~AtCgf=9^y4 z30ZJA!xQxETXTlz7R<}k)d29lyE3vn^F;`dNfFb8N?{rA+1mQ^aR98tx~;|f?WOg$ z7mFY0u9jTOKG$4D2lawlCt>FA>8C#v*=LQn8Y>%TL7>Z|TH;!S%5BT-p<=+%|w=xm{rj)~B944Wa*s6@A|= zmPs%%KY%F?J_l{cz{TvAwKf%mRs19stvP&g3&{np)=ny|xHka~qt#prP7v6-nRe6j z+{N-3?bah>0+*m>ZPtJ`lkwSUQKpv~hc2K&BHj;jt?&Qq;0*cS9~wdP;flv~tN^$i zryw>dW+m1#Sc%(aY7;b82>^Yv*eZeT2T@MCfw~0v%1wtuc(wtkoh%EVbeok(h|yNJ zhQ%UERuOA=n2=YFY9>zd7`ULAAVeG;k9#j^9IC|dk_eqD zIun#o`Q^DoO}oDV5w8pYncyqrU04Hb+3(;!@Y4E}MKktn;URL+R2T+j3PRs@im9MC zs3?a{SU4;hLQ#Q5nEBQKVU*Toen{unWpULKNonF7{LS`fe8kZ!0s7Tjwji`XS_L6ja6`&-N zS~GPw5WOdy#X?=F!tI;5qo18vc+}rqnk8P73_*3>33KHG8G$twcb>xq;velt)L_q3 z0{fC~R!qe@B3f?0rGR`)EGgowEYJEq|F{`)5W!gJ=2H3hVfNLMw8R6I+v`QXO5R)f zxG0a^1>pqR`NJ?|UW7M_uZNb}b;F?jA|oXVd&+5T7JIZ-GcCG4s%RSNY`9`d3!Ggs zm9kvTXRuPQ_1eN;w_^_wnIl7^N#MZ{c`(on_i0Mdg_yd!{9hX|0wfh|-Bw;%Y$^fE z!k-(v^s73{B_w)$DtVMxV1~Z~I(P0m8oC_7uKS*!F+j82j0qxRH?(3p{qUXF_FmP{ zY{FxvTceaqxu{RN&ykAv!bx+yDj!$h4Q(SIpQoMX7DZlq$DI-fz62a``-YI>Gn;?J^}f3h7#xnw3g z5bsX#JeAGr0LDE!zd17p<}M8GF18T9EyX_qA$sX&$8V^3J=VR(-bd4gWw90}Tki-U zrA8yVV0_Y_-avl5iXcr%w5h#1(Si@G2L;BvS#uZd+(Lv}Q1D0G!Vhc?=?@MQhXYq@LcE@w3H6(1~Tc;AAPkX7eM+$8UWBw%v&Ehz*Ci5ge2!8EhAlk`1hOR0sB3l`{~;(o<3o8j)TNG>pjs8$D(1GF!c-biER^`UMasM zjpa26BwddKtYVZ%XD-obYT=0szxqxU0UxRS0M;#kTrd^GEI|MAH9WneY73KDx+7k1 z;LR?La+gHBAsLQ4b^phvNmk&%OZ9r_&8;j%aVmI(ApfLsB@sh`f9_+Ff#RNX&eOtM zIJIKFzqR#ukD|($V#W^CO&(9kMgGg zd0&AlOuT(=<&-iy*j{VdK->w`?Fs$>@DoBKX2lcwqK)@CQX~3aoIwbtRk!SdJC9}u zdnDa#FqiR2Bcr{d6unZ8w7C;}6+MV$#|hB+g&}ws6Yy3Ivd(u0g@&?^%!orP6dF1^ZQFtw(EtRwP1gpQi zyGQm6pO;Gm;mq^=koq3QKYL(b=J*=%@EdZY%pcqkoVoiUPuCnrrh22xSP`8oMwuD8 zM8sDT-&97S@0(r!0G)vtCfoO)843Q2i@i()%$)AE)OYYuNyZ1%xw8pO>Lx}m)EvP; z_{i1DJ&{XgXG6uXS!8TidB@=x1B#fQ0gQvYQo$h0Zv@3Sn3^Gd8e8^089y96Y7G-I zCmdX%f73w!ScC*F=jnoMA>G$haeruy$Ei}@%$|2CYGsuM(E?8a91msfEUs*ap`pfC z^BRP~^bxWgV#Rf^x>ZByHA?e?{S6R)0mVj~w5iS%VG3Nm?Q0`vdjOmv+F|sfcOL@s zSW`6DSN|)h)|XbbLuyCkFI)<(vO`_T$jmti);(;Gl{LEd55#-&qkVJ4iJ6h?@+N@T a1f&3xk#$oL=R5b2^h-}>ZZRj~ZCRoHtlvlg literal 0 HcmV?d00001 diff --git a/options.json b/options.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/options.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/revanced-magisk/META-INF/com/google/android/update-binary b/revanced-magisk/META-INF/com/google/android/update-binary new file mode 100755 index 0000000..28b48e5 --- /dev/null +++ b/revanced-magisk/META-INF/com/google/android/update-binary @@ -0,0 +1,33 @@ +#!/sbin/sh + +################# +# Initialization +################# + +umask 022 + +# echo before loading util_functions +ui_print() { echo "$1"; } + +require_new_magisk() { + ui_print "*******************************" + ui_print " Please install Magisk v20.4+! " + ui_print "*******************************" + exit 1 +} + +######################### +# Load util_functions.sh +######################### + +OUTFD=$2 +ZIPFILE=$3 + +mount /data 2>/dev/null + +[ -f /data/adb/magisk/util_functions.sh ] || require_new_magisk +. /data/adb/magisk/util_functions.sh +[ $MAGISK_VER_CODE -lt 20400 ] && require_new_magisk + +install_module +exit 0 diff --git a/revanced-magisk/META-INF/com/google/android/updater-script b/revanced-magisk/META-INF/com/google/android/updater-script new file mode 100755 index 0000000..11d5c96 --- /dev/null +++ b/revanced-magisk/META-INF/com/google/android/updater-script @@ -0,0 +1 @@ +#MAGISK diff --git a/scripts/customize.sh b/scripts/customize.sh new file mode 100755 index 0000000..48e1711 --- /dev/null +++ b/scripts/customize.sh @@ -0,0 +1,117 @@ +# shellcheck disable=SC2148,SC2086 +ui_print "" + +if [ $ARCH = "arm" ]; then + #arm + ARCH_LIB=armeabi-v7a + alias cmpr='$MODPATH/bin/arm/cmpr' +elif [ $ARCH = "arm64" ]; then + #arm64 + ARCH_LIB=arm64-v8a + alias cmpr='$MODPATH/bin/arm64/cmpr' +else + abort "ERROR: unsupported arch: ${ARCH}" +fi +set_perm_recursive $MODPATH/bin 0 0 0755 0777 + +nsenter -t1 -m -- grep __PKGNAME /proc/mounts | while read -r line; do + ui_print "* Un-mount" + mp=${line#* } + mp=${mp%% *} + nsenter -t1 -m -- umount -l "${mp%%\\*}" +done +am force-stop __PKGNAME + +INS=true +if BASEPATH=$(pm path __PKGNAME); then + BASEPATH=${BASEPATH##*:} + BASEPATH=${BASEPATH%/*} + if [ ${BASEPATH:1:6} = system ]; then + ui_print "* __PKGNAME is a system app" + elif [ ! -d ${BASEPATH}/lib ]; then + ui_print "* Invalid installation found. Uninstalling..." + pm uninstall -k --user 0 __PKGNAME + elif [ ! -f $MODPATH/__PKGNAME.apk ]; then + ui_print "* Stock __PKGNAME APK was not found" + VERSION=$(dumpsys package __PKGNAME | grep -m1 versionName) + VERSION="${VERSION#*=}" + if [ "$VERSION" = __PKGVER ] || [ -z "$VERSION" ]; then + ui_print "* Skipping stock installation" + INS=false + else + abort "ERROR: Version mismatch + installed: $VERSION + module: __PKGVER + " + fi + elif cmpr $BASEPATH/base.apk $MODPATH/__PKGNAME.apk; then + ui_print "* __PKGNAME is up-to-date" + INS=false + fi +fi +if [ $INS = true ]; then + if [ ! -f $MODPATH/__PKGNAME.apk ]; then + abort "ERROR: Stock __PKGNAME apk was not found" + fi + ui_print "* Updating __PKGNAME to __PKGVER" + settings put global verifier_verify_adb_installs 0 + SZ=$(stat -c "%s" $MODPATH/__PKGNAME.apk) + if ! SES=$(pm install-create --user 0 -i com.android.vending -r -d -S "$SZ" 2>&1); then + ui_print "ERROR: install-create failed" + abort "$SES" + fi + SES=${SES#*[} + SES=${SES%]*} + set_perm "$MODPATH/__PKGNAME.apk" 1000 1000 644 u:object_r:apk_data_file:s0 + if ! op=$(pm install-write -S "$SZ" "$SES" "__PKGNAME.apk" "$MODPATH/__PKGNAME.apk" 2>&1); then + ui_print "ERROR: install-write failed" + abort "$op" + fi + if ! op=$(pm install-commit "$SES" 2>&1); then + ui_print "ERROR: install-commit failed" + abort "$op" + fi + settings put global verifier_verify_adb_installs 1 + if BASEPATH=$(pm path __PKGNAME); then + BASEPATH=${BASEPATH##*:} + BASEPATH=${BASEPATH%/*} + else + abort "ERROR: install __PKGNAME manually and reflash the module" + fi +fi +BASEPATHLIB=${BASEPATH}/lib/${ARCH} +if [ -z "$(ls -A1 ${BASEPATHLIB})" ]; then + ui_print "* Extracting native libs" + mkdir -p $BASEPATHLIB + if ! op=$(unzip -j $MODPATH/__EXTRCT lib/${ARCH_LIB}/* -d ${BASEPATHLIB} 2>&1); then + ui_print "ERROR: extracting native libs failed" + abort "$op" + fi + set_perm_recursive ${BASEPATH}/lib 1000 1000 755 755 u:object_r:apk_data_file:s0 +fi +ui_print "* Setting Permissions" +set_perm $MODPATH/base.apk 1000 1000 644 u:object_r:apk_data_file:s0 + +ui_print "* Mounting __PKGNAME" +mkdir -p $NVBASE/rvhc +RVPATH=$NVBASE/rvhc/${MODPATH##*/}.apk +mv -f $MODPATH/base.apk $RVPATH + +if ! op=$(nsenter -t1 -m -- mount -o bind $RVPATH $BASEPATH/base.apk 2>&1); then + ui_print "ERROR: Mount failed!" + ui_print "$op" +fi +am force-stop __PKGNAME +ui_print "* Optimizing __PKGNAME" +nohup cmd package compile --reset __PKGNAME >/dev/null 2>&1 & + +ui_print "* Cleanup" +rm -rf $MODPATH/bin $MODPATH/__PKGNAME.apk + +for s in "uninstall.sh" "service.sh"; do + sed -i "2 i\NVBASE=${NVBASE}" $MODPATH/$s +done + +ui_print "* Done" +ui_print " by j-hc (github.com/j-hc)" +ui_print " " diff --git a/scripts/service.sh b/scripts/service.sh new file mode 100755 index 0000000..01d0cc3 --- /dev/null +++ b/scripts/service.sh @@ -0,0 +1,47 @@ +#!/system/bin/sh +# shellcheck disable=SC2086 +MODDIR=${0%/*} +RVPATH=$NVBASE/rvhc/${MODDIR##*/}.apk + +until [ "$(getprop sys.boot_completed)" = 1 ]; do sleep 1; done +until [ -d "/sdcard/Android" ]; do sleep 1; done +while + BASEPATH=$(pm path __PKGNAME) + svcl=$? + [ $svcl = 20 ] +do sleep 2; done +sleep 5 + +err() { + [ ! -f $MODDIR/err ] && cp $MODDIR/module.prop $MODDIR/err + sed -i "s/^des.*/description=⚠️ Module is inactive: '${1}'/g" $MODDIR/module.prop +} + +if [ $svcl = 0 ]; then + BASEPATH=${BASEPATH##*:} + BASEPATH=${BASEPATH%/*} + if [ -d $BASEPATH/lib ]; then + VERSION=$(dumpsys package __PKGNAME | grep -m1 versionName) + VERSION="${VERSION#*=}" + if [ "$VERSION" = __PKGVER ] || [ -z "$VERSION" ]; then + grep __PKGNAME /proc/mounts | while read -r line; do + mp=${line#* } + mp=${mp%% *} + umount -l ${mp%%\\*} + done + if chcon u:object_r:apk_data_file:s0 $RVPATH; then + mount -o bind $RVPATH $BASEPATH/base.apk + am force-stop __PKGNAME + [ -f $MODDIR/err ] && mv -f $MODDIR/err $MODDIR/module.prop + else + err "mount failed" + fi + else + err "version mismatch (installed:${VERSION}, module:__PKGVER)" + fi + else + err "invalid installation" + fi +else + err "app not installed" +fi diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh new file mode 100755 index 0000000..ab2372e --- /dev/null +++ b/scripts/uninstall.sh @@ -0,0 +1,11 @@ +#!/system/bin/sh +{ + MODDIR=${0%/*} + rm "$NVBASE/rvhc/${MODDIR##*/}".apk + rmdir "$NVBASE/rvhc" + # if __ISBNDL; then + # until [ "$(getprop sys.boot_completed)" = 1 ]; do sleep 1; done + # sleep 15 + # pm uninstall __PKGNAME + # fi +} & diff --git a/utils.sh b/utils.sh new file mode 100755 index 0000000..d29a84a --- /dev/null +++ b/utils.sh @@ -0,0 +1,557 @@ +#!/usr/bin/env bash + +MODULE_TEMPLATE_DIR="revanced-magisk" +TEMP_DIR="temp" +BUILD_DIR="build" + +if [ "${GITHUB_TOKEN:-}" ]; then GH_HEADER="Authorization: token ${GITHUB_TOKEN}"; else GH_HEADER=; fi +NEXT_VER_CODE=${NEXT_VER_CODE:-$(date +'%Y%m%d')} +REBUILD=${REBUILD:-false} +OS=$(uname -o) + +SERVICE_SH=$(cat scripts/service.sh) +CUSTOMIZE_SH=$(cat scripts/customize.sh) +UNINSTALL_SH=$(cat scripts/uninstall.sh) + +# -------------------- json/toml -------------------- +json_get() { grep -o "\"${1}\":[^\"]*\"[^\"]*\"" | sed -E 's/".*".*"(.*)"/\1/'; } +toml_prep() { __TOML__=$(tr -d '\t\r' <<<"$1" | tr "'" '"' | grep -o '^[^#]*' | grep -v '^$' | sed -r 's/(\".*\")|\s*/\1/g; 1i []'); } +toml_get_table_names() { + local tn + tn=$(grep -x '\[.*\]' <<<"$__TOML__" | tr -d '[]') || return 1 + if [ "$(sort <<<"$tn" | uniq -u | wc -l)" != "$(wc -l <<<"$tn")" ]; then + abort "ERROR: Duplicate tables in TOML" + fi + echo "$tn" +} +toml_get_table() { sed -n "/\[${1}]/,/^\[.*]$/p" <<<"$__TOML__" | sed '${/^\[/d;}'; } +toml_get() { + local table=$1 key=$2 val + val=$(grep -m 1 "^${key}=" <<<"$table") && sed -e "s/^\"//; s/\"$//" <<<"${val#*=}" +} +# --------------------------------------------------- + +pr() { echo -e "\033[0;32m[+] ${1}\033[0m"; } +epr() { + echo >&2 -e "\033[0;31m[-] ${1}\033[0m" + if [ "${GITHUB_REPOSITORY:-}" ]; then echo -e "::error::utils.sh [-] ${1}\n"; fi +} +abort() { + epr "ABORT: ${1:-}" + exit 1 +} + +get_rv_prebuilts() { + local integrations_src=$1 patches_src=$2 integrations_ver=$3 patches_ver=$4 cli_src=$5 cli_ver=$6 + local patches_dir=${patches_src%/*} + patches_dir=${TEMP_DIR}/${patches_dir,,}-rv + local integrations_dir=${integrations_src%/*} + integrations_dir=${TEMP_DIR}/${integrations_dir,,}-rv + local cli_dir=${cli_src%/*} + cli_dir=${TEMP_DIR}/${cli_dir,,}-rv + mkdir -p "$patches_dir" "$integrations_dir" "$cli_dir" + + pr "Getting prebuilts (${patches_src%/*})" >&2 + local rv_cli_url rv_integrations_url rv_patches rv_patches_dl rv_patches_url rv_patches_json + + local rv_cli_rel="https://api.github.com/repos/${cli_src}/releases/" + if [ "$cli_ver" ]; then rv_cli_rel+="tags/${cli_ver}"; else rv_cli_rel+="latest"; fi + local rv_integrations_rel="https://api.github.com/repos/${integrations_src}/releases/" + if [ "$integrations_ver" ]; then rv_integrations_rel+="tags/${integrations_ver}"; else rv_integrations_rel+="latest"; fi + local rv_patches_rel="https://api.github.com/repos/${patches_src}/releases/" + if [ "$patches_ver" ]; then rv_patches_rel+="tags/${patches_ver}"; else rv_patches_rel+="latest"; fi + rv_cli_url=$(gh_req "$rv_cli_rel" - | json_get 'browser_download_url') || return 1 + local rv_cli_jar="${cli_dir}/${rv_cli_url##*/}" + echo "CLI: $(cut -d/ -f4 <<<"$rv_cli_url")/$(cut -d/ -f9 <<<"$rv_cli_url") " >"$patches_dir/changelog.md" + + rv_integrations_url=$(gh_req "$rv_integrations_rel" - | json_get 'browser_download_url') || return 1 + local rv_integrations_apk="${integrations_dir}/${rv_integrations_url##*/}" + echo "Integrations: $(cut -d/ -f4 <<<"$rv_integrations_url")/$(cut -d/ -f9 <<<"$rv_integrations_url") " >>"$patches_dir/changelog.md" + + rv_patches=$(gh_req "$rv_patches_rel" -) || return 1 + # rv_patches_changelog=$(json_get 'body' <<<"$rv_patches" | sed 's/\(\\n\)\+/\\n/g') + rv_patches_dl=$(json_get 'browser_download_url' <<<"$rv_patches") + rv_patches_json="${patches_dir}/patches-$(json_get 'tag_name' <<<"$rv_patches").json" + rv_patches_url=$(grep 'jar' <<<"$rv_patches_dl") + local rv_patches_jar="${patches_dir}/${rv_patches_url##*/}" + [ -f "$rv_patches_jar" ] || REBUILD=true + local nm + nm=$(cut -d/ -f9 <<<"$rv_patches_url") + echo "Patches: $(cut -d/ -f4 <<<"$rv_patches_url")/$nm " >>"$patches_dir/changelog.md" + # shellcheck disable=SC2001 + echo -e "[Changelog](https://github.com/${patches_src}/releases/tag/v$(sed 's/.*-\(.*\)\..*/\1/' <<<"$nm"))\n" >>"$patches_dir/changelog.md" + # echo -e "\n${rv_patches_changelog//# [/### [}\n---" >>"$patches_dir/changelog.md" + + dl_if_dne "$rv_cli_jar" "$rv_cli_url" >&2 || return 1 + dl_if_dne "$rv_integrations_apk" "$rv_integrations_url" >&2 || return 1 + dl_if_dne "$rv_patches_jar" "$rv_patches_url" >&2 || return 1 + dl_if_dne "$rv_patches_json" "$(grep 'json' <<<"$rv_patches_dl")" >&2 || return 1 + + echo "$rv_cli_jar" "$rv_integrations_apk" "$rv_patches_jar" "$rv_patches_json" +} + +get_prebuilts() { + if [ "$OS" = Android ]; then + local arch + if [ "$(uname -m)" = aarch64 ]; then arch=arm64; else arch=arm; fi + dl_if_dne ${TEMP_DIR}/aapt2 https://github.com/rendiix/termux-aapt/raw/d7d4b4a344cc52b94bcdab3500be244151261d8e/prebuilt-binary/${arch}/aapt2 + chmod +x "${TEMP_DIR}/aapt2" + fi + mkdir -p ${MODULE_TEMPLATE_DIR}/bin/arm64 ${MODULE_TEMPLATE_DIR}/bin/arm + dl_if_dne "${MODULE_TEMPLATE_DIR}/bin/arm64/cmpr" "https://github.com/j-hc/cmpr/releases/latest/download/cmpr-arm64-v8a" + dl_if_dne "${MODULE_TEMPLATE_DIR}/bin/arm/cmpr" "https://github.com/j-hc/cmpr/releases/latest/download/cmpr-armeabi-v7a" + + HTMLQ="${TEMP_DIR}/htmlq" + if [ ! -f "$HTMLQ" ]; then + if [ "$OS" = Android ]; then + if [ "$arch" = arm64 ]; then arch=arm64-v8a; else arch=armeabi-v7a; fi + dl_if_dne ${TEMP_DIR}/htmlq https://github.com/j-hc/htmlq-ndk/releases/latest/download/htmlq-${arch} + chmod +x $HTMLQ + else + if [ "${DRYRUN:-}" ]; then + : >"$HTMLQ" + else + req "https://github.com/mgdm/htmlq/releases/latest/download/htmlq-x86_64-linux.tar.gz" "${TEMP_DIR}/htmlq.tar.gz" + tar -xf "${TEMP_DIR}/htmlq.tar.gz" -C "$TEMP_DIR" + rm "${TEMP_DIR}/htmlq.tar.gz" + fi + fi + + fi +} + +config_update() { + declare -A sources + : >$TEMP_DIR/skipped + local conf="" + # shellcheck disable=SC2154 + conf+=$(sed '1d' <<<"$main_config_t") + conf+=$'\n' + local prcfg=false + for table_name in $(toml_get_table_names); do + if [ -z "$table_name" ]; then continue; fi + t=$(toml_get_table "$table_name") + enabled=$(toml_get "$t" enabled) || enabled=true + if [ "$enabled" = false ]; then continue; fi + PATCHES_SRC=$(toml_get "$t" patches-source) || PATCHES_SRC=$DEF_PATCHES_SRC + if [[ -v sources[$PATCHES_SRC] ]]; then + if [ "${sources[$PATCHES_SRC]}" = 1 ]; then echo "$t"; fi + else + sources[$PATCHES_SRC]=0 + if ! last_patches_url=$(gh_req "https://api.github.com/repos/${PATCHES_SRC}/releases/latest" - 2>&1 | json_get 'browser_download_url' | grep 'jar'); then + abort oops + fi + last_patches=${last_patches_url##*/} + cur_patches=$(sed -n "s/.*Patches: ${PATCHES_SRC%%/*}\/\(.*\)/\1/p" build.md | xargs) + if [ "$cur_patches" ] && [ "$last_patches" ]; then + if [ "${cur_patches}" != "$last_patches" ]; then + sources[$PATCHES_SRC]=1 + prcfg=true + conf+="$t" + conf+=$'\n' + else + echo "Patches: ${PATCHES_SRC%%/*}/${cur_patches} " >>$TEMP_DIR/skipped + fi + fi + fi + done + if [ "$prcfg" = true ]; then echo "$conf"; fi +} + +_req() { + if [ "$2" = - ]; then + wget -nv -O "$2" --header="$3" "$1" + else + local dlp + dlp="$(dirname "$2")/tmp.$(basename "$2")" + if [ -f "$dlp" ]; then + while [ -f "$dlp" ]; do sleep 1; done + return + fi + wget -nv -O "$dlp" --header="$3" "$1" || return 1 + mv -f "$dlp" "$2" + fi +} +req() { _req "$1" "$2" "User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:108.0) Gecko/20100101 Firefox/108.0"; } +gh_req() { _req "$1" "$2" "$GH_HEADER"; } + +log() { echo -e "$1 " >>"build.md"; } +get_largest_ver() { + local vers m + vers=$(tee) + m=$(head -1 <<<"$vers") + if ! semver_validate "$m"; then echo "$m"; else sort -rV <<<"$vers" | head -1; fi +} +semver_validate() { + local a="${1%-*}" + local ac="${a//[.0-9]/}" + [ ${#ac} = 0 ] +} +get_patch_last_supported_ver() { + local inc_sel exc_sel vs + inc_sel=$(list_args "$2" | sed 's/.*/\.name == &/' | paste -sd '~' | sed 's/~/ or /g' || :) + exc_sel=$(list_args "$3" | sed 's/.*/\.name != &/' | paste -sd '~' | sed 's/~/ and /g' || :) + inc_sel=${inc_sel:-false} + if [ "$4" = false ]; then inc_sel="${inc_sel} or .use==true"; fi + if ! vs=$(jq -r ".[] + | select(.compatiblePackages // [] | .[] | .name==\"${1}\") + | select(${inc_sel}) + | select(${exc_sel:-true}) + | .compatiblePackages[].versions // []" "$5"); then + abort "error in jq query" + fi + tr -d ' ,\t[]"' <<<"$vs" | sort -u | grep -v '^$' | get_largest_ver || : +} + +dl_if_dne() { + [ "${DRYRUN:-}" ] && { + : >"$1" + return 0 + } + if [ ! -f "$1" ]; then + pr "Getting '$1' from '$2'" + req "$2" "$1" + fi +} + +isoneof() { + local i=$1 v + shift + for v; do [ "$v" = "$i" ] && return 0; done + return 1 +} + +# -------------------- apkmirror -------------------- +dl_apkmirror() { + local url=$1 version=${2// /-} output=$3 arch=$4 dpi=$5 apkorbundle=APK + if [ "$arch" = "arm-v7a" ]; then arch="armeabi-v7a"; fi + [ "${DRYRUN:-}" ] && { + : >"$output" + return 0 + } + local apparch resp node app_table dlurl="" + if [ "$arch" = all ]; then + apparch=(universal noarch 'arm64-v8a + armeabi-v7a') + else apparch=("$arch" universal noarch 'arm64-v8a + armeabi-v7a'); fi + url="${url}/${url##*/}-${version//./-}-release/" + resp=$(req "$url" -) || return 1 + for ((n = 1; n < 40; n++)); do + node=$($HTMLQ "div.table-row.headerFont:nth-last-child($n)" -r "span:nth-child(n+3)" <<<"$resp") + if [ -z "$node" ]; then break; fi + app_table=$($HTMLQ --text --ignore-whitespace <<<"$node") + if [ "$(sed -n 3p <<<"$app_table")" = "$apkorbundle" ] && { [ "$apkorbundle" = BUNDLE ] || + { [ "$apkorbundle" = APK ] && [ "$(sed -n 6p <<<"$app_table")" = "$dpi" ] && + isoneof "$(sed -n 4p <<<"$app_table")" "${apparch[@]}"; }; }; then + dlurl=$($HTMLQ --base https://www.apkmirror.com --attribute href "div:nth-child(1) > a:nth-child(1)" <<<"$node") + break + fi + done + [ -z "$dlurl" ] && return 1 + url=$(req "$dlurl" - | $HTMLQ --base https://www.apkmirror.com --attribute href "a.btn") || return 1 + if [ "$apkorbundle" = BUNDLE ] && [[ "$url" != *"&forcebaseapk=true" ]]; then url="${url}&forcebaseapk=true"; fi + url=$(req "$url" - | $HTMLQ --base https://www.apkmirror.com --attribute href "span > a[rel = nofollow]") || return 1 + req "$url" "$output" +} +get_apkmirror_vers() { + local vers apkm_resp + apkm_resp=$(req "https://www.apkmirror.com/uploads/?appcategory=${__APKMIRROR_CAT__}" -) + vers=$(sed -n 's;.*Version:\(.*\) .*;\1;p' <<<"$apkm_resp") + if [ "$__AAV__" = false ]; then + local IFS=$'\n' + vers=$(grep -iv "\(beta\|alpha\)" <<<"$vers") + local v r_vers=() + for v in $vers; do + grep -iq "${v} \(beta\|alpha\)" <<<"$apkm_resp" || r_vers+=("$v") + done + echo "${r_vers[*]}" + else + echo "$vers" + fi +} +get_apkmirror_pkg_name() { sed -n 's;.*id=\(.*\)" class="accent_color.*;\1;p' <<<"$__APKMIRROR_RESP__"; } +get_apkmirror_resp() { + __APKMIRROR_RESP__=$(req "${1}" -) + __APKMIRROR_CAT__="${1##*/}" +} +# -------------------------------------------------- + +# -------------------- uptodown -------------------- +get_uptodown_resp() { + __UPTODOWN_RESP__=$(req "${1}/versions" -) + __UPTODOWN_RESP_PKG__=$(req "${1}/download" -) +} +get_uptodown_vers() { $HTMLQ --text ".version" <<<"$__UPTODOWN_RESP__"; } +dl_uptodown() { + local uptodown_dlurl=$1 version=$2 output=$3 + local url + if [ -n "$version" ]; then + url=$(grep -F "${version}" -B 2 <<<"$__UPTODOWN_RESP__" | head -1 | sed -n 's;.*data-url=".*download\/\(.*\)".*;\1;p') || return 1 + else url=""; fi + url="https://dw.uptodown.com/dwn/$(req "${uptodown_dlurl}/post-download/${url}" - | sed -n 's;.*class="post-download" data-url="\(.*\)".*;\1;p')" || return 1 + req "$url" "$output" +} +get_uptodown_pkg_name() { $HTMLQ --text "tr.full:nth-child(1) > td:nth-child(3)" <<<"$__UPTODOWN_RESP_PKG__"; } +# -------------------------------------------------- + +# -------------------- apkmonk --------------------- +get_apkmonk_resp() { + __APKMONK_RESP__=$(req "${1}" -) + __APKMONK_PKG_NAME__=$(awk -F/ '{print $NF}' <<<"$1") +} +get_apkmonk_vers() { grep -oP 'download_ver.+?>\K([0-9,\.]*)' <<<"$__APKMONK_RESP__"; } +dl_apkmonk() { + local url=$1 version=$2 output=$3 + url="https://www.apkmonk.com/down_file?pkg="$(grep -F "$version" <<<"$__APKMONK_RESP__" | grep -oP 'href=\"/download-app/\K.+?(?=/?\">)' | sed 's;/;\&key=;') || return 1 + url=$(req "$url" - | grep -oP 'https.+?(?=\",)') || return 1 + req "$url" "$output" +} +get_apkmonk_pkg_name() { echo "$__APKMONK_PKG_NAME__"; } +# -------------------------------------------------- +dl_archive() { + local url=$1 version=$2 output=$3 arch=$4 + local path version=${version// /} + path=$(grep "${version_f#v}-${arch// /}" <<<"$__ARCHIVE_RESP__") || return 1 + req "${url}/${path}" "$output" +} +get_archive_resp() { + local r + r=$(req "$1" -) + if [ -z "$r" ]; then return 1; else __ARCHIVE_RESP__=$(sed -n 's;^ 10000000)); then + # pr "'${table}' bundle was downloaded successfully and will be used for the module" + # is_bundle=true + # else + # pr "'${table}' bundle was downloaded but will not be used" + # fi + # else + # pr "'${table}' bundle was not found" + # fi + # fi + # fi + + if [ "${args[riplib]}" = true ]; then + p_patcher_args+=("--rip-lib x86_64 --rip-lib x86") + if [ "$arch" = "arm64-v8a" ]; then + p_patcher_args+=("--rip-lib armeabi-v7a") + elif [ "$arch" = "arm-v7a" ]; then + p_patcher_args+=("--rip-lib arm64-v8a") + fi + fi + if [ "$mode_arg" = module ]; then + build_mode_arr=(module) + elif [ "$mode_arg" = apk ]; then + build_mode_arr=(apk) + elif [ "$mode_arg" = both ]; then + build_mode_arr=(apk module) + fi + local patcher_args patched_apk build_mode + local rv_brand_f=${args[rv_brand],,} + rv_brand_f=${rv_brand_f// /-} + for build_mode in "${build_mode_arr[@]}"; do + patcher_args=("${p_patcher_args[@]}") + pr "Building '${table}' in '$build_mode' mode" + if [ -n "$microg_patch" ]; then + patched_apk="${TEMP_DIR}/${app_name_l}-${rv_brand_f}-${version_f}-${arch_f}-${build_mode}.apk" + if [ "$build_mode" = apk ]; then + patcher_args+=("-i \"${microg_patch}\"") + elif [ "$build_mode" = module ]; then + patcher_args+=("-e \"${microg_patch}\"") + fi + else + patched_apk="${TEMP_DIR}/${app_name_l}-${rv_brand_f}-${version_f}-${arch_f}.apk" + fi + if [ "$build_mode" = module ] && [ "${args[riplib]}" = true ]; then + patcher_args+=("--unsigned --rip-lib arm64-v8a --rip-lib armeabi-v7a") + fi + if [ ! -f "$patched_apk" ] || [ "$REBUILD" = true ]; then + if ! patch_apk "$stock_apk" "$patched_apk" "${patcher_args[*]}" "${args[cli]}" "${args[ptjar]}"; then + epr "Building '${table}' failed!" + return 0 + fi + fi + if [ "$build_mode" = apk ]; then + local apk_output="${BUILD_DIR}/${app_name_l}-${rv_brand_f}-v${version_f}-${arch_f}.apk" + cp -f "$patched_apk" "$apk_output" + pr "Built ${table} (non-root): '${apk_output}'" + continue + fi + local base_template + base_template=$(mktemp -d -p $TEMP_DIR) + cp -a $MODULE_TEMPLATE_DIR/. "$base_template" + local upj="${table,,}-update.json" + + local isbndl extrct stock_apk_module + if [ $is_bundle = true ]; then + isbndl=":" + extrct="base.apk" + stock_apk_module=$stock_bundle_apk + else + isbndl="! :" + extrct="${pkg_name}.apk" + stock_apk_module=$stock_apk + fi + + uninstall_sh "$pkg_name" "$isbndl" "$base_template" + service_sh "$pkg_name" "$version" "$base_template" + customize_sh "$pkg_name" "$version" "$arch" "$extrct" "$base_template" + module_prop \ + "${args[module_prop_name]}" \ + "${app_name} ${args[rv_brand]}" \ + "$version" \ + "${app_name} ${args[rv_brand]} Magisk module" \ + "https://raw.githubusercontent.com/${GITHUB_REPOSITORY:-}/update/${upj}" \ + "$base_template" + + local module_output="${app_name_l}-${rv_brand_f}-magisk-v${version_f}-${arch_f}.zip" + if [ ! -f "$module_output" ] || [ "$REBUILD" = true ]; then + pr "Packing module ${table}" + cp -f "$patched_apk" "${base_template}/base.apk" + if [ "${args[include_stock]}" = true ]; then cp -f "$stock_apk_module" "${base_template}/${pkg_name}.apk"; fi + pushd >/dev/null "$base_template" || abort "Module template dir not found" + zip -"$COMPRESSION_LEVEL" -FSqr "../../${BUILD_DIR}/${module_output}" . + popd >/dev/null || : + fi + pr "Built ${table} (root): '${BUILD_DIR}/${module_output}'" + done +} + +list_args() { tr -d '\t\r' <<<"$1" | tr -s ' ' | sed 's/" "/"\n"/g' | sed 's/\([^"]\)"\([^"]\)/\1'\''\2/g' | grep -v '^$' || :; } +join_args() { list_args "$1" | sed "s/^/${2} /" | paste -sd " " - || :; } + +uninstall_sh() { + local s="${UNINSTALL_SH//__PKGNAME/$1}" + echo "${s//__ISBNDL/$2}" >"${3}/uninstall.sh" +} +customize_sh() { + local s="${CUSTOMIZE_SH//__PKGNAME/$1}" + s="${s//__EXTRCT/$4}" + # shellcheck disable=SC2001 + if [ "$3" = "arm64-v8a" ]; then + s=$(sed 's/#arm$/abort "ERROR: Wrong arch\nYour device: arm\nModule: arm64"/g' <<<"$s") + elif [ "$3" = "arm-v7a" ]; then + s=$(sed 's/#arm64$/abort "ERROR: Wrong arch\nYour device: arm64\nModule: arm"/g' <<<"$s") + fi + echo "${s//__PKGVER/$2}" >"${5}/customize.sh" +} +service_sh() { + local s="${SERVICE_SH//__PKGNAME/$1}" + echo "${s//__PKGVER/$2}" >"${3}/service.sh" +} +module_prop() { + echo "id=${1} +name=${2} +version=v${3} +versionCode=${NEXT_VER_CODE} +author=j-hc +description=${4}" >"${6}/module.prop" + + if [ "$ENABLE_MAGISK_UPDATE" = true ]; then echo "updateJson=${5}" >>"${6}/module.prop"; fi +}