mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

macOS: Do case-insensitive compare in auto-launch code

Browse Source 
Case-sensitive compares will give problems when a launchd plist file
exists, but the executable gets upated, and the name only has a
different case (e.g.: owncloud -> ownCloud).

Signed-off-by: Camila Ayres <hello@camilasan.com>
This commit is contained in:
Erik Verbruggen 2022-02-16 14:53:44 +01:00 committed by Camila Ayres
parent 76cf707934
commit 1f046ccd5e
No known key found for this signature in database
GPG Key ID: 7A4A6121E88E2AD4
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/utility_mac.mm
View File

@ -108,7 +108,8 @@ bool Utility::hasLaunchOnStartup(const QString &appName)
// ... and yes, it's the correct app-id...
if (id program = plist[@"Program"]) {
// .. and there is a program mentioned ...
if ([QCoreApplication::applicationFilePath().toNSString() isEqualToString:program]) {
// (Note: case insensitive compare, because most fs setups on mac are case insensitive)
if ([QCoreApplication::applicationFilePath().toNSString() compare:program options:NSCaseInsensitiveSearch] == NSOrderedSame) {
// ... and it's our executable ..
if (NSNumber *value = plist[@"RunAtLoad"]) {
// yes, there is even a RunAtLoad key, so use it!
@ -194,7 +195,7 @@ void Utility::setLaunchOnStartup(const QString &appName, const QString &guiName,
if (!result) {
qCWarning(lcUtility) << result.error();
}
} else if ([fullPath isEqualToString:programValue]) {
} else if ([fullPath compare:programValue options:NSCaseInsensitiveSearch] == NSOrderedSame) { // (Note: case insensitive compare, because most fs setups on mac are case insensitive)
// Wohoo, it's ours! Now carefully change only the RunAtLoad entry. If any value for
// e.g. KeepAlive was changed, we leave it as-is.
auto result = modifyPlist(plistFile, plist, enable);