v4.2_ryukimod.5

Author: reiryuki

README.md

@@ -9,11 +9,13 @@ To uninstall, REMOVE WITH MAGISK MANAGER
 * Module [GitHub](https://github.com/Zackptg5/Audio-Modification-Library)
 
 ## Ryuki Mod Version Adventages
-* Magisk Delta support. If your device using /odm/etc/ audio files and/or /my_product/etc/ audio files, then you need to use the latest Magisk Delta and this modded AML version instead.
+* /odm/etc & /my_product/etc audio files support with Magisk Delta
+* /odm/etc/ and /my_product/etc/ audio files mount bind support
+* KernelSU support
 * stage_policy.conf file support
 * Fixed permissions
 
-## Ryuki Mod Version Download Link
+## Ryuki Mod Version Download Link and Changelog
 * https://www.pling.com/p/1981006/
 
 

module.prop

@@ -1,6 +1,6 @@
 id=aml
 name=Audio Modification Library Ryuki Mod
-version=v4.2_ryukimod.4
+version=v4.2_ryukimod.5
 versionCode=57
 author=Rei Ryuki the Fixer
 description=AudModLib is a framework originally created by zackptg5 & ahrion that allows the seamless integration of multiple audio mods in Magisk. Ryuki Mod version has advantages that are not or have not been owned by the official version.

post-fs-data.sh

@@ -1,7 +1,7 @@
+# ryukimod
 # Variables
-# magisk --path isn't accessible during till part way through post-fs-data 
-[ -d "/sbin/.magisk" ] && MAGISKTMP="/sbin/.magisk" || MAGISKTMP="$(find /dev -mindepth 2 -maxdepth 2 -type d -name ".magisk")"
-MODPATH=$MAGISKTMP/modules/aml
+mount -o rw,remount /data
+MODPATH=${0%/*}
 API=
 moddir=
 amldir=
@@ -55,34 +55,49 @@ osp_detect() {
 exec 2>$MODPATH/debug-pfsd.log
 set -x
 
-# ryukimod Paths
-MIRROR=$MAGISKTMP/mirror
-SYSTEM=`realpath $MIRROR/system`
-VENDOR=`realpath $MIRROR/vendor`
-ODM=`realpath $MIRROR/odm`
-MY_PRODUCT=`realpath $MIRROR/my_product`
+# ryukimod
+# Paths
+MAGISKPATH=`magisk --path`
+if [ "$MAGISKPATH" ]; then
+  MAGISKTMP=$MAGISKPATH/.magisk
+  MIRROR=$MAGISKTMP/mirror
+  ODM=$MIRROR/odm
+  MY_PRODUCT=$MIRROR/my_product
+fi
+SYSTEMPATH=`realpath /system`
+VENDORPATH=`realpath /vendor`
+ODMPATH=`realpath /odm`
+MY_PRODUCTPATH=`realpath /my_product`
 
 # Restore and reset
 . $MODPATH/uninstall.sh
 rm -rf $amldir $MODPATH/system $MODPATH/errors.txt $MODPATH/system.prop
 [ -f "$moddir/acdb/post-fs-data.sh" ] && mv -f $moddir/acdb/post-fs-data.sh $moddir/acdb/post-fs-data.sh.bak
 mkdir $amldir
-# ryukimod Don't follow symlinks
+# ryukimod
+# Don't follow symlinks
 lists="*audio*effects*.conf -o -name *audio*effects*.xml\
        -o -name *policy*.conf -o -name *policy*.xml\
        -o -name *mixer*paths*.xml -o -name *mixer*gains*.xml\
        -o -name *audio*device*.xml -o -name *sapa*feature*.xml\
        -o -name *audio*platform*info*.xml -o -name *audio*configs*.xml"
-files="$(find $SYSTEM $VENDOR $ODM $MY_PRODUCT -type f -name $lists)"
+files="$(find $SYSTEMPATH $VENDORPATH $ODMPATH $MY_PRODUCTPATH -type f -name $lists)"
 for file in $files; do
-  name=$(echo "$file" | sed -e "s|$MAGISKTMP/mirror||" -e "s|/system_root/|/|" -e "s|/system/|/|")
+  name=$(echo "$file" | sed -e "s|/system_root/|/|" -e "s|/system/|/|")
   cp_mv -c $file $MODPATH/system$name
   modfiles="/system$name $modfiles"
 done
-if [ ! -d $ODM ] && [ ! -d $MY_PRODUCT ]; then
-  files="$(find /odm /my_product -type f -name $lists)"
+if [ ! -d $ODM ]; then
+  files="$(find /odm -type f -name $lists)"
+  for file in $files; do
+    name=$(echo "$file" | sed -e "s|/odm||")
+    cp_mv -c $file $MODPATH/system/vendor$name
+  done
+fi
+if [ ! -d $MY_PRODUCT ]; then
+  files="$(find /my_product -type f -name $lists)"
   for file in $files; do
-    name=$(echo "$file" | sed -e "s|/odm||" -e "s|/my_product/||")
+    name=$(echo "$file" | sed -e "s|/my_product/||")
     cp_mv -c $file $MODPATH/system/vendor$name
   done
 fi
@@ -92,7 +107,8 @@ osp_detect "music"
 for mod in $(find $moddir/* -maxdepth 0 -type d ! -name aml); do
   modname="$(basename $mod)"
   [ -f "$mod/disable" ] && continue
-  # ryukimod Move files
+  # ryukimod
+  # Move files
   files="$(find $mod/system -type f -name $lists 2>/dev/null)"
   [ "$files" ] && echo "$modname" >> $amldir/modlist || continue
   for file in $files; do
@@ -107,7 +123,8 @@ for file in $modfiles; do
   [ "$(find $amldir -type f -path "*$file")" ] || rm -f $MODPATH$file
 done
 
-# ryukimod Set perms and such
+# ryukimod
+# Set perms and such
 set_perm_recursive $MODPATH/system 0 0 0755 0644
 if [ $API -ge 26 ]; then
   set_perm_recursive $MODPATH/system/vendor 0 2000 0755 0644 u:object_r:vendor_file:s0

service.sh

@@ -1,6 +1,6 @@
+# ryukimod
 # Variables
-[ "$(magisk --path 2>/dev/null)" ] && MAGISKTMP="$(magisk --path 2>/dev/null)/.magisk" || MAGISKTMP="/sbin/.magisk"
-MODPATH=$MAGISKTMP/modules/aml
+MODPATH=${0%/*}
 API=
 moddir=
 amldir=
@@ -182,12 +182,15 @@ legacy_script() {
 exec 2>$MODPATH/debug.log
 set -x
 
-# ryukimod Paths
-MIRROR=$MAGISKTMP/mirror
-SYSTEM=`realpath $MIRROR/system`
-VENDOR=`realpath $MIRROR/vendor`
-ODM=`realpath $MIRROR/odm`
-MY_PRODUCT=`realpath $MIRROR/my_product`
+# ryukimod
+# Paths
+MAGISKPATH=`magisk --path`
+if [ "$MAGISKPATH" ]; then
+  MAGISKTMP=$MAGISKPATH/.magisk
+  MIRROR=$MAGISKTMP/mirror
+  ODM=$MIRROR/odm
+  MY_PRODUCT=$MIRROR/my_product
+fi
 
 # Detect/install audio mods
 for mod in $(find $moddir/* -maxdepth 0 -type d ! -name aml); do
@@ -218,7 +221,8 @@ for mod in $(find $moddir/* -maxdepth 0 -type d ! -name aml); do
   fi
 done
 
-# ryukimod Reload patched files - original mounted files are seemingly deleted and replaced by sed
+# ryukimod
+# Reload patched files - original mounted files are seemingly deleted and replaced by sed
 dir=$MODPATH/system
 files=$(find $dir -type f)
 for i in $files; do
@@ -228,7 +232,8 @@ for i in $files; do
 done
 dir=$MODPATH/system/vendor
 files=$(find $dir/etc -maxdepth 1 -type f)
-if [ ! -d $ODM ] && [ "`realpath /odm/etc`" == /odm/etc ]\
+if [ ! -d $ODM ] && [ -d /odm/etc ]\
+&& [ "`realpath /odm/etc`" == /odm/etc ]\
 && [ "$files" ]; then
   for i in $files; do
     j="/odm$(echo $i | sed "s|$dir||")"