github/pyenv
1
0
Fork 0
mirror of https://github.com/pyenv/pyenv.git synced 2024-11-14 20:39:55 -05:00
Code Issues Projects Releases Packages Wiki Activity

Let Jython installer to generate shell script instead of python script even if there's python2.7 available in $PATH (#800)

Browse source
This commit is contained in:
Yamashita, Yuu 2017-01-06 14:19:04 +00:00
parent e3c8a754a4
commit 9833be730a
6 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugins/python-build/bin/python-build
View file

@ -588,7 +588,7 @@ fetch_jar() {
# Must use full path to jar and destination directory: # Must use full path to jar and destination directory:
# http://bugs.jython.org/issue2350 # http://bugs.jython.org/issue2350
{ if $JAVA -jar $PWD/${package_name}.jar -s -d $PWD/${package_name}; then { if $JAVA -jar "$PWD/${package_name}.jar" -s -d "$PWD/${package_name}"; then
if [ -z "$KEEP_BUILD_PATH" ]; then if [ -z "$KEEP_BUILD_PATH" ]; then
rm -f "$package_filename" rm -f "$package_filename"
else else
@ -902,11 +902,10 @@ fix_jython_shebangs() {
for file in "${PREFIX_PATH}/bin"/*; do for file in "${PREFIX_PATH}/bin"/*; do
case "$(head -1 "${file}")" in case "$(head -1 "${file}")" in
"#!"*"/bin/jython" ) "#!"*"/bin/jython" )
sed -i.bak "1 s:.*:#\!\/usr\/bin\/env ${PREFIX_PATH}\/bin\/jython:" "${file}" sed -i.bak "1 s:.*:#\!${PREFIX_PATH}\/bin\/jython:" "${file}"
;; ;;
"#!"*"/bin/python2.7"* ) "#!"*"/bin/python2.7"* )
# Jython 2.7+ requires CPython 2.7 to run sed -i.bak "1 s:.*:#\!\/usr\/bin\/env python:" "${file}"
sed -i.bak "1 s:.*:#\!\/usr\/bin\/env python2.7:" "${file}"
;; ;;
esac esac
rm -f "${file}.bak" rm -f "${file}.bak"
@ -1276,6 +1275,17 @@ require_java() {
export JAVA="$java" export JAVA="$java"
} }
# Let Jython installer to generate shell script instead of python script even if there's `python2.7` available in `$PATH` (#800)
# FIXME: better function naming
unrequire_python27() {
export PATH="${PWD}/bin:${PATH}"
mkdir -p "${PWD}/bin"
if command -v python2.7 1>/dev/null 2>&1; then
echo false > "${PWD}/bin/python2.7"
chmod +x "${PWD}/bin/python2.7"
fi
}
require_distro() { require_distro() {
for arg; do for arg; do
if [[ "$(cat /etc/issue 2>/dev/null || true)" == "$arg"* ]]; then if [[ "$(cat /etc/issue 2>/dev/null || true)" == "$arg"* ]]; then

1
plugins/python-build/share/python-build/jython-2.7.0
View file

@ -1,4 +1,5 @@
require_java require_java
unrequire_python27
install_jar "jython-2.7.0" "https://repo1.maven.org/maven2/org/python/jython-installer/2.7.0/jython-installer-2.7.0.jar#b44352ece72382268a60e2848741c96609a91d796bb9a9c6ebeff62f0c12c9cf" jython install_jar "jython-2.7.0" "https://repo1.maven.org/maven2/org/python/jython-installer/2.7.0/jython-installer-2.7.0.jar#b44352ece72382268a60e2848741c96609a91d796bb9a9c6ebeff62f0c12c9cf" jython
case "$(pypy_architecture 2>/dev/null || true)" in case "$(pypy_architecture 2>/dev/null || true)" in

1
plugins/python-build/share/python-build/jython-2.7.1b1
View file

@ -1,4 +1,5 @@
require_java require_java
unrequire_python27
install_jar "jython-2.7.1b1" "https://repo1.maven.org/maven2/org/python/jython-installer/2.7.1b1/jython-installer-2.7.1b1.jar#c7a05911fed666c8f9df5bdce50bb5dc75482b7f6b1f1dbe433162d94c960ec3" jython install_jar "jython-2.7.1b1" "https://repo1.maven.org/maven2/org/python/jython-installer/2.7.1b1/jython-installer-2.7.1b1.jar#c7a05911fed666c8f9df5bdce50bb5dc75482b7f6b1f1dbe433162d94c960ec3" jython
case "$(pypy_architecture 2>/dev/null || true)" in case "$(pypy_architecture 2>/dev/null || true)" in

1
plugins/python-build/share/python-build/jython-2.7.1b2
View file

@ -1,4 +1,5 @@
require_java require_java
unrequire_python27
install_jar "jython-2.7.1b2" "https://repo1.maven.org/maven2/org/python/jython-installer/2.7.1b2/jython-installer-2.7.1b2.jar#d994500808c8d448baab1f98e043e6a11360cff302f401901e73f0e34c27251a" jython install_jar "jython-2.7.1b2" "https://repo1.maven.org/maven2/org/python/jython-installer/2.7.1b2/jython-installer-2.7.1b2.jar#d994500808c8d448baab1f98e043e6a11360cff302f401901e73f0e34c27251a" jython
case "$(pypy_architecture 2>/dev/null || true)" in case "$(pypy_architecture 2>/dev/null || true)" in

1
plugins/python-build/share/python-build/jython-2.7.1b3
View file

@ -1,4 +1,5 @@
require_java require_java
unrequire_python27
install_jar "jython-2.7.1b3" "https://repo1.maven.org/maven2/org/python/jython-installer/2.7.1b3/jython-installer-2.7.1b3.jar#5c6c7dc372a131dbc2b29b95407c69a4ebab22c1823d9098b7f993444f3090c5" jython install_jar "jython-2.7.1b3" "https://repo1.maven.org/maven2/org/python/jython-installer/2.7.1b3/jython-installer-2.7.1b3.jar#5c6c7dc372a131dbc2b29b95407c69a4ebab22c1823d9098b7f993444f3090c5" jython
case "$(pypy_architecture 2>/dev/null || true)" in case "$(pypy_architecture 2>/dev/null || true)" in

1
plugins/python-build/share/python-build/jython-dev
View file

@ -1,4 +1,5 @@
require_java require_java
unrequire_python27
install_hg "jython-dev" "https://hg.python.org/jython" "default" jython_builder ez_setup install_hg "jython-dev" "https://hg.python.org/jython" "default" jython_builder ez_setup
# pip (>= 1.3) does not work properly since it uses HTTPS for downloads # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
# * https://github.com/yyuu/pyenv/issues/15 # * https://github.com/yyuu/pyenv/issues/15