Mirrors/revanced-magisk-module
1
0
Fork 0
mirror of https://github.com/j-hc/revanced-magisk-module.git synced 2025-05-01 15:14:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

update stuff

Browse Source
This commit is contained in:
j-hc 2022-08-08 00:51:25 +03:00
parent 850adedfab
commit 73eeb8e8ae
No known key found for this signature in database
GPG Key ID: 242B44D16774A2ED
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.sh
View File

@ -35,8 +35,8 @@ reset_template
get_xdelta get_xdelta
if [ "$BUILD_YT" = true ]; then build_yt; fi if [ "$BUILD_YT" = true ]; then build_yt; fi
if [ "$BUILD_MUSIC_ARM64_V8A" = true ]; then build_music "$ARM64_V8A"; fi if [ "$BUILD_MUSIC_ARM64_V8A" = true ]; then build_music $ARM64_V8A; fi
if [ "$BUILD_MUSIC_ARM_V7A" = true ]; then build_music "$ARM_V7A"; fi if [ "$BUILD_MUSIC_ARM_V7A" = true ]; then build_music $ARM_V7A; fi
if [ "$BUILD_TWITTER" = true ]; then build_twitter; fi if [ "$BUILD_TWITTER" = true ]; then build_twitter; fi
if [ "$BUILD_REDDIT" = true ]; then build_reddit; fi if [ "$BUILD_REDDIT" = true ]; then build_reddit; fi
if [ "$BUILD_MINDETACH_MODULE" = true ]; then if [ "$BUILD_MINDETACH_MODULE" = true ]; then

28
utils.sh
View File

@ -37,9 +37,9 @@ extract_deb() {
dl_if_dne "$deb_path" "$url" dl_if_dne "$deb_path" "$url"
ar x "$deb_path" data.tar.xz ar x "$deb_path" data.tar.xz
if [ "${output: -1}" = "/" ]; then if [ "${output: -1}" = "/" ]; then
tar -C "$output" -vxf data.tar.xz --wildcards "$path" --strip-components 7 tar -C "$output" -xf data.tar.xz --wildcards "$path" --strip-components 7
else else
tar -C "$TEMP_DIR" -vxf data.tar.xz "$path" --strip-components 7 tar -C "$TEMP_DIR" -xf data.tar.xz "$path" --strip-components 7
mv -f "${TEMP_DIR}/${path##*/}" "$output" mv -f "${TEMP_DIR}/${path##*/}" "$output"
fi fi
rm -rf data.tar.xz rm -rf data.tar.xz
@ -162,8 +162,7 @@ build_twitter() {
build_yt() { build_yt() {
echo "Building YouTube" echo "Building YouTube"
reset_template reset_template
local last_ver declare -r last_ver=$(get_patch_last_supported_ver "youtube")
last_ver=$(get_patch_last_supported_ver "youtube")
echo "Choosing version '${last_ver}'" echo "Choosing version '${last_ver}'"
local stock_apk="${TEMP_DIR}/youtube-stock-v${last_ver}.apk" patched_apk="${TEMP_DIR}/youtube-revanced-v${last_ver}.apk" local stock_apk="${TEMP_DIR}/youtube-stock-v${last_ver}.apk" patched_apk="${TEMP_DIR}/youtube-revanced-v${last_ver}.apk"
@ -199,10 +198,10 @@ build_yt() {
} }
build_music() { build_music() {
echo "Building YouTube Music" local arch=$1
echo "Building YouTube Music (${arch})"
reset_template reset_template
local arch=$1 last_ver declare -r last_ver=$(get_patch_last_supported_ver "music")
last_ver=$(get_patch_last_supported_ver "music")
echo "Choosing version '${last_ver}'" echo "Choosing version '${last_ver}'"
local stock_apk="${TEMP_DIR}/music-stock-v${last_ver}-${arch}.apk" patched_apk="${TEMP_DIR}/music-revanced-v${last_ver}-${arch}.apk" local stock_apk="${TEMP_DIR}/music-stock-v${last_ver}-${arch}.apk" patched_apk="${TEMP_DIR}/music-revanced-v${last_ver}-${arch}.apk"
@ -279,8 +278,7 @@ install_sh() {
DUMP=$(dumpsys package __PKGNAME) DUMP=$(dumpsys package __PKGNAME)
MODULE_VER=__MDVRSN MODULE_VER=__MDVRSN
CUR_VER=$(echo "$DUMP" | grep versionName | head -n1 | cut -d= -f2) CUR_VER=$(echo "$DUMP" | grep versionName | head -n1 | cut -d= -f2)
[ -z "$CUR_VER" ] && "ERROR: __PKGNAME is not installed!"
if [ -z "$CUR_VER" ]; then abort "ERROR: __PKGNAME is not installed!"; fi
am force-stop __PKGNAME am force-stop __PKGNAME
grep __PKGNAME /proc/mounts | while read -r line; do grep __PKGNAME /proc/mounts | while read -r line; do
@ -293,7 +291,7 @@ if [ "$MODULE_VER" != "$CUR_VER" ]; then
ui_print " module : ${MODULE_VER}" ui_print " module : ${MODULE_VER}"
abort "" abort ""
fi fi
ui_print "* Patching __PKGNAME"
if [ "$ARCH" = "arm" ]; then if [ "$ARCH" = "arm" ]; then
export LD_LIBRARY_PATH=$MODPATH/lib/arm export LD_LIBRARY_PATH=$MODPATH/lib/arm
ln -s $MODPATH/xdelta_arm $MODPATH/xdelta ln -s $MODPATH/xdelta_arm $MODPATH/xdelta
@ -304,24 +302,22 @@ else
abort "ERROR: unsupported arch: ${ARCH}" abort "ERROR: unsupported arch: ${ARCH}"
fi fi
chmod +x $MODPATH/xdelta chmod +x $MODPATH/xdelta
ui_print "* Patching __PKGNAME"
BASEPATH=$(echo "$DUMP" | grep path | cut -d: -f2 | xargs) BASEPATH=$(echo "$DUMP" | grep path | cut -d: -f2 | xargs)
[ -z "$BASEPATH" ] && abort "ERROR: Base path not found" [ -z "$BASEPATH" ] && abort "ERROR: Base path not found!"
if ! op=$($MODPATH/xdelta -d -f -s $BASEPATH $MODPATH/rv.xdelta $MODPATH/base.apk 2>&1); then if ! op=$($MODPATH/xdelta -d -f -s $BASEPATH $MODPATH/rv.xdelta $MODPATH/base.apk 2>&1); then
ui_print "ERROR: Patching failed!" ui_print "ERROR: Patching failed!"
ui_print "Make sure you installed __PKGNAME from the link given in releases section." ui_print "Make sure you installed __PKGNAME from the link given in releases section."
abort "$op" abort "$op"
fi fi
ui_print "* Patching done" ui_print "* Patching done"
rm -r $MODPATH/lib $MODPATH/*xdelta*
chcon u:object_r:apk_data_file:s0 $MODPATH/base.apk chcon u:object_r:apk_data_file:s0 $MODPATH/base.apk
if ! op=$(mount -o bind $MODPATH/base.apk $BASEPATH 2>&1); then if ! op=$(mount -o bind $MODPATH/base.apk $BASEPATH 2>&1); then
ui_print "ERROR: Mount failed!" ui_print "ERROR: Mount failed!"
abort "$op" abort "$op"
fi fi
ui_print "* Mounted __PKGNAME"' ui_print "* Mounted __PKGNAME"
rm -r $MODPATH/lib $MODPATH/*xdelta*
am force-stop __PKGNAME'
s="${s//__PKGNAME/$1}" s="${s//__PKGNAME/$1}"
echo "${s//__MDVRSN/$2}" >"${MODULE_TEMPLATE_DIR}/common/install.sh" echo "${s//__MDVRSN/$2}" >"${MODULE_TEMPLATE_DIR}/common/install.sh"