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

General: Fix output if subtitles are disabled and prin is used

This commit is contained in:
Dylan Araps 2017-01-26 17:51:36 +11:00
parent 1c24b007c0
commit a6c5c64bea
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
movies.txt Normal file
View File

@ -0,0 +1,9 @@
ascii
CHANGELOG.md
config
LICENSE.md
Makefile
movies.txt
neofetch
neofetch.1
README.md

18
neofetch
View File

@ -1093,7 +1093,7 @@ get_gpu() {
gpu="${gpu/Intel }" gpu="${gpu/Intel }"
fi fi
prin "${subtitle}${gpu_num}" "$gpu" prin "${subtitle:+${subtitle}${gpu_name}}" "$gpu"
((++gpu_num)) ((++gpu_num))
done done
@ -1748,7 +1748,7 @@ get_disk() {
esac esac
# Append '(disk mount point)' to the subtitle. # Append '(disk mount point)' to the subtitle.
prin "${subtitle} (${disk_sub})" "$disk" prin "${subtitle:+${subtitle} (${disk_sub})}" "$disk"
done done
} }
@ -1774,7 +1774,7 @@ get_battery() {
"barinfo") battery="$(bar "$capacity" 100) ${battery}" ;; "barinfo") battery="$(bar "$capacity" 100) ${battery}" ;;
esac esac
prin "${subtitle}${bat: -1}" "$battery" prin "${subtitle:+${subtitle}${bat: -1}}" "$battery"
done done
return return
;; ;;
@ -2519,7 +2519,7 @@ scrot_program() {
info() { info() {
# Save subtitle value. # Save subtitle value.
subtitle="$1" [[ "$2" ]] && subtitle="$1"
# Make sure that $prin is unset. # Make sure that $prin is unset.
unset -v prin unset -v prin
@ -2544,14 +2544,20 @@ info() {
else else
err "Info: Couldn't detect ${1}." err "Info: Couldn't detect ${1}."
fi fi
unset -v subtitle
} }
prin() { prin() {
# If $2 doesn't exist we format $1 as info. # If $2 doesn't exist we format $1 as info.
[[ -z "$2" ]] && local subtitle_color="$info_color" if [[ "$(trim "$1")" && "$2" ]]; then
string="${1//$'\033[0m'}${2:+: $2}"
else
string="${2:-$1}"
local subtitle_color="$info_color"
fi
# Format the output. # Format the output.
string="${1//$'\033[0m'}${2:+: $2}"
string="$(trim "$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}"