From 4cd011e0a2099aa52a47cd0e43f58b586c58cfa7 Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Tue, 12 Dec 2023 13:04:03 +0400 Subject: [PATCH] diff --color=always --- enable-service.sh | 2 +- nixos-rebuild.sh | 2 +- query-services-state.sh | 2 +- systemctl-failed.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/enable-service.sh b/enable-service.sh index c9e4039..5d82045 100755 --- a/enable-service.sh +++ b/enable-service.sh @@ -69,7 +69,7 @@ sorted_response="$(jq --sort-keys <<<"$received_response")" \ jq <<<"$sorted_response" -if diff -w -u --color <(printf "%s\n" "$EXPECTED_RESPONSE") <(printf "%s\n" "$sorted_response") 2>/dev/null +if diff -w -u --color=always <(printf "%s\n" "$EXPECTED_RESPONSE") <(printf "%s\n" "$sorted_response") 2>/dev/null then echo -e "\e[1;32mOK\e[0m" else diff --git a/nixos-rebuild.sh b/nixos-rebuild.sh index d0c76bd..5905b54 100755 --- a/nixos-rebuild.sh +++ b/nixos-rebuild.sh @@ -56,7 +56,7 @@ sorted_response="$(jq --sort-keys <<<"$received_response")" \ jq <<<"$sorted_response" -if diff -w -u --color <(printf "%s\n" "$EXPECTED_RESPONSE") <(printf "%s\n" "$sorted_response") 2>/dev/null +if diff -w -u --color=always <(printf "%s\n" "$EXPECTED_RESPONSE") <(printf "%s\n" "$sorted_response") 2>/dev/null then echo -e "\e[1;32mOK\e[0m" else diff --git a/query-services-state.sh b/query-services-state.sh index 484a21e..5cd5d27 100755 --- a/query-services-state.sh +++ b/query-services-state.sh @@ -37,7 +37,7 @@ received_response="$(curl --show-error -s "https://api.$DOMAIN/graphql" \ jq <<<"$received_response" -if diff -w -u --color "$EXPECTED_RESPONSE_FILE" <(printf "%s\n" "$received_response") 2>/dev/null +if diff -w -u --color=always "$EXPECTED_RESPONSE_FILE" <(printf "%s\n" "$received_response") 2>/dev/null then echo -e "\e[1;32mOK\e[0m" else diff --git a/systemctl-failed.sh b/systemctl-failed.sh index 7b7b700..8290e07 100755 --- a/systemctl-failed.sh +++ b/systemctl-failed.sh @@ -13,7 +13,7 @@ received_response="$(\ jq . <(printf "%s" "$received_response") -if diff --color <(printf "%s\n" "$EXPECTED_RESPONSE") <(printf "%s\n" "$received_response") 2>/dev/null +if diff --color=always <(printf "%s\n" "$EXPECTED_RESPONSE") <(printf "%s\n" "$received_response") 2>/dev/null then echo -e "\e[1;32mOK\e[0m" else