preview-tui: directly call $PAGER on text files (jarun#599)

shaun-mathew · May 27, 2020 · 135821a · 135821a
1 parent bbcd89c
commit 135821a
Showing 1 changed file with 22 additions and 21 deletions.
diff --git 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
+
+        cd "$1" || return
 
-    (
-        exec > "$tmpfifopath"
+        # we use a FIFO to access less PID
+        tmpfifopath="${TMPDIR:-/tmp}/nnn-preview-tui-fifo.$$"
+        mkfifo "$tmpfifopath" || 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 &
+        $PAGER < "$tmpfifopath" &
 
-    )
+        (
+            exec > "$tmpfifopath"
+            tree&
+        )
 
-    rm "$tmpfifopath"
+        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