From 1cca9e4b72b106374f203890b266f18609deefe3 Mon Sep 17 00:00:00 2001 From: Arun Prakash Jana Date: Fri, 22 Nov 2019 02:14:25 +0530 Subject: shellcheck fixes --- plugins/ndiff | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/ndiff') diff --git a/plugins/ndiff b/plugins/ndiff index f5ca0dc..3680627 100755 --- a/plugins/ndiff +++ b/plugins/ndiff @@ -10,14 +10,14 @@ selection=${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.selection -if [ -s $selection ]; then +if [ -s "$selection" ]; then arr=$(tr '\0' '\n' < "$selection") if [ "$(echo "$arr" | wc -l)" -gt 1 ]; then f1="$(echo "$arr" | sed -n '1p')" f2="$(echo "$arr" | sed -n '2p')" if [ -d "$f1" ] && [ -d "$f2" ]; then - dir1=$(mktemp "${TMPDIR:-/tmp}"/nnn-$(basename "$f1").XXXXXXXX) - dir2=$(mktemp "${TMPDIR:-/tmp}"/nnn-$(basename "$f2").XXXXXXXX) + dir1=$(mktemp "${TMPDIR:-/tmp}"/nnn-"$(basename "$f1")".XXXXXXXX) + dir2=$(mktemp "${TMPDIR:-/tmp}"/nnn-"$(basename "$f2")".XXXXXXXX) ls -A1 "$f1" > "$dir1" ls -A1 "$f2" > "$dir2" vimdiff "$dir1" "$dir2" @@ -27,7 +27,7 @@ if [ -s $selection ]; then # Vim: Warning: Input is not from a terminal # xargs -0 -o vimdiff < $selection - xargs -0 vimdiff +0 < $selection + xargs -0 vimdiff +0 < "$selection" fi else echo "needs at least 2 files or directories selected for comparison" -- cgit v1.2.3-70-g09d2