EvolutionOS
/
neofetch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Info: Further reduce size of info()

This commit is contained in:
Dylan Araps 2016-12-14 21:33:05 +11:00
parent bdcb0955c4
commit 5ff2a7d9dc
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
neofetch
View File

@ -2432,34 +2432,30 @@ info() {
output="${2:-$1}" output="${2:-$1}"
output="$(trim "${!output}")" output="$(trim "${!output}")"
# If the output is empty, don't print anything. if [[ "$2" && "${output// }" ]]; then
[[ -z "${output// }" ]] && \ length="$((${#1} + ${#output} + 2))"
{ err "Info: Couldn't detect ${1}."; return; } prin "$1" "$output"
case "$1" in elif [[ "${output// }" ]]; then
"title") case "$1" in
string="${title_color}${bold}${output}" "title")
string="${string/@/${at_color}@${title_color}${bold}}" string="${title_color}${bold}${output}"
length="${#output}" string="${string/@/${at_color}@${title_color}${bold}}"
prin "$string" ;;
;;
"underline") "underline")
string="${underline_color}${output}" string="${underline_color}${output}"
prin "$string" ;;
;;
*) *) string="$output" ;;
if [[ "$2" && "${output// }" ]]; then esac
length="$((${#1} + ${#output} + 2))"
prin "$1" "$output"
elif [[ "${output// }" ]]; then length="${#output}"
length="${#output}" prin "$string"
prin "$output" else
fi
;; err "Info: Couldn't detect ${1}."
esac fi
} }
prin() { prin() {
@ -2470,8 +2466,8 @@ prin() {
[[ -z "$2" ]] && local subtitle_color="$info_color" [[ -z "$2" ]] && local subtitle_color="$info_color"
# Format the output # Format the output
string="$(trim "$string")"
string="${subtitle}${string}" string="${subtitle}${string}"
string="$(trim "$string")"
string="${string/:/${reset}${colon_color}:${info_color}}" string="${string/:/${reset}${colon_color}:${info_color}}"
string="${subtitle_color}${bold}${string}" string="${subtitle_color}${bold}${string}"