TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-22 07:57:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move manager.sh to app_functions.sh

Browse Source
This commit is contained in:
topjohnwu 2024-07-01 18:42:05 -07:00
parent 1fbd053a42
commit 59f40d5fe5
4 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/topjohnwu/magisk/core/ktx/XAndroid.kt
View File

@ -27,8 +27,6 @@ import com.topjohnwu.superuser.internal.UiThreadHandler
import java.io.File import java.io.File
import kotlin.String import kotlin.String
fun Context.rawResource(id: Int) = resources.openRawResource(id)
fun Context.getBitmap(id: Int): Bitmap { fun Context.getBitmap(id: Int): Bitmap {
var drawable = AppCompatResources.getDrawable(this, id)!! var drawable = AppCompatResources.getDrawable(this, id)!!
if (drawable is BitmapDrawable) if (drawable is BitmapDrawable)

6
app/src/main/java/com/topjohnwu/magisk/core/utils/ShellInit.kt
View File

@ -1,18 +1,14 @@
package com.topjohnwu.magisk.core.utils package com.topjohnwu.magisk.core.utils
import android.content.Context import android.content.Context
import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.StubApk import com.topjohnwu.magisk.StubApk
import com.topjohnwu.magisk.core.Config
import com.topjohnwu.magisk.core.Const import com.topjohnwu.magisk.core.Const
import com.topjohnwu.magisk.core.Info import com.topjohnwu.magisk.core.Info
import com.topjohnwu.magisk.core.isRunningAsStub import com.topjohnwu.magisk.core.isRunningAsStub
import com.topjohnwu.magisk.core.ktx.cachedFile import com.topjohnwu.magisk.core.ktx.cachedFile
import com.topjohnwu.magisk.core.ktx.deviceProtectedContext import com.topjohnwu.magisk.core.ktx.deviceProtectedContext
import com.topjohnwu.magisk.core.ktx.rawResource
import com.topjohnwu.magisk.core.ktx.writeTo import com.topjohnwu.magisk.core.ktx.writeTo
import com.topjohnwu.superuser.Shell import com.topjohnwu.superuser.Shell
import com.topjohnwu.superuser.ShellUtils
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import java.io.File import java.io.File
@ -67,7 +63,7 @@ class ShellInit : Shell.Initializer() {
add("exec $localBB sh") add("exec $localBB sh")
} }
add(context.rawResource(R.raw.manager)) add(context.assets.open("app_functions.sh"))
if (shell.isRoot) { if (shell.isRoot) {
add(context.assets.open("util_functions.sh")) add(context.assets.open("util_functions.sh"))
} }

4
buildSrc/src/main/java/Setup.kt
View File

@ -287,8 +287,8 @@ fun Project.setupApp() {
inputs.property("versionCode", Config.versionCode) inputs.property("versionCode", Config.versionCode)
into("src/${this@all.name}/assets") into("src/${this@all.name}/assets")
from(rootProject.file("scripts")) { from(rootProject.file("scripts")) {
include("util_functions.sh", "boot_patch.sh", "addon.d.sh") include("util_functions.sh", "boot_patch.sh", "addon.d.sh",
include("uninstaller.sh", "module_installer.sh") "app_functions.sh", "uninstaller.sh", "module_installer.sh")
} }
from(rootProject.file("tools/bootctl")) from(rootProject.file("tools/bootctl"))
into("chromeos") { into("chromeos") {

0
app/src/main/res/raw/manager.sh → scripts/app_functions.sh
View File