Repository: aurora Updated Branches: refs/heads/master dd86d2f62 -> c8e89538e
Fixup prepare_binary.sh to work under modern bash. Previously pushd/popd were used and these emit data to stdout muddying pants output and breaking setup of the thrift serve dir structure. build-support/thrift/prepare_binary.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) Reviewed at https://reviews.apache.org/r/54567/ Project: http://git-wip-us.apache.org/repos/asf/aurora/repo Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/c8e89538 Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/c8e89538 Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/c8e89538 Branch: refs/heads/master Commit: c8e89538ec6469c7a003aadd3eb943843c215cc1 Parents: dd86d2f Author: John Sirois <jsir...@apache.org> Authored: Thu Dec 8 22:17:13 2016 -0600 Committer: Joshua Cohen <jco...@apache.org> Committed: Thu Dec 8 22:17:13 2016 -0600 ---------------------------------------------------------------------- build-support/thrift/prepare_binary.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aurora/blob/c8e89538/build-support/thrift/prepare_binary.sh ---------------------------------------------------------------------- diff --git a/build-support/thrift/prepare_binary.sh b/build-support/thrift/prepare_binary.sh index e3b46aa..4ad997b 100755 --- a/build-support/thrift/prepare_binary.sh +++ b/build-support/thrift/prepare_binary.sh @@ -24,9 +24,10 @@ readonly KNOWN_OS_IDS=( # Runs pants safely as an indirect pants subprocess. function run_pants() { - pushd "${HERE}/../.." - ./pants --no-colors --no-lock "$@" - popd + ( + cd "${HERE}/../.." + ./pants --no-colors --no-lock "$@" + ) } # Returns the pants option value for the given scope and name.