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