File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -23,12 +23,14 @@ if (pip-grep -s requirements.txt argon2-cffi bcrypt cffi cryptography django[arg
2323 echo " -----> Noticed cffi. Bootstrapping libffi."
2424 mkdir -p .heroku/vendor
2525
26- translated_url=` translate_dependency_url $VENDORED_LIBFFI `
27- filtered_url=` filter_dependency_url $translated_url `
28- # Download and extract cryptography into target vendor directory.
29- echo " Downloaded [$filtered_url ]"
3026 # Download and extract libffi into target vendor directory.
31- curl $translated_url -s | tar zxv -C .heroku/vendor & > /dev/null
27+ exit_code=0
28+ filtered_url=$( $ROOT_DIR /compile-extensions/bin/download_dependency $VENDORED_LIBFFI /tmp)
29+ echo " Downloaded [$filtered_url ]"
30+
31+ downloaded_file=/tmp/libffi.tar.gz
32+ tar zxvf $downloaded_file -C .heroku/vendor & > /dev/null
33+ rm $downloaded_file
3234 fi
3335
3436 export LIBFFI=$( pwd) /vendor
Original file line number Diff line number Diff line change @@ -22,11 +22,14 @@ if (pip-grep -s requirements.txt pylibmc &> /dev/null) then
2222 echo " -----> Noticed pylibmc. Bootstrapping libmemcached."
2323 mkdir -p .heroku/vendor
2424
25- translated_url=` translate_dependency_url $VENDORED_MEMCACHED `
26- filtered_url=` filter_dependency_url $translated_url `
2725 # Download and extract libmemcached into target vendor directory.
26+ exit_code=0
27+ filtered_url=$( $ROOT_DIR /compile-extensions/bin/download_dependency $VENDORED_MEMCACHED /tmp)
2828 echo " Downloaded [$filtered_url ]"
29- curl $translated_url -s | tar zxv -C .heroku/vendor & > /dev/null
29+
30+ downloaded_file=/tmp/libmemcache.tar.gz
31+ tar zxvf $downloaded_file -C .heroku/vendor & > /dev/null
32+ rm $downloaded_file
3033 fi
3134
3235 export LIBMEMCACHED=$( pwd) /vendor
Original file line number Diff line number Diff line change @@ -29,13 +29,16 @@ if [ ! "$SKIP_INSTALL" ]; then
2929
3030 exit_code=0
3131 url="https://lang-python.s3.amazonaws.com/$STACK/runtimes/$PYTHON_VERSION.tar.gz"
32- translated_url=$(translate_dependency_url $url) || exit_code=$?
33- filtered_url=$(filter_dependency_url $translated_url ) || true
34- if [[ $exit_code != 0 ]] ; then
32+
33+ filtered_url=$($ROOT_DIR/compile-extensions/bin/download_dependency $url /tmp ) || exit_code=$?
34+ if [ $exit_code -ne 0 ]; then
3535 $ROOT_DIR/compile-extensions/bin/recommend_dependency $url
3636 exit 1
3737 fi
38- curl "$translated_url" -s | tar zxv -C .heroku/python &> /dev/null
38+
39+ downloaded_file=/tmp/$PYTHON_VERSION.tar.gz
40+ tar zxvf $downloaded_file -C .heroku/python &> /dev/null
41+ rm $downloaded_file
3942 echo "Downloaded [$filtered_url]"
4043
4144 bpwatch stop install_python
You can’t perform that action at this time.
0 commit comments