Rename variables so they're clearer

This commit is contained in:
Dylan 2016-03-29 18:04:36 +11:00
parent 5c6b680a1e
commit a1d409046a

View file

@ -1858,14 +1858,14 @@ getascii () {
# Get length of longest line # Get length of longest line
ascii_size=($(wc -lL 2>/dev/null <<< "$ascii_strip")) ascii_size=($(wc -lL 2>/dev/null <<< "$ascii_strip"))
ascii_length=${ascii_size[0]} ascii_height=${ascii_size[0]}
ascii_height=${ascii_size[1]} ascii_length=${ascii_size[1]}
# Fallback to using awk on systems without 'wc -L' # Fallback to using awk on systems without 'wc -L'
[ -z "$length" ] && \ [ -z "$ascii_length" ] && \
length="$(awk 'length>max{max=length}END{print max}' <<< "$ascii_strip")" ascii_length="$(awk 'length>max{max=length}END{print max}' <<< "$ascii_strip")"
padding="\033[$((length + gap))C" padding="\033[$((ascii_length + gap))C"
printf "%b%s" "$print" printf "%b%s" "$print"
export LC_ALL=C export LC_ALL=C
@ -2850,9 +2850,9 @@ if [ "$image" != "off" ]; then
[ -z "$info_height" ] && info_height=0 [ -z "$info_height" ] && info_height=0
# Set cursor position dynamically based on height of ascii/text. # Set cursor position dynamically based on height of ascii/text.
[ "$ascii_length" -lt "$info_height" ] && lines="$info_height" [ "$ascii_height" -lt "$info_height" ] && ascii_height="$info_height"
printf "%b%s" "\033[${lines}H\033[${prompt_height}A" printf "%b%s" "\033[${ascii_height}H\033[${prompt_height}A"
fi fi
# Re-enable line wrap # Re-enable line wrap