Skip to content

Commit

Permalink
Refactor fix to env_vars.sh location
Browse files Browse the repository at this point in the history
[skip ci]
  • Loading branch information
matthew-brett committed Feb 14, 2018
1 parent b065fa4 commit 5322a3a
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions docker_build_wrap.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
# BUILD_DEPENDS (may be used by config.sh, can be empty)
set -e

# Change into root directory of repo
cd /io

# Unicode width, default 32
UNICODE_WIDTH=${UNICODE_WIDTH:-32}

Expand All @@ -18,7 +21,7 @@ WHEEL_SDIR=${WHEEL_SDIR:-wheelhouse}
CONFIG_PATH=${CONFIG_PATH:-config.sh}

# Path is relative to repository from which we ran
ENV_VARS_PATH="/io/${ENV_VARS_PATH:-env_vars.sh}"
ENV_VARS_PATH=${ENV_VARS_PATH:-env_vars.sh}

# Always pull in common and library builder utils
MULTIBUILD_DIR=$(dirname "${BASH_SOURCE[0]}")
Expand All @@ -35,9 +38,6 @@ fi
# Set PATH for chosen Python, Unicode width
export PATH="$(cpython_path $PYTHON_VERSION $UNICODE_WIDTH)/bin:$PATH"

# Change into root directory of repo
cd /io

# Configuration for this package, possibly overriding `build_wheel` defined in
# `common_utils.sh` via `manylinux_utils.sh`.
source "$CONFIG_PATH"
Expand Down

0 comments on commit 5322a3a

Please sign in to comment.