nmv: ensure the tmpfile is cleaned up in all cases

currently, there's a couple exit paths where the tmpfile doesn't get
cleaned up.
This commit is contained in:
NRK 2023-02-19 21:14:53 +06:00
parent b49cc28d80
commit bc6a09475d
1 changed files with 3 additions and 3 deletions

View File

@ -37,8 +37,6 @@ esac
exit_status=0
dst_file=$(mktemp "$TMPDIR/.nnnXXXXXX")
if nnn_use_selection "Rename"; then
# shellcheck disable=SC2154
arr=$(tr '\0' '\n' < "$selection")
@ -65,6 +63,9 @@ fi
lines=$(printf "%s\n" "$arr" | wc -l)
width=${#lines}
dst_file=$(mktemp "$TMPDIR/.nnnXXXXXX")
trap 'rm -f "$dst_file"' EXIT
printf "%s" "$arr" | awk '{printf("%'"${width}"'d %s\n", NR, $0)}' > "$dst_file"
items=("~")
@ -170,5 +171,4 @@ for item in "${items[@]}"; do
$RM_UTIL "$item"
done
rm "$dst_file"
exit $exit_status