Skip to content

Commit

Permalink
Merge pull request #163 from appcelerator/timob-17808
Browse files Browse the repository at this point in the history
[TIMOB-17808] Fixed bug in Titanium SDK 3 bug fix hook where Xcode should only be removed when running on OS X.
  • Loading branch information
skypanther committed Sep 30, 2014
2 parents aa4fa7d + ded5c83 commit 7217a63
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
Unversioned
-------------------
* Fixed bug in Titanium SDK 3 bug fix hook where Xcode should only be removed when running on OS X [TIMOB-17808]

3.4.0 (9/29/14)
-------------------
* Added support for selecting latest stable SDK [TIMOB-17378]
Expand Down
4 changes: 2 additions & 2 deletions hooks/tisdk3fixes.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ exports.init = function (logger, config, cli, appc) {
}

cli.on('cli:command-loaded', function (data, done) {
if (data.command.name === 'info') {
if (process.platform === 'darwin' && data.command.name === 'info') {
// if we're running the 'info' command, then run the iOS detection and remove
// Xcode 6 even if we're not displaying iOS info
removeXcode6(done);
Expand All @@ -120,7 +120,7 @@ exports.init = function (logger, config, cli, appc) {

cli.on('build.config', {
pre: function (data, done) {
if (/^(ios|iphone|ipad)$/.test(cli.argv.platform || cli.argv.p)) {
if (process.platform === 'darwin' && /^(ios|iphone|ipad)$/.test(cli.argv.platform || cli.argv.p)) {
return removeXcode6(done);
} else {
done();
Expand Down

0 comments on commit 7217a63

Please sign in to comment.