mirrors/rbenv-ruby-build
1
0
Fork 0
mirror of https://github.com/rbenv/ruby-build.git synced 2025-11-27 14:20:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

fixed conflict with upstream

Browse source
This commit is contained in:
SHIBATA Hiroshi 2015-04-19 18:26:39 +09:00
commit a5bc77ad77
1 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
bin/ruby-build
View file

@ -6,6 +6,8 @@
# -k/--keep Do not remove source tree after installation
# -v/--verbose Verbose mode: print compilation status to stdout
# -p/--patch Apply a patch from stdin before building
# -4/--ipv4 Resolve names to IPv4 addresses only
# -6/--ipv6 Resolve names to IPv6 addresses only
# --definitions List all built-in definitions
#
@ -284,19 +286,31 @@ http() {
}
http_head_curl() {
curl -qsILf "$1" >&4 2>&1
options=""
[ -n "${IPV4}" ] && options="--ipv4"
[ -n "${IPV6}" ] && options="--ipv6"
curl -qsILf ${options} "$1" >&4 2>&1
}
http_get_curl() {
curl -q -o "${2:--}" -sSLf "$1"
options=""
[ -n "${IPV4}" ] && options="--ipv4"
[ -n "${IPV6}" ] && options="--ipv6"
curl -q -o "${2:--}" -sSLf ${options} "$1"
}
http_head_wget() {
wget -q --spider "$1" >&4 2>&1
options=""
[ -n "${IPV4}" ] && options="--inet4-only"
[ -n "${IPV6}" ] && options="--inet6-only"
wget -q --spider ${options} "$1" >&4 2>&1
}
http_get_wget() {
wget -nv -O "${2:--}" "$1"
options=""
[ -n "${IPV4}" ] && options="--inet4-only"
[ -n "${IPV6}" ] && options="--inet6-only"
wget -nv ${options} -O "${2:--}" "$1"
}
fetch_tarball() {
@ -1004,6 +1018,8 @@ sort_versions() {
unset VERBOSE
unset KEEP_BUILD_PATH
unset HAS_PATCH
unset IPV4
unset IPV6
RUBY_BUILD_INSTALL_PREFIX="$(abs_dirname "$0")/.."
@ -1033,6 +1049,12 @@ for option in "${OPTIONS[@]}"; do
"p" | "patch" )
HAS_PATCH=true
;;
"4" | "ipv4")
IPV4=true
;;
"6" | "ipv6")
IPV6=true
;;
"version" )
version
exit 0