From ffec23aabd84e231e0f0f1d76e9f7f8f3e4fa64e Mon Sep 17 00:00:00 2001 From: Rosie Date: Mon, 11 Mar 2024 20:36:30 +0000 Subject: [PATCH] Make shell colors work on both sh and bash --- make.sh | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/make.sh b/make.sh index 9172afd..ba5e7d7 100644 --- a/make.sh +++ b/make.sh @@ -1,22 +1,31 @@ #!/bin/sh +type=$(ps -p $$ -o comm=) yellow='\033[93m' green='\033[92m' red='\033[91m' endc='\033[0m' +print() { + if [ "$type" = "bash" ]; then + echo -e "$1" + else + echo "$1" + fi +} + doing() { - echo -e "$yellow[*] $1...$endc" + print "$yellow[*] $1...$endc" } finished() { - lowercase=$(echo -e "$1" | tr '[:upper:]' '[:lower:]') - echo -e "$green[+] Done $lowercase!$endc" + lowercase=$(print "$1" | tr '[:upper:]' '[:lower:]') + print "$green[+] Done $lowercase!$endc" } failed() { - lowercase=$(echo -e "$1" | tr '[:upper:]' '[:lower:]') - echo -e "$red[-] Failed $lowercase!$endc" + lowercase=$(print "$1" | tr '[:upper:]' '[:lower:]') + print "$red[-] Failed $lowercase!$endc" exit 1 }