fix(sh): 🐛 #21 修复用户证书目录可能不存在导致模块无效.

Author: ys1231

.gitignore

@@ -0,0 +1,2 @@
+*.zip
+.DS_Store

changelog.md

@@ -1,3 +1,6 @@
+- fix(sh): :bug: #21 修复用户证书目录可能不存在导致模块无效.
+- fix(sh): :bug: #21 Fix user certificate directory may not exist resulting in invalid module.
+----
 - fix(sh): :bug: 修复在系统安全设置中识别证书,在zygote启动之前挂载证书.
 - fix(sh): :bug: #19 修复模块导致系统重启,恢复selinux上下文设置即可.
 - fix(sh): :bug: Fix identifying certificates in system security settings and mounting certificates before starting zygote

customize.sh

@@ -36,7 +36,7 @@ on_install() {
   fi
   # ui_print "- mkdir $MODPATH/certificates"
   mkdir -p -m 755 "$D_CERTIFICATE"
-
+  mkdir -p -m 755 /data/misc/user/0/cacerts-added
 }
 
 # You can add more functions to assist your custom script code

module.prop

@@ -1,7 +1,7 @@
 id=MoveCertificate
 name=MoveCertificate
-version=v1.4.10
-versionCode=14
+version=v1.4.11
+versionCode=15
 author=iyue
 description=Supports magiskv20.4+/kernelsu/APatch Android 7-14 move certificates
 updateJson=https://ys1231.cn:82/modules/MoveCertificate/update.json

post-fs-data.sh

@@ -91,6 +91,7 @@ if [ "$sdk_version_number" -le 33 ]; then
     fix_user_permissions
 
     print_log "mount: /system/etc/security/cacerts"
+    selinux_context=$(ls -Zd /system/etc/security/cacerts | awk '{print $1}')
     mount -t tmpfs tmpfs /system/etc/security/cacerts
     print_log "mount status:$?"
 
@@ -99,6 +100,13 @@ if [ "$sdk_version_number" -le 33 ]; then
     print_log "move cert status:$?"
     fix_system_permissions
     print_log "certificates installed"
+    [ "$(getenforce)" = "Enforcing" ] || return 0
+    default_selinux_context=u:object_r:system_file:s0
+    if [ -n "$selinux_context" ] && [ "$selinux_context" != "?" ]; then
+        chcon -R $selinux_context /system/etc/security/cacerts
+    else
+        chcon -R $default_selinux_context /system/etc/security/cacerts
+    fi
 else
 
     print_log "start move cert !"

update.json

@@ -1,6 +1,6 @@
 {
-    "versionCode": 14,
-    "version": "v1.4.10",
-    "zipUrl": "https://ys1231.cn:82/modules/MoveCertificate/MoveCertificate-v1.4.10.zip",
+    "versionCode": 15,
+    "version": "v1.4.11",
+    "zipUrl": "https://ys1231.cn:82/modules/MoveCertificate/MoveCertificate-v1.4.11.zip",
     "changelog": "https://ys1231.cn:82/modules/MoveCertificate/changelog.md"
 }