diff --git a/avalifetch b/avalifetch index 73747e6..a93f22f 100755 --- a/avalifetch +++ b/avalifetch @@ -31,20 +31,12 @@ system_info() { colres='\033[m' process_colors() { -# colindex=1 -# while IFS=" " read -r curcol; do -# colesc="$(tput setaf "$curcol")" -# c$colindex="$colesc" -# colindex="$(($colindex + 1))" -# done <<-EOF -# "$COLORS" -# EOF - c1="$(printf '%b\033[38;5;%sm' "$colres" "$1")" - c2="$(printf '%b\033[38;5;%sm' "$colres" "$2")" - c3="$(printf '%b\033[38;5;%sm' "$colres" "$3")" - c4="$(printf '%b\033[38;5;%sm' "$colres" "$4")" - c5="$(printf '%b\033[38;5;%sm' "$colres" "$5")" - c6="$(printf '%b\033[38;5;%sm' "$colres" "$6")" + colindex=1 + for c; do + colesc="$(printf '%b\033[38;5;%sm' "$colres" "$c")" + eval "c$colindex="'$colesc' + colindex=$((colindex + 1)) + done } process_ascii() { @@ -72,16 +64,15 @@ res() { printf '\033[0m'; } iprint() { printf "%b%s\n" "\033[0m\033[${info_padding}C" "$1"; } print_all() { - tput rmam # disable line wrapping + printf '%s' '[?7l' # disable line wrapping printf '%s\n' "$final_ascii" printf '\0337 \033[?25l' # save cursor pos & hide it printf "\033[%sF" "$linecount" # system_info - tput smam # enable line wrapping + printf '%s' '[?7h' # enable line wrapping printf '\0338\n\033[?25h' # restore cursor pos & unhide it } -set -f -- $COLORS && set +f -process_colors "$@" +process_colors $COLORS process_ascii print_all