From a119480bf1158e93e789729aa005dc2b76a47ea5 Mon Sep 17 00:00:00 2001 From: Cuynu Date: Sun, 19 Nov 2023 20:35:55 +0700 Subject: [PATCH] add template --- README.md | 18 ++ .../META-INF/com/google/android/update-binary | 196 ++++++++++++++++++ .../com/google/android/updater-script | 1 + vancedx-music/customize.sh | 70 +++++++ vancedx-music/module.prop | 6 + vancedx-music/service.sh | 41 ++++ vancedx-music/uninstall.sh | 7 + vancedx-music/youtube-music/base.apk | 0 .../META-INF/com/google/android/update-binary | 196 ++++++++++++++++++ .../com/google/android/updater-script | 1 + vancedx/base-vx.apk | 0 vancedx/customize.sh | 69 ++++++ vancedx/module.prop | 6 + vancedx/service.sh | 41 ++++ vancedx/uninstall.sh | 7 + vancedx/youtube/base.apk | 0 16 files changed, 659 insertions(+) create mode 100644 README.md create mode 100644 vancedx-music/META-INF/com/google/android/update-binary create mode 100644 vancedx-music/META-INF/com/google/android/updater-script create mode 100644 vancedx-music/customize.sh create mode 100644 vancedx-music/module.prop create mode 100644 vancedx-music/service.sh create mode 100644 vancedx-music/uninstall.sh create mode 100644 vancedx-music/youtube-music/base.apk create mode 100644 vancedx/META-INF/com/google/android/update-binary create mode 100644 vancedx/META-INF/com/google/android/updater-script create mode 100644 vancedx/base-vx.apk create mode 100644 vancedx/customize.sh create mode 100644 vancedx/module.prop create mode 100644 vancedx/service.sh create mode 100644 vancedx/uninstall.sh create mode 100644 vancedx/youtube/base.apk diff --git a/README.md b/README.md new file mode 100644 index 0000000..fc09696 --- /dev/null +++ b/README.md @@ -0,0 +1,18 @@ +# Vanced+ Module Template + +## For YouTube Vanced+ + +Replace `base.apk` on `youtube` folder with original YouTube apk + +Replace `base-vx.apk` with Vanced+ apk that patched without `vx-microg-support` patch (version must be match with original YouTube apk) + +Replace `version` on `module.prop` to match with original YouTube apk and Vanced+ apk (`versionCode` leave default !) + +## For YouTube Music Vanced+ + +Replace `base.apk` on `youtube-music` folder with original YouTube Music apk + +Replace `base-vx.apk` with Vanced+ apk that patched without `vx-microg-support` patch (version must be match with original YouTube Music apk) + +Replace `version` on `module.prop` to match with original YouTube Music apk and Music Vanced+ apk (`versionCode` leave default !) + diff --git a/vancedx-music/META-INF/com/google/android/update-binary b/vancedx-music/META-INF/com/google/android/update-binary new file mode 100644 index 0000000..c0c7f6f --- /dev/null +++ b/vancedx-music/META-INF/com/google/android/update-binary @@ -0,0 +1,196 @@ +#!/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.0+! " + 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 20000 ] && require_new_magisk + +if [ $MAGISK_VER_CODE -ge 20400 ]; then + # New Magisk have complete installation logic within util_functions.sh + install_module + exit 0 +fi + +################# +# Legacy Support +################# + +TMPDIR=/dev/tmp +PERSISTDIR=/sbin/.magisk/mirror/persist + +is_legacy_script() { + unzip -l "$ZIPFILE" install.sh | grep -q install.sh + return $? +} + +print_modname() { + local authlen len namelen pounds + namelen=`echo -n $MODNAME | wc -c` + authlen=$((`echo -n $MODAUTH | wc -c` + 3)) + [ $namelen -gt $authlen ] && len=$namelen || len=$authlen + len=$((len + 2)) + pounds=$(printf "%${len}s" | tr ' ' '*') + ui_print "$pounds" + ui_print " $MODNAME " + ui_print " by $MODAUTH " + ui_print "$pounds" + ui_print "*******************" + ui_print " Powered by Magisk " + ui_print "*******************" +} + +# Override abort as old scripts have some issues +abort() { + ui_print "$1" + $BOOTMODE || recovery_cleanup + [ -n $MODPATH ] && rm -rf $MODPATH + rm -rf $TMPDIR + exit 1 +} + +rm -rf $TMPDIR 2>/dev/null +mkdir -p $TMPDIR + +# Preperation for flashable zips +setup_flashable + +# Mount partitions +mount_partitions + +# Detect version and architecture +api_level_arch_detect + +# Setup busybox and binaries +$BOOTMODE && boot_actions || recovery_actions + +############## +# Preparation +############## + +# Extract prop file +unzip -o "$ZIPFILE" module.prop -d $TMPDIR >&2 +[ ! -f $TMPDIR/module.prop ] && abort "! Unable to extract zip file!" + +$BOOTMODE && MODDIRNAME=modules_update || MODDIRNAME=modules +MODULEROOT=$NVBASE/$MODDIRNAME +MODID=`grep_prop id $TMPDIR/module.prop` +MODNAME=`grep_prop name $TMPDIR/module.prop` +MODAUTH=`grep_prop author $TMPDIR/module.prop` +MODPATH=$MODULEROOT/$MODID + +# Create mod paths +rm -rf $MODPATH 2>/dev/null +mkdir -p $MODPATH + +########## +# Install +########## + +if is_legacy_script; then + unzip -oj "$ZIPFILE" module.prop install.sh uninstall.sh 'common/*' -d $TMPDIR >&2 + + # Load install script + . $TMPDIR/install.sh + + # Callbacks + print_modname + on_install + # Custom uninstaller + [ -f $TMPDIR/uninstall.sh ] && cp -af $TMPDIR/uninstall.sh $MODPATH/uninstall.sh + + # Skip mount + $SKIPMOUNT && touch $MODPATH/skip_mount + + # prop file + $PROPFILE && cp -af $TMPDIR/system.prop $MODPATH/system.prop + + # Module info + cp -af $TMPDIR/module.prop $MODPATH/module.prop + + # post-fs-data scripts + $POSTFSDATA && cp -af $TMPDIR/post-fs-data.sh $MODPATH/post-fs-data.sh + + # service scripts + $LATESTARTSERVICE && cp -af $TMPDIR/service.sh $MODPATH/service.sh + + ui_print "- Setting permissions" + set_permissions +else + print_modname + + unzip -o "$ZIPFILE" customize.sh -d $MODPATH >&2 + + if ! grep -q '^SKIPUNZIP=1$' $MODPATH/customize.sh 2>/dev/null; then + sleep 1 + ui_print "- Extracting module files" + unzip -o "$ZIPFILE" -x 'META-INF/*' -d $MODPATH >&2 + + # Default permissions + set_perm_recursive $MODPATH 0 0 0755 0644 + fi + + # Load customization script + [ -f $MODPATH/customize.sh ] && . $MODPATH/customize.sh +fi + +# Handle replace folders +for TARGET in $REPLACE; do + ui_print "- Replace target: $TARGET" + mktouch $MODPATH$TARGET/.replace +done + +if $BOOTMODE; then + # Update info for Magisk Manager + mktouch $NVBASE/modules/$MODID/update + cp -af $MODPATH/module.prop $NVBASE/modules/$MODID/module.prop +fi + +# Copy over custom sepolicy rules +if [ -f $MODPATH/sepolicy.rule -a -e $PERSISTDIR ]; then + ui_print "- Installing custom sepolicy patch" + # Remove old recovery logs (which may be filling partition) to make room + rm -f $PERSISTDIR/cache/recovery/* + PERSISTMOD=$PERSISTDIR/magisk/$MODID + mkdir -p $PERSISTMOD + cp -af $MODPATH/sepolicy.rule $PERSISTMOD/sepolicy.rule || abort "! Insufficient partition size" +fi + +# Remove stuffs that don't belong to modules +rm -rf \ +$MODPATH/system/placeholder $MODPATH/customize.sh \ +$MODPATH/README.md $MODPATH/.git* 2>/dev/null + +############# +# Finalizing +############# + +cd / +$BOOTMODE || recovery_cleanup +rm -rf $TMPDIR +sleep 1 +ui_print "- Done" +exit 0 diff --git a/vancedx-music/META-INF/com/google/android/updater-script b/vancedx-music/META-INF/com/google/android/updater-script new file mode 100644 index 0000000..11d5c96 --- /dev/null +++ b/vancedx-music/META-INF/com/google/android/updater-script @@ -0,0 +1 @@ +#MAGISK diff --git a/vancedx-music/customize.sh b/vancedx-music/customize.sh new file mode 100644 index 0000000..2230bd2 --- /dev/null +++ b/vancedx-music/customize.sh @@ -0,0 +1,70 @@ +#!/system/bin/sh + +# Checking for installation environment +# Abort TWRP installation with error message when user tries to install this module in TWRP + +if [ $BOOTMODE = false ]; then + ui_print "INFO : Installing through TWRP Not supported" + ui_print "INFO : Intsall this module via Magisk Manager" + abort "INFO: Aborting installation !!" +fi + + +PKGNAME=com.google.android.apps.youtube.music +APPNAME="YTMusic" + +# Unmount Old App +stock_path=$( pm path $PKGNAME | grep base | sed 's/package://g' ) +if [[ '$stock_path' ]] ; then umount -l $stock_path; fi + +# Install YouTube Music +ui_print "INFO : Installing stock YouTube Music app..." +SESSION=$(pm install-create -r | grep -oE '[0-9]+') +APKS="$(ls $MODPATH/youtube-music)" +for APK in $APKS; do +pm install-write $SESSION $APK $MODPATH/youtube-music/$APK > /dev/null +done +pm install-commit $SESSION +rm -rf $MODPATH/youtube-music + +if ! dumpsys package $PKGNAME | grep path > /dev/null 2>&1 +then + ui_print "INFO : $APPNAME app is not installed" + abort "ERROR : Aborting installation !!" +fi + + +STOCKAPPVER=$(dumpsys package $PKGNAME | grep versionName | cut -d= -f 2 | sed -n '1p') +VANCEDXAPPVER=$(grep version= module.prop | sed 's/version=v//') + +if [ "$STOCKAPPVER" != "$VANCEDXAPPVER" ] +then + ui_print "INFO : Installed $APPNAME version : $STOCKAPPVER" + ui_print "INFO : $APPNAME Vanced+ version : $VANCEDXAPPVER" + ui_print "ERROR : Installed app version mismatch with module !" + ui_print "ERROR : Uninstall current installed stock YTM app or" + ui_print "ERROR : Get Vanced+ module that match with current installed YTM App version !" + abort "INFO : Aborting installation !!" +fi + +ui_print "INFO : Unmounting previous mounts" + +grep $PKGNAME /proc/mounts | while read -r LINE +do + echo "$LINE" | grep "$PKGNAME" | cut -d " " -f 2 | sed "s/apk.*/apk/" | xargs -r umount -l +done + +ui_print "INFO : Moving files and setting permissions" +mkdir -p "$MODPATH/app" +rm $MODPATH/app/"$APPNAME"* +mv $MODPATH/*.apk $MODPATH/app/"$APPNAME"VancedX-"$VANCEDXAPPVER".apk +STOCKAPK=$(pm path $PKGNAME | grep base | cut -d ":" -f2) +VANCEDXAPK=$MODPATH/app/"$APPNAME"VancedX-"$VANCEDXAPPVER".apk +chmod 644 "$VANCEDXAPK" +chown system:system "$VANCEDXAPK" +chcon u:object_r:apk_data_file:s0 "$VANCEDXAPK" +mount -o bind "$VANCEDXAPK" "$STOCKAPK" +am force-stop "$PKGNAME" + + +ui_print "INFO : YouTube Music Vanced+ Installed !!" diff --git a/vancedx-music/module.prop b/vancedx-music/module.prop new file mode 100644 index 0000000..086fcd8 --- /dev/null +++ b/vancedx-music/module.prop @@ -0,0 +1,6 @@ +id=ytvancedx-music +name=YTMusic Vanced+ +version=vX.XX.XX +versionCode=2023 +author=cuynu +description=YouTube Music Vanced+ Module diff --git a/vancedx-music/service.sh b/vancedx-music/service.sh new file mode 100644 index 0000000..d6ef34b --- /dev/null +++ b/vancedx-music/service.sh @@ -0,0 +1,41 @@ +#!/system/bin/sh + +# Wait till device boot process completes +while [ "$(getprop sys.boot_completed)" != "1" ]; do + sleep 1 +done + +# Device online functions +wait_until_login() +{ + # whether in lock screen, tested on Android 7.1 & 10.0 + # in case of other magisk module remounting /data as RW + while [ "$(dumpsys window policy | grep mInputRestricted=true)" != "" ]; do + sleep 2 + done + # we doesn't have the permission to rw "/sdcard" before the user unlocks the screen + while [ ! -d "/sdcard/Android" ]; do + sleep 2 + done +} + +# Detect temproot +if [ -e /data/local/tmp/magisk ]; then + sleep 20 +else + sleep 3 +fi + +# Mounting +wait_until_login +PKGNAME=com.google.android.apps.youtube.music +STOCKAPPVER=$(dumpsys package $PKGNAME | grep versionName | cut -d "=" -f 2 | sed -n '1p') +VANCEDXAPPVER=$(basename /data/adb/modules/ytvancedx-music/app/YTMusic* .apk | cut -d "-" -f 2) +if [ "$STOCKAPPVER" = "$VANCEDXAPPVER" ] +then + STOCKAPK=$(pm path $PKGNAME | grep base | cut -d ":" -f2) + VANCEDXAPK="/data/adb/modules/ytvancedx-music/app/YTMusicVancedX-$VANCEDXAPPVER.apk" + chcon u:object_r:apk_data_file:s0 "$VANCEDXAPK" + mount -o bind "$VANCEDXAPK" "$STOCKAPK" +fi +am force-stop com.google.android.apps.youtube.music diff --git a/vancedx-music/uninstall.sh b/vancedx-music/uninstall.sh new file mode 100644 index 0000000..24d4315 --- /dev/null +++ b/vancedx-music/uninstall.sh @@ -0,0 +1,7 @@ +#!/system/bin/sh + +PKGNAME=com.google.android.apps.youtube.music + +# Unmount ReVanced +stock_path=$( pm path $PKGNAME | grep base | sed 's/package://g' ) +if [[ '$stock_path' ]] ; then umount -l $stock_path; fi \ No newline at end of file diff --git a/vancedx-music/youtube-music/base.apk b/vancedx-music/youtube-music/base.apk new file mode 100644 index 0000000..e69de29 diff --git a/vancedx/META-INF/com/google/android/update-binary b/vancedx/META-INF/com/google/android/update-binary new file mode 100644 index 0000000..c0c7f6f --- /dev/null +++ b/vancedx/META-INF/com/google/android/update-binary @@ -0,0 +1,196 @@ +#!/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.0+! " + 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 20000 ] && require_new_magisk + +if [ $MAGISK_VER_CODE -ge 20400 ]; then + # New Magisk have complete installation logic within util_functions.sh + install_module + exit 0 +fi + +################# +# Legacy Support +################# + +TMPDIR=/dev/tmp +PERSISTDIR=/sbin/.magisk/mirror/persist + +is_legacy_script() { + unzip -l "$ZIPFILE" install.sh | grep -q install.sh + return $? +} + +print_modname() { + local authlen len namelen pounds + namelen=`echo -n $MODNAME | wc -c` + authlen=$((`echo -n $MODAUTH | wc -c` + 3)) + [ $namelen -gt $authlen ] && len=$namelen || len=$authlen + len=$((len + 2)) + pounds=$(printf "%${len}s" | tr ' ' '*') + ui_print "$pounds" + ui_print " $MODNAME " + ui_print " by $MODAUTH " + ui_print "$pounds" + ui_print "*******************" + ui_print " Powered by Magisk " + ui_print "*******************" +} + +# Override abort as old scripts have some issues +abort() { + ui_print "$1" + $BOOTMODE || recovery_cleanup + [ -n $MODPATH ] && rm -rf $MODPATH + rm -rf $TMPDIR + exit 1 +} + +rm -rf $TMPDIR 2>/dev/null +mkdir -p $TMPDIR + +# Preperation for flashable zips +setup_flashable + +# Mount partitions +mount_partitions + +# Detect version and architecture +api_level_arch_detect + +# Setup busybox and binaries +$BOOTMODE && boot_actions || recovery_actions + +############## +# Preparation +############## + +# Extract prop file +unzip -o "$ZIPFILE" module.prop -d $TMPDIR >&2 +[ ! -f $TMPDIR/module.prop ] && abort "! Unable to extract zip file!" + +$BOOTMODE && MODDIRNAME=modules_update || MODDIRNAME=modules +MODULEROOT=$NVBASE/$MODDIRNAME +MODID=`grep_prop id $TMPDIR/module.prop` +MODNAME=`grep_prop name $TMPDIR/module.prop` +MODAUTH=`grep_prop author $TMPDIR/module.prop` +MODPATH=$MODULEROOT/$MODID + +# Create mod paths +rm -rf $MODPATH 2>/dev/null +mkdir -p $MODPATH + +########## +# Install +########## + +if is_legacy_script; then + unzip -oj "$ZIPFILE" module.prop install.sh uninstall.sh 'common/*' -d $TMPDIR >&2 + + # Load install script + . $TMPDIR/install.sh + + # Callbacks + print_modname + on_install + # Custom uninstaller + [ -f $TMPDIR/uninstall.sh ] && cp -af $TMPDIR/uninstall.sh $MODPATH/uninstall.sh + + # Skip mount + $SKIPMOUNT && touch $MODPATH/skip_mount + + # prop file + $PROPFILE && cp -af $TMPDIR/system.prop $MODPATH/system.prop + + # Module info + cp -af $TMPDIR/module.prop $MODPATH/module.prop + + # post-fs-data scripts + $POSTFSDATA && cp -af $TMPDIR/post-fs-data.sh $MODPATH/post-fs-data.sh + + # service scripts + $LATESTARTSERVICE && cp -af $TMPDIR/service.sh $MODPATH/service.sh + + ui_print "- Setting permissions" + set_permissions +else + print_modname + + unzip -o "$ZIPFILE" customize.sh -d $MODPATH >&2 + + if ! grep -q '^SKIPUNZIP=1$' $MODPATH/customize.sh 2>/dev/null; then + sleep 1 + ui_print "- Extracting module files" + unzip -o "$ZIPFILE" -x 'META-INF/*' -d $MODPATH >&2 + + # Default permissions + set_perm_recursive $MODPATH 0 0 0755 0644 + fi + + # Load customization script + [ -f $MODPATH/customize.sh ] && . $MODPATH/customize.sh +fi + +# Handle replace folders +for TARGET in $REPLACE; do + ui_print "- Replace target: $TARGET" + mktouch $MODPATH$TARGET/.replace +done + +if $BOOTMODE; then + # Update info for Magisk Manager + mktouch $NVBASE/modules/$MODID/update + cp -af $MODPATH/module.prop $NVBASE/modules/$MODID/module.prop +fi + +# Copy over custom sepolicy rules +if [ -f $MODPATH/sepolicy.rule -a -e $PERSISTDIR ]; then + ui_print "- Installing custom sepolicy patch" + # Remove old recovery logs (which may be filling partition) to make room + rm -f $PERSISTDIR/cache/recovery/* + PERSISTMOD=$PERSISTDIR/magisk/$MODID + mkdir -p $PERSISTMOD + cp -af $MODPATH/sepolicy.rule $PERSISTMOD/sepolicy.rule || abort "! Insufficient partition size" +fi + +# Remove stuffs that don't belong to modules +rm -rf \ +$MODPATH/system/placeholder $MODPATH/customize.sh \ +$MODPATH/README.md $MODPATH/.git* 2>/dev/null + +############# +# Finalizing +############# + +cd / +$BOOTMODE || recovery_cleanup +rm -rf $TMPDIR +sleep 1 +ui_print "- Done" +exit 0 diff --git a/vancedx/META-INF/com/google/android/updater-script b/vancedx/META-INF/com/google/android/updater-script new file mode 100644 index 0000000..11d5c96 --- /dev/null +++ b/vancedx/META-INF/com/google/android/updater-script @@ -0,0 +1 @@ +#MAGISK diff --git a/vancedx/base-vx.apk b/vancedx/base-vx.apk new file mode 100644 index 0000000..e69de29 diff --git a/vancedx/customize.sh b/vancedx/customize.sh new file mode 100644 index 0000000..2addc35 --- /dev/null +++ b/vancedx/customize.sh @@ -0,0 +1,69 @@ +#!/system/bin/sh + +# Checking for installation environment +# Abort TWRP installation with error message when user tries to install this module in TWRP + +if [ $BOOTMODE = false ]; then + ui_print "ERROR: Installing through TWRP Not supported" + ui_print "ERROR: Intsall this module via Magisk Manager" + abort "ERROR: Aborting installation !!" +fi + + +PKGNAME=com.google.android.youtube +APPNAME="YouTube" + +# Unmount YouTube app +stock_path=$( pm path $PKGNAME | grep base | sed 's/package://g' ) +if [[ '$stock_path' ]] ; then umount -l $stock_path; fi + +# Install YouTube app +ui_print "INFO : Installing stock YouTube app..." +SESSION=$(pm install-create -r | grep -oE '[0-9]+') +APKS="$(ls $MODPATH/youtube)" +for APK in $APKS; do +pm install-write $SESSION $APK $MODPATH/youtube/$APK > /dev/null +done +pm install-commit $SESSION +rm -rf $MODPATH/youtube + +if ! dumpsys package $PKGNAME | grep path > /dev/null 2>&1 +then + ui_print "ERROR : $APPNAME app is not installed" + abort "INFO : Aborting installation !!" +fi + + +STOCKAPPVER=$(dumpsys package $PKGNAME | grep versionName | cut -d= -f 2 | sed -n '1p') +VANCEDXAPPVER=$(grep version= module.prop | sed 's/version=v//') + +if [ "$STOCKAPPVER" != "$VANCEDXAPPVER" ] +then + ui_print "INFO : Installed $APPNAME version : $STOCKAPPVER" + ui_print "- $APPNAME Vanced+ version : $VANCEDXAPPVER" + ui_print "ERROR : Installed app version mismatch with module !" + ui_print "ERROR : Uninstall current installed stock YT app or" + ui_print "ERROR : Get Vanced+ module that match with current installed YT App version !" + abort "INFO : Aborting installation !!" +fi + +ui_print "INFO : Unmounting previous mounts" + +grep $PKGNAME /proc/mounts | while read -r LINE +do + echo "$LINE" | grep "$PKGNAME" | cut -d " " -f 2 | sed "s/apk.*/apk/" | xargs -r umount -l +done + +ui_print "INFO : Moving files and setting permissions" +mkdir -p "$MODPATH/app" +rm $MODPATH/app/"$APPNAME"* +mv $MODPATH/*.apk $MODPATH/app/"$APPNAME"VancedX-"$VANCEDXAPPVER".apk +STOCKAPK=$(pm path $PKGNAME | grep base | cut -d ":" -f2) +VANCEDXAPK=$MODPATH/app/"$APPNAME"VancedX-"$VANCEDXAPPVER".apk +chmod 644 "$VANCEDXAPK" +chown system:system "$VANCEDXAPK" +chcon u:object_r:apk_data_file:s0 "$VANCEDXAPK" +mount -o bind "$VANCEDXAPK" "$STOCKAPK" +am force-stop "$PKGNAME" + +ui_print "INFO : YouTube Vanced+ Installed !!" diff --git a/vancedx/module.prop b/vancedx/module.prop new file mode 100644 index 0000000..17c46bb --- /dev/null +++ b/vancedx/module.prop @@ -0,0 +1,6 @@ +id=ytvancedx +name=YouTube Vanced+ +version=vXX.XX.XX +versionCode=2023 +author=cuynu +description=YouTube Vanced+ Module diff --git a/vancedx/service.sh b/vancedx/service.sh new file mode 100644 index 0000000..13902d0 --- /dev/null +++ b/vancedx/service.sh @@ -0,0 +1,41 @@ +#!/system/bin/sh + +# Wait till device boot process completes +while [ "$(getprop sys.boot_completed)" != "1" ]; do + sleep 1 +done + +# Device online functions +wait_until_login() +{ + # whether in lock screen, tested on Android 7.1 & 10.0 + # in case of other magisk module remounting /data as RW + while [ "$(dumpsys window policy | grep mInputRestricted=true)" != "" ]; do + sleep 2 + done + # we doesn't have the permission to rw "/sdcard" before the user unlocks the screen + while [ ! -d "/sdcard/Android" ]; do + sleep 2 + done +} + +# Detect temproot +if [ -e /data/local/tmp/magisk ]; then + sleep 20 +else + sleep 3 +fi + +# Mounting +wait_until_login +PKGNAME=com.google.android.youtube +STOCKAPPVER=$(dumpsys package $PKGNAME | grep versionName | cut -d "=" -f 2 | sed -n '1p') +VANCEDXAPPVER=$(basename /data/adb/modules/ytvancedx/app/YouTube* .apk | cut -d "-" -f 2) +if [ "$STOCKAPPVER" = "$VANCEDXAPPVER" ] +then + STOCKAPK=$(pm path $PKGNAME | grep base | cut -d ":" -f2) + VANCEDXAPK="/data/adb/modules/ytvancedx/app/YouTubeVancedX-$VANCEDXAPPVER.apk" + chcon u:object_r:apk_data_file:s0 "$VANCEDXAPK" + mount -o bind "$VANCEDXAPK" "$STOCKAPK" +fi +am force-stop com.google.android.youtube diff --git a/vancedx/uninstall.sh b/vancedx/uninstall.sh new file mode 100644 index 0000000..727f981 --- /dev/null +++ b/vancedx/uninstall.sh @@ -0,0 +1,7 @@ +#!/system/bin/sh + +PKGNAME=com.google.android.youtube + +# Unmount ReVanced +stock_path=$( pm path $PKGNAME | grep base | sed 's/package://g' ) +if [[ '$stock_path' ]] ; then umount -l $stock_path; fi \ No newline at end of file diff --git a/vancedx/youtube/base.apk b/vancedx/youtube/base.apk new file mode 100644 index 0000000..e69de29