From eea18cf68cb6a38dc2ed286d3c6ddce77957702a Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Mon, 9 Apr 2018 07:04:40 +0700 Subject: [PATCH 1/3] Misc: change all escape sequences from \e to \e --- neofetch | 62 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/neofetch b/neofetch index 40f1de05..d249a5b7 100755 --- a/neofetch +++ b/neofetch @@ -27,7 +27,7 @@ export PATH="/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec:${PATH}" shopt -s nocasematch # Reset colors and bold. -reset="\\e[0m" +reset="\e[0m" # DETECT INFORMATION @@ -2540,9 +2540,9 @@ get_cols() { # Generate the string. for ((start; start<=end; start++)); do case "$start" in - [0-6]) blocks+="${reset}\\e[3${start}m\\e[4${start}m${block_width}" ;; - 7) blocks+="${reset}\\e[3${start}m\\e[4${start}m${block_width}" ;; - *) blocks2+="\\e[38;5;${start}m\\e[48;5;${start}m${block_width}" ;; + [0-6]) blocks+="${reset}\e[3${start}m\e[4${start}m${block_width}" ;; + 7) blocks+="${reset}\e[3${start}m\e[4${start}m${block_width}" ;; + *) blocks2+="\e[38;5;${start}m\e[48;5;${start}m${block_width}" ;; esac done @@ -2555,12 +2555,12 @@ get_cols() { # Add newlines to the string. cols="${cols%%'nl'}" - cols="${cols//nl/\\n\\\e[${text_padding}C${zws}}" + cols="${cols//nl/\\n\\e[${text_padding}C${zws}}" # Add block height to info height. info_height="$((info_height+=block_height+2))" - printf "%b\n" "\\e[${text_padding}C${zws}${cols}" + printf "%b\n" "\e[${text_padding}C${zws}${cols}" fi unset -v blocks blocks2 cols @@ -2568,7 +2568,7 @@ get_cols() { # TosWin2 on FreeMiNT is terrible at this, # so we'll reset colors arbitrarily. [[ "$term" == "TosWin2" ]] && \ - printf "%b\n" "\\e[30;47m" + printf "%b\n" "\e[30;47m" # Tell info() that we printed manually. prin=1 @@ -2622,7 +2622,7 @@ image_backend() { esac # Set cursor position next image/ascii. - [[ "$image_backend" != "off" ]] && printf "%b" "\\e[${lines:-0}A\\e[9999999D" + [[ "$image_backend" != "off" ]] && printf "%b" "\e[${lines:-0}A\e[9999999D" } get_ascii() { @@ -2816,14 +2816,14 @@ get_term_size() { # so we have to use a slightly different sequence to # get the terminal size. if [[ -n "$TMUX" ]]; then - printf "%b" "\\ePtmux;\\e\\e[14t\\e\\e[c\\e\\" + printf "%b" "\ePtmux;\e\e[14t\e\e[c\e\\" read_flags=(-d c) elif [[ "$image_backend" == "tycat" ]]; then - printf "%b" "\\e}qs\000" + printf "%b" "\e}qs\000" else - printf "%b" "\\e[14t\\e[c" + printf "%b" "\e[14t\e[c" read_flags=(-d c) fi @@ -2842,7 +2842,7 @@ get_term_size() { term_width="${term_size[2]/t*}" fi - # Get terminal width/height if \\e[14t is unsupported. + # Get terminal width/height if \e[14t is unsupported. if [[ -z "$term_width" ]] || (( "$term_width" < 50 )); then if type -p xdotool >/dev/null 2>&1; then current_window="$(xdotool getactivewindow)" @@ -3040,10 +3040,10 @@ display_image() { "iterm2") image="$(base64 < "$image")" - iterm_cmd="\\e]1337;File=width=${width}px;height=${height}px;inline=1:${image}" + iterm_cmd="\e]1337;File=width=${width}px;height=${height}px;inline=1:${image}" # Tmux requires an additional escape sequence for this to work. - [[ -n "$TMUX" ]] && iterm_cmd="\\ePtmux;\\e${iterm_cmd}\\e\\" + [[ -n "$TMUX" ]] && iterm_cmd="\ePtmux;\e${iterm_cmd}\e\\" printf "%b\a\n" "$iterm_cmd" ;; @@ -3079,7 +3079,7 @@ to_ascii() { get_ascii # Set cursor position next image/ascii. - printf "%b" "\\e[${lines:-0}A\\e[9999999D" + printf "%b" "\e[${lines:-0}A\e[9999999D" } to_off() { @@ -3239,7 +3239,7 @@ prin() { string="${2:-$1}" local subtitle_color="$info_color" fi - string="$(trim "${string//$'\\e[0m'}")" + string="$(trim "${string//$'\e[0m'}")" # Log length if it doesn't exist. if [[ -z "$length" ]]; then @@ -3252,7 +3252,7 @@ prin() { string="${subtitle_color}${bold}${string}" # Print the info. - printf "%b\n" "${text_padding:+\\e[${text_padding}C}${zws}${string}${reset} " + printf "%b\n" "${text_padding:+\e[${text_padding}C}${zws}${string}${reset} " # Calculate info height. ((++info_height)) @@ -3264,7 +3264,7 @@ prin() { get_underline() { if [[ "$underline_enabled" == "on" ]]; then printf -v underline "%${length}s" - printf "%b%b\n" "${text_padding:+\\e[${text_padding}C}${zws}${underline_color}" \ + printf "%b%b\n" "${text_padding:+\e[${text_padding}C}${zws}${underline_color}" \ "${underline// /$underline_char}${reset} " unset -v length fi @@ -3285,12 +3285,12 @@ get_line_break() { get_bold() { case "$ascii_bold" in - "on") ascii_bold="\\e[1m" ;; + "on") ascii_bold="\e[1m" ;; "off") ascii_bold="" ;; esac case "$bold" in - "on") bold="\\e[1m" ;; + "on") bold="\e[1m" ;; "off") bold="" ;; esac } @@ -3310,10 +3310,10 @@ trim_quotes() { } strip_sequences() { - strip="${1//$'\\e['3[0-9]m}" - strip="${strip//$'\\e['38\;5\;[0-9]m}" - strip="${strip//$'\\e['38\;5\;[0-9][0-9]m}" - strip="${strip//$'\\e['38\;5\;[0-9][0-9][0-9]m}" + strip="${1//$'\e['3[0-9]m}" + strip="${strip//$'\e['38\;5\;[0-9]m}" + strip="${strip//$'\e['38\;5\;[0-9][0-9]m}" + strip="${strip//$'\e['38\;5\;[0-9][0-9][0-9]m}" printf "%s\n" "$strip" } @@ -4172,9 +4172,9 @@ set_text_colors() { color() { case "$1" in - [0-6]) printf "%b" "${reset}\\e[3${1}m" ;; - 7 | "fg") printf "%b" "\\e[37m${reset}" ;; - *) printf "%b" "\\e[38;5;${1}m" ;; + [0-6]) printf "%b" "${reset}\e[3${1}m" ;; + 7 | "fg") printf "%b" "\e[37m${reset}" ;; + *) printf "%b" "\e[38;5;${1}m" ;; esac } @@ -4197,7 +4197,7 @@ stdout() { } err() { - err+="$(color 1)[!]\\e[0m $1\n" + err+="$(color 1)[!]\e[0m $1\n" } get_full_path() { @@ -4381,7 +4381,7 @@ dynamic_prompt() { if ((lines > 1)); then case "$kernel_name" in "OpenBSD") tput cud "$lines" ;; - *) printf "%b" "\\e[${lines}B" ;; + *) printf "%b" "\e[${lines}B" ;; esac fi } @@ -5034,10 +5034,10 @@ main() { # Minix doesn't support these sequences. if [[ "$TERM" != "minix" && "$stdout" != "on" ]]; then # If the script exits for any reason, unhide the cursor. - trap 'printf "\\e[?25h\\e[?7h"' EXIT + trap 'printf "\e[?25h\e[?7h"' EXIT # Hide the cursor and disable line wrap. - printf "\\e[?25l\\e[?7l" + printf "\e[?25l\e[?7l" fi image_backend From 07cf1bd7397830e8d4fb8a4cf7100d5ab329a279 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Mon, 9 Apr 2018 09:47:21 +0700 Subject: [PATCH 2/3] Misc: exclude SC1117 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 388082b0..bbef3e9c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,7 +20,7 @@ script: - time ./neofetch --ascii --config config/travis.conf -v # See this wiki page for why we're disabling these errors. # https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1117; fi # The if statement is here to invert the exit code from grep. # grep normally errors if no match is found but we want the opposite. # We invert it so grep fails if a match is found. From 7f722a1b0f8ba33b489101246925e1bdafaabd31 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Tue, 10 Apr 2018 13:09:02 +0700 Subject: [PATCH 3/3] docs: changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9652019..e419f4b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,8 @@ ## Contributors + +## Info + +**Title** + +- Fixed unexpected backslash being inserted on some systems