Fixes phonegap/ios-deploy#80 (re-fix) --detect not showing non-zero exit code when no devices are detected.

When --detect is turned on, --debug is turned on implicitly so you won't get a segmentation fault.

.gitignore

@@ -1,5 +1,6 @@
 demo
 demo.app
 ios-deploy
-
-/.DS_Store
+ios-deploy.dSYM
+/.DS_Store
+*~

CONTRIBUTING.md

@@ -0,0 +1,31 @@
+## Contributing to ios-deploy
+
+Github url: 
+
+        https://github.com/phonegap/ios-deploy
+
+Git clone url: 
+
+        https://github.com/phonegap/ios-deploy.git
+
+## Filing an issue
+
+Please run the commands below in your Terminal.app and include it in the issue:
+
+```
+1. sw_vers -productVersion
+2. ios-deploy -V
+3. xcodebuild -version
+4. xcode-select --print-path
+5. gcc --version
+6. lldb --version
+
+```
+Also include **command line arguments** you used for ios-deploy.
+
+
+## Sending a Pull Request
+
+Please **create a topic branch** for your issue before submitting your pull request. You will be asked to re-submit if your pull request contains unrelated commits.
+
+Please elaborate regarding the problem the pull request is supposed to solve, and perhaps also link to any relevant issues the pull request is trying to fix.

Info.plist

@@ -10,6 +10,8 @@
 	</array>
 	<key>CFBundleExecutable</key>
 	<string>demo</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
 	<key>CFBundleIdentifier</key>
 	<string>demo</string>
 	<key>CFBundleResourceSpecification</key>

Makefile

@@ -1,6 +1,8 @@
+IOS_SDK_VERSION = 7.1
+
 IOS_CC = gcc -ObjC
-IOS_SDK = $(shell xcode-select --print-path)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.1.sdk
 DEVICE_SUPPORT = $(shell xcode-select --print-path)/Platforms/iPhoneOS.platform/DeviceSupport
+IOS_SDK = $(shell xcode-select --print-path)/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS$(IOS_SDK_VERSION).sdk
 
 all: clean ios-deploy
 

MobileDevice.h

@@ -396,11 +396,11 @@ afc_error_t AFCFileRefOpen(afc_connection *conn, const char *path,
 afc_error_t AFCFileRefSeek(afc_connection *conn, afc_file_ref ref,
     unsigned long long offset1, unsigned long long offset2);
 afc_error_t AFCFileRefRead(afc_connection *conn, afc_file_ref ref,
-    void *buf, unsigned int *len);
+    void *buf, size_t *len);
 afc_error_t AFCFileRefSetFileSize(afc_connection *conn, afc_file_ref ref,
     unsigned long long offset);
 afc_error_t AFCFileRefWrite(afc_connection *conn, afc_file_ref ref,
-    const void *buf, unsigned int len);
+    const void *buf, size_t len);
 afc_error_t AFCFileRefClose(afc_connection *conn, afc_file_ref ref);
 
 afc_error_t AFCFileInfoOpen(afc_connection *conn, const char *path, struct
@@ -453,6 +453,8 @@ typedef int (*am_device_install_application_callback)(CFDictionaryRef, int);
 mach_error_t AMDeviceInstallApplication(service_conn_t socket, CFStringRef path, CFDictionaryRef options, am_device_install_application_callback callback, void *user);
 mach_error_t AMDeviceTransferApplication(service_conn_t socket, CFStringRef path, CFDictionaryRef options, am_device_install_application_callback callbackj, void *user);
 
+int AMDeviceSecureUninstallApplication(int unknown0, struct am_device *device, CFStringRef bundle_id, int unknown1, void *callback, int callback_arg);
+
 /* ----------------------------------------------------------------------------
  *   Semi-private routines
  * ------------------------------------------------------------------------- */
@@ -491,4 +493,4 @@ typedef unsigned int (*t_performOperation)(struct am_restore_device *rdev,
 }
 #endif
 
-#endif
+#endif

README.md

@@ -1,16 +1,16 @@
 ios-deploy
 ==========
-Install and debug iPhone apps without using Xcode. Designed to work on unjailbroken devices.
+Install and debug iOS apps without using Xcode. Designed to work on un-jailbroken devices.
 
 ## Requirements
 
-* Mac OS X. Tested on Snow Leopard only.
-* You need to have a valid iPhone development certificate installed.
-* Xcode must be installed, along with the SDK for your iOS version.
+* Mac OS X. Tested on 10.10 Yosemite and iOS 8.1
+* You need to have a valid iOS development certificate installed.
+* Xcode 6.1 should be installed
 
 ## Usage
 
-    ./ios-deploy [OPTION]...
+    Usage: ios-deploy [OPTION]...
       -d, --debug                  launch the app in GDB after installation
       -i, --id <device_id>         the id of the device to connect to
       -c, --detect                 only detect if the device is connected
@@ -18,13 +18,45 @@ Install and debug iPhone apps without using Xcode. Designed to work on unjailbro
       -a, --args <args>            command line arguments to pass to the app when launching it
       -t, --timeout <timeout>      number of seconds to wait for a device to be connected
       -u, --unbuffered             don't buffer stdout
-      -g, --gdbargs <args>         extra arguments to pass to GDB when starting the debugger
-      -x, --gdbexec <file>         GDB commands script file
       -n, --nostart                do not start the app when debugging
+      -I, --noninteractive         start in non interactive mode (quit when app crashes or exits)
+      -L, --justlaunch             just launch the app and exit lldb
       -v, --verbose                enable verbose output
-      -m, --noinstall              directly start debugging without app install (-d not required) 
-      -V, --version                print the executable version
+      -m, --noinstall              directly start debugging without app install (-d not required)
+      -p, --port <number>          port used for device, default: 12345 
+      -r, --uninstall              uninstall the app before install (do not use with -m; app cache and data are cleared) 
+      -1, --bundle_id <bundle id>  specify bundle id for list and upload
+      -l, --list                   list files
+      -o, --upload <file>          upload file
+      -w, --download               download app tree
+      -2, --to <target pathname>   use together with up/download file/tree. specify target
+      -V, --version                print the executable version 
 
+## Examples
+
+The commands below assume that you have an app called `my.app` with bundle id `bundle.id`. Substitute where necessary.
+
+    // deploy and debug your app to a connected device
+    ios-deploy --debug --bundle my.app
+
+    // deploy and launch your app to a connected device, but quit the debugger after
+    ios-deploy --justlaunch --debug --bundle my.app
+
+    // deploy and launch your app to a connected device, quit when app crashes or exits
+    ios-deploy --noninteractive --debug --bundle my.app
+
+    // Upload a file to your app's Documents folder
+    ios-deploy --bundle_id 'bundle.id' --upload test.txt --to Documents/test.txt
+    
+    // Download your app's Documents, Library and tmp folders
+    ios-deploy --bundle_id 'bundle.id' --download --to MyDestinationFolder
+
+    // List the contents of your app's Documents, Library and tmp folders
+    ios-deploy --bundle_id 'bundle.id' --list
+
+    // deploy and debug your app to a connected device, uninstall the app first
+    ios-deploy --uninstall --debug --bundle my.app
+    
 ## Demo
 
 * The included demo.app represents the minimum required to get code running on iOS.
@@ -33,11 +65,11 @@ Install and debug iPhone apps without using Xcode. Designed to work on unjailbro
 
 ## Notes
 
-* With some modifications, it may be possible to use this without Xcode installed; however, you would need a copy of the relevant DeveloperDiskImage.dmg (included with Xcode). GDB would also run slower as symbols would be downloaded from the device on-the-fly.
+* With some modifications, it may be possible to use this without Xcode installed; however, you would need a copy of the relevant DeveloperDiskImage.dmg (included with Xcode). lldb would also run slower as symbols would be downloaded from the device on-the-fly.
 
 
 ## Listing Device Ids
 
 Device Ids are the UDIDs of the iOS devices. From the command line, you can list device ids [this way](http://javierhz.blogspot.com/2012/06/how-to-get-udid-of-iphone-using-shell.html):
 
-        system_profiler SPUSBDataType | sed -n -e '/iPad/,/Serial/p' -e '/iPhone/,/Serial/p' | grep "Serial Number:" | awk -F ": " '{print $2}'
+        system_profiler SPUSBDataType | sed -n -e '/iPod/,/Serial/p' | sed -n -e '/iPad/,/Serial/p' -e '/iPhone/,/Serial/p' | grep "Serial Number:" | awk -F ": " '{print $2}'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "ios-deploy",
-  "version": "1.0.5",
-  "description": "launch iOS apps iOS devices from the command line (Xcode 4)",
+  "version": "1.3.2",
+  "description": "launch iOS apps iOS devices from the command line (Xcode 6)",
   "main": "ios-deploy",
   "scripts": {
       "preinstall": "make ios-deploy"

resources/buildbox/build.sh

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+echo "$ make"
+make