refactored terminal detection for fewer fields

This commit is contained in:
pyr0ball 2023-04-11 10:12:44 -07:00
parent bb2604415b
commit 8b64019a0c

170
functions
View file

@ -72,14 +72,14 @@ fi
# Extra Unicode Character Manipulation # Extra Unicode Character Manipulation
case $OSTYPE in case $OSTYPE in
linux-gnu* ) linux-gnu*|cygwin|msys)
return_arrow=$(echo -e "\u2BAC") return_arrow=$(echo -e "\u2BAC")
enter_arrow=$(echo -e "\u21B5") enter_arrow=$(echo -e "\u21B5")
green_check=${grn}$(echo -e "\u2714")${dfl} green_check=${grn}$(echo -e "\u2714")${dfl}
red_x=${lrd}$(echo -e "\u00D7")${dfl} red_x=${lrd}$(echo -e "\u00D7")${dfl}
selected_opt=$(echo -e "\u25C9") selected_opt=$(echo -e "\u25C9")
deselected_opt=$(echo -e "\u25CE") deselected_opt=$(echo -e "\u25CE")
;; ;;&
darwin* ) darwin* )
return_arrow=$(echo -e "⮬") return_arrow=$(echo -e "⮬")
enter_arrow=$(echo -e "↵") enter_arrow=$(echo -e "↵")
@ -88,22 +88,6 @@ case $OSTYPE in
selected_opt=$(echo -e "◉") selected_opt=$(echo -e "◉")
deselected_opt=$(echo -e "◎") deselected_opt=$(echo -e "◎")
;; ;;
cygwin )
return_arrow=$(echo -e "\u2BAC")
enter_arrow=$(echo -e "\u21B5")
green_check=${grn}$(echo -e "\u2714")${dfl}
red_x=${lrd}$(echo -e "\u00D7")${dfl}
selected_opt=$(echo -e "\u25C9")
deselected_opt=$(echo -e "\u25CE")
;;
msys )
return_arrow=$(echo -e "\u2BAC")
enter_arrow=$(echo -e "\u21B5")
green_check=${grn}$(echo -e "\u2714")${dfl}
red_x=${lrd}$(echo -e "\u00D7")${dfl}
selected_opt=$(echo -e "\u25C9")
deselected_opt=$(echo -e "\u25CE")
;;
esac esac
# For drawing pretty boxes # For drawing pretty boxes
@ -116,14 +100,14 @@ fi
# Box Drawing characters # Box Drawing characters
case $OSTYPE in case $OSTYPE in
linux-gnu* ) linux-gnu*|cygwin|msys)
light_h=$(echo -e "\u2500") light_h=$(echo -e "\u2500")
norm_h=$(echo -e "\u2501") norm_h=$(echo -e "\u2501")
double_h=$(echo -e "\u2550") double_h=$(echo -e "\u2550")
light_v=$(echo -e "\u2502") light_v=$(echo -e "\u2502")
norm_v=$(echo -e "\u2503") norm_v=$(echo -e "\u2503")
double_v=$(echo -e "\u2551") double_v=$(echo -e "\u2551")
;; ;;&
darwin* ) darwin* )
light_h=$(echo -e "─") light_h=$(echo -e "─")
norm_h=$(echo -e "━") norm_h=$(echo -e "━")
@ -132,22 +116,6 @@ case $OSTYPE in
norm_v=$(echo -e "┃") norm_v=$(echo -e "┃")
double_v=$(echo -e "║") double_v=$(echo -e "║")
;; ;;
cygwin )
light_h=$(echo -e "\u2500")
norm_h=$(echo -e "\u2501")
double_h=$(echo -e "\u2550")
light_v=$(echo -e "\u2502")
norm_v=$(echo -e "\u2503")
double_v=$(echo -e "\u2551")
;;
msys )
light_h=$(echo -e "\u2500")
norm_h=$(echo -e "\u2501")
double_h=$(echo -e "\u2550")
light_v=$(echo -e "\u2502")
norm_v=$(echo -e "\u2503")
double_v=$(echo -e "\u2551")
;;
esac esac
@ -156,7 +124,7 @@ esac
box-norm(){ box-norm(){
# ---------------------------------------# # ---------------------------------------#
case $OSTYPE in case $OSTYPE in
linux-gnu* ) linux-gnu*|cygwin|msys)
top_border=${norm_h} top_border=${norm_h}
bottom_border=${norm_h} bottom_border=${norm_h}
left_border=${norm_v} left_border=${norm_v}
@ -166,7 +134,7 @@ box-norm(){
left_bottom_border=$(echo -e "\u2517") left_bottom_border=$(echo -e "\u2517")
right_bottom_border=$(echo -e "\u251b") right_bottom_border=$(echo -e "\u251b")
box_break_line=$(echo -e "\u25AB") box_break_line=$(echo -e "\u25AB")
;; ;;&
darwin* ) darwin* )
top_border=${norm_h} top_border=${norm_h}
bottom_border=${norm_h} bottom_border=${norm_h}
@ -178,28 +146,6 @@ box-norm(){
right_bottom_border=$(echo -e "┛") right_bottom_border=$(echo -e "┛")
box_break_line=$(echo -e "▫") box_break_line=$(echo -e "▫")
;; ;;
cygwin )
top_border=${norm_h}
bottom_border=${norm_h}
left_border=${norm_v}
right_border=${norm_v}
left_top_border=$(echo -e "\u250f")
right_top_border=$(echo -e "\u2513")
left_bottom_border=$(echo -e "\u2517")
right_bottom_border=$(echo -e "\u251b")
box_break_line=$(echo -e "\u25AB")
;;
msys )
top_border=${norm_h}
bottom_border=${norm_h}
left_border=${norm_v}
right_border=${norm_v}
left_top_border=$(echo -e "\u250f")
right_top_border=$(echo -e "\u2513")
left_bottom_border=$(echo -e "\u2517")
right_bottom_border=$(echo -e "\u251b")
box_break_line=$(echo -e "\u25AB")
;;
esac esac
# ---------------------------------------# # ---------------------------------------#
@ -209,7 +155,7 @@ box-norm(){
box-double(){ box-double(){
# ---------------------------------------# # ---------------------------------------#
case $OSTYPE in case $OSTYPE in
linux-gnu* ) linux-gnu*|cygwin|msys)
top_border=${double_h} top_border=${double_h}
bottom_border=${double_h} bottom_border=${double_h}
left_border=${double_v} left_border=${double_v}
@ -219,7 +165,7 @@ box-double(){
left_bottom_border=$(echo -e "\u255A") left_bottom_border=$(echo -e "\u255A")
right_bottom_border=$(echo -e "\u255D") right_bottom_border=$(echo -e "\u255D")
box_break_line=$(echo -e "\u25AB") box_break_line=$(echo -e "\u25AB")
;; ;;&
darwin* ) darwin* )
top_border=${double_h} top_border=${double_h}
bottom_border=${double_h} bottom_border=${double_h}
@ -231,28 +177,6 @@ box-double(){
right_bottom_border=$(echo -e "╝") right_bottom_border=$(echo -e "╝")
box_break_line=$(echo -e "▫") box_break_line=$(echo -e "▫")
;; ;;
cygwin )
top_border=${double_h}
bottom_border=${double_h}
left_border=${double_v}
right_border=${double_v}
left_top_border=$(echo -e "\u2554")
right_top_border=$(echo -e "\u2557")
left_bottom_border=$(echo -e "\u255A")
right_bottom_border=$(echo -e "\u255D")
box_break_line=$(echo -e "\u25AB")
;;
msys )
top_border=${double_h}
bottom_border=${double_h}
left_border=${double_v}
right_border=${double_v}
left_top_border=$(echo -e "\u2554")
right_top_border=$(echo -e "\u2557")
left_bottom_border=$(echo -e "\u255A")
right_bottom_border=$(echo -e "\u255D")
box_break_line=$(echo -e "\u25AB")
;;
esac esac
# ---------------------------------------# # ---------------------------------------#
} }
@ -261,7 +185,7 @@ box-double(){
box-heavy(){ box-heavy(){
# ---------------------------------------# # ---------------------------------------#
case $OSTYPE in case $OSTYPE in
linux-gnu* ) linux-gnu*|cygwin|msys)
top_border=$(echo -e "\u2580") top_border=$(echo -e "\u2580")
bottom_border=$(echo -e "\u2584") bottom_border=$(echo -e "\u2584")
left_border=$(echo -e "\u258C") left_border=$(echo -e "\u258C")
@ -271,7 +195,7 @@ box-heavy(){
left_bottom_border=$(echo -e "\u2599") left_bottom_border=$(echo -e "\u2599")
right_bottom_border=$(echo -e "\u259F") right_bottom_border=$(echo -e "\u259F")
box_break_line=$(echo -e "\u25AC") box_break_line=$(echo -e "\u25AC")
;; ;;&
darwin* ) darwin* )
top_border=$(echo -e "▀") top_border=$(echo -e "▀")
bottom_border=$(echo -e "▄") bottom_border=$(echo -e "▄")
@ -283,28 +207,6 @@ box-heavy(){
right_bottom_border=$(echo -e "▟") right_bottom_border=$(echo -e "▟")
box_break_line=$(echo -e "▫") box_break_line=$(echo -e "▫")
;; ;;
cygwin )
top_border=$(echo -e "\u2580")
bottom_border=$(echo -e "\u2584")
left_border=$(echo -e "\u258C")
right_border=$(echo -e "\u2590")
left_top_border=$(echo -e "\u259B")
right_top_border=$(echo -e "\u259C")
left_bottom_border=$(echo -e "\u2599")
right_bottom_border=$(echo -e "\u259F")
box_break_line=$(echo -e "\u25AC")
;;
msys )
top_border=$(echo -e "\u2580")
bottom_border=$(echo -e "\u2584")
left_border=$(echo -e "\u258C")
right_border=$(echo -e "\u2590")
left_top_border=$(echo -e "\u259B")
right_top_border=$(echo -e "\u259C")
left_bottom_border=$(echo -e "\u2599")
right_bottom_border=$(echo -e "\u259F")
box_break_line=$(echo -e "\u25AC")
;;
esac esac
# ---------------------------------------# # ---------------------------------------#
} }
@ -314,7 +216,7 @@ box-light(){
# ---------------------------------------# # ---------------------------------------#
#top_border=$(echo -e '\u23BA') #top_border=$(echo -e '\u23BA')
case $OSTYPE in case $OSTYPE in
linux-gnu* ) linux-gnu*|cygwin|msys)
top_border=${light_h} top_border=${light_h}
bottom_border=${light_h} bottom_border=${light_h}
left_border=${light_v} left_border=${light_v}
@ -324,7 +226,7 @@ box-light(){
left_bottom_border=$(echo -e "\u23BF") left_bottom_border=$(echo -e "\u23BF")
right_bottom_border=$(echo -e "\u23CC") right_bottom_border=$(echo -e "\u23CC")
box_break_line=$(echo -e "\u23AF") box_break_line=$(echo -e "\u23AF")
;; ;;&
darwin* ) darwin* )
top_border=${light_h} top_border=${light_h}
bottom_border=${light_h} bottom_border=${light_h}
@ -336,28 +238,6 @@ box-light(){
right_bottom_border=$(echo -e "⏌") right_bottom_border=$(echo -e "⏌")
box_break_line=$(echo -e "⎯") box_break_line=$(echo -e "⎯")
;; ;;
cygwin )
top_border=${light_h}
bottom_border=${light_h}
left_border=${light_v}
right_border=${light_v}
left_top_border=$(echo -e "\u23BE")
right_top_border=$(echo -e "\u23CB")
left_bottom_border=$(echo -e "\u23BF")
right_bottom_border=$(echo -e "\u23CC")
box_break_line=$(echo -e "\u23AF")
;;
msys )
top_border=${light_h}
bottom_border=${light_h}
left_border=${light_v}
right_border=${light_v}
left_top_border=$(echo -e "\u23BE")
right_top_border=$(echo -e "\u23CB")
left_bottom_border=$(echo -e "\u23BF")
right_bottom_border=$(echo -e "\u23CC")
box_break_line=$(echo -e "\u23AF")
;;
esac esac
# ---------------------------------------# # ---------------------------------------#
} }
@ -365,7 +245,7 @@ box-light(){
box-rounded(){ box-rounded(){
# ---------------------------------------# # ---------------------------------------#
case $OSTYPE in case $OSTYPE in
linux-gnu* ) linux-gnu*|cygwin|msys)
top_border=${light_h} top_border=${light_h}
bottom_border=${light_h} bottom_border=${light_h}
left_border=${light_v} left_border=${light_v}
@ -375,7 +255,7 @@ box-rounded(){
left_bottom_border=$(echo -e "\u2570") left_bottom_border=$(echo -e "\u2570")
right_bottom_border=$(echo -e "\u256F") right_bottom_border=$(echo -e "\u256F")
box_break_line=$(echo -e "\u25A2") box_break_line=$(echo -e "\u25A2")
;; ;;&
darwin* ) darwin* )
top_border=${light_h} top_border=${light_h}
bottom_border=${light_h} bottom_border=${light_h}
@ -387,28 +267,6 @@ box-rounded(){
right_bottom_border=$(echo -e "╯") right_bottom_border=$(echo -e "╯")
box_break_line=$(echo -e "▢") box_break_line=$(echo -e "▢")
;; ;;
cygwin )
top_border=${light_h}
bottom_border=${light_h}
left_border=${light_v}
right_border=${light_v}
left_top_border=$(echo -e "\u256D")
right_top_border=$(echo -e "\u256E")
left_bottom_border=$(echo -e "\u2570")
right_bottom_border=$(echo -e "\u256F")
box_break_line=$(echo -e "\u25A2")
;;
msys )
top_border=${light_h}
bottom_border=${light_h}
left_border=${light_v}
right_border=${light_v}
left_top_border=$(echo -e "\u256D")
right_top_border=$(echo -e "\u256E")
left_bottom_border=$(echo -e "\u2570")
right_bottom_border=$(echo -e "\u256F")
box_break_line=$(echo -e "\u25A2")
;;
esac esac
# ---------------------------------------# # ---------------------------------------#
} }