From af7f3e6a8a828bcf70447ebfbb9b5d05cd2cd682 Mon Sep 17 00:00:00 2001
From: androidacy-user <opensource@androidacy.com>
Date: Sun, 10 Dec 2023 06:55:03 +0100
Subject: [PATCH] fix install

Signed-off-by: androidacy-user <opensource@androidacy.com>
---
 .../com/fox2code/mmm/androidacy/AndroidacyActivity.kt |  4 ++--
 .../com/fox2code/mmm/installer/InstallerActivity.kt   | 11 ++++++++---
 .../fox2code/mmm/installer/InstallerInitializer.kt    |  4 ++--
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/com/fox2code/mmm/androidacy/AndroidacyActivity.kt b/app/src/main/kotlin/com/fox2code/mmm/androidacy/AndroidacyActivity.kt
index 3371fcc..23c807b 100644
--- a/app/src/main/kotlin/com/fox2code/mmm/androidacy/AndroidacyActivity.kt
+++ b/app/src/main/kotlin/com/fox2code/mmm/androidacy/AndroidacyActivity.kt
@@ -419,7 +419,7 @@ class AndroidacyActivity : AppCompatActivity() {
         if (url == null) return false
         for (prefix in arrayOf(
             "https://production-api.androidacy.com/magisk/file/",
-            "https://staging-api.androidacy.com/magisk/file/"
+            "https://production-api.androidacy.com/downloads/"
         )) { // Make both staging and non staging act the same
             if (url.startsWith(prefix)) {
                 return true
@@ -513,4 +513,4 @@ class AndroidacyActivity : AppCompatActivity() {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerActivity.kt b/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerActivity.kt
index 1d08314..9b30de9 100644
--- a/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerActivity.kt
+++ b/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerActivity.kt
@@ -338,6 +338,13 @@ class InstallerActivity : AppCompatActivity() {
         )
         val installerMonitor: InstallerMonitor
         val installJob: Shell.Job
+            val mgskPath = InstallerInitializer.peekMagiskPath()
+            val ashExec = if (!InstallerInitializer.isKsu) {
+		"$mgskPath/magisk/busybox ash"
+			} else {
+				"$mgskPath/ksu/busybox ash"
+		}
+
         if (rootless) { // rootless is only used for debugging
             val installScript = extractInstallScript("module_installer_test.sh")
             if (installScript == null) {
@@ -365,7 +372,7 @@ class InstallerActivity : AppCompatActivity() {
             }
             installerMonitor = InstallerMonitor(installScript)
             installJob = Shell.cmd(
-                "export ASH_STANDALONE=1 exec /data/adb/magisk/busybox ash",
+                "export ASH_STANDALONE=1 exec " + ashExec,
                 "export MMM_EXT_SUPPORT=1",
                 "export MMM_USER_LANGUAGE=" + this.resources.configuration.locales[0].toLanguageTag(),
                 "export MMM_APP_VERSION=" + BuildConfig.VERSION_NAME,
@@ -382,12 +389,10 @@ class InstallerActivity : AppCompatActivity() {
             var magiskModule = false
             var installZipMagiskModule = false
             var mmtReborn = false
-            val mgskPath = InstallerInitializer.peekMagiskPath()
             if (mgskPath == null) {
                 setInstallStateFinished(false, "! Unable to resolve magisk path", "")
                 return
             }
-            val ashExec = "$mgskPath/.magisk/busybox/busybox ash"
             try {
                 ZipFile(file).use { zipFile ->
                     // Check if module is AnyKernel module
diff --git a/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerInitializer.kt b/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerInitializer.kt
index 0440e3d..2894d31 100644
--- a/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerInitializer.kt
+++ b/app/src/main/kotlin/com/fox2code/mmm/installer/InstallerInitializer.kt
@@ -56,7 +56,7 @@ class InstallerInitializer {
          * For read/write only "/data/adb/modules" should be used
          */
         fun peekModulesPath(): String? {
-            return if (mgskPth == null) null else "$mgskPth/.magisk/modules"
+            return if (mgskPth == null) null else "/data/adb/modules"
         }
 
         fun peekMagiskVersion(): Int {
@@ -172,7 +172,7 @@ class InstallerInitializer {
                         }
                         verCode = 0
                     }
-                    mgskPth = "/data/adb/modules" // hardcoded path. all modern versions of ksu and magisk use this path
+                    mgskPth = "/data/adb" // hardcoded path. all modern versions of ksu and magisk use this path
                     if (MainApplication.forceDebugLogging) {
                         Timber.i("Magisk path: %s", mgskPth)
                     }