Merge pull request #47 from jjkola/fix/magisk_version_detection

Fix Magisk version detection for the cases where there is no separate 32/64 version
Magisk-Modules-Alt-Repo · Oct 17, 2024 · 2ae45b6 · 2ae45b6
2 parents 294fb82 + 1d58f4a
commit 2ae45b6
Showing 1 changed file with 24 additions and 2 deletions.
diff --git a/system/bin/chroot-distro b/system/bin/chroot-distro
@@ -187,8 +187,30 @@ if [ "" != "$check_env" ]; then
         echo 'Could not determine the type of root solution installed'
     elif [ -e /data/adb/magisk ]; then
         case "$hardware_machine" in
-            *64) magisk_version=$(/data/adb/magisk/magisk64 -v) ;;
-            *) magisk_version=$(/data/adb/magisk/magisk32 -v) ;;
+            *64)
+                if [ -e /data/adb/magisk/magisk64 ]; then
+                    magiskbin=/data/adb/magisk/magisk64
+                elif [ -e /data/adb/magisk/magisk ]; then
+                    magiskbin=/data/adb/magisk/magisk
+                fi
+                if [ "" != "$magiskbin" ]; then
+                    magisk_version=$($magiskbin -v)
+                else
+                    magisk_version=Unknown
+                fi
+            ;;
+            *)
+                if [ -e /data/adb/magisk/magisk32 ]; then
+                    magiskbin=/data/adb/magisk/magisk32
+                elif [ -e /data/adb/magisk/magisk ]; then
+                    magiskbin=/data/adb/magisk/magisk
+                fi
+                if [ "" != "$magiskbin" ]; then
+                    magisk_version=$($magiskbin -v)
+                else
+                    magisk_version=Unknown
+                fi
+            ;;
         esac
         echo "Magisk installed ($magisk_version)"
     elif [ -e /data/adb/ksu ]; then