Merge branch 'okkez-specify-inet-protocol' (e9d25d0f) · Commits · mirror / rbenv / ruby-build mirror

bin/ruby-build

+26 −4

Original line number	Diff line number	Diff line
		@@ -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