Merge branch 'development' into sqlite-dependency

This commit is contained in:
Mcat12 2017-09-08 13:43:26 -04:00 committed by GitHub
commit d69e62589a

View file

@ -1,28 +1,49 @@
# Determine if terminal is capable of showing colours
if [[ -t 1 ]] && [[ $(tput colors) -ge 8 ]]; then if [[ -t 1 ]] && [[ $(tput colors) -ge 8 ]]; then
# Bold and underline may not show up on all clients
# If something MUST be emphasised, use both
COL_BOLD=''
COL_ULINE=''
COL_NC='' COL_NC=''
COL_WHITE='' COL_GRAY=''
COL_BLACK='' COL_RED=''
COL_BLUE='' COL_GREEN=''
COL_LIGHT_BLUE='' COL_YELLOW=''
COL_GREEN='' COL_BLUE=''
COL_LIGHT_GREEN='' COL_PURPLE=''
COL_CYAN='' COL_CYAN=''
COL_LIGHT_CYAN='' else
COL_RED='' # Provide empty variables for `set -u`
COL_LIGHT_RED='' COL_BOLD=""
COL_URG_RED='' COL_ULINE=""
COL_PURPLE=''
COL_LIGHT_PURPLE='' COL_NC=""
COL_BROWN='' COL_GRAY=""
COL_YELLOW='' COL_RED=""
COL_GRAY='' COL_GREEN=""
COL_LIGHT_GRAY='' COL_YELLOW=""
COL_DARK_GRAY='' COL_BLUE=""
COL_PURPLE=""
COL_CYAN=""
fi fi
TICK="[${COL_LIGHT_GREEN}✓${COL_NC}]" # Deprecated variables
CROSS="[${COL_LIGHT_RED}✗${COL_NC}]" COL_WHITE="${COL_BOLD}"
COL_BLACK="${COL_NC}"
COL_LIGHT_BLUE="${COL_BLUE}"
COL_LIGHT_GREEN="${COL_GREEN}"
COL_LIGHT_CYAN="${COL_CYAN}"
COL_LIGHT_RED="${COL_RED}"
COL_URG_RED="${COL_RED}${COL_BOLD}${COL_ULINE}"
COL_LIGHT_PURPLE="${COL_PURPLE}"
COL_BROWN="${COL_YELLOW}"
COL_LIGHT_GRAY="${COL_GRAY}"
COL_DARK_GRAY="${COL_GRAY}"
TICK="[${COL_GREEN}✓${COL_NC}]"
CROSS="[${COL_RED}✗${COL_NC}]"
INFO="[i]" INFO="[i]"
QST="[?]" QST="[?]"
DONE="${COL_LIGHT_GREEN} done!${COL_NC}" DONE="${COL_GREEN} done!${COL_NC}"
OVER="\r\033[K" OVER="\\r"