From cfb76b9a0beca231ecb0935276d7111605dfd92b Mon Sep 17 00:00:00 2001 From: Daniel Berg Date: Sat, 24 Jul 2021 18:27:37 +0200 Subject: [PATCH] Move tac/tail logic to function to avoid eval --- scripts/fuzzback.sh | 12 ++++++++++-- scripts/helpers.sh | 6 ------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/fuzzback.sh b/scripts/fuzzback.sh index 8a9b1a6..8eecf01 100755 --- a/scripts/fuzzback.sh +++ b/scripts/fuzzback.sh @@ -38,6 +38,14 @@ fzf_popup_cmd() { --print-query } +rev_cmd() { + if cmd_exists tac;then + tac + else + tail -r + fi +} + cursor_up() { local line_number line_number="$1" @@ -212,7 +220,7 @@ create_head_file() { head_filename="$(get_head_filename)" capture_filename="$(get_capture_filename)" head -n "$head_n" < "$capture_filename" \ - | eval "$REV_CMD" \ + | rev_cmd \ | nl -b 'a' -s ':' \ | sed 's/^/1:/' \ | sed '1s/$//' \ @@ -232,7 +240,7 @@ create_tail_file() { echo "$trimmed" > "$tail_filename" else nl -b 'a' -s ':' < "$tmp_filename" \ - | eval "$REV_CMD" \ + | rev_cmd \ | sed 's/^/-1:/' \ | sed 's/$//' \ > "$tail_filename" diff --git a/scripts/helpers.sh b/scripts/helpers.sh index a2d6087..a8a7b4d 100644 --- a/scripts/helpers.sh +++ b/scripts/helpers.sh @@ -10,12 +10,6 @@ if cmd_exists gawk; then AWK_CMD='gawk' fi -REV_CMD="tac" -if ! cmd_exists tac; then - REV_CMD="tail -r" -fi - - # returns a string unique to current pane # sed removes `$` sign because `session_id` contains is _pane_unique_id() {