Skip to content

Commit

Permalink
chore: add scripts which were previously ignored (#4240)
Browse files Browse the repository at this point in the history
...because they were in a directory called "dist"
  • Loading branch information
rix0rrr authored Sep 26, 2019
1 parent 7c1c35c commit f2ee23e
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 3 deletions.
2 changes: 2 additions & 0 deletions packages/aws-cdk/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ coverage
.nycrc
.LAST_PACKAGE
*.snk

!test/integ/run-wrappers/dist
4 changes: 1 addition & 3 deletions packages/aws-cdk/test/integ/run-against-dist.bash
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,6 @@ function prepare_python_packages() {
# later which will re-hijack ours with a 'pip' binary. Use a function instead,
# the real logic will reside in "pip_"

ORIGINAL_PIP=$(type -p pip) || { echo "No 'pip' found" >&2; exit 1; }
export ORIGINAL_PIP
export PYTHON_WHEELS=$dist_root/python

if [ ! -d "$PYTHON_WHEELS" ]; then
Expand All @@ -188,5 +186,5 @@ function prepare_python_packages() {
}

function pip() {
exec pip_ "$@"
pip_ "$@"
}
10 changes: 10 additions & 0 deletions packages/aws-cdk/test/integ/run-wrappers/dist/dotnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash
set -eu
if [[ "${1:-}" == "build" ]]; then
shift
exec $ORIGINAL_DOTNET build \
--source $NUGET_SOURCE \
"$@"
fi

exec $ORIGINAL_DOTNET "$@"
10 changes: 10 additions & 0 deletions packages/aws-cdk/test/integ/run-wrappers/dist/pip_
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash
set -eu
if [[ "${1:-}" == "install" ]]; then
# Just install all wheels from the source repository.
# It's too hard to figure out what was actually requested, and
# this is pretty quick anyway.
exec pip install $PYTHON_WHEELS/*.whl
fi

exec pip "$@"

0 comments on commit f2ee23e

Please sign in to comment.