Valve/Proton
1
0
Fork 0
mirror of https://github.com/ValveSoftware/Proton.git synced 2024-12-27 07:05:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

default_pfx.py: Don't accept the shell argument any more.

Browse Source 
We now only invoke it inside of the container instead of passing the
`docker run ...` as a parameter.
This commit is contained in:
Arkadiusz Hiler 2023-01-13 17:20:54 +02:00
parent 692ef0aa1f
commit 62174c7c1e
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
default_pfx.py
View File

@ -109,22 +109,15 @@ def filter_registry(filename):
os.rename(filename + '.tmp', filename) os.rename(filename + '.tmp', filename)
def make_default_pfx(default_pfx_dir, dist_dir, runtime): def make_default_pfx(default_pfx_dir, dist_dir):
local_env = dict(os.environ) local_env = dict(os.environ)
ld_path = dist_dir + "/lib64:" + dist_dir + "/lib" ld_path = dist_dir + "/lib64:" + dist_dir + "/lib"
if runtime is None: local_env["LD_LIBRARY_PATH"] = ld_path
local_env["LD_LIBRARY_PATH"] = ld_path local_env["WINEPREFIX"] = default_pfx_dir
local_env["WINEPREFIX"] = default_pfx_dir local_env["WINEDEBUG"] = "-all"
local_env["WINEDEBUG"] = "-all" runtime_args = []
runtime_args = []
else:
#the runtime clears the environment, so we pass it in on the CL via env
runtime_args = runtime + ["env",
"LD_LIBRARY_PATH=" + ld_path,
"WINEPREFIX=" + default_pfx_dir,
"WINEDEBUG=-all"]
subprocess.run(runtime_args + ["/bin/bash", "-c", subprocess.run(runtime_args + ["/bin/bash", "-c",
os.path.join(dist_dir, 'bin', 'wine') + " wineboot && " + os.path.join(dist_dir, 'bin', 'wine') + " wineboot && " +
@ -138,7 +131,4 @@ def make_default_pfx(default_pfx_dir, dist_dir, runtime):
if __name__ == '__main__': if __name__ == '__main__':
import sys import sys
if len(sys.argv) > 3: make_default_pfx(sys.argv[1], sys.argv[2])
make_default_pfx(sys.argv[1], sys.argv[2], sys.argv[3:])
else:
make_default_pfx(sys.argv[1], sys.argv[2], None)