v3.3

Author: Zackptg5

.gitattributes

@@ -1,5 +1,5 @@
-# Declare files that will always have LF line endings on checkout.
-*.sh text eol=lf
-*.prop text eol=lf
-*.md text eol=lf
+# Declare files that will always have LF line endings on checkout.
+*.sh text eol=lf
+*.prop text eol=lf
+*.md text eol=lf
 META-INF/** text eol=lf

README.md

@@ -3,6 +3,9 @@ AudModLib is a compatibility framework that allows the seamless integration of m
 To uninstall, REMOVE WITH MAGISK MANAGER
 
 ## Change Log
+### v3.3 - 03.26.2020
+* Fixes for Magisk v20.4
+
 ### v3.2 - 03.17.2020
 * Restructured script for better efficiency/faster running time - may fix xposed issues
 * Fix prop issue where non-aml supported mods were affected

module.prop

@@ -1,7 +1,7 @@
 id=aml
 name=Audio Modification Library
-version=v3.2
-versionCode=51
+version=v3.3
+versionCode=52
 author=zackptg5, ahrion
 description=AudModLib is a framework that allows the seamless integration of multiple audio mods in Magisk.
 support=https://forum.xda-developers.com/apps/magisk/module-audio-modification-library-t3579612

post-fs-data.sh

@@ -5,7 +5,8 @@ MAGISKTMP=
 API=
 IS64BIT=
 libdir=
-set -x 2>$MODPATH/debug.log
+exec 2>$MODPATH/debug.log
+set -x
 echo `date +%S`
 moddir=$(dirname $MODPATH)
 amldir=/data/adb/aml
@@ -227,7 +228,7 @@ for mod in $(find $moddir/* -maxdepth 0 -type d ! -name "aml"); do
   modname="$(basename $mod)"
   [ -f "$mod/disable" ] && continue
   # Move files
-  files="$(find $mod/system -type f -name "*audio_effects*.conf" -o -name "*audio_effects*.xml" -o -name "*audio_*policy*.conf" -o -name "*audio_*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" -o -name "*audio_device*.xml")"
+  files="$(find $mod/system -type f -name "*audio_effects*.conf" -o -name "*audio_effects*.xml" -o -name "*audio_*policy*.conf" -o -name "*audio_*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" -o -name "*audio_device*.xml" 2>/dev/null)"
   [ "$files" ] && echo "$modname" >> $amldir/modlist
   for file in $files; do
     cp_mv -m $file $amldir/$modname/$(echo "$file" | sed "s|$mod/||")
@@ -242,7 +243,7 @@ for mod in $(find $moddir/* -maxdepth 0 -type d ! -name "aml"); do
     fi
   else
     # Favor vendor libs over system ones, no aml builtins are 64bit only - use 32bit lib dir
-    libs="$(find $mod/system/vendor/lib/soundfx $mod/system/lib/soundfx -type f <libs>)"
+    libs="$(find $mod/system/vendor/lib/soundfx $mod/system/lib/soundfx -type f <libs> 2>/dev/null)"
     for lib in $libs; do
       for audmod in $MODPATH/.scripts/$(basename $lib)~*; do
         uuid=$(basename $audmod | sed -r "s/.*~(.*).sh/\1/")