extern/bat-extras
1
0
Fork 0
mirror of https://github.com/eth-p/bat-extras.git synced 2025-06-21 04:07:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

lib: Fix issue when pagers read an empty argument as a file

Browse Source
This commit is contained in:
Ethan P 2020-05-01 23:03:59 -07:00
parent d29915f141
commit 20a0058014
No known key found for this signature in database
GPG Key ID: 6963FD04F6CF35EA
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/pager.sh
View File

@ -36,15 +36,13 @@ pager_version() {
# Example: # Example:
# pager_exec echo hi # pager_exec echo hi
pager_exec() { pager_exec() {
if [[ -n "$1" ]]; then
if [[ -n "$SCRIPT_PAGER_CMD" ]]; then if [[ -n "$SCRIPT_PAGER_CMD" ]]; then
"$@" | "${SCRIPT_PAGER_CMD[@]}" "${SCRIPT_PAGER_ARGS[@]}" "$@" | pager_display
return $? return $?
else else
"$@" "$@"
return $? return $?
fi fi
fi
} }
# Displays the output of a command or function inside the pager (if it exists). # Displays the output of a command or function inside the pager (if it exists).
@ -53,7 +51,7 @@ pager_exec() {
# bat | pager_display # bat | pager_display
pager_display() { pager_display() {
if [[ -n "$SCRIPT_PAGER_CMD" ]]; then if [[ -n "$SCRIPT_PAGER_CMD" ]]; then
if [[ -n "$SCRIPT_PAGER_CMD" ]]; then if [[ -n "$SCRIPT_PAGER_ARGS" ]]; then
"${SCRIPT_PAGER_CMD[@]}" "${SCRIPT_PAGER_ARGS[@]}" "${SCRIPT_PAGER_CMD[@]}" "${SCRIPT_PAGER_ARGS[@]}"
return $? return $?
else else