From 135821aa521cd3120c18681d57785ebefc78fe81 Mon Sep 17 00:00:00 2001 From: lvgx Date: Thu, 28 May 2020 01:34:53 +0200 Subject: [PATCH] preview-tui: directly call $PAGER on text files (#599) --- plugins/preview-tui | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/plugins/preview-tui b/plugins/preview-tui index b156cacf..7872b07e 100755 --- a/plugins/preview-tui +++ b/plugins/preview-tui @@ -25,35 +25,36 @@ TERMINAL="${TERMINAL:-xterm}" PAGER="${PAGER:-less}" preview_file () { - kill %- %+ 2>/dev/null + kill "$(jobs -p)" 2>/dev/null clear - # prevent shell pipe reuse - tmpfifopath="${TMPDIR:-/tmp}/nnn-preview-tui-fifo.$$" - mkfifo "$tmpfifopath" || return - encoding="$(file -b --mime-encoding "$1")" - $PAGER < "$tmpfifopath" & + if [ -d "$1" ]; then + # Print directory tree - ( - exec > "$tmpfifopath" + cd "$1" || return - if [ -d "$1" ]; then - # Print directory tree - cd "$1" && tree - elif [ "$encoding" = "binary" ] ; then - # Binary file: just print filetype info - echo "-------- Binary file --------" - file -b "$1" - else - # Text file: - cat "$1" - fi & + # we use a FIFO to access less PID + tmpfifopath="${TMPDIR:-/tmp}/nnn-preview-tui-fifo.$$" + mkfifo "$tmpfifopath" || return - ) + $PAGER < "$tmpfifopath" & - rm "$tmpfifopath" + ( + exec > "$tmpfifopath" + tree& + ) + + rm "$tmpfifopath" + elif [ "$encoding" = "binary" ] ; then + # Binary file: just print filetype info + echo "-------- Binary file --------" + file -b "$1" + else + # Text file: + $PAGER "$1" & + fi } if [ "$PREVIEW_MODE" ] ; then