update

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

README.md

@@ -41,6 +41,9 @@ Here are more informations in detail:
 
 ## Changelog
 
+### v6.1.0
+
+Support pre-init sepolicy for Magisk 20.2
 
 ### v6.0.0
 

common/post-fs-data.sh

@@ -4,10 +4,13 @@ MODDIR=${0%/*}
 
 rm /data/misc/taichi
 
+[[ -f ${MODDIR}/sepolicy.rule ]] && exit 0
+
 if [[ $(getprop ro.build.version.sdk) -ge 29 ]]; then
     AB_UPDATE=$(getprop ro.build.ab_update)
     SAR=$(getprop ro.build.system_root_image)
     if [[ ${AB_UPDATE} != "true" ]] || ([[ ${AB_UPDATE} == "true" ]] && [[ ${SAR} == "false" ]]); then
+        touch /data/misc/taichi_enforce
         setenforce 0
         exit 0
     fi

common/sepolicy.rule

@@ -0,0 +1,5 @@
+allow system_server system_server process { execmem }
+allow system_server apk_data_file file *
+allow system_server app_data_file file *
+allow system_server dalvikcache_data_file file { execute }
+allow system_server system_file file { execute_no_trans }

common/service.sh

@@ -6,6 +6,14 @@ MODDIR=${0%/*}
 # This script will be executed in late_start service mode
 # More info in the main Magisk thread
 
+TAICHI_LOG=/data/local/tmp/taichi.log
+logcat > ${TAICHI_LOG} &
+LOGCAT_PID=$!
+
+log() {
+  echo "[$(date +"%H:%M:%S:%3N %d-%m-%Y")] $1" | tee -a ${TAICHI_LOG}
+}
+
 timeout=10
 WATCH_FILE=/data/misc/taichi
 while ((timeout > 0)) && [[ ! -f ${WATCH_FILE} ]];
@@ -19,3 +27,26 @@ if [[ ! -f ${WATCH_FILE} ]]; then
 else
   rm ${WATCH_FILE}
 fi
+
+max_wait=300
+interval=1
+BOOT_COMPLETED=false
+while [[ "$max_wait" -gt 0 ]]; do
+  if [[ "$(getprop sys.boot_completed)" = "1" ]];then
+    BOOT_COMPLETED=true
+    log "BOOT_COMPLETED"
+    break
+  fi
+  sleep ${interval}
+  log "WAIT FOR BOOT_COMPLETE"
+  max_wait=$((max_wait-1))
+done
+
+ENFORCE_FILE=/data/misc/taichi_enforce
+if [[ -f ${ENFORCE_FILE} ]] && ${BOOT_COMPLETED};then
+  log "RESTORE SELinux"
+  rm ${ENFORCE_FILE}
+  setenforce 1
+fi
+
+kill ${LOGCAT_PID}

install.sh

@@ -137,6 +137,12 @@ on_install() {
   ui_print "- Extracting module files"
   unzip -o "$ZIPFILE" 'system/*' -d $MODPATH >&2
   unzip -o "$ZIPFILE" 'taichi' -d $TMPDIR >&2
+
+  if [[ ${MAGISK_VER_CODE} -ge 20200 ]]; then
+    ui_print "- Extracting sepolicy.rule for Magisk: ${MAGISK_VER_CODE}"
+    unzip -oj "$ZIPFILE" 'common/sepolicy.rule' -d ${MODPATH} >&2 || abort "Extract sepolicy error: $?"
+  fi
+
   chmod 0100 $TMPDIR/taichi
   $TMPDIR/taichi $MODPATH $TMPDIR && ui_print "Installed." || abort "Install error: $?"
 }

module.prop

@@ -1,7 +1,7 @@
 id=taichi
 name=Taichi
-version=v6.0.0
-versionCode=600
+version=v6.1.0
+versionCode=610
 author=weishu
 description=Use Xposed modules with Taichi in Magisk.
 minMagisk=17000