From af454a32dc943a92125021690309086a17bd6802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mislav=20Marohni=C4=87?= Date: Wed, 23 Oct 2019 12:12:38 +0200 Subject: [PATCH] Silence errors when piping `type | head -1` --- libexec/rbenv | 2 +- libexec/rbenv-help | 12 +++++++----- libexec/rbenv-hooks | 2 +- libexec/rbenv-versions | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/libexec/rbenv b/libexec/rbenv index 4880df38..a1b9d69f 100755 --- a/libexec/rbenv +++ b/libexec/rbenv @@ -28,7 +28,7 @@ if enable -f "${BASH_SOURCE%/*}"/../libexec/rbenv-realpath.dylib realpath 2>/dev else [ -z "$RBENV_NATIVE_EXT" ] || abort "failed to load \`realpath' builtin" - READLINK=$(type -p greadlink readlink | head -1) + READLINK=$(type -p greadlink readlink 2>/dev/null | head -1) [ -n "$READLINK" ] || abort "cannot find readlink - are you missing GNU coreutils?" resolve_link() { diff --git a/libexec/rbenv-help b/libexec/rbenv-help index d1296d62..5b3af232 100755 --- a/libexec/rbenv-help +++ b/libexec/rbenv-help @@ -42,13 +42,15 @@ extract_initial_comment_block() { } collect_documentation() { - local all_awks - local first_awk - all_awks=$(type -p gawk awk) - first_awk=$(head -1 <<<"$all_awks") + local awk + awk="$(type -p gawk awk 2>/dev/null | head -1)" + if [ -z "$awk" ]; then + echo "rbenv: cannot find awk" >&2 + return 1 + fi # shellcheck disable=SC2016 - "$first_awk" ' + "$awk" ' /^Summary:/ { summary = substr($0, 10) next diff --git a/libexec/rbenv-hooks b/libexec/rbenv-hooks index 010c7058..64334cc7 100755 --- a/libexec/rbenv-hooks +++ b/libexec/rbenv-hooks @@ -26,7 +26,7 @@ if ! enable -f "${BASH_SOURCE%/*}"/rbenv-realpath.dylib realpath 2>/dev/null; th echo "rbenv: failed to load \`realpath' builtin" >&2 exit 1 fi -READLINK=$(type -p greadlink readlink | head -1) +READLINK=$(type -p greadlink readlink 2>/dev/null | head -1) if [ -z "$READLINK" ]; then echo "rbenv: cannot find readlink - are you missing GNU coreutils?" >&2 exit 1 diff --git a/libexec/rbenv-versions b/libexec/rbenv-versions index d1a110ce..21a9bdf2 100755 --- a/libexec/rbenv-versions +++ b/libexec/rbenv-versions @@ -33,7 +33,7 @@ if ! enable -f "${BASH_SOURCE%/*}"/rbenv-realpath.dylib realpath 2>/dev/null; th exit 1 fi - READLINK=$(type -p greadlink readlink | head -1) + READLINK=$(type -p greadlink readlink 2>/dev/null | head -1) if [ -z "$READLINK" ]; then echo "rbenv: cannot find readlink - are you missing GNU coreutils?" >&2 exit 1