Remove persist check to fix #477

appveyor.yml

@@ -1,4 +1,4 @@
-version: '0.4.6.1 ({build})'
+version: '0.4.6.2 ({build})'
 
 environment:
   ANDROID_HOME: C:\android-sdk-windows

edxp-core/build.gradle

@@ -4,7 +4,7 @@ import org.gradle.internal.os.OperatingSystem
 apply plugin: 'com.android.library'
 
 // Values set here will be overriden by AppVeyor, feel free to modify during development.
-def buildVersionName = 'v0.4.6.1'
+def buildVersionName = 'v0.4.6.2'
 def buildVersionCode = 233
 
 if (System.env.APPVEYOR_BUILD_VERSION != null) {

edxp-core/template_override/customize.sh

@@ -33,7 +33,7 @@ HUAWEI
 
 OLD_MAGISK=false
 DETECTED_DEVICE=false
-NO_PERSIST=false
+#NO_PERSIST=false
 
 abortC() {
   rm -rf "${MODPATH}"
@@ -41,21 +41,21 @@ abortC() {
 }
 
 require_new_magisk() {
-    if [[ "${NO_PERSIST}" == true ]]; then
-        ui_print "******************************"
-        ui_print "! Special device detected"
-        ui_print "! But persist is not found in your device, SEPolicy rules will not take effect correctly"
-        ui_print "! Deprecated custom Magisk v20.1 is required"
-        ui_print "! Change Magisk update channel to http://edxp.meowcat.org/repo/version.json"
-        ui_print "! And re-install Magisk"
-        abortC   "******************************"
-    else
+#    if [[ "${NO_PERSIST}" == true ]]; then
+#        ui_print "******************************"
+#        ui_print "! Special device detected"
+#        ui_print "! But persist is not found in your device, SEPolicy rules will not take effect correctly"
+#        ui_print "! Deprecated custom Magisk v20.1 is required"
+#        ui_print "! Change Magisk update channel to http://edxp.meowcat.org/repo/version.json"
+#        ui_print "! And re-install Magisk"
+#        abortC   "******************************"
+#    else
         ui_print "******************************"
         ui_print "! Special device detected"
         ui_print "! Magisk v20.2+ or custom Magisk v20.1(Deprecated) is required"
         ui_print "! You can update from 'Magisk Manager' or https://github.com/topjohnwu/Magisk/releases"
         abortC   "******************************"
-    fi
+#    fi
 }
 
 update_new_magisk() {
@@ -184,15 +184,15 @@ check_android_version() {
     fi
 }
 
-check_persist() {
-    if [[ "$(cat /proc/mounts | grep /sbin/.magisk/mirror/persist)" == "" ]]; then
-        NO_PERSIST=true
-    fi
-}
+#check_persist() {
+#    if [[ "$(cat /proc/mounts | grep /sbin/.magisk/mirror/persist)" == "" ]]; then
+#        NO_PERSIST=true
+#    fi
+#}
 
 ui_print "- EdXposed Version ${VERSION}"
 
-check_persist
+#check_persist
 check_magisk_version
 check_riru_version
 check_architecture
@@ -217,7 +217,9 @@ fi
 
 if [[ ${BOOTMODE} == true && "$(pm path org.meowcat.edxposed.manager)" == "" ]]; then
     ui_print "- Installing stub apk"
-    pm install ${MODPATH}/EdXposed.apk 2>&2
+    cp -f ${MODPATH}/EdXposed.apk /data/local/tmp/
+    pm install /data/local/tmp/EdXposed.apk 2>&2
+    rm -rf /data/local/tmp/EdXposed.apk
 fi
 
 if [[ "${OLD_MAGISK}" == true ]]; then
@@ -225,12 +227,13 @@ if [[ "${OLD_MAGISK}" == true ]]; then
     rm ${MODPATH}/sepolicy.rule
 fi
 
-if [[ "${NO_PERSIST}" == true ]]; then
-    ui_print "- Persist not detected, remove SEPolicy rule"
-	echo "- Mounted persist:" >&2
-	mount | grep persist >&2
-    rm ${MODPATH}/sepolicy.rule
-fi
+echo "- Mounted persist:" >&2
+mount | grep persist >&2
+
+#if [[ "${NO_PERSIST}" == true ]]; then
+#    ui_print "- Persist not detected, remove SEPolicy rule"
+#    rm ${MODPATH}/sepolicy.rule
+#fi
 
 ui_print "- Copying extra files"
 

edxp-core/template_override/post-fs-data.sh

@@ -153,7 +153,9 @@ cp -f "/system/bin/app_process32" "${MODDIR}/system/bin/app_process32"
 
 # install stub if manager not installed
 if [[ "$(pm path org.meowcat.edxposed.manager)" == "" ]]; then
-    pm install ${MODDIR}/EdXposed.apk 2>&2
+    cp -f ${MODDIR}/EdXposed.apk /data/local/tmp/
+    pm install /data/local/tmp/EdXposed.apk
+    rm -rf /data/local/tmp/EdXposed.apk
 fi
 
 start_verbose_log_catcher