mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-01 23:15:59 +00:00
Code Issues Releases Wiki Activity

Convert TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION to runtime environment variable

Browse Source
This commit is contained in:
Ilya Fedin
2020-03-07 09:54:47 +04:00
committed by John Preston
parent 1dc6d942cf
commit 5927e8272c
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Telegram/SourceFiles/platform/linux/specific_linux.cpp
View File

@@ -524,18 +524,21 @@ void finish() {
void RegisterCustomScheme(bool force) {
#ifndef TDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME
auto home = getHomeDir();
const auto home = getHomeDir();
if (home.isEmpty() || cExeName().isEmpty())
return;
static const auto disabledByEnv = qEnvironmentVariableIsSet(
"TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION");
// don't update desktop file for alpha version or if updater is disabled
if ((cAlphaVersion() || Core::UpdaterDisabled()) && !force)
if ((cAlphaVersion() || Core::UpdaterDisabled() || disabledByEnv)
&& !force)
return;
const auto applicationsPath = QStandardPaths::writableLocation(
QStandardPaths::ApplicationsLocation) + '/';
#ifndef TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION
GenerateDesktopFile(applicationsPath, qsl("-- %u"));
const auto icons =
@@ -558,7 +561,6 @@ void RegisterCustomScheme(bool force) {
DEBUG_LOG(("App Info: Icon copied to '%1'").arg(icon));
}
}
#endif // !TDESKTOP_DISABLE_DESKTOP_FILE_GENERATION
RunShellCommand("update-desktop-database "
+ EscapeShell(QFile::encodeName(applicationsPath)));
@@ -629,7 +631,7 @@ bool psShowOpenWithMenu(int x, int y, const QString &file) {
}
void psAutoStart(bool start, bool silent) {
auto home = getHomeDir();
const auto home = getHomeDir();
if (home.isEmpty() || cExeName().isEmpty())
return;