Merge branch 'master' into irix

This commit is contained in:
Dylan Araps 2020-03-09 23:26:41 +02:00
commit 542b6af284
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E

6
pfetch
View File

@ -22,11 +22,9 @@ log() {
info=$* info=$*
} }
align=$(printf '%*.s' "$((${#name}-info_length))" "")
# Construct the information string. # Construct the information string.
out="[3${PF_COL1-4};1m${name}" out="[3${PF_COL1-4};1m${name}"
out="$out${PF_SEP}${align}" out="$out${PF_SEP}[$((info_length-${#name}))C"
out="$out[3${PF_COL2-7}m${info}" out="$out[3${PF_COL2-7}m${info}"
} }
@ -1463,7 +1461,7 @@ main() {
while IFS= read -r line || [ "$1" ]; do while IFS= read -r line || [ "$1" ]; do
"get_$1" "get_$1"
shift "$(($# ? 1 : 0))" shift "$(($# ? 1 : 0))"
printf '%*.s%s\r%s\n' "$ascii_width" "" "$out" "$line" >&6 printf '\033[%sC%s\r%s\n' "$ascii_width" "$out" "$line" >&6
out= out=
done <<-EOF done <<-EOF
$ascii $ascii