Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-22 10:42:29 +01:00
Code Issues Projects Releases Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Elias Steurer 2022-11-19 16:31:32 +01:00
commit ed77f15224
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ScreenPlay/inc/public/ScreenPlay/settings.h
View File

@ -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);

4
Tools/steam_publish.py
View File

@ -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)