KofTwentyTwo/CommandTabFree
2
0 Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 4 Wiki Activity

fix: suggest moving the app to the global applications folder

Browse Source 
closes #267
This commit is contained in:
Louis Pontoise authored and lwouis committed 2020-04-26 01:37:23 +09:00
1 parent 9540a9eb84
commit 91e31da876
4 files changed
+38 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Podfile
+1 -1
View File
@@ -2,7 +2,7 @@ platform :osx, '10.12'
target 'alt-tab-macos' do
use_frameworks!
pod 'LetsMove', '1.24'
pod 'LetsMove', :git => 'https://github.com/lwouis/LetsMove.git', :branch => 'master'
pod 'Sparkle', '1.23.0'
pod 'ShortcutRecorder', :git => 'https://github.com/Kentzo/ShortcutRecorder.git', :branch => 'issue-114'
pod 'SwiftyMarkdown', '1.1.0'
Podfile.lock
+8 -3
View File
@@ -6,7 +6,7 @@ PODS:
- SwiftyMarkdown (1.1.0)
DEPENDENCIES:
- LetsMove (= 1.24)
- LetsMove (from `https://github.com/lwouis/LetsMove.git`, branch `master`)
- Preferences (= 1.0.1)
- ShortcutRecorder (from `https://github.com/Kentzo/ShortcutRecorder.git`, branch `issue-114`)
- Sparkle (= 1.23.0)
@@ -14,17 +14,22 @@ DEPENDENCIES:
SPEC REPOS:
trunk:
- LetsMove
- Preferences
- Sparkle
- SwiftyMarkdown
EXTERNAL SOURCES:
LetsMove:
:branch: master
:git: https://github.com/lwouis/LetsMove.git
ShortcutRecorder:
:branch: issue-114
:git: https://github.com/Kentzo/ShortcutRecorder.git
CHECKOUT OPTIONS:
LetsMove:
:commit: 7abf4daed1a25218f2b52f2dfd190aee5a50071c
:git: https://github.com/lwouis/LetsMove.git
ShortcutRecorder:
:commit: f718220854575bad86fa89dd2bb3decd0b14b2b0
:git: https://github.com/Kentzo/ShortcutRecorder.git
@@ -36,6 +41,6 @@ SPEC CHECKSUMS:
Sparkle: 55b1a87ba69d56913375a281546b7c82dec95bb0
SwiftyMarkdown: 033abc9dad9a37903f81aec5188cade436f40520
PODFILE CHECKSUM: 59c4f773e0cca4647e11f7a5113c033bfdd5c0ff
PODFILE CHECKSUM: bd7bc9c2d6dc0ac1fe0e329b4ffe4780839f0e0f
COCOAPODS: 1.8.4
Pods/LetsMove/PFMoveApplication.m
Generated
+21 -21
View File
@@ -244,27 +244,27 @@ static NSString *PreferredInstallLocation(BOOL *isUserDirectory) {
// Assume that if the user has a ~/Applications folder, they'd prefer their
// applications to go there.
NSFileManager *fm = [NSFileManager defaultManager];
NSArray *userApplicationsDirs = NSSearchPathForDirectoriesInDomains(NSApplicationDirectory, NSUserDomainMask, YES);
if ([userApplicationsDirs count] > 0) {
NSString *userApplicationsDir = [userApplicationsDirs objectAtIndex:0];
BOOL isDirectory;
if ([fm fileExistsAtPath:userApplicationsDir isDirectory:&isDirectory] && isDirectory) {
// User Applications directory exists. Get the directory contents.
NSArray *contents = [fm contentsOfDirectoryAtPath:userApplicationsDir error:NULL];
// Check if there is at least one ".app" inside the directory.
for (NSString *contentsPath in contents) {
if ([[contentsPath pathExtension] isEqualToString:@"app"]) {
if (isUserDirectory) *isUserDirectory = YES;
return [userApplicationsDir stringByResolvingSymlinksInPath];
}
}
}
}
// NSFileManager *fm = [NSFileManager defaultManager];
//
// NSArray *userApplicationsDirs = NSSearchPathForDirectoriesInDomains(NSApplicationDirectory, NSUserDomainMask, YES);
//
// if ([userApplicationsDirs count] > 0) {
// NSString *userApplicationsDir = [userApplicationsDirs objectAtIndex:0];
// BOOL isDirectory;
//
// if ([fm fileExistsAtPath:userApplicationsDir isDirectory:&isDirectory] && isDirectory) {
// // User Applications directory exists. Get the directory contents.
// NSArray *contents = [fm contentsOfDirectoryAtPath:userApplicationsDir error:NULL];
//
// // Check if there is at least one ".app" inside the directory.
// for (NSString *contentsPath in contents) {
// if ([[contentsPath pathExtension] isEqualToString:@"app"]) {
// if (isUserDirectory) *isUserDirectory = YES;
// return [userApplicationsDir stringByResolvingSymlinksInPath];
// }
// }
// }
// }
// No user Applications directory in use. Return the machine local Applications directory
if (isUserDirectory) *isUserDirectory = NO;
Pods/Manifest.lock
Generated
+8 -3
View File
@@ -6,7 +6,7 @@ PODS:
- SwiftyMarkdown (1.1.0)
DEPENDENCIES:
- LetsMove (= 1.24)
- LetsMove (from `https://github.com/lwouis/LetsMove.git`, branch `master`)
- Preferences (= 1.0.1)
- ShortcutRecorder (from `https://github.com/Kentzo/ShortcutRecorder.git`, branch `issue-114`)
- Sparkle (= 1.23.0)
@@ -14,17 +14,22 @@ DEPENDENCIES:
SPEC REPOS:
trunk:
- LetsMove
- Preferences
- Sparkle
- SwiftyMarkdown
EXTERNAL SOURCES:
LetsMove:
:branch: master
:git: https://github.com/lwouis/LetsMove.git
ShortcutRecorder:
:branch: issue-114
:git: https://github.com/Kentzo/ShortcutRecorder.git
CHECKOUT OPTIONS:
LetsMove:
:commit: 7abf4daed1a25218f2b52f2dfd190aee5a50071c
:git: https://github.com/lwouis/LetsMove.git
ShortcutRecorder:
:commit: f718220854575bad86fa89dd2bb3decd0b14b2b0
:git: https://github.com/Kentzo/ShortcutRecorder.git
@@ -36,6 +41,6 @@ SPEC CHECKSUMS:
Sparkle: 55b1a87ba69d56913375a281546b7c82dec95bb0
SwiftyMarkdown: 033abc9dad9a37903f81aec5188cade436f40520
PODFILE CHECKSUM: 59c4f773e0cca4647e11f7a5113c033bfdd5c0ff
PODFILE CHECKSUM: bd7bc9c2d6dc0ac1fe0e329b4ffe4780839f0e0f
COCOAPODS: 1.8.4