Misc: Reimplement stdout
This commit is contained in:
parent
e9f6ffc2d9
commit
04c22a8edd
1 changed files with 19 additions and 3 deletions
22
neofetch
22
neofetch
|
@ -2801,7 +2801,7 @@ prin() {
|
|||
string="${subtitle_color}${bold}${string}"
|
||||
|
||||
# Print the info.
|
||||
printf "%b\n" "${text_padding:+\033[${text_padding}C}${zws}${string}${reset} "
|
||||
printf "%b\n" "${text_padding:+\033[${text_padding}C}${zws}${string}${reset}"
|
||||
|
||||
# Calculate info height.
|
||||
((++info_height))
|
||||
|
@ -2813,7 +2813,7 @@ prin() {
|
|||
get_underline() {
|
||||
if [[ "$underline_enabled" == "on" ]]; then
|
||||
printf -v underline "%${length}s"
|
||||
printf "%b\n" "${text_padding:+\033[${text_padding}C}${zws}${underline_color}${underline// /$underline_char}${reset} "
|
||||
printf "%b\n" "${text_padding:+\033[${text_padding}C}${zws}${underline_color}${underline// /$underline_char}${reset}"
|
||||
unset -v length
|
||||
fi
|
||||
prin=1
|
||||
|
@ -3636,6 +3636,20 @@ color() {
|
|||
|
||||
# OTHER
|
||||
|
||||
stdout() {
|
||||
image_backend="off"
|
||||
unset subtitle_color
|
||||
unset colon_color
|
||||
unset info_color
|
||||
unset underline_color
|
||||
unset bold
|
||||
unset title_color
|
||||
unset at_color
|
||||
unset text_padding
|
||||
unset zws
|
||||
unset reset
|
||||
}
|
||||
|
||||
err() {
|
||||
err+="$(color 1)[!]\033[0m $1\n"
|
||||
}
|
||||
|
@ -4401,6 +4415,7 @@ get_args() {
|
|||
;;
|
||||
esac
|
||||
;;
|
||||
"--stdout") stdout="on" ;;
|
||||
"-v") verbose="on" ;;
|
||||
"-vv") set -x; verbose="on" ;;
|
||||
"--help") usage ;;
|
||||
|
@ -4421,9 +4436,10 @@ main() {
|
|||
get_distro
|
||||
get_bold
|
||||
get_distro_colors
|
||||
[[ "$stdout" == "on" ]] && stdout
|
||||
|
||||
# Minix doesn't support these sequences.
|
||||
if [[ "$TERM" != "minix" ]]; then
|
||||
if [[ "$TERM" != "minix" && "$stdout" != "on" ]]; then
|
||||
# If the script exits for any reason, unhide the cursor.
|
||||
trap 'printf "\033[?25h\033[?7h"' EXIT
|
||||
|
||||
|
|
Loading…
Reference in a new issue