Added support for Magisk v20.X

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

@@ -1,47 +1,77 @@
 #!/sbin/sh
 
-TMPDIR=/dev/tmp
-MOUNTPATH=/dev/magisk_img
+#################
+# Initialization
+#################
 
-# Default permissions
 umask 022
 
-# Initial cleanup
-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 the latest Magisk! "
-  ui_print "***********************************"
+  ui_print "*******************************"
+  ui_print " Please install Magisk v19.0+! "
+  ui_print "*******************************"
   exit 1
 }
 
-imageless_magisk() {
-  [ $MAGISK_VER_CODE -gt 18100 ]
-  return $?
-}
-
-##########################################################################################
-# Environment
-##########################################################################################
+#########################
+# Load util_functions.sh
+#########################
 
 OUTFD=$2
 ZIPFILE=$3
 
 mount /data 2>/dev/null
 
-# Load utility functions
-if [ -f /data/adb/magisk/util_functions.sh ]; then
-  . /data/adb/magisk/util_functions.sh
-  NVBASE=/data/adb
-else
-  require_new_magisk
+[ -f /data/adb/magisk/util_functions.sh ] || require_new_magisk
+. /data/adb/magisk/util_functions.sh
+[ $MAGISK_VER_CODE -lt 19000 ] && 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 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 "*******************"
+}
+
+# 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
 
@@ -54,98 +84,107 @@ api_level_arch_detect
 # Setup busybox and binaries
 $BOOTMODE && boot_actions || recovery_actions
 
-##########################################################################################
+##############
 # Preparation
-##########################################################################################
+##############
 
-# Extract common files
-unzip -oj "$ZIPFILE" module.prop install.sh uninstall.sh 'common/*' -d $TMPDIR >&2
-
-[ ! -f $TMPDIR/install.sh ] && abort "! Unable to extract zip file!"
-# Load install script
-. $TMPDIR/install.sh
-
-if imageless_magisk; then
-  $BOOTMODE && MODDIRNAME=modules_update || MODDIRNAME=modules
-  MODULEROOT=$NVBASE/$MODDIRNAME
-else
-  $BOOTMODE && IMGNAME=magisk_merge.img || IMGNAME=magisk.img
-  IMG=$NVBASE/$IMGNAME
-  request_zip_size_check "$ZIPFILE"
-  mount_magisk_img
-  MODULEROOT=$MOUNTPATH
-fi
+# 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
-
-print_modname
-
-ui_print "******************************"
-ui_print "Powered by Magisk (@topjohnwu)"
-ui_print "******************************"
-
-##########################################################################################
-# Install
-##########################################################################################
+MODNAME=`grep_prop name $TMPDIR/module.prop`
 
 # Create mod paths
 rm -rf $MODPATH 2>/dev/null
 mkdir -p $MODPATH
 
-on_install
+##########
+# Install
+##########
+
+if is_legacy_script; then
+  unzip -oj "$ZIPFILE" module.prop install.sh uninstall.sh 'common/*' -d $TMPDIR >&2
 
-# Remove placeholder
-rm -f $MODPATH/system/placeholder 2>/dev/null
+  # Load install script
+  . $TMPDIR/install.sh
 
-# Custom uninstaller
-[ -f $TMPDIR/uninstall.sh ] && cp -af $TMPDIR/uninstall.sh $MODPATH/uninstall.sh
+  # Callbacks
+  print_modname
+  on_install
 
-# Auto Mount
-if imageless_magisk; then
+  # 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
-  $SKIPMOUNT || touch $MODPATH/auto_mount
-fi
+  print_modname
 
-# prop files
-$PROPFILE && cp -af $TMPDIR/system.prop $MODPATH/system.prop
+  unzip -o "$ZIPFILE" customize.sh -d $MODPATH >&2
 
-# Module info
-cp -af $TMPDIR/module.prop $MODPATH/module.prop
-if $BOOTMODE; then
-  # Update info for Magisk Manager
-  if imageless_magisk; then
-    mktouch $NVBASE/modules/$MODID/update
-    cp -af $TMPDIR/module.prop $NVBASE/modules/$MODID/module.prop
-  else
-    mktouch /sbin/.magisk/img/$MODID/update
-    cp -af $TMPDIR/module.prop /sbin/.magisk/img/$MODID/module.prop
-  fi
-fi
+  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
 
-# post-fs-data mode scripts
-$POSTFSDATA && cp -af $TMPDIR/post-fs-data.sh $MODPATH/post-fs-data.sh
+    # Default permissions
+    set_perm_recursive $MODPATH 0 0 0755 0644
+  fi
 
-# service mode scripts
-$LATESTARTSERVICE && cp -af $TMPDIR/service.sh $MODPATH/service.sh
+  # 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
 
-ui_print "- Setting permissions"
-set_permissions
+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 /
-imageless_magisk || unmount_magisk_img
 $BOOTMODE || recovery_cleanup
-rm -rf $TMPDIR $MOUNTPATH
+rm -rf $TMPDIR
 
 ui_print "- Done"
-exit 0
+exit 0

README.md

@@ -4,7 +4,7 @@
 
 ## LEGAL
 
-Copyright (C) 2017-2019, VR25 @ xda-developers
+Copyright (C) 2017-2020, VR25 & Rikj000 @ xda-developers
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@ Features list
 
 ## PREREQUISITE
 
-- Magisk 17-19
+- Magisk 19-20
 
 
 
@@ -73,16 +73,15 @@ Features list
 
 ## LINKS
 
-- [Donate](https://paypal.me/vr25xda/)
-- [Facebook page](https://facebook.com/VR25-at-xda-developers-258150974794782/)
-- [Git repository](https://github.com/Magisk-Modules-Repo/mm)
-- [Telegram channel](https://t.me/vr25_xda/)
-- [Telegram profile](https://t.me/vr25xda/)
-- [XDA thread](https://forum.xda-developers.com/apps/magisk/module-tool-magisk-manager-recovery-mode-t3693165)
-
-
+- [New Git repository](https://github.com/Rikj000/mm)
+- [Old Git repository](https://github.com/Magisk-Modules-Repo/mm)
+- [Original XDA thread](https://forum.xda-developers.com/apps/magisk/module-tool-magisk-manager-recovery-mode-t3693165)
+- [VR25 Donate](https://paypal.me/vr25xda/)
+- [VR25 Facebook page](https://facebook.com/VR25-at-xda-developers-258150974794782/)
 
 ## LATEST CHANGES
+**2020.4.17 (202004170)**
+- Magisk 19-20 support
 
 **2019.4.4 (201904040)**
 - Complete redesign

build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Flashable zip builder
-# Copyright (C) 2018-2019, VR25 @ xda-developers
+# Copyright (C) 2018-2020, VR25 & Rikj000 @ xda-developers
 # License: GPLv3+
 
 echo

check_syntax.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # Basic shell syntax checker
-# Copyright (C) 2018-2019, VR25 @ xda-developers
+# Copyright (C) 2018-2020, VR25 & Rikj000 @ xda-developers
 # License: GPLv3+
 
 echo

install.sh

@@ -133,7 +133,7 @@ unset -f print
 print_modname() {
   ui_print " "
   ui_print "$name $version"
-  ui_print "Copyright (C) 2017-2019, $author"
+  ui_print "Copyright (C) 2017-2020, $author"
   ui_print "License: GPLv3+"
   ui_print " "
 }
@@ -215,12 +215,11 @@ version_info() {
   ui_print " "
 
   ui_print "  LINKS"
-  ui_print "    - Donate: paypal.me/vr25xda/"
-  ui_print "    - Facebook page: facebook.com/VR25-at-xda-developers-258150974794782/"
-  ui_print "    - Git repository: github.com/Magisk-Modules-Repo/mm/"
-  ui_print "    - Telegram channel: t.me/vr25_xda/"
-  ui_print "    - Telegram profile: t.me/vr25xda/"
-  ui_print "    - XDA thread: forum.xda-developers.com/apps/magisk/module-tool-magisk-manager-recovery-mode-t3693165/"
+  ui_print "    - New Git repository: github.com/Rikj000/mm"
+  ui_print "    - Old Git repository: github.com/Magisk-Modules-Repo/mm/"
+  ui_print "    - Original XDA thread: forum.xda-developers.com/apps/magisk/module-tool-magisk-manager-recovery-mode-t3693165/"
+  ui_print "    - VR25 Donate: paypal.me/vr25xda/"
+  ui_print "    - VR25 Facebook page: facebook.com/VR25-at-xda-developers-258150974794782/"
   ui_print " "
 
   ui_print "  USAGE"

mm

@@ -1,6 +1,6 @@
 #!/sbin/sh
 # Magisk Manager for Recovery Mode (mm)
-# Copyright (C) 2017-2019, VR25 @ xda-developers
+# Copyright (C) 2018-2020, VR25 & Rikj000 @ xda-developers
 # License: GPLv3+
 
 
@@ -13,8 +13,8 @@ mountPath=/_magisk
 img=/data/adb/magisk.img
 [ -f $img ] || img=/data/adb/modules
 
-echo -e "\nMagisk Manager for Recovery Mode (mm) 2019.4.4
-Copyright (C) 2017-2019, VR25 @ xda-developers
+echo -e "\nMagisk Manager for Recovery Mode (mm) 2020.4.17
+Copyright (C) 2018-2020, VR25 & Rikj000 @ xda-developers
 License: GPLv3+\n"
 
 trap 'exxit $?' EXIT

module.prop

@@ -1,7 +1,7 @@
 id=mm
 name=Magisk Manager for Recovery Mode (mm)
-version=2019.4.4
-versionCode=201904040
-author=VR25 @ xda-developers
-description=Manage your Magisk v17-19 modules from recovery (e.g., TWRP) -- run " sh /sdcard/mm" on recovery terminal.
-minMagisk=17000
+version=2020.4.17
+versionCode=202004170
+author=VR25 & Rikj000 @ xda-developers
+description=Manage your Magisk v19-20 modules from recovery (e.g., TWRP) -- run " sh /sdcard/mm" on recovery terminal.
+minMagisk=19000