From 70c7509343252c6a792a83a71f7287f6d0ce73ad Mon Sep 17 00:00:00 2001 From: Ethan P Date: Fri, 2 Apr 2021 16:23:53 -0700 Subject: [PATCH] batwatch: Disable bat's pager (#23) --- src/batwatch.sh | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/batwatch.sh b/src/batwatch.sh index 4406a64..f787fb6 100755 --- a/src/batwatch.sh +++ b/src/batwatch.sh @@ -11,7 +11,6 @@ source "${LIB}/constants.sh" source "${LIB}/opt.sh" source "${LIB}/opt_hook_color.sh" source "${LIB}/opt_hook_help.sh" -source "${LIB}/opt_hook_pager.sh" source "${LIB}/opt_hook_version.sh" source "${LIB}/opt_hook_width.sh" source "${LIB}/print.sh" @@ -20,7 +19,6 @@ source "${LIB}/pager.sh" # Init: # ----------------------------------------------------------------------------- hook_color -hook_pager hook_version hook_width hook_help @@ -46,7 +44,7 @@ watcher_entr_watch() { ENTR_ARGS+=('-c') fi - pager_exec entr "${ENTR_ARGS[@]}" \ + entr "${ENTR_ARGS[@]}" \ "$EXECUTABLE_BAT" "${BAT_ARGS[@]}" \ --terminal-width="$OPT_TERMINAL_WIDTH" \ --paging=never \ @@ -109,7 +107,7 @@ watcher_poll_watch() { if "$modified"; then modified=false clear - pager_exec "$EXECUTABLE_BAT" "${BAT_ARGS[@]}" \ + "$EXECUTABLE_BAT" "${BAT_ARGS[@]}" \ --terminal-width="$OPT_TERMINAL_WIDTH" \ --paging=never \ "${files[@]}" @@ -165,7 +163,7 @@ determine_watcher() { # ----------------------------------------------------------------------------- # Options: # ----------------------------------------------------------------------------- -BAT_ARGS=() +BAT_ARGS=(--paging=never) FILES=() FILES_HAS_DIRECTORY=false OPT_MODE=file @@ -280,7 +278,7 @@ else main() { while true; do clear - "${FILES[@]}" 2>&1 | bat + "${FILES[@]}" 2>&1 | "$EXECUTABLE_BAT" "${BAT_ARGS[@]}" sleep "${OPT_INTERVAL}" || exit 1 done }