From 20a0058014b76a0527ede33a40a4cccfdd8f8707 Mon Sep 17 00:00:00 2001 From: Ethan P Date: Fri, 1 May 2020 23:03:59 -0700 Subject: [PATCH] lib: Fix issue when pagers read an empty argument as a file --- lib/pager.sh | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/lib/pager.sh b/lib/pager.sh index da66264..0de84fb 100644 --- a/lib/pager.sh +++ b/lib/pager.sh @@ -36,14 +36,12 @@ pager_version() { # Example: # pager_exec echo hi pager_exec() { - if [[ -n "$1" ]]; then - if [[ -n "$SCRIPT_PAGER_CMD" ]]; then - "$@" | "${SCRIPT_PAGER_CMD[@]}" "${SCRIPT_PAGER_ARGS[@]}" - return $? - else - "$@" - return $? - fi + if [[ -n "$SCRIPT_PAGER_CMD" ]]; then + "$@" | pager_display + return $? + else + "$@" + return $? fi } @@ -53,7 +51,7 @@ pager_exec() { # bat | pager_display pager_display() { if [[ -n "$SCRIPT_PAGER_CMD" ]]; then - if [[ -n "$SCRIPT_PAGER_CMD" ]]; then + if [[ -n "$SCRIPT_PAGER_ARGS" ]]; then "${SCRIPT_PAGER_CMD[@]}" "${SCRIPT_PAGER_ARGS[@]}" return $? else