From 5cff1e0d72961c3fbf7fa2f0bc2ebaab4cde7f14 Mon Sep 17 00:00:00 2001 From: Fox2Code Date: Mon, 16 May 2022 01:04:08 +0200 Subject: [PATCH] Fix AnyKernel3 typos --- app/src/main/assets/module_installer_anykernel3.sh | 3 +-- .../java/com/fox2code/mmm/installer/InstallerActivity.java | 6 +++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/src/main/assets/module_installer_anykernel3.sh b/app/src/main/assets/module_installer_anykernel3.sh index 359024e..8b8803a 100644 --- a/app/src/main/assets/module_installer_anykernel3.sh +++ b/app/src/main/assets/module_installer_anykernel3.sh @@ -65,7 +65,6 @@ AK3TMPFS=$($AK3TMPFS/busybox readlink -f $AK3TMPFS); if $AK3TMPFS/busybox grep -q AnyKernel3 $AK3TMPFS/update-binary; then # work around more restrictive upstream SELinux policies for Magisk <19306 magiskpolicy --live "allow kernel app_data_file file write" || true; - TMP=$AK3TMPFS/tmp; else echo "Module is not an AnyKernel3 module!" exit 1 @@ -77,6 +76,6 @@ RC=$?; # Original script delete all generated files, # But we just need to unmount as we store everything inside tmpfs -umount $TMP; +umount $AK3TMPFS; return $RC; \ No newline at end of file diff --git a/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java b/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java index a63b6db..aaab697 100644 --- a/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java +++ b/app/src/main/java/com/fox2code/mmm/installer/InstallerActivity.java @@ -191,7 +191,7 @@ public class InstallerActivity extends CompatActivity { } if (!isModule && !isAnyKernel3) { this.setInstallStateFinished(false, - "! File is not a valid Magisk or AnyKernel3 module", ""); + "! File is not a valid Magisk module or AnyKernel3 zip", ""); return; } if (noPatch) { @@ -339,7 +339,7 @@ public class InstallerActivity extends CompatActivity { installExecutable = this.extractInstallScript("module_installer_anykernel3.sh"); if (installExecutable == null) { this.setInstallStateFinished(false, - "! Failed to extract AnyKernel3 module install script", null); + "! Failed to extract AnyKernel3 install script", null); return; } // "unshare -m" is needed to force mount namespace isolation. @@ -366,7 +366,7 @@ public class InstallerActivity extends CompatActivity { " 3 1 \"" + file.getAbsolutePath() + "\""; } else { this.setInstallStateFinished(false, - "! Zip file is not a valid Magisk or AnyKernel3 module!", null); + "! Zip file is not a valid Magisk module or AnyKernel3 zip!", null); return; } installerMonitor = new InstallerMonitor(installExecutable);