Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

User/hshami/color code output #35

Merged
merged 3 commits into from
Jun 15, 2021
Merged

User/hshami/color code output #35

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fe7ae29
error is red, info is green
mhshami01 Jun 14, 2021
ea2ae34
one more redirect
mhshami01 Jun 14, 2021
81ace1d
ensure consistent background
mhshami01 Jun 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 22 additions & 6 deletions src/utils.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,23 @@
declare -A flag_to_variable_dict

# output color indicators
BLACK_BG=$(echo -en "\e[40m")
RED_BG=$(echo -en "\e[41m")
GREEN_BG=$(echo -en "\e[42m")
MAGENTA_BG=$(echo -en "\e[45m")
WHITE_BG=$(echo -en "\e[47m")

RED=$(echo -en "\e[31m")
GREEN=$(echo -en "\e[32m")
MAGENTA=$(echo -en "\e[35m")
DEFAULT=$(echo -en "\e[00m")
BOLD=$(echo -en "\e[01m")
BLACK=$(echo -en "\e[30m")

BOLD=$(echo -en "\e[1m")
ITALIC=$(echo -en "\e[3m")
UNDERLINE=$(echo -en "\e[4m")
BLINK=$(echo -en "\e[5m")
REVERSE=$(echo -en "\e[7m")

# OPT_IN - set to true if the user opts in for sending telemetry information to us.
OPT_IN=false
Expand Down Expand Up @@ -217,7 +228,7 @@ log() {

#
function announce_my_log_file() {
printf '\n------\n%s%s%s%s%s\n------\n\n' "$GREEN" "$BOLD" "$BLINK" "$1 '$2'" "$DEFAULT"
printf '\n------\n%s%s%s%s%s\n------\n\n' "$BOLD" "$REVERSE" "$GREEN" "$1 '$2'" "$DEFAULT"
}

#
Expand All @@ -243,12 +254,12 @@ log_init() {

#
log_error() {
log "ERR" "$@"
log "${BLACK_BG}${RED}ERR${DEFAULT}" "$@"
}

#
log_info() {
log "INFO" "$@"
log "${BLACK_BG}${GREEN}INFO${DEFAULT}" "$@"
}

#
Expand Down Expand Up @@ -317,7 +328,7 @@ function prepare_apt() {
then
rm -f $gpg_file 2>>$STDERR_REDIRECT 1>>$STDOUT_REDIRECT
fi
gpg --dearmor --output $gpg_file $tmp_file
gpg --dearmor --output $gpg_file $tmp_file 2>>$STDERR_REDIRECT 1>>$STDOUT_REDIRECT
exit_code=$?

rm -f $tmp_file 2>>$STDERR_REDIRECT 1>>$STDOUT_REDIRECT
Expand Down Expand Up @@ -427,7 +438,12 @@ function handle_ctrl_c() {

function handle_exit() {
local e_code=$?
log_info "Exit %d" $e_code
local tc=${GREEN}
if [[ $e_code != 0 ]];
then
tc=${RED}
fi
log_info "${REVERSE}${BOLD}${UNDERLINE}${tc}Exit %d$DEFAULT" $e_code

local end=`date +%s`
runtime=$((end-start))
Expand Down