6.1.6 - minor fixes

Changelog:
- redirect stdout to avoid any scripts crashing
- more elegant way to display own print_modname function

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

@@ -121,10 +121,10 @@ if is_legacy_script; then
  set_permissions
 else
  unzip -o "$ZIPFILE" customize.sh -d $MODPATH >&2
+
+ grep -q '^print_modname' $MODPATH/customize.sh 2>/dev/null || print_modname
 
  if ! grep -q '^SKIPUNZIP=1$' $MODPATH/customize.sh 2>/dev/null; then
- print_modname
-
  ui_print "- Extracting module files"
  unzip -o "$ZIPFILE" -x 'META-INF/*' -d $MODPATH >&2
 

common/post-fs-data.sh

@@ -12,23 +12,23 @@ ENFORCE_FILE="/data/misc/taichi_enforce"
 LOG_FILE="/data/local/tmp/taichi.log"
 SEPOLICY_FILE="${MODDIR}/sepolicy.rule"
 
-rm -f "{WATCH_FILE}"
-rm -f "{ENFORCE_FILE}"
-rm -f "{LOG_FILE}"
+rm -f "{WATCH_FILE}" 2>/dev/null
+rm -f "{ENFORCE_FILE}" 2>/dev/null
+rm -f "{LOG_FILE}" 2>/dev/null
 
 # Load utility functions
 [ -f "/data/adb/magisk/util_functions.sh" ] && . /data/adb/magisk/util_functions.sh
 [ "${MAGISK_VER_CODE}" -ge 20110 ] && exit 0
 
 AB_UPDATE=$(getprop ro.build.ab_update)
 grep ' / ' /proc/mounts | grep -qv 'rootfs' && SAR="true" || SAR="false"
-[ "${AB_UPDATE}" != "true" ] || ([ "${AB_UPDATE}" == "true" ] && [ "${SAR}" == "false" ]) && ENFORCE="true" || ENFORCE="false"
+[ "${AB_UPDATE}" != "true" ] || ([ "${AB_UPDATE}" == "true" ] && [ "${SAR}" == "false" ]) && SETENFORCE="true" || SETENFORCE="false"
 
-if ([ $(getprop ro.build.version.sdk) -ge 29 ] && [ "${ENFORCE}" == "true" ]) || [ ! -f "${SEPOLICY_FILE}" ]; then
- touch "${ENFORCE_FILE}" >&2
+if ([ $(getprop ro.build.version.sdk) -ge 29 ] && [ "${SETENFORCE}" == "true" ]) || [ ! -f "${SEPOLICY_FILE}" ]; then
+ touch "${ENFORCE_FILE}" 2>/dev/null
  setenforce 0
 else
  grep -v '^#' < "${SEPOLICY_FILE}" | while read RULE; do
- magiskpolicy --live "${RULE}"
+ magiskpolicy --live "${RULE}" 2>/dev/null
  done
 fi

common/service.sh

@@ -19,16 +19,16 @@ while [ ! -f "${WATCH_FILE}" ] && [ "$timeout" -gt 0 ]; do
 done
 
 if [ ! -f "${WATCH_FILE}" ]; then
- setprop ctl.restart zygote_secondary >&2
+ setprop ctl.restart zygote_secondary 2>/dev/null
 else
- rm -f "${WATCH_FILE}"
+ rm -f "${WATCH_FILE}" 2>/dev/null
 fi
 
 until [ $(getprop sys.boot_completed) -eq 1 ]; do
  sleep 1
 done
 
 if [ -f "${ENFORCE_FILE}" ]; then
- rm -f "${ENFORCE_FILE}"
+ rm -f "${ENFORCE_FILE}" 2>/dev/null
  setenforce 1
 fi

customize.sh

@@ -24,8 +24,8 @@ on_install() {
 set_permissions() {
  ui_print "- Setting permissions"
  # The following is the default rule, DO NOT remove
- set_perm_recursive $MODPATH  0 0 0755  0644
- # set_perm  $MODPATH/system/lib/libmedia_legacy.so  0  0  0644  u:object_r:system_lib_file:s0
+ set_perm_recursive $MODPATH 0 0 0755 0644
+ # set_perm $MODPATH/system/lib/libmedia_legacy.so 0 0 0644 u:object_r:system_lib_file:s0
 }
 
 SKIPUNZIP=1

module.prop

@@ -1,6 +1,6 @@
 id=taichi
 name=Taichi
-version=v6.1.5
-versionCode=615
+version=v6.1.6
+versionCode=616
 author=weishu
 description=Use Xposed modules with Taichi in Magisk.

uninstall.sh

@@ -3,7 +3,7 @@ WATCH_FILE="/data/misc/taichi"
 ENFORCE_FILE="/data/misc/taichi_enforce"
 LOG_FILE="/data/local/tmp/taichi.log"
 
-rm -rf "${SYSTEM_DIR}"
-rm -f "${WATCH_FILE}"
-rm -f "${ENFORCE_FILE}"
-rm -f "${LOG_FILE}"
+rm -rf "${SYSTEM_DIR}" 2>/dev/null
+rm -f "${WATCH_FILE}" 2>/dev/null
+rm -f "${ENFORCE_FILE}" 2>/dev/null
+rm -f "${LOG_FILE}" 2>/dev/null