From ecd919d176d05fc71d5751f7a9d511de4b0e8c24 Mon Sep 17 00:00:00 2001 From: j-hc Date: Thu, 25 Jul 2024 23:45:13 +0300 Subject: [PATCH 1/3] module: remove NVBASE --- revanced-magisk/customize.sh | 8 ++------ revanced-magisk/service.sh | 2 +- revanced-magisk/uninstall.sh | 4 ++-- utils.sh | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/revanced-magisk/customize.sh b/revanced-magisk/customize.sh index 1e00b9d0..86b7c94f 100755 --- a/revanced-magisk/customize.sh +++ b/revanced-magisk/customize.sh @@ -118,8 +118,8 @@ ui_print "* Setting Permissions" set_perm "$MODPATH/base.apk" 1000 1000 644 u:object_r:apk_data_file:s0 ui_print "* Mounting $PKG_NAME" -mkdir -p "$NVBASE/rvhc" -RVPATH=$NVBASE/rvhc/${MODPATH##*/}.apk +mkdir -p "/data/adb/rvhc" +RVPATH=/data/adb/rvhc/${MODPATH##*/}.apk mv -f "$MODPATH/base.apk" "$RVPATH" if ! op=$(mm mount -o bind "$RVPATH" "$BASEPATH/base.apk" 2>&1); then @@ -133,10 +133,6 @@ nohup cmd package compile --reset "$PKG_NAME" >/dev/null 2>&1 & ui_print "* Cleanup" rm -rf "${MODPATH:?}/bin" "$MODPATH/$PKG_NAME.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/revanced-magisk/service.sh b/revanced-magisk/service.sh index 974c75d5..99a3a2ce 100755 --- a/revanced-magisk/service.sh +++ b/revanced-magisk/service.sh @@ -1,6 +1,6 @@ #!/system/bin/sh MODDIR=${0%/*} -RVPATH=$NVBASE/rvhc/${MODDIR##*/}.apk +RVPATH=/data/adb/rvhc/${MODDIR##*/}.apk . "$MODDIR/config" until [ "$(getprop sys.boot_completed)" = 1 ]; do sleep 1; done diff --git a/revanced-magisk/uninstall.sh b/revanced-magisk/uninstall.sh index 1bf629d9..7ed3fbe2 100755 --- a/revanced-magisk/uninstall.sh +++ b/revanced-magisk/uninstall.sh @@ -1,6 +1,6 @@ #!/system/bin/sh { MODDIR=${0%/*} - rm "$NVBASE/rvhc/${MODDIR##*/}".apk - rmdir "$NVBASE/rvhc" + rm "/data/adb/rvhc/${MODDIR##*/}".apk + rmdir "/data/adb/rvhc" } & diff --git a/utils.sh b/utils.sh index 91a186e7..f07f6f96 100755 --- a/utils.sh +++ b/utils.sh @@ -260,7 +260,7 @@ get_uptodown_resp() { } get_uptodown_vers() { $HTMLQ --text ".version" <<<"$__UPTODOWN_RESP__"; } dl_uptodown() { - local uptodown_dlurl=$1 version=$2 output=$3 arch=$4 is_latest=$6 + local uptodown_dlurl=$1 version=$2 output=$3 arch=$4 _dpi=$5 is_latest=$6 local url if [ "$is_latest" = false ]; then url=$(grep -F "${version}" -B 2 <<<"$__UPTODOWN_RESP__" | head -1 | sed -n 's;.*data-url=".*download\/\(.*\)".*;\1;p') || return 1 From 638dd2487488ea9bfa0a17fa3a1725c71c1068d4 Mon Sep 17 00:00:00 2001 From: j-hc Date: Sat, 3 Aug 2024 22:42:26 +0300 Subject: [PATCH 2/3] format --- utils.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/utils.sh b/utils.sh index f07f6f96..300bd3b9 100755 --- a/utils.sh +++ b/utils.sh @@ -120,8 +120,8 @@ config_update() { fi else sources[$PATCHES_SRC]=0 - if ! last_patches=$(gh_req "https://api.github.com/repos/${PATCHES_SRC}/releases/latest" - \ - | jq -e -r '.assets[] | select(.name | endswith("jar")) | .name'); then + if ! last_patches=$(gh_req "https://api.github.com/repos/${PATCHES_SRC}/releases/latest" - | + jq -e -r '.assets[] | select(.name | endswith("jar")) | .name'); then abort oops fi cur_patches=$(sed -n "s/.*Patches: ${PATCHES_SRC%%/*}\/\(.*\)/\1/p" build.md | xargs) @@ -216,9 +216,9 @@ dl_apkmirror() { 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 + 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 From 90037fcd4b59a029b80aead1a21a346b368412a5 Mon Sep 17 00:00:00 2001 From: j-hc Date: Sun, 4 Aug 2024 00:54:02 +0300 Subject: [PATCH 3/3] remove twitter from sig.txt as twitter does not exist as non-split anymore --- sig.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/sig.txt b/sig.txt index cfa06754..93841b14 100644 --- a/sig.txt +++ b/sig.txt @@ -1,6 +1,5 @@ a2a1ad7ba7f41dfca4514e2afeb90691719af6d0fdbed4b09bbf0ed897701ceb com.google.android.apps.youtube.music 3d7a1223019aa39d9ea0e3436ab7c0896bfb4fb679f4de5fe7c23f326c8f994a com.google.android.youtube 970b91143813b4c9d5f3634f672c9fcaa5621b4efaaedafd6c235cbbb869736f com.reddit.frontpage -0fd9a0cfb07b65950997b4eaebdc53931392391aa406538a3b04073bc2ce2fe9 com.twitter.android 9041803e91bcb814b4b4399fb5c85a91640b755e5e8ba76813814bf4cf2ab5ba com.zhiliaoapp.musically 1338f9b049893cc70b78432a177582f90bd4bc6296ea4ed35bcc7df59687ac53 tv.twitch.android.app \ No newline at end of file