mirror of
https://github.com/AyuGram/AyuGramDesktop.git
synced 2025-06-06 15:13:57 +02:00
Remove -externalupdater flag
Having a path to executable in /etc/tdesktop/externalupdater is a way more convenient and is enough
This commit is contained in:
parent
a3ee1e4ed5
commit
8b7b0fa570
7 changed files with 2 additions and 29 deletions
|
@ -384,7 +384,6 @@ int main(int argc, char *argv[]) {
|
||||||
bool writeprotected = false;
|
bool writeprotected = false;
|
||||||
bool tosettings = false;
|
bool tosettings = false;
|
||||||
bool startintray = false;
|
bool startintray = false;
|
||||||
bool externalupdater = false;
|
|
||||||
bool customWorkingDir = false;
|
bool customWorkingDir = false;
|
||||||
|
|
||||||
char *key = 0;
|
char *key = 0;
|
||||||
|
@ -398,8 +397,6 @@ int main(int argc, char *argv[]) {
|
||||||
debug = _debug = true;
|
debug = _debug = true;
|
||||||
} else if (equal(argv[i], "-startintray")) {
|
} else if (equal(argv[i], "-startintray")) {
|
||||||
startintray = true;
|
startintray = true;
|
||||||
} else if (equal(argv[i], "-externalupdater")) {
|
|
||||||
externalupdater = true;
|
|
||||||
} else if (equal(argv[i], "-tosettings")) {
|
} else if (equal(argv[i], "-tosettings")) {
|
||||||
tosettings = true;
|
tosettings = true;
|
||||||
} else if (equal(argv[i], "-workdir_custom")) {
|
} else if (equal(argv[i], "-workdir_custom")) {
|
||||||
|
@ -500,7 +497,6 @@ int main(int argc, char *argv[]) {
|
||||||
if (autostart) push("-autostart");
|
if (autostart) push("-autostart");
|
||||||
if (debug) push("-debug");
|
if (debug) push("-debug");
|
||||||
if (startintray) push("-startintray");
|
if (startintray) push("-startintray");
|
||||||
if (externalupdater) push("-externalupdater");
|
|
||||||
if (tosettings) push("-tosettings");
|
if (tosettings) push("-tosettings");
|
||||||
if (key) {
|
if (key) {
|
||||||
push("-key");
|
push("-key");
|
||||||
|
|
|
@ -90,7 +90,7 @@ int main(int argc, const char * argv[]) {
|
||||||
|
|
||||||
openLog();
|
openLog();
|
||||||
pid_t procId = 0;
|
pid_t procId = 0;
|
||||||
BOOL update = YES, toSettings = NO, autoStart = NO, startInTray = NO, freeType = NO, externalUpdater = NO;
|
BOOL update = YES, toSettings = NO, autoStart = NO, startInTray = NO, freeType = NO;
|
||||||
BOOL customWorkingDir = NO;
|
BOOL customWorkingDir = NO;
|
||||||
NSString *key = nil;
|
NSString *key = nil;
|
||||||
for (int i = 0; i < argc; ++i) {
|
for (int i = 0; i < argc; ++i) {
|
||||||
|
@ -116,8 +116,6 @@ int main(int argc, const char * argv[]) {
|
||||||
startInTray = YES;
|
startInTray = YES;
|
||||||
} else if ([@"-freetype" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
|
} else if ([@"-freetype" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
|
||||||
freeType = YES;
|
freeType = YES;
|
||||||
} else if ([@"-externalupdater" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
|
|
||||||
externalUpdater = YES;
|
|
||||||
} else if ([@"-workdir_custom" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
|
} else if ([@"-workdir_custom" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
|
||||||
customWorkingDir = YES;
|
customWorkingDir = YES;
|
||||||
} else if ([@"-key" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
|
} else if ([@"-key" isEqualToString:[NSString stringWithUTF8String:argv[i]]]) {
|
||||||
|
@ -255,7 +253,6 @@ int main(int argc, const char * argv[]) {
|
||||||
if (_debug) [args addObject:@"-debug"];
|
if (_debug) [args addObject:@"-debug"];
|
||||||
if (startInTray) [args addObject:@"-startintray"];
|
if (startInTray) [args addObject:@"-startintray"];
|
||||||
if (freeType) [args addObject:@"-freetype"];
|
if (freeType) [args addObject:@"-freetype"];
|
||||||
if (externalUpdater) [args addObject:@"-externalupdater"];
|
|
||||||
if (autoStart) [args addObject:@"-autostart"];
|
if (autoStart) [args addObject:@"-autostart"];
|
||||||
if (key) {
|
if (key) {
|
||||||
[args addObject:@"-key"];
|
[args addObject:@"-key"];
|
||||||
|
|
|
@ -343,7 +343,7 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPWSTR cmdPara
|
||||||
LPWSTR *args;
|
LPWSTR *args;
|
||||||
int argsCount;
|
int argsCount;
|
||||||
|
|
||||||
bool needupdate = false, autostart = false, debug = false, writeprotected = false, startintray = false, freetype = false, externalupdater = false;
|
bool needupdate = false, autostart = false, debug = false, writeprotected = false, startintray = false, freetype = false;
|
||||||
args = CommandLineToArgvW(GetCommandLine(), &argsCount);
|
args = CommandLineToArgvW(GetCommandLine(), &argsCount);
|
||||||
if (args) {
|
if (args) {
|
||||||
for (int i = 1; i < argsCount; ++i) {
|
for (int i = 1; i < argsCount; ++i) {
|
||||||
|
@ -359,8 +359,6 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPWSTR cmdPara
|
||||||
startintray = true;
|
startintray = true;
|
||||||
} else if (equal(args[i], L"-freetype")) {
|
} else if (equal(args[i], L"-freetype")) {
|
||||||
freetype = true;
|
freetype = true;
|
||||||
} else if (equal(args[i], L"-externalupdater")) {
|
|
||||||
externalupdater = true;
|
|
||||||
} else if (equal(args[i], L"-writeprotected") && ++i < argsCount) {
|
} else if (equal(args[i], L"-writeprotected") && ++i < argsCount) {
|
||||||
writeLog(std::wstring(L"Argument: ") + args[i]);
|
writeLog(std::wstring(L"Argument: ") + args[i]);
|
||||||
writeprotected = true;
|
writeprotected = true;
|
||||||
|
@ -431,7 +429,6 @@ int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE prevInstance, LPWSTR cmdPara
|
||||||
if (debug) targs += L" -debug";
|
if (debug) targs += L" -debug";
|
||||||
if (startintray) targs += L" -startintray";
|
if (startintray) targs += L" -startintray";
|
||||||
if (freetype) targs += L" -freetype";
|
if (freetype) targs += L" -freetype";
|
||||||
if (externalupdater) targs += L" -externalupdater";
|
|
||||||
if (!customWorkingDir.empty()) {
|
if (!customWorkingDir.empty()) {
|
||||||
targs += L" -workdir \"" + customWorkingDir + L"\"";
|
targs += L" -workdir \"" + customWorkingDir + L"\"";
|
||||||
}
|
}
|
||||||
|
|
|
@ -454,7 +454,6 @@ void Launcher::processArguments() {
|
||||||
{ "-fixprevious" , KeyFormat::NoValues },
|
{ "-fixprevious" , KeyFormat::NoValues },
|
||||||
{ "-cleanup" , KeyFormat::NoValues },
|
{ "-cleanup" , KeyFormat::NoValues },
|
||||||
{ "-noupdate" , KeyFormat::NoValues },
|
{ "-noupdate" , KeyFormat::NoValues },
|
||||||
{ "-externalupdater", KeyFormat::NoValues },
|
|
||||||
{ "-tosettings" , KeyFormat::NoValues },
|
{ "-tosettings" , KeyFormat::NoValues },
|
||||||
{ "-startintray" , KeyFormat::NoValues },
|
{ "-startintray" , KeyFormat::NoValues },
|
||||||
{ "-sendpath" , KeyFormat::AllLeftValues },
|
{ "-sendpath" , KeyFormat::AllLeftValues },
|
||||||
|
@ -485,9 +484,6 @@ void Launcher::processArguments() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (parseResult.contains("-externalupdater")) {
|
|
||||||
SetUpdaterDisabledAtStartup();
|
|
||||||
}
|
|
||||||
gUseFreeType = parseResult.contains("-freetype");
|
gUseFreeType = parseResult.contains("-freetype");
|
||||||
gDebugMode = parseResult.contains("-debug");
|
gDebugMode = parseResult.contains("-debug");
|
||||||
gManyInstance = parseResult.contains("-many");
|
gManyInstance = parseResult.contains("-many");
|
||||||
|
|
|
@ -124,11 +124,6 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
|
||||||
if (cStartInTray()) {
|
if (cStartInTray()) {
|
||||||
argumentsList.push("-startintray");
|
argumentsList.push("-startintray");
|
||||||
}
|
}
|
||||||
#ifndef TDESKTOP_DISABLE_AUTOUPDATE
|
|
||||||
if (Core::UpdaterDisabled()) {
|
|
||||||
argumentsList.push("-externalupdater");
|
|
||||||
}
|
|
||||||
#endif // !TDESKTOP_DISABLE_AUTOUPDATE
|
|
||||||
if (cDataFile() != qsl("data")) {
|
if (cDataFile() != qsl("data")) {
|
||||||
argumentsList.push("-key");
|
argumentsList.push("-key");
|
||||||
argumentsList.push(QFile::encodeName(cDataFile()));
|
argumentsList.push(QFile::encodeName(cDataFile()));
|
||||||
|
|
|
@ -61,9 +61,6 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
|
||||||
if (Logs::DebugEnabled()) [args addObject:@"-debug"];
|
if (Logs::DebugEnabled()) [args addObject:@"-debug"];
|
||||||
if (cStartInTray()) [args addObject:@"-startintray"];
|
if (cStartInTray()) [args addObject:@"-startintray"];
|
||||||
if (cUseFreeType()) [args addObject:@"-freetype"];
|
if (cUseFreeType()) [args addObject:@"-freetype"];
|
||||||
#ifndef TDESKTOP_DISABLE_AUTOUPDATE
|
|
||||||
if (Core::UpdaterDisabled()) [args addObject:@"-externalupdater"];
|
|
||||||
#endif // !TDESKTOP_DISABLE_AUTOUPDATE
|
|
||||||
if (cDataFile() != qsl("data")) {
|
if (cDataFile() != qsl("data")) {
|
||||||
[args addObject:@"-key"];
|
[args addObject:@"-key"];
|
||||||
[args addObject:Q2NSString(cDataFile())];
|
[args addObject:Q2NSString(cDataFile())];
|
||||||
|
|
|
@ -70,11 +70,6 @@ bool Launcher::launchUpdater(UpdaterLaunch action) {
|
||||||
if (cUseFreeType()) {
|
if (cUseFreeType()) {
|
||||||
pushArgument(qsl("-freetype"));
|
pushArgument(qsl("-freetype"));
|
||||||
}
|
}
|
||||||
#ifndef TDESKTOP_DISABLE_AUTOUPDATE
|
|
||||||
if (Core::UpdaterDisabled()) {
|
|
||||||
pushArgument(qsl("-externalupdater"));
|
|
||||||
}
|
|
||||||
#endif // !TDESKTOP_DISABLE_AUTOUPDATE
|
|
||||||
if (customWorkingDir()) {
|
if (customWorkingDir()) {
|
||||||
pushArgument(qsl("-workdir"));
|
pushArgument(qsl("-workdir"));
|
||||||
pushArgument('"' + cWorkingDir() + '"');
|
pushArgument('"' + cWorkingDir() + '"');
|
||||||
|
|
Loading…
Add table
Reference in a new issue