diff --git a/Makefile b/Makefile index bef1d32..26974ee 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ -IOS_SDK_VERSION = 7.1 +IOS_SDK_VERSION = 8.3 IOS_CC = gcc -ObjC 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 +all: clean ios-deploy demo.app demo.app: demo Info.plist mkdir -p demo.app @@ -32,4 +32,4 @@ debug: all ./ios-deploy --debug --bundle demo.app clean: - rm -rf *.app demo ios-deploy + @rm -rf *.app demo ios-deploy diff --git a/README.md b/README.md index 69be2ed..5525f7f 100644 --- a/README.md +++ b/README.md @@ -4,20 +4,32 @@ Install and debug iOS apps without using Xcode. Designed to work on un-jailbroke ## Requirements -* 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 +* Mac OS X. Tested on 10.10 Yosemite and iOS 8.3 +* You need to have a valid iOS Development certificate installed. +* Xcode 6 or greater should be installed ## Installation -ios-deploy installation is made simple using the node.js package manager. If you use [Homebrew](http://brew.sh/), install node.js: -```bash +======= + +ios-deploy installation is made simple using the node.js package manager. If you use [Homebrew](http://brew.sh/), install [node.js](https://nodejs.org): + +``` brew install node ``` -Now install ios-deploy with the node.js package manager: -```bash -$ npm install -g ios-deploy +Now install ios-deploy with the [node.js](https://nodejs.org) package manager: + ``` +npm install -g ios-deploy +``` + +To install from source: + +``` +make install prefix=/usr/local +``` + +This will install ios-deploy in the `bin` folder of `/usr/local`, i.e. `/usr/local/bin` ## Usage @@ -36,7 +48,8 @@ $ npm install -g ios-deploy -m, --noinstall directly start debugging without app install (-d not required) -p, --port 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 specify bundle id for list and upload + -9, --uninstall_only uninstall the app ONLY. Use only with -1 + -1, --bundle_id specify bundle id for list, upload, and uninstall_only -l, --list list files -o, --upload upload file -w, --download download app tree @@ -45,7 +58,7 @@ $ npm install -g ios-deploy -R, --rm remove file or directory on device (directories must be empty) -V, --version print the executable version -e, --exists check if the app with given bundle_id is installed or not - + -B, --list_bundle_id list bundle_id ## Examples @@ -77,20 +90,23 @@ The commands below assume that you have an app called `my.app` with bundle id `b // Download the Documents directory of the app *only* ios-deploy --download=/Documents -bundle_id my.app.id --to ./my_download_location + + // List ids and names of connected devices + ios-deploy -c + + // Uninstall an app + ios-deploy --uninstall_only --bundle_id my.bundle.id + + // list all bundle ids of all apps on your device + ios-deploy --list_bundle_id ## Demo -* The included demo.app represents the minimum required to get code running on iOS. -* `make install` will install demo.app to the device. -* `make debug` will install demo.app and launch a GDB session. +The included demo.app represents the minimum required to get code running on iOS. + +* `make demo.app` will generate the demo.app executable. If it doesn't compile, modify IOS_SDK_VERSION in the Makefile. +* `make debug` will install demo.app and launch a LLDB session. ## 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). 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 '/iPod/,/Serial/p' | sed -n -e '/iPad/,/Serial/p' -e '/iPhone/,/Serial/p' | grep "Serial Number:" | awk -F ": " '{print $2}' diff --git a/errors.h b/errors.h new file mode 100644 index 0000000..106ab28 --- /dev/null +++ b/errors.h @@ -0,0 +1,358 @@ + +typedef struct errorcode_to_id { + unsigned int error; + const char* id; +} errorcode_to_id_t; + +typedef struct error_id_to_message { + const char* id; + const char* message; +} error_id_to_message_t; + +// Taken from https://github.com/samdmarshall/SDMMobileDevice/blob/master/Framework/MobileDevice/Error/SDMMD_Error.h +static errorcode_to_id_t errorcode_to_id[] = { + { 0xe8000001, "kAMDUndefinedError" }, + { 0xe8000002, "kAMDBadHeaderError" }, + { 0xe8000003, "kAMDNoResourcesError" }, + { 0xe8000004, "kAMDReadError" }, + { 0xe8000005, "kAMDWriteError" }, + { 0xe8000006, "kAMDUnknownPacketError" }, + { 0xe8000007, "kAMDInvalidArgumentError" }, + { 0xe8000008, "kAMDNotFoundError" }, + { 0xe8000009, "kAMDIsDirectoryError" }, + { 0xe800000a, "kAMDPermissionError" }, + { 0xe800000b, "kAMDNotConnectedError" }, + { 0xe800000c, "kAMDTimeOutError" }, + { 0xe800000d, "kAMDOverrunError" }, + { 0xe800000e, "kAMDEOFError" }, + { 0xe800000f, "kAMDUnsupportedError" }, + { 0xe8000010, "kAMDFileExistsError" }, + { 0xe8000011, "kAMDBusyError" }, + { 0xe8000012, "kAMDCryptoError" }, + { 0xe8000013, "kAMDInvalidResponseError" }, + { 0xe8000014, "kAMDMissingKeyError" }, + { 0xe8000015, "kAMDMissingValueError" }, + { 0xe8000016, "kAMDGetProhibitedError" }, + { 0xe8000017, "kAMDSetProhibitedError" }, + { 0xe8000018, "kAMDRemoveProhibitedError" }, + { 0xe8000019, "kAMDImmutableValueError" }, + { 0xe800001a, "kAMDPasswordProtectedError" }, + { 0xe800001b, "kAMDMissingHostIDError" }, + { 0xe800001c, "kAMDInvalidHostIDError" }, + { 0xe800001d, "kAMDSessionActiveError" }, + { 0xe800001e, "kAMDSessionInactiveError" }, + { 0xe800001f, "kAMDMissingSessionIDError" }, + { 0xe8000020, "kAMDInvalidSessionIDError" }, + { 0xe8000021, "kAMDMissingServiceError" }, + { 0xe8000022, "kAMDInvalidServiceError" }, + { 0xe8000023, "kAMDInvalidCheckinError" }, + { 0xe8000024, "kAMDCheckinTimeoutError" }, + { 0xe8000025, "kAMDMissingPairRecordError" }, + { 0xe8000026, "kAMDInvalidActivationRecordError" }, + { 0xe8000027, "kAMDMissingActivationRecordError" }, + { 0xe8000028, "kAMDWrongDroidError" }, + { 0xe8000029, "kAMDSUVerificationError" }, + { 0xe800002a, "kAMDSUPatchError" }, + { 0xe800002b, "kAMDSUFirmwareError" }, + { 0xe800002c, "kAMDProvisioningProfileNotValid" }, + { 0xe800002d, "kAMDSendMessageError" }, + { 0xe800002e, "kAMDReceiveMessageError" }, + { 0xe800002f, "kAMDMissingOptionsError" }, + { 0xe8000030, "kAMDMissingImageTypeError" }, + { 0xe8000031, "kAMDDigestFailedError" }, + { 0xe8000032, "kAMDStartServiceError" }, + { 0xe8000033, "kAMDInvalidDiskImageError" }, + { 0xe8000034, "kAMDMissingDigestError" }, + { 0xe8000035, "kAMDMuxError" }, + { 0xe8000036, "kAMDApplicationAlreadyInstalledError" }, + { 0xe8000037, "kAMDApplicationMoveFailedError" }, + { 0xe8000038, "kAMDApplicationSINFCaptureFailedError" }, + { 0xe8000039, "kAMDApplicationSandboxFailedError" }, + { 0xe800003a, "kAMDApplicationVerificationFailedError" }, + { 0xe800003b, "kAMDArchiveDestructionFailedError" }, + { 0xe800003c, "kAMDBundleVerificationFailedError" }, + { 0xe800003d, "kAMDCarrierBundleCopyFailedError" }, + { 0xe800003e, "kAMDCarrierBundleDirectoryCreationFailedError" }, + { 0xe800003f, "kAMDCarrierBundleMissingSupportedSIMsError" }, + { 0xe8000040, "kAMDCommCenterNotificationFailedError" }, + { 0xe8000041, "kAMDContainerCreationFailedError" }, + { 0xe8000042, "kAMDContainerP0wnFailedError" }, + { 0xe8000043, "kAMDContainerRemovalFailedError" }, + { 0xe8000044, "kAMDEmbeddedProfileInstallFailedError" }, + { 0xe8000045, "kAMDErrorError" }, + { 0xe8000046, "kAMDExecutableTwiddleFailedError" }, + { 0xe8000047, "kAMDExistenceCheckFailedError" }, + { 0xe8000048, "kAMDInstallMapUpdateFailedError" }, + { 0xe8000049, "kAMDManifestCaptureFailedError" }, + { 0xe800004a, "kAMDMapGenerationFailedError" }, + { 0xe800004b, "kAMDMissingBundleExecutableError" }, + { 0xe800004c, "kAMDMissingBundleIdentifierError" }, + { 0xe800004d, "kAMDMissingBundlePathError" }, + { 0xe800004e, "kAMDMissingContainerError" }, + { 0xe800004f, "kAMDNotificationFailedError" }, + { 0xe8000050, "kAMDPackageExtractionFailedError" }, + { 0xe8000051, "kAMDPackageInspectionFailedError" }, + { 0xe8000052, "kAMDPackageMoveFailedError" }, + { 0xe8000053, "kAMDPathConversionFailedError" }, + { 0xe8000054, "kAMDRestoreContainerFailedError" }, + { 0xe8000055, "kAMDSeatbeltProfileRemovalFailedError" }, + { 0xe8000056, "kAMDStageCreationFailedError" }, + { 0xe8000057, "kAMDSymlinkFailedError" }, + { 0xe8000058, "kAMDiTunesArtworkCaptureFailedError" }, + { 0xe8000059, "kAMDiTunesMetadataCaptureFailedError" }, + { 0xe800005a, "kAMDAlreadyArchivedError" }, + { 0xe800005b, "kAMDServiceLimitError" }, + { 0xe800005c, "kAMDInvalidPairRecordError" }, + { 0xe800005d, "kAMDServiceProhibitedError" }, + { 0xe800005e, "kAMDCheckinSetupFailedError" }, + { 0xe800005f, "kAMDCheckinConnectionFailedError" }, + { 0xe8000060, "kAMDCheckinReceiveFailedError" }, + { 0xe8000061, "kAMDCheckinResponseFailedError" }, + { 0xe8000062, "kAMDCheckinSendFailedError" }, + { 0xe8000063, "kAMDMuxCreateListenerError" }, + { 0xe8000064, "kAMDMuxGetListenerError" }, + { 0xe8000065, "kAMDMuxConnectError" }, + { 0xe8000066, "kAMDUnknownCommandError" }, + { 0xe8000067, "kAMDAPIInternalError" }, + { 0xe8000068, "kAMDSavePairRecordFailedError" }, + { 0xe8000069, "kAMDCheckinOutOfMemoryError" }, + { 0xe800006a, "kAMDDeviceTooNewError" }, + { 0xe800006b, "kAMDDeviceRefNoGood" }, + { 0xe800006c, "kAMDCannotTranslateError" }, + { 0xe800006d, "kAMDMobileImageMounterMissingImageSignature" }, + { 0xe800006e, "kAMDMobileImageMounterResponseCreationFailed" }, + { 0xe800006f, "kAMDMobileImageMounterMissingImageType" }, + { 0xe8000070, "kAMDMobileImageMounterMissingImagePath" }, + { 0xe8000071, "kAMDMobileImageMounterImageMapLoadFailed" }, + { 0xe8000072, "kAMDMobileImageMounterAlreadyMounted" }, + { 0xe8000073, "kAMDMobileImageMounterImageMoveFailed" }, + { 0xe8000074, "kAMDMobileImageMounterMountPathMissing" }, + { 0xe8000075, "kAMDMobileImageMounterMountPathNotEmpty" }, + { 0xe8000076, "kAMDMobileImageMounterImageMountFailed" }, + { 0xe8000077, "kAMDMobileImageMounterTrustCacheLoadFailed" }, + { 0xe8000078, "kAMDMobileImageMounterDigestFailed" }, + { 0xe8000079, "kAMDMobileImageMounterDigestCreationFailed" }, + { 0xe800007a, "kAMDMobileImageMounterImageVerificationFailed" }, + { 0xe800007b, "kAMDMobileImageMounterImageInfoCreationFailed" }, + { 0xe800007c, "kAMDMobileImageMounterImageMapStoreFailed" }, + { 0xe800007d, "kAMDBonjourSetupError" }, + { 0xe800007e, "kAMDDeviceOSVersionTooLow" }, + { 0xe800007f, "kAMDNoWifiSyncSupportError" }, + { 0xe8000080, "kAMDDeviceFamilyNotSupported" }, + { 0xe8000081, "kAMDEscrowLockedError" }, + { 0xe8000082, "kAMDPairingProhibitedError" }, + { 0xe8000083, "kAMDProhibitedBySupervision" }, + { 0xe8000084, "kAMDDeviceDisconnectedError" }, + { 0xe8000085, "kAMDTooBigError" }, + { 0xe8000086, "kAMDPackagePatchFailedError" }, + { 0xe8000087, "kAMDIncorrectArchitectureError" }, + { 0xe8000088, "kAMDPluginCopyFailedError" }, + { 0xe8000089, "kAMDBreadcrumbFailedError" }, + { 0xe800008a, "kAMDBreadcrumbUnlockError" }, + { 0xe800008b, "kAMDGeoJSONCaptureFailedError" }, + { 0xe800008c, "kAMDNewsstandArtworkCaptureFailedError" }, + { 0xe800008d, "kAMDMissingCommandError" }, + { 0xe800008e, "kAMDNotEntitledError" }, + { 0xe800008f, "kAMDMissingPackagePathError" }, + { 0xe8000090, "kAMDMissingContainerPathError" }, + { 0xe8000091, "kAMDMissingApplicationIdentifierError" }, + { 0xe8000092, "kAMDMissingAttributeValueError" }, + { 0xe8000093, "kAMDLookupFailedError" }, + { 0xe8000094, "kAMDDictCreationFailedError" }, + { 0xe8000095, "kAMDUserDeniedPairingError" }, + { 0xe8000096, "kAMDPairingDialogResponsePendingError" }, + { 0xe8000097, "kAMDInstallProhibitedError" }, + { 0xe8000098, "kAMDUninstallProhibitedError" }, + { 0xe8000099, "kAMDFMiPProtectedError" }, + { 0xe800009a, "kAMDMCProtected" }, + { 0xe800009b, "kAMDMCChallengeRequired" }, + { 0xe800009c, "kAMDMissingBundleVersionError" }, + + { 0xe8008015, "A valid provisioning profile for this executable was not found."}, +}; + +const int errorcode_to_id_count = sizeof(errorcode_to_id) / sizeof(errorcode_to_id_t); + +// Taken from /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/System/Library/PrivateFrameworks/MobileDevice.framework/Versions/A/Resources/en_GB.lproj/Localizable.strings +error_id_to_message_t error_id_to_message[] = { + { "kAMDAPIInternalError", "There was an internal API error." }, + { "kAMDAlreadyArchivedError", "The application is already archived." }, + { "kAMDAppBlacklistedError", "This app is not allowed to be installed on this device." }, + { "kAMDApplicationAlreadyInstalledError", "A system application with the given bundle identifier is already installed on the device and cannot be replaced." }, + { "kAMDApplicationMoveFailedError", "The application could not be moved into place on the device." }, + { "kAMDApplicationSandboxFailedError", "The application could not be sandboxed." }, + { "kAMDApplicationVerificationFailedError", "The application could not be verified." }, + { "kAMDArchiveDestructionFailedError", "Could not remove the application archive." }, + { "kAMDBadHeaderError", "Could not transfer file." }, + { "kAMDBreadcrumbFailedError", "Could not write installation breadcrumb." }, + { "kAMDBreadcrumbUnlockError", "Could not update installation breadcrumb." }, + { "kAMDBundleVerificationFailedError", "The carrier bundle could not be verified." }, + { "kAMDBusyError", "The device is busy." }, + { "kAMDCannotTranslateError", "Could not translate messages from device" }, + { "kAMDCarrierBundleCopyFailedError", "Could not install the carrier bundle." }, + { "kAMDCarrierBundleDirectoryCreationFailedError", "Could not create the carrier bundle directory." }, + { "kAMDCarrierBundleMissingSupportedSIMsError", "There are no supported SIMs for this carrier bundle." }, + { "kAMDCheckinConnectionFailedError", "The service did not start properly on the device." }, + { "kAMDCheckinOutOfMemoryError", "The service did not start properly on the device." }, + { "kAMDCheckinReceiveFailedError", "The service did not start properly on the device." }, + { "kAMDCheckinResponseFailedError", "The service did not start properly on the device." }, + { "kAMDCheckinSendFailedError", "The service did not start properly on the device." }, + { "kAMDCheckinSetupFailedError", "Could not start service on device" }, + { "kAMDCheckinTimeoutError", "The service did not start properly on the device." }, + { "kAMDCommCenterNotificationFailedError", "Could not listen for notification from the baseband." }, + { "kAMDContainerCreationFailedError", "Could not create application container." }, + { "kAMDContainerP0wnFailedError", "Could not repair permissions on application container." }, + { "kAMDContainerRemovalFailedError", "Could not remove the application container." }, + { "kAMDCryptoError", "Could not establish a secure connection to the device." }, + { "kAMDDeviceDisconnectedError", "This device is no longer connected." }, + { "kAMDDeviceFamilyNotSupported", "This application does not support this kind of device." }, + { "kAMDDeviceOSVersionTooLow", "The device OS version is too low." }, + { "kAMDDeviceRefNoGood", "This device is no longer connected." }, + { "kAMDDeviceTooNewError", "This application needs to be updated." }, + { "kAMDDictCreationFailedError", "Could not extract capabilities from the request." }, + { "kAMDDigestFailedError", "Could not read disk image." }, + { "kAMDEOFError", "End of file." }, + { "kAMDEmbeddedProfileInstallFailedError", "Could not install the embedded provisioning profile." }, + { "kAMDErrorError", "An error occurred." }, + { "kAMDEscrowLockedError", "Device is not available until first unlock after boot." }, + { "kAMDExecutableTwiddleFailedError", "Could not change executable permissions on the application." }, + { "kAMDExistenceCheckFailedError", "Could not check to see if the application already exists." }, + { "kAMDFMiPProtectedError", "The device is in lost mode." }, + { "kAMDFileExistsError", "The file already exists." }, + { "kAMDGeoJSONCaptureFailedError", "Could not save the GeoJSON data." }, + { "kAMDGetProhibitedError", "Cannot retrieve value from the passcode-locked device." }, + { "kAMDImmutableValueError", "This value cannot be changed." }, + { "kAMDIncorrectArchitectureError", "This application does not support this device's CPU type." }, + { "kAMDInstallMapUpdateFailedError", "Could not update the installed applications list." }, + { "kAMDInstallProhibitedError", "Installation of apps is prohibited by a policy on the device." }, + { "kAMDInvalidActivationRecordError", "The activation record is not valid." }, + { "kAMDInvalidArgumentError", "The argument is invalid." }, + { "kAMDInvalidCheckinError", "Could not start service on device" }, + { "kAMDInvalidDiskImageError", "The disk image is invalid." }, + { "kAMDInvalidHostIDError", "The device does not recognise this host." }, + { "kAMDInvalidPairRecordError", "The host is no longer paired with the device." }, + { "kAMDInvalidResponseError", "Received an unexpected response from the device." }, + { "kAMDInvalidServiceError", "The service is invalid." }, + { "kAMDInvalidSessionIDError", "The session ID is invalid." }, + { "kAMDIsDirectoryError", "The path is a directory." }, + { "kAMDLookupFailedError", "Could not list installed applications." }, + { "kAMDMCChallengeRequired", "A policy on the device requires secure pairing." }, + { "kAMDMCProtected", "Pairing is prohibited by a policy on the device." }, + { "kAMDManifestCaptureFailedError", "Could not save the application manifest." }, + { "kAMDMapGenerationFailedError", "Could not generate the map." }, + { "kAMDMissingActivationRecordError", "The activation record could not be found." }, + { "kAMDMissingApplicationIdentifierError", "Request was missing the application identifier." }, + { "kAMDMissingAttributeValueError", "Request was missing a required value." }, + { "kAMDMissingBundleExecutableError", "The application bundle does not contain an executable." }, + { "kAMDMissingBundleIdentifierError", "The application bundle does not contain a valid identifier." }, + { "kAMDMissingBundlePathError", "Could not determine the application bundle path." }, + { "kAMDMissingBundleVersionError", "The bundle's Info.plist does not contain a CFBundleVersion key or its value is not a string." }, + { "kAMDMissingCommandError", "The request did not contain a command." }, + { "kAMDMissingContainerError", "Could not find the container for the installed application." }, + { "kAMDMissingContainerPathError", "Request was missing the container path." }, + { "kAMDMissingDigestError", "The digest is missing." }, + { "kAMDMissingHostIDError", "The device does not recognise this host." }, + { "kAMDMissingImageTypeError", "The image is missing." }, + { "kAMDMissingKeyError", "The key is missing." }, + { "kAMDMissingOptionsError", "The options are missing." }, + { "kAMDMissingPackagePathError", "Request was missing the package path." }, + { "kAMDMissingPairRecordError", "The host is not paired with the device." }, + { "kAMDMissingServiceError", "The service is missing." }, + { "kAMDMissingSessionIDError", "The session ID is missing." }, + { "kAMDMissingValueError", "The value is missing." }, + { "kAMDMobileImageMounterAlreadyMounted", "Could not support development." }, + { "kAMDMobileImageMounterDigestCreationFailed", "Could not support development." }, + { "kAMDMobileImageMounterDigestFailed", "Could not support development." }, + { "kAMDMobileImageMounterImageInfoCreationFailed", "Could not support development." }, + { "kAMDMobileImageMounterImageMapLoadFailed", "Could not support development." }, + { "kAMDMobileImageMounterImageMapStoreFailed", "Could not support development." }, + { "kAMDMobileImageMounterImageMountFailed", "Could not support development." }, + { "kAMDMobileImageMounterImageMoveFailed", "Could not support development." }, + { "kAMDMobileImageMounterImageVerificationFailed", "Could not support development." }, + { "kAMDMobileImageMounterMissingImagePath", "Could not support development." }, + { "kAMDMobileImageMounterMissingImageSignature", "Could not support development." }, + { "kAMDMobileImageMounterMissingImageType", "Could not support development." }, + { "kAMDMobileImageMounterMountPathMissing", "Could not support development." }, + { "kAMDMobileImageMounterMountPathNotEmpty", "Could not support development." }, + { "kAMDMobileImageMounterResponseCreationFailed", "Could not support development." }, + { "kAMDMobileImageMounterTrustCacheLoadFailed", "Could not support development." }, + { "kAMDMuxConnectError", "Could not connect to the device." }, + { "kAMDMuxCreateListenerError", "Could not listen for USB devices." }, + { "kAMDMuxError", "There was an error with the USB device multiplexor." }, + { "kAMDMuxGetListenerError", "Could not get the USB listener." }, + { "kAMDNewsstandArtworkCaptureFailedError", "Could not save the Newsstand artwork." }, + { "kAMDNoResourcesError", "Could not allocate a resource." }, + { "kAMDNoWifiSyncSupportError", "Device doesn't support wireless sync." }, + { "kAMDNotConnectedError", "Not connected to the device." }, + { "kAMDNotEntitledError", "The requesting application is not allowed to make this request." }, + { "kAMDNotFoundError", "The file could not be found." }, + { "kAMDNotificationFailedError", "Could not post a notification." }, + { "kAMDOverrunError", "There was a buffer overrun." }, + { "kAMDPackageExtractionFailedError", "Could not open the application package." }, + { "kAMDPackageInspectionFailedError", "Could not inspect the application package." }, + { "kAMDPackageMoveFailedError", "Could not move the application package into the staging location." }, + { "kAMDPackagePatchFailedError", "Could not apply patch update to application." }, + { "kAMDPairingDialogResponsePendingError", "The user has not yet responded to the pairing request." }, + { "kAMDPairingProhibitedError", "Pairing only allowed over USB." }, + { "kAMDPasswordProtectedError", "The device is passcode protected." }, + { "kAMDPathConversionFailedError", "Could not convert the path." }, + { "kAMDPermissionError", "You do not have permission." }, + { "kAMDPluginCopyFailedError", "Could not copy VPN Plug-in into app container." }, + { "kAMDProhibitedBySupervision", "Operation prohibited on supervised devices." }, + { "kAMDProvisioningProfileNotValid", "The provisioning profile is not valid." }, + { "kAMDReadError", "Could not read from the device." }, + { "kAMDReceiveMessageError", "Could not receive a message from the device." }, + { "kAMDRemoveProhibitedError", "Cannot remove value on device." }, + { "kAMDRestoreContainerFailedError", "Could not restore the application container." }, + { "kAMDSUFirmwareError", "Could not flash the firmware." }, + { "kAMDSUPatchError", "Could not patch the file." }, + { "kAMDSUVerificationError", "The software update package could not be verified." }, + { "kAMDSavePairRecordFailedError", "Could not save the pairing record." }, + { "kAMDSeatbeltProfileRemovalFailedError", "Could not remove the application seatbelt profile." }, + { "kAMDSendMessageError", "Could not send a message to the device." }, + { "kAMDServiceLimitError", "Too many instances of this service are already running." }, + { "kAMDServiceProhibitedError", "The service could not be started on the device." }, + { "kAMDSessionActiveError", "The session is active." }, + { "kAMDSessionInactiveError", "The session is inactive." }, + { "kAMDSetProhibitedError", "Cannot set value on device." }, + { "kAMDStageCreationFailedError", "Could not create the staging directory." }, + { "kAMDStartServiceError", "The service could not be started." }, + { "kAMDSuccess", "There was no error." }, + { "kAMDSymlinkFailedError", "Could not create the symlink." }, + { "kAMDTimeOutError", "The operation timed out." }, + { "kAMDTooBigError", "The message is too big." }, + { "kAMDUndefinedError", "An unknown error occurred." }, + { "kAMDUninstallProhibitedError", "Uninstallation of apps is prohibited by a policy on the device." }, + { "kAMDUnknownCommandError", "The device does not recognise the command." }, + { "kAMDUnknownPacketError", "The packet is unknown." }, + { "kAMDUnsupportedError", "This operation is unsupported." }, + { "kAMDUserDeniedPairingError", "The device rejected the pairing attempt." }, + { "kAMDWriteError", "Could not write to the device." }, + { "kAMDWrongDroidError", "The device is in recovery mode." }, + { "kAMDiTunesArtworkCaptureFailedError", "Could not save the iTunes artwork." }, + { "kAMDiTunesMetadataCaptureFailedError", "Could not save the iTunes metadata." }, +}; + +const int error_id_to_message_count = sizeof(error_id_to_message) / sizeof(error_id_to_message_t); + +const char* get_error_message(unsigned int error) { + const char* id = NULL; + + // Lookup error localization id + for (int i = 0; i < errorcode_to_id_count; i++) { + if (errorcode_to_id[i].error == error) { + id = errorcode_to_id[i].id; + break; + } + } + + // Lookup error message + if (id) { + for (int i = 0; i < error_id_to_message_count; i++) + if (strcmp(error_id_to_message[i].id, id) == 0) + return error_id_to_message[i].message; + } + + // If message is not found, then at least return id if it was found, otherwise NULL + return id; +}; diff --git a/ios-deploy.c b/ios-deploy.c index 3c2b5c7..9d65dde 100644 --- a/ios-deploy.c +++ b/ios-deploy.c @@ -14,9 +14,11 @@ #include #include #include -#include "MobileDevice.h" -#define APP_VERSION "1.5.3" +#include "MobileDevice.h" +#include "errors.h" + +#define APP_VERSION "1.7.1" #define PREP_CMDS_PATH "/tmp/fruitstrap-lldb-prep-cmds-" #define LLDB_SHELL "lldb -s " PREP_CMDS_PATH /* @@ -183,22 +185,40 @@ AMDeviceRef best_device_match = NULL; const int exitcode_error = 253; const int exitcode_app_crash = 254; -void fprintCFSTR(FILE* console, CFStringRef formatString, ...) { - CFStringRef resultString; - CFDataRef data; - va_list argList; - va_start(argList, formatString); - resultString = CFStringCreateWithFormatAndArguments(NULL, NULL, - formatString, argList); - va_end(argList); - data = CFStringCreateExternalRepresentation(NULL, resultString, - kCFStringEncodingUTF8, '?'); - if (data != NULL) { - fprintf (console, "%.*s\n\n", (int)CFDataGetLength(data), - CFDataGetBytePtr(data)); - CFRelease(data); - } - CFRelease(resultString); +// Checks for MobileDevice.framework errors, tries to print them and exits. +#define check_error(call) \ + do { \ + unsigned int err = (unsigned int)call; \ + if (err != 0) \ + { \ + const char* msg = get_error_message(err); \ + on_error("Error 0x%x: %s " #call, err, msg ? msg : "unknown."); \ + } \ + } while (false); + +// Print error message and exit +void on_error(const char* fmt, ...) { + char buf[256]; + va_list args; + va_start(args, fmt); + fprintf(stderr, "[ !! ] "); + vfprintf(stderr, fmt, args); + fprintf(stderr, "\n"); + va_end(args); + + exit(exitcode_error); +} + +// Print error message getting last errno and exit +void on_sys_error(const char* fmt, ...) { + const char* errstr = strerror(errno); + + char buf[256]; + va_list args; + va_start(args, fmt); + vsnprintf(buf, 256, fmt, args); + on_error("%s: %s", buf, errstr); + va_end(args); } Boolean path_exists(CFTypeRef path) { @@ -240,10 +260,7 @@ CFStringRef find_path(CFStringRef rootPath, CFStringRef namePattern, CFStringRef CFRelease(cf_command); if (!(fpipe = (FILE *)popen(command, "r"))) - { - perror("Error encountered while opening pipe"); - exit(exitcode_error); - } + on_sys_error("Error encountered while opening pipe"); char buffer[256] = { '\0' }; @@ -265,10 +282,7 @@ CFStringRef copy_xcode_dev_path() { char *command = "xcode-select -print-path"; if (!(fpipe = (FILE *)popen(command, "r"))) - { - perror("Error encountered while opening pipe"); - exit(exitcode_error); - } + on_sys_error("Error encountered while opening pipe"); char buffer[256] = { '\0' }; @@ -431,21 +445,12 @@ CFStringRef get_device_full_name(const AMDeviceRef device) { if (verbose) { - if (device_name != NULL) - fprintCFSTR(stdout, CFSTR("Device Name:[%@]\n"), device_name); - if (model_name != NULL) - fprintCFSTR(stdout, CFSTR("Model Name:[%@]\n"), model_name); char *devName = MYCFStringCopyUTF8String(device_name); - printf("Device Name:[%s]\n",devName); - CFShow(device_name); - printf("\n"); + CFShow([NSString stringWithFormat:@"Device Name: %s\n", devName]); free(devName); char *mdlName = MYCFStringCopyUTF8String(model_name); - printf("Model Name:[%s]\n",mdlName); - printf("MM: [%s]\n",CFStringGetCStringPtr(model_name, kCFStringEncodingUTF8)); - CFShow(model_name); - printf("\n"); + CFShow([NSString stringWithFormat:@"Model Name: %s\n", mdlName]); free(mdlName); } @@ -525,10 +530,7 @@ CFStringRef copy_device_support_path(AMDeviceRef device) { CFRelease(build); if (path == NULL) - { - printf("[ !! ] Unable to locate DeviceSupport directory.\n[ !! ] This probably means you don't have Xcode installed, you will need to launch the app manually and logging output will not be shown!\n"); - exit(exitcode_error); - } + on_error("Unable to locate DeviceSupport directory. This probably means you don't have Xcode installed, you will need to launch the app manually and logging output will not be shown!"); return path; } @@ -566,10 +568,7 @@ CFStringRef copy_developer_disk_image_path(AMDeviceRef device) { CFRelease(version_parts); CFRelease(build); if (path == NULL) - { - printf("[ !! ] Unable to locate DeveloperDiskImage.dmg.\n[ !! ] This probably means you don't have Xcode installed, you will need to launch the app manually and logging output will not be shown!\n"); - exit(exitcode_error); - } + on_error("Unable to locate DeveloperDiskImage.dmg. This probably means you don't have Xcode installed, you will need to launch the app manually and logging output will not be shown!"); return path; } @@ -615,8 +614,7 @@ void mount_developer_image(AMDeviceRef device) { } else if (result == 0xe8000076 /* already mounted */) { printf("[ 95%%] Developer disk image already mounted\n"); } else { - printf("[ !! ] Unable to mount developer disk image. (%x)\n", result); - exit(exitcode_error); + on_error("Unable to mount developer disk image. (%x)", result); } CFRelease(image_path); @@ -684,8 +682,7 @@ CFURLRef copy_device_app_url(AMDeviceRef device, CFStringRef identifier) { NSDictionary *optionsDict = [NSDictionary dictionaryWithObject:a forKey:@"ReturnAttributes"]; CFDictionaryRef options = (CFDictionaryRef)optionsDict; - afc_error_t resultStatus = AMDeviceLookupApplications(device, options, &result); - assert(resultStatus == 0); + check_error(AMDeviceLookupApplications(device, options, &result)); CFDictionaryRef app_dict = CFDictionaryGetValue(result, identifier); assert(app_dict != NULL); @@ -887,8 +884,7 @@ void fdvendor_callback(CFSocketRef s, CFSocketCallBackType callbackType, CFDataR void start_remote_debug_server(AMDeviceRef device) { - int res = AMDeviceStartService(device, CFSTR("com.apple.debugserver"), &gdbfd, NULL); - assert(res == 0); + check_error(AMDeviceStartService(device, CFSTR("com.apple.debugserver"), &gdbfd, NULL)); assert(gdbfd > 0); /* @@ -917,7 +913,7 @@ void start_remote_debug_server(AMDeviceRef device) { CFSocketSetAddress(fdvendor, address_data); CFRelease(address_data); socklen_t addrlen = sizeof(addr4); - res = getsockname(CFSocketGetNative(fdvendor),(struct sockaddr *)&addr4,&addrlen); + int res = getsockname(CFSocketGetNative(fdvendor),(struct sockaddr *)&addr4,&addrlen); assert(res == 0); port = ntohs(addr4.sin_port); @@ -999,18 +995,18 @@ void setup_lldb(AMDeviceRef device, CFURLRef url) { AMDeviceConnect(device); assert(AMDeviceIsPaired(device)); - assert(AMDeviceValidatePairing(device) == 0); - assert(AMDeviceStartSession(device) == 0); + check_error(AMDeviceValidatePairing(device)); + check_error(AMDeviceStartSession(device)); printf("------ Debug phase ------\n"); if(AMDeviceGetInterfaceType(device) == 2) { - fprintCFSTR(stdout, CFSTR("Cannot debug %@ over %@.\n"), device_full_name, device_interface_name); + CFShow([NSString stringWithFormat:@"Cannot debug %@ over %@.\n", device_full_name, device_interface_name]); exit(0); } - fprintCFSTR(stdout, CFSTR("Starting debug of %@ connected through %@...\n"), device_full_name, device_interface_name); + CFShow([NSString stringWithFormat:@"Starting debug of %@ connected through %@...\n", device_full_name, device_interface_name]); mount_developer_image(device); // put debugserver on the device start_remote_debug_server(device); // start debugserver @@ -1069,8 +1065,7 @@ void launch_debugger(AMDeviceRef device, CFURLRef url) { } else if (pid > 0) { child = pid; } else { - perror("fork failed"); - exit(exitcode_error); + on_sys_error("Fork failed"); } } @@ -1108,8 +1103,7 @@ void launch_debugger_and_exit(AMDeviceRef device, CFURLRef url) { if (verbose) printf("Waiting for child [Child: %d][Parent: %d]\n", child, parent); } else { - perror("fork failed"); - exit(exitcode_error); + on_sys_error("Fork failed"); } } @@ -1222,8 +1216,8 @@ void read_dir(service_conn_t afcFd, afc_connection* afc_conn_p, const char* dir, service_conn_t start_house_arrest_service(AMDeviceRef device) { AMDeviceConnect(device); assert(AMDeviceIsPaired(device)); - assert(AMDeviceValidatePairing(device) == 0); - assert(AMDeviceStartSession(device) == 0); + check_error(AMDeviceValidatePairing(device)); + check_error(AMDeviceStartSession(device)); service_conn_t houseFd; @@ -1239,8 +1233,8 @@ service_conn_t start_house_arrest_service(AMDeviceRef device) { exit(1); } - assert(AMDeviceStopSession(device) == 0); - assert(AMDeviceDisconnect(device) == 0); + check_error(AMDeviceStopSession(device)); + check_error(AMDeviceDisconnect(device)); CFRelease(cf_bundle_id); return houseFd; @@ -1298,34 +1292,57 @@ int app_exists(AMDeviceRef device) { if (bundle_id == NULL) { printf("Bundle id is not specified\n"); - return false; + return 1; } - AMDeviceConnect(device); assert(AMDeviceIsPaired(device)); - assert(AMDeviceValidatePairing(device) == 0); - assert(AMDeviceStartSession(device) == 0); + check_error(AMDeviceValidatePairing(device)); + check_error(AMDeviceStartSession(device)); CFStringRef cf_bundle_id = CFStringCreateWithCString(NULL, bundle_id, kCFStringEncodingASCII); NSArray *a = [NSArray arrayWithObjects:@"CFBundleIdentifier", nil]; NSDictionary *optionsDict = [NSDictionary dictionaryWithObject:a forKey:@"ReturnAttributes"]; CFDictionaryRef options = (CFDictionaryRef)optionsDict; - CFDictionaryRef result = nil; - afc_error_t resultStatus = AMDeviceLookupApplications(device, options, &result); - assert(resultStatus == 0); - - CFDictionaryRef app_dict = CFDictionaryGetValue(result, cf_bundle_id); - - int appExists = (app_dict == NULL) ? -1 : 0; + check_error(AMDeviceLookupApplications(device, options, &result)); + bool appExists = CFDictionaryContainsKey(result, cf_bundle_id); + printf("%s", appExists ? "true\n" : "false\n"); CFRelease(cf_bundle_id); - assert(AMDeviceStopSession(device) == 0); - assert(AMDeviceDisconnect(device) == 0); + check_error(AMDeviceStopSession(device)); + check_error(AMDeviceDisconnect(device)); + if (appExists) + return 0; + return -1; +} - return appExists; +void list_bundle_id(AMDeviceRef device) +{ + AMDeviceConnect(device); + assert(AMDeviceIsPaired(device)); + check_error(AMDeviceValidatePairing(device)); + check_error(AMDeviceStartSession(device)); + + NSArray *a = [NSArray arrayWithObjects:@"CFBundleIdentifier", nil]; + NSDictionary *optionsDict = [NSDictionary dictionaryWithObject:a forKey:@"ReturnAttributes"]; + CFDictionaryRef options = (CFDictionaryRef)optionsDict; + CFDictionaryRef result = nil; + check_error(AMDeviceLookupApplications(device, options, &result)); + + CFIndex count; + count = CFDictionaryGetCount(result); + const void *keys[count]; + CFDictionaryGetKeysAndValues(result, keys, NULL); + for(int i = 0; i < count; ++i) { + CFStringRef test = (CFStringRef)keys[i]; + const char * key = CFStringGetCStringPtr((CFStringRef)keys[i], kCFStringEncodingASCII); + printf("%s\n", key); + } + + check_error(AMDeviceStopSession(device)); + check_error(AMDeviceDisconnect(device)); } void copy_file_callback(afc_connection* afc_conn_p, const char *name,int file) @@ -1455,7 +1472,7 @@ void upload_file(AMDeviceRef device) { c++; } *lastSlash = '\0'; - assert(AFCDirectoryCreate(afc_conn_p, dirpath) == 0); + check_error(AFCDirectoryCreate(afc_conn_p, dirpath)); } @@ -1503,6 +1520,40 @@ void remove_path(AMDeviceRef device) { assert(AFCConnectionClose(afc_conn_p) == 0); } +void uninstall_app(AMDeviceRef device) { + CFRetain(device); // don't know if this is necessary? + + printf("------ Uninstall phase ------\n"); + + //Do we already have the bundle_id passed in via the command line? if so, use it. + CFStringRef cf_uninstall_bundle_id = NULL; + if (bundle_id != NULL) + { + cf_uninstall_bundle_id = CFStringCreateWithCString(NULL, bundle_id, kCFStringEncodingASCII); + } else { + printf ("Error: you need to pass in the bundle id, (i.e. --bundle_id com.my.app)"); + exit(1); + } + + if (cf_uninstall_bundle_id == NULL) { + printf("Error: Unable to get bundle id from user command or package %s\n Uninstall failed\n", app_path); + } else { + AMDeviceConnect(device); + assert(AMDeviceIsPaired(device)); + check_error(AMDeviceValidatePairing(device)); + check_error(AMDeviceStartSession(device)); + + int code = AMDeviceSecureUninstallApplication(0, device, cf_uninstall_bundle_id, 0, NULL, 0); + if (code == 0) { + printf("[ OK ] Uninstalled package with bundle id %s\n", CFStringGetCStringPtr(cf_uninstall_bundle_id, CFStringGetSystemEncoding())); + } else { + printf("[ ERROR ] Could not uninstall package with bundle id %s\n", CFStringGetCStringPtr(cf_uninstall_bundle_id, CFStringGetSystemEncoding())); + } + check_error(AMDeviceStopSession(device)); + check_error(AMDeviceDisconnect(device)); + } +} + void handle_device(AMDeviceRef device) { //if (found_device) // return; // handle one device only @@ -1510,10 +1561,9 @@ void handle_device(AMDeviceRef device) { CFStringRef found_device_id = AMDeviceCopyDeviceIdentifier(device), device_full_name = get_device_full_name(device), device_interface_name = get_device_interface_name(device); - + if (detect_only) { - fprintCFSTR(stdout, CFSTR("[....] Found %@ connected through %@.\n"), device_full_name, device_interface_name); - //printf("[....] Found %s connected through %s.\n", CFStringGetCStringPtr(device_full_name, CFStringGetSystemEncoding()), CFStringGetCStringPtr(device_interface_name, CFStringGetSystemEncoding())); + CFShow([NSString stringWithFormat:@"[....] Found %@ connected through %@.\n", device_full_name, device_interface_name]); found_device = true; return; } @@ -1523,8 +1573,7 @@ void handle_device(AMDeviceRef device) { found_device = true; CFRelease(deviceCFSTR); } else { - fprintCFSTR(stdout, CFSTR("Skipping %@.\n"), device_full_name); - CFRelease(deviceCFSTR); + CFShow([NSString stringWithFormat:@"Skipping %@.\n", device_full_name]); return; } } else { @@ -1532,7 +1581,7 @@ void handle_device(AMDeviceRef device) { found_device = true; } - fprintCFSTR(stdout, CFSTR("[....] Using %@ (%@).\n"), device_full_name, found_device_id); + CFShow([NSString stringWithFormat:@"[....] Using %@ (%@).\n", device_full_name, found_device_id]); if (command_only) { if (strcmp("list", command) == 0) { @@ -1547,6 +1596,10 @@ void handle_device(AMDeviceRef device) { remove_path(device); } else if (strcmp("exists", command) == 0) { exit(app_exists(device)); + } else if (strcmp("uninstall_only", command) == 0) { + uninstall_app(device); + } else if (strcmp("list_bundle_id", command) == 0) { + list_bundle_id(device); } exit(0); } @@ -1563,48 +1616,56 @@ void handle_device(AMDeviceRef device) { if (uninstall) { printf("------ Uninstall phase ------\n"); - CFStringRef bundle_id = get_bundle_id(url); - if (bundle_id == NULL) { - printf("Error: Unable to get bundle id from package %s\n Uninstall failed\n", app_path); + //Do we already have the bundle_id passed in via the command line? if so, use it. + CFStringRef cf_uninstall_bundle_id = NULL; + if (bundle_id != NULL) + { + cf_uninstall_bundle_id = CFStringCreateWithCString(NULL, bundle_id, kCFStringEncodingASCII); + } else { + cf_uninstall_bundle_id = get_bundle_id(url); + } + + if (cf_uninstall_bundle_id == NULL) { + printf("Error: Unable to get bundle id from user command or package %s\n Uninstall failed\n", app_path); } else { AMDeviceConnect(device); assert(AMDeviceIsPaired(device)); - assert(AMDeviceValidatePairing(device) == 0); - assert(AMDeviceStartSession(device) == 0); + check_error(AMDeviceValidatePairing(device)); + check_error(AMDeviceStartSession(device)); - int code = AMDeviceSecureUninstallApplication(0, device, bundle_id, 0, NULL, 0); + int code = AMDeviceSecureUninstallApplication(0, device, cf_uninstall_bundle_id, 0, NULL, 0); if (code == 0) { - printf("[ OK ] Uninstalled package with bundle id %s\n", CFStringGetCStringPtr(bundle_id, CFStringGetSystemEncoding())); + printf("[ OK ] Uninstalled package with bundle id %s\n", CFStringGetCStringPtr(cf_uninstall_bundle_id, CFStringGetSystemEncoding())); } else { - printf("[ ERROR ] Could not uninstall package with bundle id %s\n", CFStringGetCStringPtr(bundle_id, CFStringGetSystemEncoding())); + printf("[ ERROR ] Could not uninstall package with bundle id %s\n", CFStringGetCStringPtr(cf_uninstall_bundle_id, CFStringGetSystemEncoding())); } - assert(AMDeviceStopSession(device) == 0); - assert(AMDeviceDisconnect(device) == 0); + check_error(AMDeviceStopSession(device)); + check_error(AMDeviceDisconnect(device)); } } if(install) { printf("------ Install phase ------\n"); - fprintCFSTR(stdout, CFSTR("[ 0%%] Found %@ connected through %@, beginning install\n"), device_full_name, device_interface_name); + CFShow([NSString stringWithFormat:@"[ 0%%] Found %@ connected through %@, beginning install\n", device_full_name, device_interface_name]); AMDeviceConnect(device); assert(AMDeviceIsPaired(device)); - assert(AMDeviceValidatePairing(device) == 0); - assert(AMDeviceStartSession(device) == 0); + check_error(AMDeviceValidatePairing(device)); + check_error(AMDeviceStartSession(device)); // NOTE: the secure version doesn't seem to require us to start the AFC service service_conn_t afcFd; - assert(AMDeviceSecureStartService(device, CFSTR("com.apple.afc"), NULL, &afcFd) == 0); - assert(AMDeviceStopSession(device) == 0); - assert(AMDeviceDisconnect(device) == 0); + check_error(AMDeviceSecureStartService(device, CFSTR("com.apple.afc"), NULL, &afcFd)); + check_error(AMDeviceStopSession(device)); + check_error(AMDeviceDisconnect(device)); CFStringRef keys[] = { CFSTR("PackageType") }; CFStringRef values[] = { CFSTR("Developer") }; CFDictionaryRef options = CFDictionaryCreate(NULL, (const void **)&keys, (const void **)&values, 1, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); //assert(AMDeviceTransferApplication(afcFd, path, NULL, transfer_callback, NULL) == 0); - assert(AMDeviceSecureTransferPath(0, device, url, options, transfer_callback, 0)==0); + check_error(AMDeviceSecureTransferPath(0, device, url, options, transfer_callback, 0)); close(afcFd); @@ -1612,8 +1673,8 @@ void handle_device(AMDeviceRef device) { AMDeviceConnect(device); assert(AMDeviceIsPaired(device)); - assert(AMDeviceValidatePairing(device) == 0); - assert(AMDeviceStartSession(device) == 0); + check_error(AMDeviceValidatePairing(device)); + check_error(AMDeviceStartSession(device)); // // NOTE: the secure version doesn't seem to require us to start the installation_proxy service // // Although I can't find it right now, I in some code that the first param of AMDeviceSecureInstallApplication was a "dontStartInstallProxy" @@ -1623,20 +1684,12 @@ void handle_device(AMDeviceRef device) { //assert(AMDeviceSecureStartService(device, CFSTR("com.apple.mobile.installation_proxy"), NULL, &installFd) == 0); //mach_error_t result = AMDeviceInstallApplication(installFd, path, options, install_callback, NULL); - mach_error_t result = AMDeviceSecureInstallApplication(0, device, url, options, install_callback, 0); - if (result != 0) - { - char* error = "Unknown error."; - if (result == 0xe8008015) - error = "Your application failed code-signing checks. Check your certificates, provisioning profiles, and bundle ids."; - printf("AMDeviceInstallApplication failed: 0x%X: %s\n", result, error); - exit(exitcode_error); - } + check_error(AMDeviceSecureInstallApplication(0, device, url, options, install_callback, 0)); // close(installFd); - assert(AMDeviceStopSession(device) == 0); - assert(AMDeviceDisconnect(device) == 0); + check_error(AMDeviceStopSession(device)); + check_error(AMDeviceDisconnect(device)); CFRelease(path); CFRelease(options); @@ -1676,10 +1729,8 @@ void timeout_callback(CFRunLoopTimerRef timer, void *info) { best_device_match = NULL; } - if(!found_device) { - printf("[....] Timed out waiting for device.\n"); - exit(exitcode_error); - } + if(!found_device) + on_error("Timed out waiting for device."); } else { @@ -1722,6 +1773,7 @@ void usage(const char* app) { " -m, --noinstall directly start debugging without app install (-d not required)\n" " -p, --port port used for device, default: dynamic\n" " -r, --uninstall uninstall the app before install (do not use with -m; app cache and data are cleared) \n" + " -9, --uninstall_only uninstall the app ONLY. Use only with -1 \n" " -1, --bundle_id specify bundle id for list and upload\n" " -l, --list list files\n" " -o, --upload upload file\n" @@ -1730,7 +1782,8 @@ void usage(const char* app) { " -D, --mkdir make directory on device\n" " -R, --rm remove file or directory on device (directories must be empty)\n" " -V, --version print the executable version \n" - " -e, --exists check if the app with given bundle_id is installed or not \n", + " -e, --exists check if the app with given bundle_id is installed or not \n" + " -B, --list_bundle_id list bundle_id \n", app); } @@ -1755,6 +1808,7 @@ int main(int argc, char *argv[]) { { "noinstall", no_argument, NULL, 'm' }, { "port", required_argument, NULL, 'p' }, { "uninstall", no_argument, NULL, 'r' }, + { "uninstall_only", no_argument, NULL, '9'}, { "list", optional_argument, NULL, 'l' }, { "bundle_id", required_argument, NULL, '1'}, { "upload", required_argument, NULL, 'o'}, @@ -1763,11 +1817,12 @@ int main(int argc, char *argv[]) { { "mkdir", required_argument, NULL, 'D'}, { "rm", required_argument, NULL, 'R'}, { "exists", no_argument, NULL, 'e'}, + { "list_bundle_id", no_argument, NULL, 'B'}, { NULL, 0, NULL, 0 }, }; char ch; - while ((ch = getopt_long(argc, argv, "VmcdvunrILei:b:a:t:g:x:p:1:2:o:l::w::", longopts, NULL)) != -1) + while ((ch = getopt_long(argc, argv, "VmcdvunrILeD:R:i:b:a:t:g:x:p:1:2:o:l::w::9::B::", longopts, NULL)) != -1) { switch (ch) { case 'm': @@ -1818,6 +1873,10 @@ int main(int argc, char *argv[]) { case 'r': uninstall = 1; break; + case '9': + command_only = true; + command = "uninstall_only"; + break; case '1': bundle_id = optarg; break; @@ -1853,6 +1912,10 @@ int main(int argc, char *argv[]) { command_only = true; command = "exists"; break; + case 'B': + command_only = true; + command = "list_bundle_id"; + break; default: usage(argv[0]); return exitcode_error; @@ -1861,7 +1924,7 @@ int main(int argc, char *argv[]) { if (!app_path && !detect_only && !command_only) { usage(argv[0]); - exit(exitcode_error); + on_error("One of -[b|c|o|l|w|D|R|e|9] is required to proceed!"); } if (unbuffered) { @@ -1874,7 +1937,9 @@ int main(int argc, char *argv[]) { } if (app_path) { - assert(access(app_path, F_OK) == 0); + if (access(app_path, F_OK) != 0) { + on_sys_error("Can't access app path '%s'", app_path); + } } AMDSetLogLevel(5); // otherwise syslog gets flooded with crap diff --git a/package.json b/package.json index 714a4ef..c040f38 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,7 @@ { "name": "ios-deploy", - "version": "1.5.2", + "version": "1.7.0", + "os" : [ "darwin" ], "description": "launch iOS apps iOS devices from the command line (Xcode 6)", "main": "ios-deploy", "scripts": {