From 80b79d7dbb4ab71a8b48a56e7144dc2436bcce5e Mon Sep 17 00:00:00 2001 From: "Azalea (on HyDEV-Daisy)" Date: Tue, 23 Aug 2022 11:41:16 -0400 Subject: [PATCH] [O] Trim trailing space in script --- neofetch | 120 +++++++++++++++++++++++++++---------------------------- 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/neofetch b/neofetch index 1f95a550..3ca82a07 100755 --- a/neofetch +++ b/neofetch @@ -1611,7 +1611,7 @@ get_title() { case $title_fqdn in on) hostname=$(hostname -f) ;; - *) + *) hostname=${HOSTNAME:-$(hostname)} hostname=${hostname%.*} ;; @@ -3549,7 +3549,7 @@ get_style() { kde_config_file="${kde_config_dir}/kdeglobals" qt_theme="$(grep "^${kde}" "$kde_config_file")" qt_theme="${qt_theme/*=}" - + kde_theme="$(grep "^${kde}" "$kde_config_file")" kde_theme="${kde_theme/*=}" if [[ "$kde" == "font" ]]; then @@ -3600,24 +3600,24 @@ get_style() { type -p xfconf-query >/dev/null && \ gtk2_theme="$(xfconf-query -c xsettings -p "$xfconf")" ;; - + "Trinity") tde_config_dir - + if [[ -f "${tde_config_dir}/kdeglobals" ]]; then tde_config_file="${tde_config_dir}/kdeglobals" qt_theme="$(grep "^${kde}" "$tde_config_file")" qt_theme="${qt_theme/*=}" - + else err "Theme: TDE config files not found, skipping." fi ;; - + "LXQt"*) shopt -s nullglob if ! qt_theme=$(awk -F "=" -v r="^$lxqt" ' - $1~r { theme=$2 } + $1~r { theme=$2 } END { print theme } ' {/etc/xdg,/etc/xdg/*,"$XDG_CONFIG_HOME"}/lxqt/lxqt.con?); then err "Theme: Can't read LXQt config files. Unsetting Qt theme." @@ -3625,7 +3625,7 @@ get_style() { fi shopt -u nullglob ;; - + esac # Check for general GTK2 Theme. @@ -3679,14 +3679,14 @@ get_style() { qt_theme="${qt_theme%'"'}" qt_theme="${qt_theme#@Variant(}" qt_theme="${qt_theme%)}" - + # Read font name qt5ct_font_name="${qt_theme#*@}" qt5ct_font_name="${qt5ct_font_name%%@*}" # Interpret backslashes qt5ct_font_name="$(printf "%b" "$qt5ct_font_name")" - qt5ct_font_name="${qt5ct_font_name//[[:cntrl:]]}" # trim control characters - + qt5ct_font_name="${qt5ct_font_name//[[:cntrl:]]}" # trim control characters + # Get font size # Tread carefully, Qt sometimes uses @ in binary data local pre_size="${qt_theme#*@}" @@ -3698,14 +3698,14 @@ get_style() { local lowers=$(( ((raw_size[0]%16)<<8) + (raw_size[1]) )) local upper4=$((raw_size[0]>>4 )) qt5ct_font_size=$(( (2**(upper4+1)) + (lowers>>(11-upper4)) )) - + qt_theme="$qt5ct_font_name, $qt5ct_font_size" fi fi # Forced Qt theme through environment variables - Apply only if handling widget style! [[ "$kde" == "widgetStyle" && "$qt_theme" ]] && qt_theme="${QT_STYLE_OVERRIDE:-"$qt_theme"}" - + # Reformat Qt fonts if [[ "$kde" == "font" && "$qt_theme" ]]; then qt_font_size="${qt_theme#*,}" @@ -4146,7 +4146,7 @@ END "termite") [[ -f "${XDG_CONFIG_HOME}/termite/config" ]] && \ termite_config="${XDG_CONFIG_HOME}/termite/config" - + XDG_DIR="/etc/xdg" IFS=":" for directory in $XDG_CONFIG_DIRS; do @@ -5473,7 +5473,7 @@ kde_config_dir() { elif type -p kde-config &>/dev/null; then kde_config_dir="$(kde-config --path config)" - + elif [[ -d "${HOME}/.kde4" ]]; then kde_config_dir="${HOME}/.kde4/share/config" @@ -5487,15 +5487,15 @@ kde_config_dir() { tde_config_dir() { if [[ "$tde_config_dir" ]]; then return - + elif type -p tde-config &>/dev/null; then tde_config_dir="$(tde-config --path config)" - + elif [[ -d "${HOME}/.configtde" ]]; then tde_config_dir="${HOME}/.configtde" - + fi - + tde_config_dir="${tde_config_dir/$'/:'*}" } @@ -6280,8 +6280,8 @@ ${c1} ........::::.... :#####:${c2}@@@@@@@@@@@@@@@@@@@${c1}:####; :####:.${c2}@@@@@@@@@@@@@@@@${c1}:#####: `:####:.${c2}@@@@@@@@@@@@@@${c1}:#####: - ``:##:.${c2}@@@@@@@@@@@@${c1}^## # : - : ## ${c2}\@@@;@@@/ ${c1}:: # : + ``:##:.${c2}@@@@@@@@@@@@${c1}^## # : + : ## ${c2}\@@@;@@@/ ${c1}:: # : ${c2} VVV EOF ;; @@ -7154,7 +7154,7 @@ ${c3} ........ `╙▀█▄@»»»;`▀███▌¿ ,▄▀Ñ"` `"╨▀█▄▄▄░`▐█████▄, ,▄▄▀▀░` `"╙╩▀▀▀▀████████▓▌▌▌▀▀▀╨"`` - ``""░╚╨╝╝╝╝╨╨░""`` + ``""░╚╨╝╝╝╝╨╨░""`` EOF ;; @@ -11314,25 +11314,25 @@ EOF "ravynOS") set_colors 15 read -rd '' ascii_data <<'EOF' -${c1} ..oooo.. - .o$$$$$$$$$$$$$$o. - od$$$$$$$$$$$$$$$$$$$$$o - o$$$$$$$$$$$$$$$$$$$$$$$$$$o - .$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. - d$$$$$$$$$********$$$$$$$$$$$$$$$b - d$$$$$$$* °****?$$$$$$$$b - $$$$$$* °$$$$$$$ - d$$** .oo$$$$$$$$b - *° o$$$$$$$$$$$$$$ - o$$$$$$$$$$$$$$$$ - o$$$$$$$$$$$$$$$$$P - *$$$$$$$$$$$$$$$$$ - ?$$$$$$$$$$$$$$P - $$$$$$$$$$$$$P - $$$$$$$$$$$$P - ?$$$$$$$$$$* - $$$$$$$*° - d$$$$*° +${c1} ..oooo.. + .o$$$$$$$$$$$$$$o. + od$$$$$$$$$$$$$$$$$$$$$o + o$$$$$$$$$$$$$$$$$$$$$$$$$$o + .$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$. + d$$$$$$$$$********$$$$$$$$$$$$$$$b + d$$$$$$$* °****?$$$$$$$$b + $$$$$$* °$$$$$$$ + d$$** .oo$$$$$$$$b + *° o$$$$$$$$$$$$$$ + o$$$$$$$$$$$$$$$$ + o$$$$$$$$$$$$$$$$$P + *$$$$$$$$$$$$$$$$$ + ?$$$$$$$$$$$$$$P + $$$$$$$$$$$$$P + $$$$$$$$$$$$P + ?$$$$$$$$$$* + $$$$$$$*° + d$$$$*° ° EOF ;; @@ -13122,25 +13122,25 @@ EOF "KrassOS"* | "Krass"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' -${c1} ${c2}**@@@@@@@@@@@* - ${c2},@@@@%${c1}(((((((((((((${c2}%@@@@, - ${c2}#@@&${c1}(((((((((((((((((((((((${c2}&@@% - ${c2}@@&${c1}(((((((((((((((((((((((((((((${c2}@@@ - ${c2}@@&${c1}(((((((((((((((((((((((((((((((((${c2}&@@ - ${c2}.@@${c1}(((((((((((((((((((((((((((((((((((((${c2}@@. - ${c2}@@${c1}(((((((((((((((((((((((((((((((((((((((${c2}@@ - ${c2}@@#${c1}(((((((((((((((((((((((((((((${c2}%@@@@@@@#${c1}(#${c2}@@ - ${c2}.@@${c1}((((((((((((((((${c2}#%@@@@@@@@@&%#${c1}((((${c2}%@&${c1}((((${c2}@@. - ${c2}.@@${c1}(((((((/(${c2}&@@@@@@%${c1}(/((((((((((((((${c2}@@/${c1}(((((${c2}@@. - ${c2}.@@${c1}(///////////////////////////////${c2}@${c1}(///////${c2}@@ - ${c2}%@#${c1}/////////////////////////////(${c2}#${c1}////////${c2}%@% - ${c2} @@${c1}(///////////////////////////${c2}%${c1}/////////(${c2}@@ - ${c2}@@#${c1}***********************************${c2}%@@ - ${c2}*@@${c1}********************************${c2}/@@/ - ${c2},@@#${c1}***************************${c2}%@@* - ${c2}@@@&${c1}********************${c2}/@@@@ - ${c2}&@@@@&${c1}(//***//(${c2}&@@@@& -${c1} ${c2}**@@@@@@@@@@@* +${c1} ${c2}**@@@@@@@@@@@* + ${c2},@@@@%${c1}(((((((((((((${c2}%@@@@, + ${c2}#@@&${c1}(((((((((((((((((((((((${c2}&@@% + ${c2}@@&${c1}(((((((((((((((((((((((((((((${c2}@@@ + ${c2}@@&${c1}(((((((((((((((((((((((((((((((((${c2}&@@ + ${c2}.@@${c1}(((((((((((((((((((((((((((((((((((((${c2}@@. + ${c2}@@${c1}(((((((((((((((((((((((((((((((((((((((${c2}@@ + ${c2}@@#${c1}(((((((((((((((((((((((((((((${c2}%@@@@@@@#${c1}(#${c2}@@ + ${c2}.@@${c1}((((((((((((((((${c2}#%@@@@@@@@@&%#${c1}((((${c2}%@&${c1}((((${c2}@@. + ${c2}.@@${c1}(((((((/(${c2}&@@@@@@%${c1}(/((((((((((((((${c2}@@/${c1}(((((${c2}@@. + ${c2}.@@${c1}(///////////////////////////////${c2}@${c1}(///////${c2}@@ + ${c2}%@#${c1}/////////////////////////////(${c2}#${c1}////////${c2}%@% + ${c2} @@${c1}(///////////////////////////${c2}%${c1}/////////(${c2}@@ + ${c2}@@#${c1}***********************************${c2}%@@ + ${c2}*@@${c1}********************************${c2}/@@/ + ${c2},@@#${c1}***************************${c2}%@@* + ${c2}@@@&${c1}********************${c2}/@@@@ + ${c2}&@@@@&${c1}(//***//(${c2}&@@@@& +${c1} ${c2}**@@@@@@@@@@@* EOF ;;