setop/pyenv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Import recent changes from ruby-build 20140420

Browse Source
This commit is contained in:
Yamashita Yuu 2014-05-01 13:13:40 +09:00
parent 0c81002220
commit 149a915770
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/python-build/bin/pyenv-install
View File

@ -45,7 +45,7 @@ usage() {
definitions() { definitions() {
local query="$1" local query="$1"
python-build --definitions | grep -F "$query" || true python-build --definitions | $(type -p ggrep grep | head -1) -F "$query" || true
} }
indent() { indent() {

5
plugins/python-build/bin/python-build
View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
PYTHON_BUILD_VERSION="20140408" PYTHON_BUILD_VERSION="20140420"
set -E set -E
exec 3<&2 # preserve original stderr at fd 3 exec 3<&2 # preserve original stderr at fd 3
@ -284,7 +284,8 @@ fetch_tarball() {
fi fi
if ! reuse_existing_tarball "$package_filename" "$checksum"; then if ! reuse_existing_tarball "$package_filename" "$checksum"; then
echo "Downloading ${package_filename}..." >&2 local tarball_filename=$(basename $package_url)
echo "Downloading ${tarball_filename}..." >&2
http head "$mirror_url" && http head "$mirror_url" &&
download_tarball "$mirror_url" "$package_filename" "$checksum" || download_tarball "$mirror_url" "$package_filename" "$checksum" ||
download_tarball "$package_url" "$package_filename" "$checksum" download_tarball "$package_url" "$package_filename" "$checksum"

2
plugins/python-build/test/test_helper.bash
View File

@ -115,7 +115,7 @@ assert_output() {
assert_output_contains() { assert_output_contains() {
local expected="$1" local expected="$1"
echo "$output" | grep -F "$expected" >/dev/null || { echo "$output" | $(type -p ggrep grep | head -1) -F "$expected" >/dev/null || {
{ echo "expected output to contain $expected" { echo "expected output to contain $expected"
echo "actual: $output" echo "actual: $output"
} | flunk } | flunk