KolibriOS/kolibrios
13
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

[WS][run.py] Use os.path.dirname instead of hand-written function

Browse Source 
git-svn-id: svn://kolibrios.org@9381 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Magomed Kostoev (mkostoevr) 2021-12-04 09:53:10 +00:00
parent 577dc1255d
commit f505262a89
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
_tools/workspace/run.py
View File

@ -16,17 +16,6 @@ from lib.platform import is_win32, path
from lib.logging import log from lib.logging import log
from lib.network import download from lib.network import download
# TODO: Move into _tools/lib
def get_file_directory(path):
path = path.replace("\\", "/")
if "/" in path:
folder = "/".join(path.split("/")[:-1])
if folder == "":
return "/" # It was a file in the root folder
return folder
else:
return "." # Just a filename, let's return current folder
# TODO: Move into _tools/lib # TODO: Move into _tools/lib
def run_qemu(start_dir = "workspace"): def run_qemu(start_dir = "workspace"):
qemu_command = f"qemu-system-i386" qemu_command = f"qemu-system-i386"
@ -39,7 +28,7 @@ def run_qemu(start_dir = "workspace"):
flags += "-soundhw ac97 " flags += "-soundhw ac97 "
if is_win32(): if is_win32():
qemu_full_path = shutil.which(qemu_command) qemu_full_path = shutil.which(qemu_command)
qemu_directory = get_file_directory(qemu_full_path) qemu_directory = os.path.dirname(qemu_full_path)
flags += f"-L {qemu_directory} " flags += f"-L {qemu_directory} "
s = f"{qemu_command} {flags}" s = f"{qemu_command} {flags}"
qemu_stdout = open(f"{start_dir}/qemu_stdout.log", "w") qemu_stdout = open(f"{start_dir}/qemu_stdout.log", "w")