Further fixes

fix perms, uninstall
fix other partitions
non-system partitions located in root of module rather than /system for ksu
Figure out inconsistent mounting problem
post-fs-data happens before mounting, has been this way for some time apparently......
only ksu and magisk delta work with extra partitions
fix for disable scenario

META-INF/com/google/android/update-binary

@@ -6,168 +6,28 @@
 
 umask 022
 
-# Global vars
-TMPDIR=/dev/tmp
-PERSISTDIR=/sbin/.magisk/mirror/persist
-
-rm -rf $TMPDIR 2>/dev/null
-mkdir -p $TMPDIR
-
 # echo before loading util_functions
 ui_print() { echo "$1"; }
 
 require_new_magisk() {
   ui_print "*******************************"
-  ui_print " Please install Magisk v19.0+! "
+  ui_print " Please install Magisk v20.4+! "
   ui_print "*******************************"
   exit 1
 }
 
-is_legacy_script() {
-  unzip -l "$ZIPFILE" install.sh | grep -q install.sh
-  return $?
-}
-
-print_modname() {
-  local len
-  len=`echo -n $MODNAME | wc -c`
-  len=$((len + 2))
-  local pounds=`printf "%${len}s" | tr ' ' '*'`
-  ui_print "$pounds"
-  ui_print " $MODNAME "
-  ui_print "$pounds"
-  ui_print "*******************"
-  ui_print " Powered by Magisk "
-  ui_print "*******************"
-}
-
-##############
-# Environment
-##############
+#########################
+# Load util_functions.sh
+#########################
 
 OUTFD=$2
 ZIPFILE=$3
 
 mount /data 2>/dev/null
 
-# Load utility functions
 [ -f /data/adb/magisk/util_functions.sh ] || require_new_magisk
 . /data/adb/magisk/util_functions.sh
-[ $MAGISK_VER_CODE -gt 18100 ] || require_new_magisk
-
-# 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`
-MODPATH=$MODULEROOT/$MODID
-MODNAME=`grep_prop name $TMPDIR/module.prop`
-
-# 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
-    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"
-  PERSISTMOD=$PERSISTDIR/magisk/$MODID
-  mkdir -p $PERSISTMOD
-  cp -af $MODPATH/sepolicy.rule $PERSISTMOD/sepolicy.rule
-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
+[ $MAGISK_VER_CODE -lt 20400 ] && require_new_magisk
 
-ui_print "- Done"
-exit 0
+install_module
+exit 0

changelog.md

@@ -1,3 +1,13 @@
+### v5.0 - 7.10.2023
+* Big thanks to @reiryuki for this update
+* Update to current magisk module template - minimum magisk v20.4
+* Context fix
+* Add stage_policy.conf support
+* Add KSU support
+* Add support for other partitions - requires ksu or magisk delta
+* Rework/simplify some scripting
+* Fix for disabling aml in manager
+
 ### v4.2 - 1.6.2023
 * Add support for V4A RE
 

customize.sh

@@ -27,15 +27,19 @@ libs="$(echo $libs | sed "s/\" /\" -o /g")"
 sed -i -e "s|<libs>|$libs|" $MODPATH/service.sh
 
 # Set vars in script
+[ -z $SERVICED ] && SERVICED=$NVBASE/service.d
 amldir=$NVBASE/aml
-moddir=$NVBASE/modules
-for i in API amldir moddir; do
+for i in API amldir; do
   for j in post-fs-data service uninstall; do
     sed -i "s|$i=|$i=$(eval echo \$$i)|" $MODPATH/$j.sh
   done
 done
 
 # Place fallback script in the event idiot user deletes aml module in file explorer
-cp -f $MODPATH/uninstall.sh $SERVICED/aml.sh && chmod 0755 $SERVICED/aml.sh
-sed -i "3a[ -d \"\$moddir/$MODID\" ] && exit 0" $SERVICED/aml.sh
+mkdir $SERVICED 2>/dev/null
+cp -f $MODPATH/uninstall.sh $SERVICED/aml.sh
+chmod 0755 $SERVICED/aml.sh
+sed -i -e "3a[ -d \"\$moddir/$MODID\" -a ! -f \"\$moddir/$MODID/disable\" ] && exit 0" -e "s|^moddir=.*|moddir=$NVBASE/modules|" $SERVICED/aml.sh
 echo 'rm -f $0' >> $SERVICED/aml.sh
+
+rm -f $MODPATH/install.zip

module.prop

@@ -1,7 +1,7 @@
 id=aml
 name=Audio Modification Library
-version=v4.2
-versionCode=57
+version=v5.0
+versionCode=58
 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

@@ -1,10 +1,9 @@
 # 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
-API=
-moddir=
+MODPATH="${0%/*}"
 amldir=
+API=
+[ -z $KSU ] && KSU=false
+filenames="-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 -o -name *stage_policy*.conf"
 
 # Functions
 set_perm() {
@@ -29,7 +28,7 @@ cp_mv() {
 }
 osp_detect() {
   local spaces effects type="$1"
-  local files=$(find $MODPATH/system -type f -name "*audio_effects*.conf" -o -name "*audio_effects*.xml")
+  local files=$(find $MODPATH -type f -name "*audio_effects*.conf" -o -name "*audio_effects*.xml")
   for file in $files; do
     for osp in $type; do
       case $file in
@@ -55,44 +54,51 @@ osp_detect() {
 exec 2>$MODPATH/debug-pfsd.log
 set -x
 
-# Paths
-MIRROR=$MAGISKTMP/mirror
-SYSTEM=`realpath $MIRROR/system`
-VENDOR=`realpath $MIRROR/vendor`
-ODM=`realpath $MIRROR/odm`
-MY_PRODUCT=`realpath $MIRROR/my_product`
-
 # Restore and reset
 . $MODPATH/uninstall.sh
-rm -rf $amldir $MODPATH/system $MODPATH/errors.txt $MODPATH/system.prop
+moddir="$(dirname $MODPATH)" # Changed by uninstall script
+rm -rf $amldir $MODPATH/system $MODPATH/vendor $MODPATH/odm $MODPATH/my_product $MODPATH/errors.txt $MODPATH/system.prop 2>/dev/null
 [ -f "$moddir/acdb/post-fs-data.sh" ] && mv -f $moddir/acdb/post-fs-data.sh $moddir/acdb/post-fs-data.sh.bak
 mkdir $amldir
 # 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)"
+if $KSU || [ "$(echo $MAGISK_VER | awk -F- '{ print $NF}')" == "delta" ]; then
+  partitions="/system_root/system /system /vendor /odm /my_product"
+else
+  partitions="/system_root/system /system /vendor"
+fi
+files="$(find $partitions -type f $filenames 2>/dev/null)"
 for file in $files; do
-  name=$(echo "$file" | sed -e "s|$MAGISKTMP/mirror||" -e "s|/system_root/|/|" -e "s|/system/|/|")
-  cp_mv -c $file $MODPATH/system$name
-  modfiles="/system$name $modfiles"
+  $KSU && name=$(echo "$file" | sed "s|/system_root/|/|") || name=$(echo "$file" | sed -e "s|/system_root/|/|" -e "s|/system/|/|" | sed "s|^|/system|")
+  cp_mv -c $file $MODPATH$name
+  modfiles="$name $modfiles"
 done
+if $KSU; then
+  partitions="$(echo $partitions | sed "s|/system_root/system /system ||")"
+  for part in $partitions; do
+    [ -d $MODPATH$part ] && ln -sf $part $MODPATH/system$part
+  done
+fi
 osp_detect "music"
 
 # Detect/move audio mod files
-for mod in $(find $moddir/* -maxdepth 0 -type d ! -name aml); do
+for mod in $(find $moddir/* -maxdepth 0 -type d ! -name aml -a ! -name 'lost+found'); do
   modname="$(basename $mod)"
   [ -f "$mod/disable" ] && continue
+  $KSU && partitions="$mod/system $mod/vendor $mod/odm $mod/my_product" || partitions="$mod/system"
   # Move files
-  files="$(find $mod/system -type f -name $lists 2>/dev/null)"
+  files="$(find $partitions -type f $filenames 2>/dev/null)"
   [ "$files" ] && echo "$modname" >> $amldir/modlist || continue
   for file in $files; do
     cp_mv -m $file $amldir/$modname/$(echo "$file" | sed "s|$mod/||")
   done
   # Chcon fix for Android Q+
-  [ $API -ge 29 ] && chcon -R u:object_r:vendor_file:s0 $mod/system/vendor/lib*/soundfx 2>/dev/null
+  if [ $API -ge 29 ]; then
+    if $KSU && [ -d $mod/vendor ] && [ ! -L $mod/vendor ]; then
+      chcon -R u:object_r:vendor_file:s0 $mod/vendor/lib*/soundfx 2>/dev/null
+    else
+      chcon -R u:object_r:vendor_file:s0 $mod/system/vendor/lib*/soundfx 2>/dev/null
+    fi
+  fi
 done
 
 # Remove unneeded files from aml
@@ -107,5 +113,11 @@ if [ $API -ge 26 ]; then
   set_perm_recursive $MODPATH/system/vendor/etc 0 2000 0755 0644 u:object_r:vendor_configs_file:s0
   set_perm_recursive $MODPATH/system/vendor/odm/etc 0 2000 0755 0644 u:object_r:vendor_configs_file:s0
   set_perm_recursive $MODPATH/system/odm/etc 0 0 0755 0644 u:object_r:vendor_configs_file:s0
+  if $KSU; then
+    set_perm_recursive $MODPATH/vendor 0 2000 0755 0644 u:object_r:vendor_file:s0
+    set_perm_recursive $MODPATH/vendor/etc 0 2000 0755 0644 u:object_r:vendor_configs_file:s0
+    set_perm_recursive $MODPATH/vendor/odm/etc 0 2000 0755 0644 u:object_r:vendor_configs_file:s0
+    set_perm_recursive $MODPATH/odm/etc 0 2000 0755 0644 u:object_r:vendor_configs_file:s0
+  fi
 fi
 exit 0