From 4c34e7892fe699dc579399b1765d61de4d7e8475 Mon Sep 17 00:00:00 2001 From: Jason Pitman Date: Tue, 20 Aug 2019 23:27:00 -0500 Subject: [PATCH] updates --- backup/archive_repos/_lib/c/base.sh | 85 ++++++++++++++++++++++++++ backup/archive_repos/_lib/c/esc.sh | 24 ++++++++ backup/archive_repos/_lib/colors.sh | 17 ++++-- backup/archive_repos/_lib/functions.sh | 1 + 4 files changed, 121 insertions(+), 6 deletions(-) create mode 100644 backup/archive_repos/_lib/c/base.sh create mode 100644 backup/archive_repos/_lib/c/esc.sh diff --git a/backup/archive_repos/_lib/c/base.sh b/backup/archive_repos/_lib/c/base.sh new file mode 100644 index 0000000..f033908 --- /dev/null +++ b/backup/archive_repos/_lib/c/base.sh @@ -0,0 +1,85 @@ +#!/usr/bin/env bash + +path="$(echo "${PWD##*/}")" +if [ $path = 'c' ]; then + source ./esc.sh +fi + +# FF colors +# ------------------------------------------------------------------------------ +# ff4500 - #ff4500 +# lightpurple - #6e00ff +# darkpurple - #500096 +# lightgrey - #787878 +# darkgrey_01 - #3B3B3B +# darkgrey_02 - #323232 +# black - #222222 +# ------------------------------------------------------------------------------ + +# base color definitions (rgb) +# ------------------------------------------------------------------------------ +base_ff4500="255;69;0m" +base_lightpurple="110;0;255m" +base_darkpurple="80;0;150m" +base_lightgrey="120;120;120m" +base_darkgrey_01="60;60;60m" +base_darkgrey_02="50;50;50m" +base_black="0;0;0m" + +l_grey_rgb="120;120;120m" +m_grey_rgb="80;80;80m" +d_grey_rgb="40;40;40m" + +# Named colors +# ------------------------------------------------------------------------------ +fg_ff4500="${esc_seq_fg}${base_ff4500}" +fg_lightpurple="${esc_seq_fg}${base_lightpurple}" +fg_darkpurple="${esc_seq_fg}${base_darkpurple}" +fg_lightgrey="${esc_seq_fg}${base_lightgrey}" +d_lightgrey="${esc_seq_fg}${base_lightgrey}" +fg_darkgrey_01="${esc_seq_fg}${base_darkgrey_01}" +fg_darkgrey_02="${esc_seq_fg}${base_darkgrey_02}" +fg_black="${esc_seq_fg}${base_black}" + +# Named background colors +# ------------------------------------------------------------------------------ +bg_ff4500="${esc_seq_fg}${c_white}${esc_seq_bg}${base_ff4500}" +bg_lightpurple="${esc_seq_fg}${c_white}${esc_seq_bg}${base_lightpurple}" +bg_darkpurple="${esc_seq_fg}${c_white}${esc_seq_bg}${base_darkpurple}" +bg_lightgrey="${esc_seq_fg}${c_white}${esc_seq_bg}${base_lightgrey}" +bg_darkgrey_01="${esc_seq_fg}${c_white}${esc_seq_bg}${base_darkgrey_01}" +bg_darkgrey_02="${esc_seq_fg}${c_white}${esc_seq_bg}${base_darkgrey_02}" +bg_black="${esc_seq_fg}${c_white}${esc_seq_bg}${base_black}" + +# Color variations and special use cases +# ------------------------------------------------------------------------------ +bg_lightpurple_w_grey="${esc_seq_fg}${c_dark_grey}${esc_seq_bg}${base_lightpurple}" +bg_lightpurple_w_blk="${esc_seq_fg}${c_black}${esc_seq_bg}${base_lightpurple}" + +# Color tests - uncomment to print tests in the console +# ------------------------------------------------------------------------------ + +function print_ff() { + clear + echo + echo -e "${fg_darkgrey_01}------------------------------------------------------------${reset}" + echo + echo -e "${indent}${indent}${bg_darkpurple} Base colors: ${reset}" + echo + for var in "${!fg_@}"; do + #printf '%s=%s\n' "$var" "${!var}" + printf "${var} ${fg_lightgrey}(%s)${reset}: ${esc_seq_fg}${!var}${var}${reset}\n" "${!var:10}" + done + echo + for var in "${!bg_@}"; do + printf "${var}: ${!var} ${var} ${reset}\n" + done + echo + echo -e "${fg_darkgrey_01}------------------------------------------------------------${reset}" + echo +} +if [ $path = 'c' ]; then + print_ff +elif [ $path != 'c' ] && [ $print_colors = 'yes' ]; then + print_ff +fi diff --git a/backup/archive_repos/_lib/c/esc.sh b/backup/archive_repos/_lib/c/esc.sh new file mode 100644 index 0000000..94f7763 --- /dev/null +++ b/backup/archive_repos/_lib/c/esc.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env bash + +# Color escape sequences - Required +# ------------------------------------------------------------------------------ +esc_seq="\x1b[" +reset="${esc_seq}39;49;00m" + +# Color escape sequences - Required for RGB colors +# ------------------------------------------------------------------------------ +esc_seq_fg="\x1b[38;2;" +esc_seq_bg="\x1b[48;2;" + +# RGB black/white/grey base definitions - Required for RGB colors +# ------------------------------------------------------------------------------ +c_black="0;0;0m" +c_white="255;255;255m" +c_light_grey="120;120;120m" +c_medium_grey="80;80;80m" +c_dark_grey="40;40;40m" + +# Set variables for black/white foreground colors - Required for RGB colors +# ------------------------------------------------------------------------------ +blk_fg="${esc_seq_fg}${c_black}" +wht_fg="${esc_seq_fg}${c_white}" diff --git a/backup/archive_repos/_lib/colors.sh b/backup/archive_repos/_lib/colors.sh index fe35ef5..0f7f7d6 100644 --- a/backup/archive_repos/_lib/colors.sh +++ b/backup/archive_repos/_lib/colors.sh @@ -3,13 +3,18 @@ # Sourced colors # ------------------------------------------------------------------------------ -#source ./lib/c/base.sh +source ./_lib/c/esc.sh +source ./_lib/c/base.sh # UI colors # ------------------------------------------------------------------------------ -ui_base="${ff_lightpurple_bg}" -ui_accent_light="${ff_lightpurple}" -ui_accent_dark="${ff_darkpurple}" +ui_base="${lightgrey_bg}" +ui_accent_light="${lightpurple}" +ui_accent_dark="${darkpurple}" ui_text_normal="" -ui_text_muted="${ff_lightgrey}" -ui_dialog_bg="${ff_darkgrey_02_bg}" +ui_text_muted="${lightgrey}" +ui_dialog_bg="${darkgrey_bg}" + +# for var in "${!ui_@}"; do +# printf '%s=%s\n' "$var" "${!var}" +# done diff --git a/backup/archive_repos/_lib/functions.sh b/backup/archive_repos/_lib/functions.sh index 4191f29..9a7cfa5 100755 --- a/backup/archive_repos/_lib/functions.sh +++ b/backup/archive_repos/_lib/functions.sh @@ -87,4 +87,5 @@ run() { sep indent; echo "Yay" sep + echo }