From ff87489be81049567148bb7a1e453cb3fd536ca3 Mon Sep 17 00:00:00 2001 From: Valentin Lab Date: Fri, 19 Mar 2021 19:16:48 +0100 Subject: [PATCH] chg: [rsync-backup-target] use color when outputing diff when available Signed-off-by: Valentin Lab --- rsync-backup-target/resources/bin/compose-add-rsync-key | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rsync-backup-target/resources/bin/compose-add-rsync-key b/rsync-backup-target/resources/bin/compose-add-rsync-key index ffd76ac..5be9ff6 100755 --- a/rsync-backup-target/resources/bin/compose-add-rsync-key +++ b/rsync-backup-target/resources/bin/compose-add-rsync-key @@ -125,8 +125,11 @@ EOF exit 1 fi echo "${WHITE}Applying these changes:${NORMAL}" - echo "$diff" - + if type -p colordiff >/dev/null; then + colordiff -u "$compose_file" <(echo "$content") + else + echo "$diff" + fi | egrep -v "^[^ ]*(---|\+\+\+)" cp "$compose_file" "${compose_file}.old" echo "$content" > "$compose_file"