Merge pull request #59 from enovella/new-template

Fix #54: New template Magisk v20.4+/APatch/KernelSU & new UI button action

base/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

base/action.sh

@@ -0,0 +1,32 @@
+#!/system/bin/sh
+MODPATH=${0%/*}
+PATH=$PATH:/data/adb/ap/bin:/data/adb/magisk:/data/adb/ksu/bin
+
+# log
+exec 2> $MODPATH/logs/action.log
+set -x
+
+. $MODPATH/utils.sh
+
+[ -f $MODPATH/disable ] && {
+    echo "[-] Frida-server is disable"
+    string="description=Run frida-server on boot: ❌ (failed)"
+    sed -i "s/^description=.*/$string/g" $MODPATH/module.prop
+    sleep 1
+    exit 0
+}
+
+result="$(busybox pgrep 'frida-server')"
+if [ $result -gt 0 ]; then
+    echo "[-] Stopping Frida-server..."
+    busybox kill -9 $result
+else
+    echo "[-] Starting Frida server..."
+    frida-server -D
+fi
+
+sleep 1
+
+check_frida_is_up 1
+
+#EOF

base/install.sh → base/customize.sh

@@ -1,3 +1,4 @@
+#!/bin/sh
 ##########################################################################################
 #
 # Magisk Module Installer Script
@@ -119,12 +120,23 @@ REPLACE="
 # Enable boot scripts by setting the flags in the config section above.
 ##########################################################################################
 
-# Set what you want to display when installing your module
+[ ! -d $MODPATH/logs ] && mkdir -p $MODPATH/logs
+
+# log
+exec 2> $MODPATH/logs/custom.log
+set -x
+
+PATH=$PATH:/data/adb/ap/bin:/data/adb/magisk:/data/adb/ksu/bin
+
+# keep Magisk's forced module installer backend involvement minimal (must end without ";")
+# SKIPUNZIP=1
 
+# Set what you want to display when installing your module
 print_modname() {
   ui_print " "
   ui_print "    ********************************************"
-  ui_print "    *          Magisk-/KernelSU-Frida          *"
+  ui_print "    *          Magisk/KernelSU/APatch          *"
+  ui_print "    *                  Frida                   *"
   ui_print "    ********************************************"
   ui_print " "
 }
@@ -143,31 +155,28 @@ on_install() {
   ui_print "- Detected architecture: $F_ARCH"
 
   if [ "$BOOTMODE" ] && [ "$KSU" ]; then
-      ui_print "- Installing from KernelSU app"
+      ui_print "- Installing from KernelSU"
       ui_print "- KernelSU version: $KSU_KERNEL_VER_CODE (kernel) + $KSU_VER_CODE (ksud)"
-      UNZIP="/data/adb/ksu/bin/busybox unzip"
   elif [ "$BOOTMODE" ] && [ "$APATCH" ]; then
-      ui_print "- Installing from APatch app"
+      ui_print "- Installing from APatch"
       ui_print "- APatch version: $APATCH_VER_CODE. Magisk version: $MAGISK_VER_CODE"
-      UNZIP="/data/adb/ap/bin/busybox unzip"
   elif [ "$BOOTMODE" ] && [ "$MAGISK_VER_CODE" ]; then
-      ui_print "- Installing from Magisk app"
-      ui_print "- Magisk version: $MAGISK_VER_CODE"
-      UNZIP="/data/adb/magisk/busybox unzip"
+      ui_print "- Installing from Magisk"
+      ui_print "- Magisk version: $MAGISK_VER_CODE ($MAGISK_VER)"
   else
     ui_print "*********************************************************"
     ui_print "! Install from recovery is not supported"
     ui_print "! Please install from KernelSU or Magisk app"
     abort    "*********************************************************"
 fi
 
-  ui_print "- Extracting module files"
+  ui_print "- Unzipping module files..."
   F_TARGETDIR="$MODPATH/system/bin"
   mkdir -p "$F_TARGETDIR"
   chcon -R u:object_r:system_file:s0 "$F_TARGETDIR"
   chmod -R 755 "$F_TARGETDIR"
 
-  $UNZIP -qq -o "$ZIPFILE" "files/frida-server-$F_ARCH" -j -d "$F_TARGETDIR"
+  busybox unzip -qq -o "$ZIPFILE" "files/frida-server-$F_ARCH" -j -d "$F_TARGETDIR"
   mv "$F_TARGETDIR/frida-server-$F_ARCH" "$F_TARGETDIR/frida-server"
 }
 
@@ -183,4 +192,13 @@ set_permissions() {
   set_perm $MODPATH/system/bin/frida-server 0 2000 0755 u:object_r:system_file:s0
 }
 
-# You can add more functions to assist your custom script code
+print_modname
+on_install
+set_permissions
+
+[ -f $MODPATH/disable ] && {
+  string="description=Run frida-server on boot: ❌ (failed)"
+  sed -i "s/^description=.*/$string/g" $MODPATH/module.prop
+}
+
+#EOF

base/post-fs-data.sh

@@ -0,0 +1,8 @@
+MODPATH=${0%/*}
+
+# This script will be executed in post-fs-data mode
+# log
+exec 2> $MODPATH/logs/post-fs-data.log
+set -x
+
+#EOF

base/service.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+# This script will be executed in late_start service mode
+MODPATH=${0%/*}
+
+# log
+exec 2> $MODPATH/logs/service.log
+set -x
+
+. $MODPATH/utils.sh || exit $?
+
+wait_for_boot
+
+frida-server -D
+
+check_frida_is_up
+
+#EOF