From 0a169e76a4ffa97ef51673554beaab3f7d1f00d1 Mon Sep 17 00:00:00 2001
From: Casey Faist <caseylfaist@gmail.com>
Date: Mon, 22 Oct 2018 15:46:10 -0500
Subject: [PATCH] fix extra slash in python install location

---
 CHANGELOG.md                 | 4 ++++
 builds/runtimes/python-3.5.6 | 7 +++++--
 builds/runtimes/python-3.6.7 | 7 +++++--
 builds/runtimes/python-3.7.1 | 7 +++++--
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a5e3a0e..b4170265 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # 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)
 
 Switch to cautious upgrade for Pipenv install to ensure the pinned pip version
diff --git a/builds/runtimes/python-3.5.6 b/builds/runtimes/python-3.5.6
index 0ee79d57..0d179352 100755
--- a/builds/runtimes/python-3.5.6
+++ b/builds/runtimes/python-3.5.6
@@ -15,7 +15,7 @@ sqlite3_install "$OUT_PREFIX" "$SQLITE3_VERSION" 1
 echo "Building Python…"
 SOURCE_TARBALL='https://python.org/ftp/python/3.5.6/Python-3.5.6.tgz'
 curl -L $SOURCE_TARBALL | tar xz
-mv Python-3.7.0 src
+mv Python-3.5.6 src
 cd src
 
 ./configure --prefix=$OUT_PREFIX --with-ensurepip=no
@@ -26,4 +26,7 @@ make install
 # https://github.com/docker-library/python
 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
diff --git a/builds/runtimes/python-3.6.7 b/builds/runtimes/python-3.6.7
index 9d43de8e..052ee1e2 100755
--- a/builds/runtimes/python-3.6.7
+++ b/builds/runtimes/python-3.6.7
@@ -15,7 +15,7 @@ sqlite3_install "$OUT_PREFIX" "$SQLITE3_VERSION" 1
 echo "Building Python…"
 SOURCE_TARBALL='https://python.org/ftp/python/3.6.7/Python-3.6.7.tgz'
 curl -L $SOURCE_TARBALL | tar xz
-mv Python-3.7.0 src
+mv Python-3.6.7 src
 cd src
 
 ./configure --prefix=$OUT_PREFIX --with-ensurepip=no
@@ -26,4 +26,7 @@ make install
 # https://github.com/docker-library/python
 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
diff --git a/builds/runtimes/python-3.7.1 b/builds/runtimes/python-3.7.1
index a4ad45f2..b8051393 100755
--- a/builds/runtimes/python-3.7.1
+++ b/builds/runtimes/python-3.7.1
@@ -15,7 +15,7 @@ sqlite3_install "$OUT_PREFIX" "$SQLITE3_VERSION" 1
 echo "Building Python…"
 SOURCE_TARBALL='https://python.org/ftp/python/3.7.1/Python-3.7.1.tgz'
 curl -L $SOURCE_TARBALL | tar xz
-mv Python-3.7.0 src
+mv Python-3.7.1 src
 cd src
 
 ./configure --prefix=$OUT_PREFIX --with-ensurepip=no
@@ -26,4 +26,7 @@ make install
 # https://github.com/docker-library/python
 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
-- 
GitLab