redstrate/astra
1
Fork 0
mirror of https://github.com/redstrate/Astra.git synced 2025-05-01 08:27:45 +00:00
Code Activity

Simplify launching Astra through the compatibility tool

Browse source 
Instead of using steamwrap (which doesn't work) use the recommended
method from Valve of escaping their LD_LIBRARY_PATH.
This commit is contained in:
Joshua Goins 2025-04-29 15:12:07 -04:00
parent 0041b53e3f
commit 8f43744366
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
launcher/src/compatibilitytoolinstaller.cpp
View file

@ -33,27 +33,29 @@ void CompatibilityToolInstaller::installCompatibilityTool()
Q_UNUSED(QDir().mkpath(astraToolDir.absolutePath()))
// we need a run script to escape the compatibility tool quirk where it runs everything in the current directory
const auto runScriptContents = QStringLiteral("#!/bin/sh\nexec \"$@\"");
QFile runScriptFile(astraToolDir.absoluteFilePath(QStringLiteral("run.sh")));
runScriptFile.open(QIODevice::WriteOnly | QIODevice::Text);
runScriptFile.write(runScriptContents.toUtf8());
runScriptFile.close();
QProcess::execute(QStringLiteral("chmod"), {QStringLiteral("+x"), astraToolDir.absoluteFilePath(QStringLiteral("run.sh"))});
QString command;
if (KSandbox::isFlatpak()) {
QFile::copy(QStringLiteral("/app/bin/steamwrap"), astraToolDir.absoluteFilePath(QStringLiteral("steamwrap")));
QFile::copy(QStringLiteral("/app/bin/libsteam_api.so"), astraToolDir.absoluteFilePath(QStringLiteral("libsteam_api.so")));
QProcess::execute(QStringLiteral("chmod"), {QStringLiteral("+x"), astraToolDir.absoluteFilePath(QStringLiteral("steamwrap"))});
command = QStringLiteral("/steamwrap /usr/bin/flatpak run zone.xiv.astra");
command = QStringLiteral("flatpak run zone.xiv.astra");
} else {
const QString appPath = QCoreApplication::applicationFilePath();
QFile appFile(appPath);
appFile.link(astraToolDir.absoluteFilePath(QStringLiteral("astra")));
command = QStringLiteral("/astra");
command = QCoreApplication::applicationFilePath();
}
const QString toolManifestContents = QStringLiteral(
const QString toolManifestContents =
QStringLiteral(
"\"manifest\"\n"
"{\n"
" \"version\" \"2\"\n"
" \"commandline\" \"%1 --steam %verb%\"\n"
" \"commandline\" \"/run.sh \\\"$STEAM_RUNTIME/scripts/switch-runtime.sh\\\" --runtime=\\\"\\\" -- %1 --steam %verb%\"\n"
"}")
.arg(command);