Large changes.

Removed recovery part, removed update json, refactored most of the code.

Author: ez-me

README.md

@@ -1,33 +1,31 @@
 # Magisk BootloopSaver
 
+
 ## About
-Protect your system from bootloop caused by Magisk modules. In case the data partition is encrypted and you cannot access `/data/adb/modules`, or you don't want to turn off **force encryption** to protect your private data.
+Protect your system from bootloop caused by Magisk modules.
+In case the data partition is encrypted and you cannot access `/data/adb/modules`, or you don't want to turn off **force encryption** to protect your private data.
+
 
 ## Requirements
 - Magisk 20.4+ is installed
 
+
 ## Installation
 It's Magisk module, flash it in **Magisk** app
 
+
 ## Usage
 
 ### Auto detect
-Usually, bootloop occurs because zygote doesn't start properly or stuck at restarting. The script run in `late_start` mode. It will check Zygote's Process ID 3 times every 15 seconds.  And if Zygote's Process ID doesn't match for 3 times, check the Process ID for next 15 seconds to make sure and if it's different again, the script will disable all modules and reboot the your device.
-
-### Disable from Custom Recovery
-
+Usually, bootloop occurs because zygote doesn't start properly or stuck at restarting.
+The script run in `late_start` mode. It will check Zygote's Process ID 3 times every 15 seconds.
+And if Zygote's Process ID doesn't match for 3 times, check the Process ID for next 15 seconds to make sure and if it's different again, the script will disable all modules and reboot the your device.
 
-You can boot into **TWRP** and create a dummy file named `disable_magisk` in one of these location and then reboot to system to boot into Safe Mode (if **Auto detect** is not working):
-- /cache
-- /data/unencrypted
-- /metadata
-- /persist
-- /mnt/vendor/persist
 
-How to create a file in TWRP? Open Terminal Emulator in TWRP and type:
+## Known issues
+It may be too eager to Disable all modules and Reboot.
 
-```
-touch /cache/disable_magisk
-```
 
-**NOTE: MAKE SURE ALL PARTITIONS ARE MOUNTED**
+## Attribution
+Module originally made by HuskyDG, but I didn't like how large it was for something that looked like it could be done in less code, so I forked it and made it into just one script.
+This involved removing the custom recovery parts, but for me the AutoDetect has worked.

changelog.md

@@ -1,9 +1,8 @@
-id=huskydg_bootloopsaver
+id=simple_bootloopsaver
 name=Magisk Bootloop Protector
-version=v1.6
-versionCode=10008
-author=HuskyDG
+version=v1
+versionCode=1
+author=ez-me
 description=Protect your system from bootloop caused by Magisk modules by turning off all your modules and restart your system if bootloop is detected.
-updateJson=https://raw.githubusercontent.com/Magisk-Modules-Alt-Repo/HuskyDG_BootloopSaver/master/module.json
-changeBoot=true
+changeBoot=false
 needRamdisk=false

customize.sh

@@ -1,65 +1,82 @@
 #!/system/bin/sh
-#Bootloop saver by HuskyDG
+#Bootloop saver by HuskyDG, modified by ez-me
 
-MODDIR=${0%/*}
-. "$MODDIR/utils.sh"
+# Get variables
+MODPATH=${0%/*}
+MESSAGE="$(cat "$MODPATH"/msg.txt | head -c100)"
 
+if [ -n "$(getprop ro.product.cpu.abi | grep 64)" ]
+then
+   ZYGOTE_NAME=zygote64
+else
+   ZYGOTE_NAME=zygote
+fi
 
-rm -rf /cache/bootloop_saver.log.bak
-mv -f /cache/bootloop_saver.log /cache/bootloop_saver.log.bak 2>/dev/null
-write_log "bootloop saver started"
-MAIN_ZYGOTE_NICENAME=zygote
-CPU_ABI=$(getprop ro.product.cpu.api)
-[ "$CPU_ABI" = "arm64-v8a" -o "$CPU_ABI" = "x86_64" ] && MAIN_ZYGOTE_NICENAME=zygote64
+# Log
+log(){
+   TEXT=$@; echo "[`date -Is`]: $TEXT" >> $MODPATH/log.txt
+}
 
-check(){
-TEXT1="$1"
-TEXT2="$2"
-result=false
-for i in $TEXT1; do
-    for j in $TEXT2; do
-        [ "$i" == "$j" ] && result=true
-    done
-done
-$result
+log "Started"
+
+# Modify description
+cp "$MODPATH/module.prop" "$MODPATH/temp.prop"
+sed -Ei "s/^description=(\[.*][[:space:]]*)?/description=[Working. $MESSAGE] /g" "$MODPATH/temp.prop"
+mv "$MODPATH/temp.prop" "$MODPATH/module.prop"
+
+# Define the function
+disable_modules(){
+   log "Disabling modules..."
+   list="$(find /data/adb/modules/* -prune -type d)"
+   for module in $list
+   do
+      touch $module/disable
+   done
+   rm -rf "$MODPATH/disable"
+   echo "Disabled modules at $(date -Is)" > "$MODPATH/msg.txt"
+   rm -rf /cache/.system_booting /data/unencrypted/.system_booting /metadata/.system_booting /persist/.system_booting /mnt/vendor/persist/.system_booting
+   log "Rebooting"
+   reboot
+   exit
 }
 
 
-# Wait for zygote starts
+# Gather PIDs
 sleep 5
+ZYGOTE_PID1=$(pidof "$ZYGOTE_NAME")
+log "PID1: $ZYGOTE_PID1"
 
-ZYGOTE_PID1=$(pidof "$MAIN_ZYGOTE_NICENAME")
-write_log "pid of zygote stage 1: $ZYGOTE_PID1"
-sleep 15
-ZYGOTE_PID2=$(pidof "$MAIN_ZYGOTE_NICENAME")
-write_log "pid of zygote stage 2: $ZYGOTE_PID2"
 sleep 15
-ZYGOTE_PID3=$(pidof "$MAIN_ZYGOTE_NICENAME")
-write_log "pid of zygote stage 3: $ZYGOTE_PID3"
+ZYGOTE_PID2=$(pidof "$ZYGOTE_NAME")
+log "PID2: $ZYGOTE_PID2"
 
+sleep 15
+ZYGOTE_PID3=$(pidof "$ZYGOTE_NAME")
+log "PID3: $ZYGOTE_PID3"
 
-if check "$ZYGOTE_PID1" "$ZYGOTE_PID2" && check "$ZYGOTE_PID2" "$ZYGOTE_PID3"; then
-    if [ -z "$ZYGOTE_PID1" ]; then
-        write_log "maybe zygote not start :("
-        write_log "zygote meets the trouble, disable all modules and restart"
+# Check for BootLoop
+log "Checking..."
 
-        disable_modules
-    else
-        exit_log "pid of 3 stage zygote is the same"
-    fi
-else
-    write_log "pid of 3 stage zygote is different, continue check to make sure... "
+if [ -z "$ZYGOTE_PID1" ]
+then
+   log "Zygote didn't start?"
+   disable_modules
 fi
 
+if [ "$ZYGOTE_PID1" != "$ZYGOTE_PID2" -o "$ZYGOTE_PID2" != "$ZYGOTE_PID3" ]
+then
+   log "PID mismatch, checking again"
+   sleep 15
+   ZYGOTE_PID4=$(pidof "$ZYGOTE_NAME")
+   log "PID4: $ZYGOTE_PID4"
+
+   if [ "$ZYGOTE_PID3" != "$ZYGOTE_PID4" ]
+   then
+      log "They don't match..."
+      disable_modules
+   fi
+fi
 
-
-
-sleep 15
-ZYGOTE_PID4=$(pidof "$MAIN_ZYGOTE_NICENAME")
-write_log "pid of zygote stage 4: $ZYGOTE_PID4"
-check "$ZYGOTE_PID3" "$ZYGOTE_PID4" && exit_log "pid of zygote stage 3 and 4 is the same."
-
-write_log "zygote meets the trouble, disable all modules and restart"
-
-disable_modules
-
+# If  we reached this section we should be fine
+log "looks good to me!"
+exit