diff --git a/backup/archive_repos/_lib/c/base.sh b/backup/archive_repos/_lib/c/base.sh index 1d0d579..b3c3fd6 100644 --- a/backup/archive_repos/_lib/c/base.sh +++ b/backup/archive_repos/_lib/c/base.sh @@ -26,6 +26,7 @@ base_darkpurple="80;0;150m" base_lightgrey="120;120;120m" base_darkgrey_01="60;60;60m" base_darkgrey_02="50;50;50m" +base_white="255;255;255m" base_black="0;0;0m" base_lime="0;255;0m" base_aqua="0;255;255m" @@ -44,6 +45,7 @@ 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_white="${esc_seq_fg}${base_white}" fg_black="${esc_seq_fg}${base_black}" fg_lime="${esc_seq_fg}${base_lime}" fg_aqua="${esc_seq_fg}${base_aqua}" @@ -57,6 +59,7 @@ 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_white="${esc_seq_fg}${c_black}${esc_seq_bg}${base_white}" bg_black="${esc_seq_fg}${c_white}${esc_seq_bg}${base_black}" bg_lime="${esc_seq_fg}${c_black}${esc_seq_bg}${base_lime}" bg_aqua="${esc_seq_fg}${c_black}${esc_seq_bg}${base_aqua}" diff --git a/backup/archive_repos/_lib/colors.sh b/backup/archive_repos/_lib/colors.sh index 9f85ed2..a492cef 100644 --- a/backup/archive_repos/_lib/colors.sh +++ b/backup/archive_repos/_lib/colors.sh @@ -17,7 +17,7 @@ ui_text_muted="${fg_lightgrey}" ui_dialog_bg="${bg_darkgrey_01}" ui_highlight_bg="${bg_ff4500}" ui_text_info="${fg_lime}" -ui_text_cmd="${fg_aqua}" +ui_text_cmd="${fg_lime}" # for var in "${!ui_@}"; do # printf '%s=%s\n' "$var" "${!var}" diff --git a/backup/archive_repos/_lib/config.sh b/backup/archive_repos/_lib/config.sh index e93ec27..bd3581d 100755 --- a/backup/archive_repos/_lib/config.sh +++ b/backup/archive_repos/_lib/config.sh @@ -26,7 +26,7 @@ output="${base_dir}/${output_dir}" # Debugging # ------------------------------------------------------------------------------ -print_colors="no" +print_colors="yes" # Colors - source the colors.sh file # ------------------------------------------------------------------------------ diff --git a/backup/archive_repos/_lib/functions.sh b/backup/archive_repos/_lib/functions.sh index 5c05a13..40ba390 100755 --- a/backup/archive_repos/_lib/functions.sh +++ b/backup/archive_repos/_lib/functions.sh @@ -22,9 +22,14 @@ info(){ } cmd(){ - indent; indent; echo -e "${bg_darkgrey_02} ${reset}" - indent; indent; echo -e "${bg_darkgrey_02}${ui_text_cmd} > ${reset}${fg_lightgrey} \$ ${reset}\c" - echo -e "${fg_lightgrey}$1${reset}" + # indent; indent; echo -e "${bg_darkgrey_02} ${reset}" + # echo; + # indent; indent; echo -e "${bg_darkgrey_02}${ui_text_cmd} > ${reset}${fg_lightgrey} \$ ${reset}\c" + indent; indent; indent; indent; echo -e "${bg_black}${ui_text_cmd} \$ $1 ${reset}" +} + +cmd_inline(){ + echo -e "${bg_black}${ui_text_cmd} \$ $1 ${reset}" } sec_hl(){ @@ -45,7 +50,7 @@ line_2(){ } alert_line(){ - indent; indent; echo -e "${bg_red}${fg_darkgrey_02} ! ${reset} \c"; echo -e "${fg_red}$1${reset}" + indent; indent; echo -e "${bg_red}${fg_white} ! ${reset} \c"; echo -e "${fg_red}$1${reset}" } titleblock() { @@ -75,42 +80,42 @@ check_ex(){ sec_hl "Checking for required files/folders:" if [ ! -d "${base_dir}" ]; then - alert_line "Base dir doesn't exist."; line_2 "Making it now." - cmd "mkdir ${base_dir}" + alert_line "Base dir doesn't exist. ${reset}"; sleep 1; + line_2 "Making it now. \c"; sleep 1; cmd_inline "mkdir ${base_dir}" echo; sleep 1 mkdir ${base_dir} else - info; line "Base dir exists at:"; line_2 "${ui_text_cmd}${base_dir}${reset}" + info; line "Base dir exists at: ${ui_text_cmd}${base_dir}${reset}" echo fi if [ ! -d "${source}" ]; then - alert_line "Source dir doesn't exist."; line_2 "Making it now." - cmd "mkdir ${source}" + alert_line "Source dir doesn't exist. ${reset}"; sleep 1; + line_2 "Making it now. \c"; sleep 1; cmd_inline "mkdir ${source}" echo; sleep 1 mkdir ${source} else - info; line "Source dir exists at:"; line_2 "${ui_text_cmd}${source}${reset}" + info; line "Source dir exists at: ${ui_text_cmd}${source}${reset}" echo fi if [ ! -d "${output}" ]; then - alert_line "Output dir doesn't exist."; line_2 "Making it now." - cmd "mkdir ${output}" + alert_line "Output dir doesn't exist. ${reset}"; sleep 1; + line_2 "Making it now. \c"; sleep 1; cmd_inline "mkdir ${output}" echo; sleep 1 mkdir ${output} else - info; line "Output dir exists at:"; line_2 "${ui_text_cmd}${output}${reset}" + info; line "Output dir exists at: ${ui_text_cmd}${output}${reset}" echo fi if [ ! -f "${repo_list}" ]; then - alert_line "A repository list doesn't exist."; line_2 "Making the ${bg_aqua} _src ${reset} dir and an empty list now." - cmd "touch ${repo_list}" + alert_line "A repository list doesn't exist. ${reset}"; sleep 1; + line_2 "Making the ${bg_aqua} _src ${reset} dir and an empty list now. \c"; sleep 1; cmd_inline "touch ${repo_list}" echo; sleep 1 mkdir ${base_dir}/_src && touch ${repo_list} else - info; line "A repository list exists at:"; line_2 "${ui_text_cmd}${repo_list}${reset}" + info; line "A repository list exists at: ${ui_text_cmd}${repo_list}${reset}" echo fi