From 2d6abb037cbbea75d924ff98027c92b9ba8b7d48 Mon Sep 17 00:00:00 2001 From: Alexander Tomokhov Date: Tue, 12 Dec 2023 12:40:43 +0400 Subject: [PATCH] turn off green color after printing OK --- enable-service.sh | 2 +- nixos-rebuild.sh | 2 +- query-services-state.sh | 2 +- systemctl-failed.sh | 5 ++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/enable-service.sh b/enable-service.sh index a5afec1..c9e4039 100755 --- a/enable-service.sh +++ b/enable-service.sh @@ -71,7 +71,7 @@ jq <<<"$sorted_response" if diff -w -u --color <(printf "%s\n" "$EXPECTED_RESPONSE") <(printf "%s\n" "$sorted_response") 2>/dev/null then - echo -e "\e[1;32mOK" + echo -e "\e[1;32mOK\e[0m" else echo -e "\e[1;31mFAIL: response does not match!" jd -color <(printf "%s\n" "$EXPECTED_RESPONSE") <(printf "%s" "$sorted_response") diff --git a/nixos-rebuild.sh b/nixos-rebuild.sh index 7c6be09..d0c76bd 100755 --- a/nixos-rebuild.sh +++ b/nixos-rebuild.sh @@ -58,7 +58,7 @@ jq <<<"$sorted_response" if diff -w -u --color <(printf "%s\n" "$EXPECTED_RESPONSE") <(printf "%s\n" "$sorted_response") 2>/dev/null then - echo -e "\e[1;32mOK" + echo -e "\e[1;32mOK\e[0m" else echo -e "\e[1;31mFAIL: response does not match!" jd -color <(printf "%s\n" "$EXPECTED_RESPONSE") <(printf "%s" "$sorted_response") diff --git a/query-services-state.sh b/query-services-state.sh index c39c72b..484a21e 100755 --- a/query-services-state.sh +++ b/query-services-state.sh @@ -39,7 +39,7 @@ jq <<<"$received_response" if diff -w -u --color "$EXPECTED_RESPONSE_FILE" <(printf "%s\n" "$received_response") 2>/dev/null then - echo -e "\e[1;32mOK" + echo -e "\e[1;32mOK\e[0m" else echo -e "\e[1;31mFAIL: response does not match!" jd -color "$EXPECTED_RESPONSE_FILE" <(printf "%s" "$received_response") diff --git a/systemctl-failed.sh b/systemctl-failed.sh index 5622693..7b7b700 100755 --- a/systemctl-failed.sh +++ b/systemctl-failed.sh @@ -4,7 +4,7 @@ set -o pipefail set -o errexit set -o nounset -: ${DOMAIN:?specify domain name} +: "${DOMAIN:?specify domain name}" EXPECTED_RESPONSE="[]" received_response="$(\ @@ -15,7 +15,7 @@ jq . <(printf "%s" "$received_response") if diff --color <(printf "%s\n" "$EXPECTED_RESPONSE") <(printf "%s\n" "$received_response") 2>/dev/null then - echo -e "\e[1;32mOK" + echo -e "\e[1;32mOK\e[0m" else echo -e "\e[1;31mFAIL: response does not match!" if type jd > /dev/null; then @@ -26,4 +26,3 @@ else fi exit 1 fi -