Skip to content
Snippets Groups Projects
Commit 0a169e76 authored by Casey Faist's avatar Casey Faist
Browse files

fix extra slash in python install location

parent 2f430abf
No related branches found
No related tags found
No related merge requests found
# Python Buildpack Changelog # Python Buildpack Changelog
# 142 (2018-10-22)
Python 3.7.1, 3.6.7 and 3.5.6 now available on all Heroku stacks.
# 141 (2018-10-10) # 141 (2018-10-10)
Switch to cautious upgrade for Pipenv install to ensure the pinned pip version Switch to cautious upgrade for Pipenv install to ensure the pinned pip version
......
...@@ -15,7 +15,7 @@ sqlite3_install "$OUT_PREFIX" "$SQLITE3_VERSION" 1 ...@@ -15,7 +15,7 @@ sqlite3_install "$OUT_PREFIX" "$SQLITE3_VERSION" 1
echo "Building Python…" echo "Building Python…"
SOURCE_TARBALL='https://python.org/ftp/python/3.5.6/Python-3.5.6.tgz' SOURCE_TARBALL='https://python.org/ftp/python/3.5.6/Python-3.5.6.tgz'
curl -L $SOURCE_TARBALL | tar xz curl -L $SOURCE_TARBALL | tar xz
mv Python-3.7.0 src mv Python-3.5.6 src
cd src cd src
./configure --prefix=$OUT_PREFIX --with-ensurepip=no ./configure --prefix=$OUT_PREFIX --with-ensurepip=no
...@@ -26,4 +26,7 @@ make install ...@@ -26,4 +26,7 @@ make install
# https://github.com/docker-library/python # https://github.com/docker-library/python
find "${OUT_PREFIX}" \( -type d -a \( -name test -o -name tests \) \) -exec rm -rf '{}' + find "${OUT_PREFIX}" \( -type d -a \( -name test -o -name tests \) \) -exec rm -rf '{}' +
ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python # Remove spare /
LOCATION=${OUT_PREFIX%?}
ln $LOCATION/bin/python3 $LOCATION/bin/python
...@@ -15,7 +15,7 @@ sqlite3_install "$OUT_PREFIX" "$SQLITE3_VERSION" 1 ...@@ -15,7 +15,7 @@ sqlite3_install "$OUT_PREFIX" "$SQLITE3_VERSION" 1
echo "Building Python…" echo "Building Python…"
SOURCE_TARBALL='https://python.org/ftp/python/3.6.7/Python-3.6.7.tgz' SOURCE_TARBALL='https://python.org/ftp/python/3.6.7/Python-3.6.7.tgz'
curl -L $SOURCE_TARBALL | tar xz curl -L $SOURCE_TARBALL | tar xz
mv Python-3.7.0 src mv Python-3.6.7 src
cd src cd src
./configure --prefix=$OUT_PREFIX --with-ensurepip=no ./configure --prefix=$OUT_PREFIX --with-ensurepip=no
...@@ -26,4 +26,7 @@ make install ...@@ -26,4 +26,7 @@ make install
# https://github.com/docker-library/python # https://github.com/docker-library/python
find "${OUT_PREFIX}" \( -type d -a \( -name test -o -name tests \) \) -exec rm -rf '{}' + find "${OUT_PREFIX}" \( -type d -a \( -name test -o -name tests \) \) -exec rm -rf '{}' +
ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python # Remove spare /
LOCATION=${OUT_PREFIX%?}
ln $LOCATION/bin/python3 $LOCATION/bin/python
...@@ -15,7 +15,7 @@ sqlite3_install "$OUT_PREFIX" "$SQLITE3_VERSION" 1 ...@@ -15,7 +15,7 @@ sqlite3_install "$OUT_PREFIX" "$SQLITE3_VERSION" 1
echo "Building Python…" echo "Building Python…"
SOURCE_TARBALL='https://python.org/ftp/python/3.7.1/Python-3.7.1.tgz' SOURCE_TARBALL='https://python.org/ftp/python/3.7.1/Python-3.7.1.tgz'
curl -L $SOURCE_TARBALL | tar xz curl -L $SOURCE_TARBALL | tar xz
mv Python-3.7.0 src mv Python-3.7.1 src
cd src cd src
./configure --prefix=$OUT_PREFIX --with-ensurepip=no ./configure --prefix=$OUT_PREFIX --with-ensurepip=no
...@@ -26,4 +26,7 @@ make install ...@@ -26,4 +26,7 @@ make install
# https://github.com/docker-library/python # https://github.com/docker-library/python
find "${OUT_PREFIX}" \( -type d -a \( -name test -o -name tests \) \) -exec rm -rf '{}' + find "${OUT_PREFIX}" \( -type d -a \( -name test -o -name tests \) \) -exec rm -rf '{}' +
ln $OUT_PREFIX/bin/python3 $OUT_PREFIX/bin/python # Remove spare /
LOCATION=${OUT_PREFIX%?}
ln $LOCATION/bin/python3 $LOCATION/bin/python
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment