commit 8f351d8d005f023b5b9b8d60bce73be1d704e2a2 parent ff1b4d108508b84e10f98def68382af891368fc0 Author: Jacob R. Edwards <n/a> Date: Thu, 17 Nov 2022 10:27:16 -0600 Simplify ddiff Diffstat:
| M | local/bin/bin/ddiff | | | 10 | +++++----- |
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/local/bin/bin/ddiff b/local/bin/bin/ddiff @@ -2,9 +2,9 @@ # Copyright 2021 Jacob R. Edwards # Directory listing diff -tmp="$(mktemp -t ddiff-XXXXXXXXXX)" +tmp="$(mktemp -dt ddiff-XXXXXXXXXX)" -cleanup() rm -f "$tmp" +cleanup() rm -rf "$tmp" list() { find "$1" -not -type d | cut -c $(expr ${#1} + 1)- @@ -12,7 +12,7 @@ list() { trap cleanup 0 -list "${1%%/}/" >"$tmp" -list "${2%%/}/" | diff -u "$tmp" /dev/stdin | - sed -e "s!^--- [^ ]*!--- $1!" -e "s!^+++ [^ ]*!+++ $2!" +list "${1%%/}/" >"$tmp/a" +list "${2%%/}/" >"$tmp/b" +diff -u "$tmp/a" "$tmp/b" | sed -e "s!^--- [^ ]*!--- $1!" -e "s!^+++ [^ ]*!+++ $2!" # exit with diff's status