From 670fb2238ec479d51a28da6fa5b63ad2393722f6 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 16:35:24 +1100 Subject: [PATCH] Simplified sdtout function --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 98974f78..6e3071f6 100755 --- a/neofetch +++ b/neofetch @@ -1963,25 +1963,25 @@ prin () { # Stdout {{{ stdout () { + # Read args early for the separator stdout_separator_flag="$(awk -F '--stdout_separator ' '{printf $2}' <<< "${args[@]}")" stdout_separator_flag=${stdout_separator_flag/ '--'*} [ ! -z "$stdout_separator_flag" ] && \ stdout_separator="$stdout_separator_flag" - index=0 for func in "${args[@]}"; do case "$func" in "--"*) break ;; *) "get$func" 2>/dev/null eval output="\$$func" - case "${args[$((index + 1))]}" in "--"*) unset stdout_separator ;; esac - printf "%s" "${output}${stdout_separator}" + stdout+="${output}${stdout_separator}" ;; esac - index=$((index + 1)) done + + printf "%s" "${stdout%%${stdout_separator}}" exit }