Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
022b42ffd4 | ||
|
865fa822fd | ||
|
00a362a99c | ||
|
01f8e09b31 |
22
ios-deploy.c
22
ios-deploy.c
@ -18,7 +18,7 @@
|
||||
#include "MobileDevice.h"
|
||||
#include "errors.h"
|
||||
|
||||
#define APP_VERSION @"1.7.0"
|
||||
#define APP_VERSION @"1.7.0-dev1"
|
||||
#define PREP_CMDS_PATH "/tmp/fruitstrap-lldb-prep-cmds-"
|
||||
#define LLDB_SHELL "lldb -s " PREP_CMDS_PATH
|
||||
/*
|
||||
@ -325,6 +325,11 @@ CFStringRef copy_xcode_path_for(CFStringRef subPath, CFStringRef search) {
|
||||
if (!found) {
|
||||
path = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@/%@/%@"), xcodeDevPath, subPath, search);
|
||||
found = path_exists(path);
|
||||
if (verbose) {
|
||||
NSLog(@"copy_xcode_path_for:");
|
||||
NSLog(@"\tpath: %@", path);
|
||||
NSLog(@"\tfound: %d", found);
|
||||
}
|
||||
}
|
||||
// Try find `xcode-select --print-path` with search as a name pattern
|
||||
if (!found) {
|
||||
@ -335,16 +340,31 @@ CFStringRef copy_xcode_path_for(CFStringRef subPath, CFStringRef search) {
|
||||
path = find_path(CFStringCreateWithFormat(NULL, NULL, CFSTR("%@/%@"), xcodeDevPath, subPath), search, CFSTR(""));
|
||||
}
|
||||
found = CFStringGetLength(path) > 0 && path_exists(path);
|
||||
if (verbose) {
|
||||
NSLog(@"copy_xcode_path_for:");
|
||||
NSLog(@"\tpath: %@", path);
|
||||
NSLog(@"\tfound: %d", found);
|
||||
}
|
||||
}
|
||||
// If not look in the default xcode location (xcode-select is sometimes wrong)
|
||||
if (!found) {
|
||||
path = CFStringCreateWithFormat(NULL, NULL, CFSTR("/Applications/Xcode.app/Contents/Developer/%@&%@"), subPath, search);
|
||||
found = path_exists(path);
|
||||
if (verbose) {
|
||||
NSLog(@"copy_xcode_path_for:");
|
||||
NSLog(@"\tpath: %@", path);
|
||||
NSLog(@"\tfound: %d", found);
|
||||
}
|
||||
}
|
||||
// If not look in the users home directory, Xcode can store device support stuff there
|
||||
if (!found) {
|
||||
path = CFStringCreateWithFormat(NULL, NULL, CFSTR("%s/Library/Developer/Xcode/%@/%@"), home, subPath, search);
|
||||
found = path_exists(path);
|
||||
if (verbose) {
|
||||
NSLog(@"copy_xcode_path_for:");
|
||||
NSLog(@"\tpath: %@", path);
|
||||
NSLog(@"\tfound: %d", found);
|
||||
}
|
||||
}
|
||||
|
||||
CFRelease(xcodeDevPath);
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "ios-deploy",
|
||||
"version": "1.7.0",
|
||||
"version": "1.7.0-dev1",
|
||||
"os" : [ "darwin" ],
|
||||
"description": "launch iOS apps iOS devices from the command line (Xcode 6)",
|
||||
"main": "ios-deploy",
|
||||
|
Loading…
x
Reference in New Issue
Block a user