Move relaunch / update logic to Core::Launcher.

Also pass "-workdir" argument through relaunch / update.

Fixes #4149.

Telegram/SourceFiles/platform/linux/launcher_linux.cpp

@@ -20,9 +20,98 @@ Copyright (c) 2014-2017 John Preston, https://desktop.telegram.org
 */
 #include "platform/linux/launcher_linux.h"
 
-namespace Platform {
+#include "core/crash_reports.h"
 
-void Launcher::initHook() {
+#include <sys/stat.h>
+#include <sys/types.h>
+#include <cstdlib>
+#include <unistd.h>
+#include <dirent.h>
+#include <pwd.h>
+
+namespace Platform {
+namespace {
+
+class Arguments {
+public:
+	void push(QByteArray argument) {
+		argument.append(char(0));
+		_argumentValues.push_back(argument);
+		_arguments.push_back(_argumentValues.back().data());
+	}
+
+	char **result() {
+		_arguments.push_back(nullptr);
+		return _arguments.data();
+	}
+
+private:
+	std::vector<QByteArray> _argumentValues;
+	std::vector<char*> _arguments;
+
+};
+
+} // namespace
+
+bool Launcher::launchUpdater(UpdaterLaunch action) {
+	if (cExeName().isEmpty()) {
+		return false;
+	}
+
+	const auto binaryName = (action == UpdaterLaunch::JustRelaunch)
+		? cExeName()
+		: QStringLiteral("Updater");
+
+	auto argumentsList = Arguments();
+	argumentsList.push(QFile::encodeName(cExeDir() + binaryName));
+
+	if (cLaunchMode() == LaunchModeAutoStart) {
+		argumentsList.push("-autostart");
+	}
+	if (cDebug()) {
+		argumentsList.push("-debug");
+	}
+	if (cStartInTray()) {
+		argumentsList.push("-startintray");
+	}
+	if (cTestMode()) {
+		argumentsList.push("-testmode");
+	}
+	if (cDataFile() != qsl("data")) {
+		argumentsList.push("-key");
+		argumentsList.push(QFile::encodeName(cDataFile()));
+	}
+
+	if (action == UpdaterLaunch::JustRelaunch) {
+		argumentsList.push("-noupdate");
+		argumentsList.push("-tosettings");
+		if (customWorkingDir()) {
+			argumentsList.push("-workdir");
+			argumentsList.push(QFile::encodeName(cWorkingDir()));
+		}
+	} else {
+		argumentsList.push("-workpath");
+		argumentsList.push(QFile::encodeName(cWorkingDir()));
+		argumentsList.push("-exename");
+		argumentsList.push(QFile::encodeName(cExeName()));
+		argumentsList.push("-exepath");
+		argumentsList.push(QFile::encodeName(cExeDir()));
+		if (customWorkingDir()) {
+			argumentsList.push("-workdir_custom");
+		}
+	}
+
+	Logs::closeMain();
+	CrashReports::Finish();
+
+	const auto args = argumentsList.result();
+
+	pid_t pid = fork();
+	switch (pid) {
+	case -1: return false;
+	case 0: execv(args[0], args); return false;
+	}
+	return true;
 }
 
 } // namespace