From 6a41642bfe7cf60b1de9fb7845dc81d29b807183 Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Sat, 12 Nov 2022 17:09:51 +0100 Subject: [PATCH 1/2] Fix date format and missing chmod for steamcmd --- Tools/steam_publish.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Tools/steam_publish.py b/Tools/steam_publish.py index c5b389ec..783abc70 100644 --- a/Tools/steam_publish.py +++ b/Tools/steam_publish.py @@ -48,10 +48,12 @@ def publish( vdf_config_name = "app_build_mac.vdf" depot_config_name = "depot_build_mac.vdf" steamcmd_path = os.path.join(contentBuiler_path, "builder_osx/steamcmd") + execute(f"chmod +x {steamcmd_path}") elif platform.system() == "Linux": vdf_config_name = "app_build_linux.vdf" depot_config_name = "depot_build_linux.vdf" steamcmd_path = os.path.join(contentBuiler_path, "builder_linux/steamcmd.sh") + execute(f"chmod +x {steamcmd_path}") print(f"Set steamCmd path: {steamcmd_path}") @@ -66,7 +68,7 @@ def publish( config_content = file.read() git_hash = get_git_revision_short_hash().decode("utf-8").replace("\n", "") git_commit_text = get_git_commit_text().decode("utf-8").replace("\n", "") - current_date_time = datetime.now().strftime("%m/%d/%Y, %H:%M:%S") + current_date_time = datetime.now().strftime("%d/%m/%Y, %H:%M:%S") build_description = "- git hash: " + git_hash + ", commit: " + git_commit_text + " - upload datetime: " + current_date_time config_content = config_content.replace("{{BUILD_DESCRIPTION}}", build_description) From 95e8098bcf1ab476f51603887bba53fd7dfcf5a9 Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Sat, 12 Nov 2022 17:10:05 +0100 Subject: [PATCH 2/2] Fix invalid path --- ScreenPlay/inc/public/ScreenPlay/settings.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ScreenPlay/inc/public/ScreenPlay/settings.h b/ScreenPlay/inc/public/ScreenPlay/settings.h index 7ed3ea4b..2a7a85e6 100644 --- a/ScreenPlay/inc/public/ScreenPlay/settings.h +++ b/ScreenPlay/inc/public/ScreenPlay/settings.h @@ -197,11 +197,12 @@ public slots: } if (desktopEnvironment() == DesktopEnvironment::OSX) { const QString plistFileName = "app.screenplay.plist"; - QFile defaultPListFile(":/assets/macos/" + plistFileName); + QFile defaultPListFile(":/qml/ScreenPlayApp/assets/macos/" + plistFileName); defaultPListFile.open(QIODevice::ReadOnly); QString settingsPlistContent = defaultPListFile.readAll(); if (!settingsPlistContent.contains("{{SCREENPLAY_PATH}}")) { qCritical() << "Unable to load plist settings template from qrc to set autostart!"; + return; } QDir workingDir(QGuiApplication::applicationDirPath()); @@ -226,6 +227,8 @@ public slots: out << settingsPlistContent; settingsPlist.flush(); settingsPlist.close(); + + qInfo() << "Set autostart enabled: " << autostart; } setqSetting("Autostart", autostart);