Reopen

README.md

@@ -29,7 +29,7 @@ and zip binaries can be downloaded from [here](http://gnuwin32.sourceforge.net/p
 
 ## Install
 
-1. Install Magisk v19.0+ (for latest EdXposed or Huawei devices, use our custom Magisk: Change Magisk update channel to [this](http://edxp.meowcat.org/repo/version.json)).
+1. Install Magisk v19.0+ (for latest EdXposed or Huawei devices, use at least official Magisk v20.2+ or use our custom Magisk: Change Magisk update channel to [this](http://edxp.meowcat.org/repo/version.json)).
 2. Install [Riru-Core](https://github.com/RikkaApps/Riru/releases) v19+ from Magisk repo.
 3. [Download](#download) and install EdXposed in Magisk Manager or recovery mode.
 4. Install [companion application](#companion-applications).

edxp-core/build.gradle

@@ -161,8 +161,8 @@ afterEvaluate {
                         into zipPathMagiskRelease
                     }
                     copy {
-                        from "${projectDir}/template_override/common/util_functions.sh"
-                        into "${zipPathMagiskRelease}/common"
+                        from "${projectDir}/template_override/util_functions.sh"
+                        into "${zipPathMagiskRelease}/"
                         filter { line -> line
                                 .replaceAll('%VERSION%', "$version")
                                     .replaceAll('%VERSION_CODE%', "$versionCode")

edxp-core/template_override/META-INF/com/google/android/update-binary

@@ -1,46 +1,59 @@
 #!/sbin/sh
 
-TMPDIR=/dev/tmp
-MOUNTPATH=/dev/magisk_img
+#################
+# Initialization
+#################
 
-# Default permissions
 umask 022
 
-# Initial cleanup
+# 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 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 ]
+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
-##########################################################################################
+##############
 
 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
-fi
+[ -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
@@ -54,98 +67,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
+
+  # Load install script
+  . $TMPDIR/install.sh
 
-# Remove placeholder
-rm -f $MODPATH/system/placeholder 2>/dev/null
+  # Callbacks
+  print_modname
+  on_install
 
-# Custom uninstaller
-[ -f $TMPDIR/uninstall.sh ] && cp -af $TMPDIR/uninstall.sh $MODPATH/uninstall.sh
+  # Custom uninstaller
+  [ -f $TMPDIR/uninstall.sh ] && cp -af $TMPDIR/uninstall.sh $MODPATH/uninstall.sh
 
-# Auto Mount
-if imageless_magisk; then
+  # 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

edxp-core/template_override/customize.sh

@@ -0,0 +1,50 @@
+SKIPUNZIP=1
+
+RIRU_PATH="/data/misc/riru"
+
+check_riru_version() {
+  [[ ! -f "$RIRU_PATH/api_version" ]] && abort "! Please Install Riru - Core v19 or above"
+  VERSION=$(cat "$RIRU_PATH/api_version")
+  ui_print "- Riru API version is $VERSION"
+  [[ "$VERSION" -ge 4 ]] || abort "! Please Install Riru - Core v19 or above"
+}
+
+check_architecture() {
+  if [[ "$ARCH" != "arm" && "$ARCH" != "arm64" && "$ARCH" != "x86" && "$ARCH" != "x64" ]]; then
+    abort "! Unsupported platform: $ARCH"
+  else
+    ui_print "- Device platform: $ARCH"
+  fi
+}
+
+check_architecture
+check_riru_version
+
+unzip -o "$ZIPFILE" module.prop post-fs-data.sh sepolicy.rule system.prop util_functions.sh -d "$MODPATH" >&2
+
+if [[ "$ARCH" == "x86" || "$ARCH" == "x64" ]]; then
+  ui_print "- Extracting x86/64 libraries"
+  unzip -o "$ZIPFILE" 'system_x86/*' -d "$MODPATH" >&2
+  mv "$MODPATH/system_x86/lib" "$MODPATH/system/lib"
+  mv "$MODPATH/system_x86/lib64" "$MODPATH/system/lib64"
+else
+  ui_print "- Extracting arm/arm64 libraries"
+  unzip -o "$ZIPFILE" 'system/*' -d "$MODPATH" >&2
+fi
+
+if [[ "$IS64BIT" = false ]]; then
+  ui_print "- Removing 64-bit libraries"
+  rm -rf "$MODPATH/system/lib64"
+fi
+
+TARGET="$RIRU_PATH/modules"
+
+ui_print "- Extracting extra files"
+unzip -o "$ZIPFILE" 'data/*' -d "$TMPDIR" >&2
+
+[[ -d "$TARGET" ]] || mkdir -p "$TARGET" || abort "! Can't mkdir -p $TARGET"
+cp -af "$TMPDIR$TARGET/." "$TARGET" || abort "! Can't cp -af $TMPDIR$TARGET/. $TARGET"
+
+ui_print "- Files copied"
+
+set_perm_recursive "$MODPATH" 0 0 0755 0644