mirrors/rbenv-ruby-build
1
0
Fork 0
mirror of https://github.com/rbenv/ruby-build.git synced 2025-09-18 15:11:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Simplify printing various error messages to stderr

Browse source 
There is no need to redirect to &3 to most cases anymore: &2 will suffice.

Also, it is better to print failure errors like checksum mismatches to
stderr instead of to the log file at &4.
This commit is contained in:
Mislav Marohnić 2023-11-07 11:03:53 +01:00
parent 5d1bebaccc
commit ff4f335cb1
No known key found for this signature in database
1 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
bin/ruby-build
View file

@ -369,7 +369,7 @@ verify_checksum() {
echo "unexpected checksum length: ${#expected_checksum} (${expected_checksum})" echo "unexpected checksum length: ${#expected_checksum} (${expected_checksum})"
echo "expected 0 (no checksum), 32 (MD5), or 64 (SHA2-256)" echo "expected 0 (no checksum), 32 (MD5), or 64 (SHA2-256)"
echo echo
} >&4 } >&2
return 1 ;; return 1 ;;
esac esac
@ -386,7 +386,7 @@ verify_checksum() {
echo "checksum mismatch: ${filename} (file is corrupt)" echo "checksum mismatch: ${filename} (file is corrupt)"
echo "expected $expected_checksum, got $computed_checksum" echo "expected $expected_checksum, got $computed_checksum"
echo echo
} >&4 } >&2
return 1 return 1
fi fi
} }
@ -396,7 +396,7 @@ http() {
[ -n "$2" ] || return 1 [ -n "$2" ] || return 1
shift 1 shift 1
RUBY_BUILD_HTTP_CLIENT="${RUBY_BUILD_HTTP_CLIENT:-$(detect_http_client 2>&3)}" RUBY_BUILD_HTTP_CLIENT="${RUBY_BUILD_HTTP_CLIENT:-$(detect_http_client)}"
[ -n "$RUBY_BUILD_HTTP_CLIENT" ] || return 1 [ -n "$RUBY_BUILD_HTTP_CLIENT" ] || return 1
# http_get_curl, http_get_wget, etc. # http_get_curl, http_get_wget, etc.
@ -474,7 +474,7 @@ fetch_tarball() {
if [ "$package_url" != "${package_url%bz2}" ]; then if [ "$package_url" != "${package_url%bz2}" ]; then
if ! type -p bzip2 >/dev/null; then if ! type -p bzip2 >/dev/null; then
echo "warning: bzip2 not found; consider installing \`bzip2\` package" >&4 echo "warning: bzip2 not found; consider installing the \`bzip2\` package" >&2
fi fi
package_filename="${package_filename%.gz}.bz2" package_filename="${package_filename%.gz}.bz2"
tar_args="${tar_args/z/j}" tar_args="${tar_args/z/j}"
@ -619,7 +619,7 @@ build_package_warn_eol() {
echo "WARNING: $package_name is past its end of life and is now unsupported." echo "WARNING: $package_name is past its end of life and is now unsupported."
echo "It no longer receives bug fixes or critical security updates." echo "It no longer receives bug fixes or critical security updates."
echo echo
} >&3 } >&2
} }
build_package_warn_unsupported() { build_package_warn_unsupported() {
@ -629,7 +629,7 @@ build_package_warn_unsupported() {
echo "WARNING: $package_name is nearing its end of life." echo "WARNING: $package_name is nearing its end of life."
echo "It only receives critical security updates, no bug fixes." echo "It only receives critical security updates, no bug fixes."
echo echo
} >&3 } >&2
} }
build_package_standard_build() { build_package_standard_build() {
@ -903,10 +903,11 @@ clean_prefix_path_truffleruby() {
if [ -d "$PREFIX_PATH" ] && if [ -d "$PREFIX_PATH" ] &&
[ ! -e "$PREFIX_PATH/bin/truffleruby" ] && [ ! -e "$PREFIX_PATH/bin/truffleruby" ] &&
[ -n "$(ls -A "$PREFIX_PATH")" ]; then [ -n "$(ls -A "$PREFIX_PATH")" ]; then
echo { echo
echo "ERROR: cannot install TruffleRuby to $PREFIX_PATH, which does not look like a valid TruffleRuby prefix" >&2 echo "ERROR: cannot install TruffleRuby to $PREFIX_PATH, which does not look like a valid TruffleRuby prefix."
echo "TruffleRuby only supports being installed to a not existing directory, an empty directory, or replacing an existing TruffleRuby installation" echo "TruffleRuby only supports being installed to a not existing directory, an empty directory, or replacing an existing TruffleRuby installation."
echo "See https://github.com/oracle/truffleruby/issues/1389 for details" >&2 echo "See https://github.com/oracle/truffleruby/issues/1389 for details"
} >&2
return 1 return 1
fi fi
@ -940,9 +941,9 @@ require_java() {
local found_version="${nums[0]}" local found_version="${nums[0]}"
[ "$found_version" -gt 1 ] 2>/dev/null || found_version="${nums[1]}" [ "$found_version" -gt 1 ] 2>/dev/null || found_version="${nums[1]}"
[ "$found_version" -ge "$required" ] 2>/dev/null && return 0 [ "$found_version" -ge "$required" ] 2>/dev/null && return 0
colorize 1 "ERROR" >&3 { colorize 1 "ERROR"
echo ": Java >= ${required} required, but your Java version was:" >&3 printf ": Java >= %s required, but your Java version was:\n%s\n" "$required" "$java_version"
cat <<<"$java_version" >&3 } >&2
return 1 return 1
} }
@ -1150,7 +1151,9 @@ use_homebrew_openssl() {
log_notice "using openssl@1.1 from homebrew" log_notice "using openssl@1.1 from homebrew"
package_option ruby configure --with-openssl-dir="$ssldir" package_option ruby configure --with-openssl-dir="$ssldir"
else else
colorize 1 "ERROR openssl@1.1 from Homebrew is required, run 'brew install openssl@1.1'" { colorize 1 "ERROR"
echo ": openssl@1.1 from Homebrew is required; run: brew install openssl@1.1"
} >&2
return 1 return 1
fi fi
} }