TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-16 16:18:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Run commands through shell on Windows

Browse Source
This commit is contained in:
topjohnwu 2024-07-31 17:21:18 -07:00
parent 606d076251
commit 9093be1329
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
build.py
View File

@ -90,9 +90,9 @@ ndk_path = ndk_root / "magisk"
ndk_build = ndk_path / "ndk-build" ndk_build = ndk_path / "ndk-build"
rust_bin = ndk_path / "toolchains" / "rust" / "bin" rust_bin = ndk_path / "toolchains" / "rust" / "bin"
llvm_bin = ndk_path / "toolchains" / "llvm" / "prebuilt" / f"{os_name}-x86_64" / "bin" llvm_bin = ndk_path / "toolchains" / "llvm" / "prebuilt" / f"{os_name}-x86_64" / "bin"
cargo = rust_bin / f"cargo{EXE_EXT}" cargo = rust_bin / "cargo"
gradlew = Path("gradlew" + (".bat" if is_windows else "")).resolve() gradlew = Path.cwd() / "gradlew"
adb_path = sdk_path / "platform-tools" / f"adb{EXE_EXT}" adb_path = sdk_path / "platform-tools" / "adb"
native_gen_path = Path("native", "out", "generated").resolve() native_gen_path = Path("native", "out", "generated").resolve()
# Global vars # Global vars
@ -141,12 +141,19 @@ def rm_rf(path: Path):
def execv(cmds: list, env=None): def execv(cmds: list, env=None):
return subprocess.run(cmds, stdout=STDOUT, env=env) # Use shell on Windows to support PATHEXT
return subprocess.run(cmds, stdout=STDOUT, env=env, shell=is_windows)
def cmd_out(cmds: list, env=None): def cmd_out(cmds: list, env=None):
return ( return (
subprocess.run(cmds, stdout=subprocess.PIPE, stderr=subprocess.DEVNULL, env=env) subprocess.run(
cmds,
stdout=subprocess.PIPE,
stderr=subprocess.DEVNULL,
env=env,
shell=is_windows,
)
.stdout.strip() .stdout.strip()
.decode("utf-8") .decode("utf-8")
) )