q3aql/pfetch
q3aql/pfetch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pfetch: move string trimming to log()

Browse Source
This commit is contained in:
Dylan Araps 2019-09-25 19:05:55 +03:00
parent 3bc621579a
commit 977afd6e9d
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
pfetch
View File

@ -59,12 +59,28 @@ log() {
# End here if no data was found. # End here if no data was found.
[ "$2" ] || return [ "$2" ] || return
# Store the value of '$1' as we reset the argument list below.
name=$1
# Use 'set --' as a means of stripping all leading and trailing
# white-space from the info string. This also normalizes all
# whitespace inside of the string.
#
# Disable the shellcheck warning for word-splitting
# as it's safe and intended ('set -f' disables globbing).
# shellcheck disable=2046,2086
{
set -f
set +f -- $2
info=$*
}
# Move the cursor to the right, the width of the ascii art with an # Move the cursor to the right, the width of the ascii art with an
# additional gap for text spacing. # additional gap for text spacing.
printf '[%sC' "${ascii_width--1}" printf '[%sC' "${ascii_width--1}"
# Print the info name and color the text. # Print the info name and color the text.
printf '[3%s;1m%s' "${PF_COL1-4}" "$1" printf '[3%s;1m%s' "${PF_COL1-4}" "$name"
# Print the info name and info data separator. # Print the info name and info data separator.
printf '%s' "$PF_SEP" printf '%s' "$PF_SEP"
@ -72,11 +88,11 @@ log() {
# Move the cursor backward the length of the *current* info name and # Move the cursor backward the length of the *current* info name and
# then move it forwards the length of the *longest* info name. This # then move it forwards the length of the *longest* info name. This
# aligns each info data line. # aligns each info data line.
printf '[%sD[%sC' "${#1}" "${PF_ALIGN-$info_length}" printf '[%sD[%sC' "${#name}" "${PF_ALIGN-$info_length}"
# Print the info data, color it and strip all leading whitespace # Print the info data, color it and strip all leading whitespace
# from the string. # from the string.
printf '[3%sm%s\n' "${PF_COL2-7}" "${2#${2%%[![:space:]]*}}" printf '[3%sm%s\n' "${PF_COL2-7}" "$info"
# Keep track of the number of times 'log()' has been run. # Keep track of the number of times 'log()' has been run.
: $((info_height+=1)) : $((info_height+=1))
@ -217,34 +233,12 @@ get_host() {
;; ;;
NetBSD*) NetBSD*)
# Use 'set --' to store the output of the command host=$(sysctl -n machdep.dmi.system-vendor \
# as it normalizes whitespace and strips newlines. machdep.dmi.system-product)
#
# Disable the shellcheck warning for word-splitting
# as it's safe and intended ('set -f' disables globbing).
# shellcheck disable=2046
{
set -f
set +f -- $(sysctl -n machdep.dmi.system-vendor \
machdep.dmi.system-product)
}
host=$*
;; ;;
*BSD*) *BSD*)
# Use 'set --' to store the output of the command host=$(sysctl -n hw.vendor hw.product)
# as it normalizes whitespace and strips newlines.
#
# Disable the shellcheck warning for word-splitting
# as it's safe and intended ('set -f' disables globbing).
# shellcheck disable=2046
{
set -f
set +f -- $(sysctl -n hw.vendor hw.product)
}
host=$*
;; ;;
esac esac