Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[system-dependencies] Ensure xcode-select points to the Xcode we care about. #53

Merged
merged 1 commit into from
May 16, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions system-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,16 @@ function check_specific_xcode () {
return
fi

local XCODE_SELECT=$(xcode-select -p)
if [[ "x$XCODE_SELECT" != "x$XCODE_DEVELOPER_ROOT" ]]; then
if ! test -z $PROVISION_XCODE; then
log "Executing 'sudo xcode-select -s $XCODE_DEVELOPER_ROOT'"
sudo xcode-select -s $XCODE_DEVELOPER_ROOT
else
fail "'xcode-select -p' does not point to $XCODE_DEVELOPER_ROOT, it points to $XCODE_SELECT. Execute 'sudo xcode-select -s $XCODE_DEVELOPER_ROOT' to fix."
fi
fi

ok "Found Xcode $XCODE_ACTUAL_VERSION in $XCODE_ROOT"
}

Expand Down