Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Linux installShortcut bugs #135

Merged
merged 2 commits into from
Jul 24, 2024
Merged

Fix Linux installShortcut bugs #135

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f81409
Linux: fix filename for xdg-mime protocol command
slipher Jul 23, 2024
4a44db0
Linux: handle issues with QStandardPaths::writableLocation
slipher Jul 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions linux.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,22 @@ bool installShortcuts()
{
// Set up menu and protocol handler
Settings settings;
QString desktopDir = QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation);
QFile::remove(desktopDir + "/unvanquished.desktop"); // updater v0.0.5 and before
QFile::remove(desktopDir + "/net.unvanquished.UnvanquishedProtocolHandler.desktop"); // up to v0.2.0
QString desktopDirString = QStandardPaths::writableLocation(QStandardPaths::ApplicationsLocation);
if (desktopDirString.isEmpty()) {
qDebug() << "ApplicationsLocation for desktop files not provided";
return false;
}
QDir desktopDir(desktopDirString);
if (desktopDir.exists()) {
desktopDir.remove("unvanquished.desktop"); // updater v0.0.5 and before
desktopDir.remove("net.unvanquished.UnvanquishedProtocolHandler.desktop"); // up to v0.2.0
} else {
if (!desktopDir.mkpath(".")) {
qDebug() << "Could not create directory for desktop files" << desktopDirString;
return false;
}
qDebug() << "Created directory for desktop files" << desktopDirString;
}

QString desktopFileName = "net.unvanquished.Unvanquished.desktop";
QFile desktopFile(":resources/" + desktopFileName);
Expand All @@ -150,22 +163,24 @@ bool installShortcuts()
}
QString desktopStr = QString(desktopFile.readAll().data()).arg(settings.installPath());
{
QFile outputFile(desktopDir + "/" + desktopFileName);
QFile outputFile(desktopDir.filePath(desktopFileName));
if (!outputFile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Truncate)) {
qDebug() << "error opening" << desktopFileName;
qDebug() << "error opening" << outputFile.fileName();
return false;
}
if (outputFile.write(desktopStr.toUtf8().constData(), desktopStr.size()) != desktopStr.size()) {
qDebug() << "error writing" << desktopFileName;
qDebug() << "error writing" << outputFile.fileName();
return false;
}
qDebug() << "Created desktop file" << outputFile.fileName();
}

int ret = QProcess::execute("xdg-mime",
{QString("default"),
desktopDir + "/net.unvanquished.UnvanquishedProtocolHandler.desktop",
desktopDir.filePath(desktopFileName),
QString("x-scheme-handler/unv")});
qDebug() << "xdg-mime returned" << ret;
ret = QProcess::execute("update-desktop-database", {desktopDir});
ret = QProcess::execute("update-desktop-database", {desktopDirString});
qDebug() << "update-desktop-database returned" << ret;

// install icon
Expand Down