From 377fd486dc98ecb19420968fcaea3964862fbaed Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Wed, 7 Sep 2022 19:42:07 +0300 Subject: [PATCH] stupid quotes --- .github/workflows/tests.yml | 4 +++- rare/__main__.py | 3 +-- rare/utils/misc.py | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index d1bb2d88..dde4f957 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -77,7 +77,6 @@ jobs: name: Rare.AppImage path: Rare.AppImage - cx_freeze: runs-on: "windows-latest" steps: @@ -91,6 +90,8 @@ jobs: run: pip3 install -r requirements.txt - name: cx_freeze run: pip3 install --upgrade cx_freeze wheel + - name: pypresence + run: pip3 install pypresence - name: Build run: python freeze.py bdist_msi @@ -98,6 +99,7 @@ jobs: with: name: Rare-Windows.msi path: dist/*.msi + mac_os: runs-on: macos-latest steps: diff --git a/rare/__main__.py b/rare/__main__.py index cba7a615..7d4f1748 100644 --- a/rare/__main__.py +++ b/rare/__main__.py @@ -1,3 +1,4 @@ +import multiprocessing import os import pathlib import sys @@ -6,8 +7,6 @@ from argparse import ArgumentParser def main(): # fix cx_freeze - import multiprocessing - multiprocessing.freeze_support() # insert legendary for installed via pip/setup.py submodule to path diff --git a/rare/utils/misc.py b/rare/utils/misc.py index f3c6cf12..be8ee9a5 100644 --- a/rare/utils/misc.py +++ b/rare/utils/misc.py @@ -165,7 +165,7 @@ def get_size(b: Union[int, float]) -> str: def get_rare_executable() -> List[str]: - # lk: detech if nuitka + # lk: detect if nuitka if "__compiled__" in globals(): executable = [sys.executable] elif platform.system() == "Linux" or platform.system() == "Darwin": @@ -285,7 +285,10 @@ def create_desktop_link(app_name=None, core: LegendaryCore = None, type_of_link= arguments.extend(["launch", app_name]) # Maybe there is a better solution, but windows does not accept single quotes (Windows is weird) + logger.warning(executable) + logger.warning(shlex.quote(executable).replace("'", '"')) shortcut.Targetpath = shlex.quote(executable).replace("'", '"') + logger.warning(shlex.join(arguments).replace("'", '"')) shortcut.Arguments = shlex.join(arguments).replace("'", '"') if for_rare: shortcut.WorkingDirectory = QStandardPaths.writableLocation(QStandardPaths.HomeLocation)