Skip to content

Commit f2bba38

Browse files
committed
Respect non-cpython versions and aliases
1 parent b229c32 commit f2bba38

File tree

2 files changed

+21
-5
lines changed

2 files changed

+21
-5
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
# cpython-builder
1+
# `cpython-builder`
2+
23
Clones and builds CPython using `python-build`

bin/archive

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,29 @@ set -o xtrace
2222
: ${TAR_PATHS:=}
2323
: ${DEST:=${1}}
2424

25-
TAR_PATHS="$TAR_PATHS $INSTALL_DEST/$VERSION $HOME/virtualenv/python$VERSION"
25+
if [[ $VERSION =~ ^python|pypy ]] ; then
26+
VERSION="${VERSION}"
27+
SHORT_VERSION="${VERSION}"
28+
else
29+
SHORT_VERSION="python${VERSION}"
30+
VERSION="python-${VERSION}"
31+
fi
32+
33+
TAR_PATHS="$TAR_PATHS $INSTALL_DEST/$VERSION $HOME/virtualenv/${SHORT_VERSION}"
2634

2735
if [[ $ALIAS ]] ; then
28-
TAR_PATHS="$TAR_PATHS $INSTALL_DEST/$ALIAS $HOME/virtualenv/python$ALIAS"
29-
DEST="$TRAVIS_BUILD_DIR/$LSB_RELEASE/python-${ALIAS}.tar.bz2"
36+
if [[ $ALIAS =~ ^python|pypy ]] ; then
37+
SHORT_ALIAS="${ALIAS}"
38+
LONG_ALIAS="${ALIAS}"
39+
else
40+
SHORT_ALIAS="python${ALIAS}"
41+
LONG_ALIAS="python-${ALIAS}"
42+
fi
43+
TAR_PATHS="$TAR_PATHS $INSTALL_DEST/$ALIAS $HOME/virtualenv/${SHORT_ALIAS}"
44+
DEST="$TRAVIS_BUILD_DIR/$LSB_RELEASE/${LONG_ALIAS}.tar.bz2"
3045
else
3146
if [[ ! $DEST ]] ; then
32-
DEST="$TRAVIS_BUILD_DIR/$LSB_RELEASE/python-${VERSION}.tar.bz2"
47+
DEST="$TRAVIS_BUILD_DIR/$LSB_RELEASE/${VERSION}.tar.bz2"
3348
fi
3449
fi
3550

0 commit comments

Comments
 (0)