CodeMirror/Rare
1
0
Fork 0
mirror of synced 2024-06-02 10:44:40 +12:00
Code Issues Projects Releases Wiki Activity

DownloadThread: args is a string!

Browse source
This commit is contained in:
Stelios Tsampas 2022-09-18 14:55:33 +03:00
parent 14eda1c246
commit 0960cbbdd3
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
rare/components/dialogs/install_dialog.py
View file

@ -292,8 +292,11 @@ class InstallDialog(QDialog):
self.ui.install_prereqs_check.setVisible(True)
self.ui.install_prereqs_lbl.setVisible(True)
self.ui.install_prereqs_check.setChecked(True)
prereq_name = dl_item.igame.prereq_info.get("name", "")
prereq_path = os.path.split(dl_item.igame.prereq_info.get("path", ""))[-1]
prereq_desc = prereq_name if prereq_name else prereq_path
self.ui.install_prereqs_check.setText(
self.tr("Also install: {}").format(dl_item.igame.prereq_info.get("name", ""))
self.tr("Also install: {}").format(prereq_desc)
)
if self.silent:
self.close()

5
rare/components/tabs/downloads/download_thread.py
View file

@ -154,9 +154,10 @@ class DownloadThread(QThread):
proc.readyReadStandardOutput.connect(
lambda: logger.debug(str(proc.readAllStandardOutput().data(), "utf-8", "ignore"))
)
proc.setArguments(postinstall.get("args", []))
proc.setProgram(fullpath)
proc.setArguments(postinstall.get("args", "").split(" "))
proc.setWorkingDirectory(work_dir)
proc.start(fullpath)
proc.start()
proc.waitForFinished() # wait, because it is inside the thread
else:
logger.info("Automatic installation not available on Linux.")