From 7492b5f78dec5bf0676c68fd156349ca5bfb9fb0 Mon Sep 17 00:00:00 2001 From: Naveen Date: Tue, 28 Jan 2025 16:41:03 +0530 Subject: [PATCH] magisk > module Signed-off-by: Naveen --- build-termux.sh | 44 ++++++++++++++++++++++---------------------- build.sh | 8 ++++---- config.toml | 2 +- utils.sh | 4 ++-- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/build-termux.sh b/build-termux.sh index 0f56580..ed397b6 100755 --- a/build-termux.sh +++ b/build-termux.sh @@ -29,33 +29,33 @@ if [ ! -f ~/.rvmm_"$(date '+%Y%m')" ]; then yes "" | pkg update -y && pkg install -y git curl jq openjdk-17 zip : >~/.rvmm_"$(date '+%Y%m')" fi -mkdir -p /sdcard/Download/revanced-magisk-module/ +mkdir -p /sdcard/Download/revanced-modules/ -if [ -d revanced-magisk-module ] || [ -f config.toml ]; then - if [ -d revanced-magisk-module ]; then cd revanced-magisk-module; fi - pr "Checking for revanced-magisk-module updates" +if [ -d revanced-modules ] || [ -f config.toml ]; then + if [ -d revanced-modules ]; then cd revanced-modules; fi + pr "Checking for revanced-modules updates" git fetch if git status | grep -q 'is behind\|fatal'; then - pr "revanced-magisk-module is not synced with upstream." - pr "Cloning revanced-magisk-module. config.toml will be preserved." + pr "revanced-modules is not synced with upstream." + pr "Cloning revanced-modules. config.toml will be preserved." cd .. - cp -f revanced-magisk-module/config.toml . - rm -rf revanced-magisk-module + cp -f revanced-modules/config.toml . + rm -rf revanced-modules git clone https://github.com/j-hc/revanced-magisk-module --recurse --depth 1 - mv -f config.toml revanced-magisk-module/config.toml - cd revanced-magisk-module + mv -f config.toml revanced-modules/config.toml + cd revanced-modules fi else - pr "Cloning revanced-magisk-module." + pr "Cloning revanced-modules." git clone https://github.com/j-hc/revanced-magisk-module --depth 1 - cd revanced-magisk-module + cd revanced-modules sed -i '/^enabled.*/d; /^\[.*\]/a enabled = false' config.toml - grep -q 'revanced-magisk-module' ~/.gitconfig 2>/dev/null || - git config --global --add safe.directory ~/revanced-magisk-module + grep -q 'revanced-modules' ~/.gitconfig 2>/dev/null || + git config --global --add safe.directory ~/revanced-modules fi -[ -f ~/storage/downloads/revanced-magisk-module/config.toml ] || - cp config.toml ~/storage/downloads/revanced-magisk-module/config.toml +[ -f ~/storage/downloads/revanced-modules/config.toml ] || + cp config.toml ~/storage/downloads/revanced-modules/config.toml if ask "Open rvmm-config-gen to generate a config?"; then am start -a android.intent.action.VIEW -d https://j-hc.github.io/rvmm-config-gen/ @@ -63,11 +63,11 @@ fi printf "\n" until if ask "Open 'config.toml' to configure builds?\nAll are disabled by default, you will need to enable at first time building"; then - am start -a android.intent.action.VIEW -d file:///sdcard/Download/revanced-magisk-module/config.toml -t text/plain + am start -a android.intent.action.VIEW -d file:///sdcard/Download/revanced-modules/config.toml -t text/plain fi ask "Setup is done. Do you want to start building?" do :; done -cp -f ~/storage/downloads/revanced-magisk-module/config.toml config.toml +cp -f ~/storage/downloads/revanced-modules/config.toml config.toml ./build.sh @@ -78,10 +78,10 @@ for op in *; do pr "glob fail" exit 1 } - mv -f "${PWD}/${op}" ~/storage/downloads/revanced-magisk-module/"${op}" + mv -f "${PWD}/${op}" ~/storage/downloads/revanced-modules/"${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 +pr "Outputs are available in /sdcard/Download/revanced-modules folder" +am start -a android.intent.action.VIEW -d file:///sdcard/Download/revanced-modules -t resource/folder sleep 2 -am start -a android.intent.action.VIEW -d file:///sdcard/Download/revanced-magisk-module -t resource/folder +am start -a android.intent.action.VIEW -d file:///sdcard/Download/revanced-modules -t resource/folder diff --git a/build.sh b/build.sh index c645773..752a78c 100755 --- a/build.sh +++ b/build.sh @@ -35,10 +35,10 @@ if [ "${2-}" = "--config-update" ]; then 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 +ENABLE_MODULE_UPDATE=$(toml_get "$main_config_t" enable-module-update) || ENABLE_MODULE_UPDATE=true +if [ "$ENABLE_MODULE_UPDATE" = true ] && [ -z "${GITHUB_REPOSITORY-}" ]; then + pr "You are building locally. Module updates will not be enabled." + ENABLE_MODULE_UPDATE=false fi if ((COMPRESSION_LEVEL > 9)) || ((COMPRESSION_LEVEL < 0)); then abort "compression-level must be within 0-9"; fi diff --git a/config.toml b/config.toml index 5af910a..d7d0de8 100755 --- a/config.toml +++ b/config.toml @@ -1,4 +1,4 @@ -enable-magisk-update = true # set this to false if you do not want to receive updates for the module in magisk app +enable-module-update = true # set this to false if you do not want to receive updates for the module in magisk app parallel-jobs = 1 # add 'enabled = false' for not patching a specific app or remove it from the config diff --git a/utils.sh b/utils.sh index 6b32396..9baf710 100755 --- a/utils.sh +++ b/utils.sh @@ -585,7 +585,7 @@ build_rv() { "${args[module_prop_name]}" \ "${app_name} ${args[rv_brand]}" \ "${version} (patches: ${rv_patches_ver%%.rvp})" \ - "${app_name} ${args[rv_brand]} Magisk module" \ + "${app_name} ${args[rv_brand]} Revanced module" \ "https://raw.githubusercontent.com/${GITHUB_REPOSITORY-}/update/${upj}" \ "$base_template" @@ -622,5 +622,5 @@ versionCode=${NEXT_VER_CODE} author=𝙴𝙻𝙾𝙷𝙸𝙼 description=${4}" >"${6}/module.prop" - if [ "$ENABLE_MAGISK_UPDATE" = true ]; then echo "updateJson=${5}" >>"${6}/module.prop"; fi + if [ "$ENABLE_MODULE_UPDATE" = true ]; then echo "updateJson=${5}" >>"${6}/module.prop"; fi }