mirror of
https://github.com/tcsenpai/UWINE.git
synced 2025-06-06 11:35:20 +00:00
Merge pull request #31 from loathingKernel/stderr
Do not silence subprocess's exit code and avoid polluting `stdout`
This commit is contained in:
commit
c116d7dbf9
15
ulwgl_run.py
15
ulwgl_run.py
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
import os
|
import os
|
||||||
import argparse
|
import argparse
|
||||||
|
from traceback import print_exception
|
||||||
from argparse import ArgumentParser, Namespace
|
from argparse import ArgumentParser, Namespace
|
||||||
import sys
|
import sys
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
@ -34,13 +35,13 @@ example usage:
|
|||||||
|
|
||||||
if not sys.argv[1:]:
|
if not sys.argv[1:]:
|
||||||
err: str = "Please see project README.md for more info and examples.\nhttps://github.com/Open-Wine-Components/ULWGL-launcher"
|
err: str = "Please see project README.md for more info and examples.\nhttps://github.com/Open-Wine-Components/ULWGL-launcher"
|
||||||
parser.print_help()
|
parser.print_help(sys.stderr)
|
||||||
raise SystemExit(err)
|
raise SystemExit(err)
|
||||||
|
|
||||||
if sys.argv[1:][0] in opt_args:
|
if sys.argv[1:][0] in opt_args:
|
||||||
return parser.parse_args(sys.argv[1:])
|
return parser.parse_args(sys.argv[1:])
|
||||||
|
|
||||||
return (sys.argv[1], sys.argv[2:])
|
return sys.argv[1], sys.argv[2:]
|
||||||
|
|
||||||
|
|
||||||
def setup_pfx(path: str) -> None:
|
def setup_pfx(path: str) -> None:
|
||||||
@ -281,7 +282,7 @@ def build_command(
|
|||||||
return command
|
return command
|
||||||
|
|
||||||
|
|
||||||
def main() -> None: # noqa: D103
|
def main() -> int: # noqa: D103
|
||||||
env: Dict[str, str] = {
|
env: Dict[str, str] = {
|
||||||
"WINEPREFIX": "",
|
"WINEPREFIX": "",
|
||||||
"GAMEID": "",
|
"GAMEID": "",
|
||||||
@ -327,8 +328,12 @@ def main() -> None: # noqa: D103
|
|||||||
os.environ[key] = val
|
os.environ[key] = val
|
||||||
|
|
||||||
build_command(env, command, opts)
|
build_command(env, command, opts)
|
||||||
subprocess.run(command)
|
return subprocess.run(command).returncode
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
try:
|
||||||
|
sys.exit(main())
|
||||||
|
except Exception as e: # noqa: BLE001
|
||||||
|
print_exception(e)
|
||||||
|
sys.exit(1)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user