Info: Move get_title() and get_underline() formatting to their own functions
This commit is contained in:
parent
abd0391c36
commit
1632a61753
1 changed files with 10 additions and 17 deletions
27
neofetch
27
neofetch
|
@ -273,7 +273,11 @@ get_model() {
|
||||||
}
|
}
|
||||||
|
|
||||||
get_title() {
|
get_title() {
|
||||||
title="${USER:-$(whoami || printf "%s" "${HOME/*\/}")}@${HOSTNAME:-$(hostname)}"
|
# Get the info.
|
||||||
|
user="${USER:-$(whoami || printf "%s" "${HOME/*\/}")}"
|
||||||
|
hostname="${HOSTNAME:-$(hostname)}"
|
||||||
|
title="${title_color}${bold}${user}${at_color}@${title_color}${bold}${hostname}"
|
||||||
|
length="$((${#user} + ${#hostname} + 1))"
|
||||||
}
|
}
|
||||||
|
|
||||||
get_kernel() {
|
get_kernel() {
|
||||||
|
@ -2437,23 +2441,10 @@ info() {
|
||||||
prin "$1" "$output"
|
prin "$1" "$output"
|
||||||
|
|
||||||
elif [[ "${output// }" ]]; then
|
elif [[ "${output// }" ]]; then
|
||||||
case "$1" in
|
[[ -z "$length" ]] && length="${#output}"
|
||||||
"title")
|
prin "$output"
|
||||||
string="${title_color}${bold}${output}"
|
|
||||||
string="${string/@/${at_color}@${title_color}${bold}}"
|
|
||||||
;;
|
|
||||||
|
|
||||||
"underline")
|
|
||||||
string="${underline_color}${output}"
|
|
||||||
;;
|
|
||||||
|
|
||||||
*) string="$output" ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
length="${#output}"
|
|
||||||
prin "$string"
|
|
||||||
else
|
else
|
||||||
|
|
||||||
err "Info: Couldn't detect ${1}."
|
err "Info: Couldn't detect ${1}."
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -2478,7 +2469,8 @@ prin() {
|
||||||
get_underline() {
|
get_underline() {
|
||||||
if [[ "$underline_enabled" == "on" ]]; then
|
if [[ "$underline_enabled" == "on" ]]; then
|
||||||
underline="$(printf %"$length"s)"
|
underline="$(printf %"$length"s)"
|
||||||
underline="${underline// /$underline_char}"
|
underline="${underline_color}${underline// /$underline_char}"
|
||||||
|
unset -v length
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3339,3 +3331,4 @@ main() {
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
|
# Print it immediatly since it's a special function.
|
||||||
|
|
Loading…
Reference in a new issue