monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow running MultiMystery.py from source on linux

This commit is contained in:
black-sliver 2021-06-27 18:52:09 +02:00 committed by Fabian Dill
parent 8b5d7028f7
commit 50ed657b0e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MultiMystery.py
View File

@ -6,6 +6,7 @@ import concurrent.futures
import argparse import argparse
import logging import logging
import random import random
from shutil import which
def feedback(text: str): def feedback(text: str):
@ -76,8 +77,10 @@ if __name__ == "__main__":
basemysterycommand = "ArchipelagoMystery.exe" # compiled windows basemysterycommand = "ArchipelagoMystery.exe" # compiled windows
elif os.path.exists("ArchipelagoMystery"): elif os.path.exists("ArchipelagoMystery"):
basemysterycommand = "./ArchipelagoMystery" # compiled linux basemysterycommand = "./ArchipelagoMystery" # compiled linux
elif which('py'):
basemysterycommand = f"py -{py_version} Mystery.py" # source windows
else: else:
basemysterycommand = f"py -{py_version} Mystery.py" # source basemysterycommand = f"python3 Mystery.py" # source others
weights_file_path = os.path.join(player_files_path, weights_file_path) weights_file_path = os.path.join(player_files_path, weights_file_path)
if os.path.exists(weights_file_path): if os.path.exists(weights_file_path):
@ -210,8 +213,10 @@ if __name__ == "__main__":
baseservercommand = ["ArchipelagoServer.exe"] # compiled windows baseservercommand = ["ArchipelagoServer.exe"] # compiled windows
elif os.path.exists("ArchipelagoServer"): elif os.path.exists("ArchipelagoServer"):
baseservercommand = ["./ArchipelagoServer"] # compiled linux baseservercommand = ["./ArchipelagoServer"] # compiled linux
elif which('py'):
baseservercommand = ["py", f"-{py_version}", "MultiServer.py"] # source windows
else: else:
baseservercommand = ["py", f"-{py_version}", "MultiServer.py"] # source baseservercommand = ["python3", "MultiServer.py"] # source others
# don't have a mac to test that. If you try to run compiled on mac, good luck. # don't have a mac to test that. If you try to run compiled on mac, good luck.
subprocess.call(baseservercommand + ["--multidata", os.path.join(output_path, multidataname)]) subprocess.call(baseservercommand + ["--multidata", os.path.join(output_path, multidataname)])
except: except: