Merge branch 'master' into deva/semver
diff --git a/package.json b/package.json
index f3d7b7c..c937352 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
"url": "https://github.com/ios-control/ios-deploy"
},
"devDependencies": {
+ "semver": "*"
"eslint": "~4.19.1",
"eslint-config-semistandard": "^12.0.1",
"eslint-config-standard": "^11.0.0",
diff --git a/src/scripts/check_reqs.js b/src/scripts/check_reqs.js
index 38c886e..34e00db 100755
--- a/src/scripts/check_reqs.js
+++ b/src/scripts/check_reqs.js
@@ -3,6 +3,7 @@
var util = require('util');
var os = require('os');
var child_process = require('child_process');
+var semver = require('semver')
var XCODEBUILD_MIN_VERSION = 7.0;
var XCODEBUILD_NOT_FOUND_MESSAGE = util.format('Please install Xcode version %s or greater from the Mac App Store.', XCODEBUILD_MIN_VERSION);
@@ -28,7 +29,7 @@
var arr = version_string.match(/^Xcode (\d+\.\d+)/);
var ver = arr[1];
- if (os.release() >= '15.0.0' && ver < XCODEBUILD_MIN_VERSION) {
+ if (semver.gte(os.release(), '15.0.0') && semver.lt(ver + '.0', '7.0.0')) {
console.log(util.format('You need at least Xcode 7.0 when you are on OS X 10.11 El Capitan (you have version %s)', ver));
process.exit(1);
}
