version: bump

neofetch

@@ -28,7 +28,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-version="5.0.1"
+version="6.0.0"
 
 bash_version="${BASH_VERSION/.*}"
 sys_locale="${LANG:-C}"
@@ -669,7 +669,8 @@ disk_display="off"
 # Image backend.
 #
 # Default:  'ascii'
-# Values:   'ascii', 'caca', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty'
+# Values:   'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'off',
+#           'termpix', 'pixterm', 'tycat', 'w3m', 'kitty'
 # Flag:     --backend
 image_backend="ascii"
 
@@ -924,11 +925,6 @@ get_distro() {
                     "tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;;
                     "off")  distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;;
                 esac
-
-                # Workarounds for distros that go against the os-release standard.
-                [[ -z "${distro// }" ]] && distro="$(awk '/BLAG/ {print $1; exit}')" "${files[@]}"
-                [[ -z "${distro// }" ]] && distro="$(awk -F'=' '{print $2; exit}')"  "${files[@]}"
-
             else
                 for release_file in /etc/*-release; do
                     distro+="$(< "$release_file")"
@@ -2622,6 +2618,7 @@ get_resolution() {
     esac
 
     resolution="${resolution%,*}"
+    [[ -z ${resolution/x} ]] && resolution=
 }
 
 get_style() {
@@ -3391,9 +3388,9 @@ get_cols() {
         cols="${cols//nl/\\n\\e[${text_padding}C${zws}}"
 
         # Add block height to info height.
-        ((info_height+=block_height+1))
+        ((info_height+=block_range[1]>7?block_height+3:block_height+2))
 
-        printf '\n\e[%bC%b\n' "$text_padding" "${zws}${cols}"
+        printf '\n\e[%bC%b\n\n' "$text_padding" "${zws}${cols}"
     fi
 
     unset -v blocks blocks2 cols
@@ -3416,7 +3413,7 @@ image_backend() {
         "ascii") get_ascii ;;
         "off") image_backend="off" ;;
 
-        "caca" | "jp2a" | "iterm2" | "termpix" |\
+        "caca" | "chafa" | "jp2a" | "iterm2" | "termpix" |\
         "tycat" | "w3m" | "sixel" | "pixterm" | "kitty")
             get_image_source
 
@@ -3441,7 +3438,7 @@ image_backend() {
 
         *)
             err "Image: Unknown image backend specified '$image_backend'."
-            err "Image: Valid backends are: 'ascii', 'caca', 'jp2a', 'iterm2', 'kitty',
+            err "Image: Valid backends are: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'kitty',
                                             'off', 'sixel', 'pixterm', 'termpix', 'tycat', 'w3m')"
             err "Image: Falling back to ascii mode."
             get_ascii
@@ -3811,12 +3808,16 @@ display_image() {
     case "$image_backend" in
         "caca")
             img2txt \
-                -W "$((width / font_width)))" \
+                -W "$((width / font_width))" \
                 -H "$((height / font_height))" \
                 --gamma=0.6 \
             "$image"
         ;;
 
+        "chafa")
+            chafa --size="$((width / font_width))x$((height / font_height))" "$image"
+        ;;
+
         "jp2a")
             jp2a \
                 --colors \
@@ -3952,7 +3953,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//\\n}${reset} "
 
     # Calculate info height.
     ((++info_height))
@@ -4423,8 +4424,8 @@ BARS:
 
 IMAGE BACKEND:
     --backend backend           Which image backend to use.
-                                Possible values: 'ascii', 'caca', 'jp2a', 'iterm2', 'off',
-                                'sixel', 'tycat', 'w3m'
+                                Possible values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2',
+                                'off', 'sixel', 'tycat', 'w3m'
     --source source             Which image or ascii file to use.
                                 Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img',
                                 '/path/to/ascii', '/path/to/dir/', 'command output' [ascii]
@@ -4434,6 +4435,7 @@ IMAGE BACKEND:
                                 NEW: neofetch --ascii \"\$(fortune | cowsay -W 30)\"
 
     --caca source               Shortcut to use 'caca' backend.
+    --chafa source              Shortcut to use 'chafa' backend.
     --iterm2 source             Shortcut to use 'iterm2' backend.
     --jp2a source               Shortcut to use 'jp2a' backend.
     --kitty source              Shortcut to use 'kitty' backend.
@@ -4618,7 +4620,7 @@ get_args() {
             # Image backend
             "--backend") image_backend="$2" ;;
             "--source") image_source="$2" ;;
-            "--ascii" | "--caca" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\
+            "--ascii" | "--caca" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\
             "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty")
                 image_backend="${1/--}"
                 case "$2" in
@@ -5279,7 +5281,7 @@ EOF
         ;;
 
         "Bedrock"*)
-            set_colors 0 7
+            set_colors 8 7
             read -rd '' ascii_data <<'EOF'
 ${c1}--------------------------------------
 --------------------------------------
@@ -5736,7 +5738,7 @@ EOF
         "debian_small")
             set_colors 1 7 3
             read -rd '' ascii_data <<'EOF'
-  ${c1}_____
+${c1}  _____
  /  __ \\
 |  /    |
 |  \\___-
@@ -6244,8 +6246,8 @@ EOF
         "GoboLinux"*)
             set_colors 5 4 6 2
             read -rd '' ascii_data <<'EOF'
-${c1}_____       _
-/ ____|     | |
+${c1}  _____       _
+ / ____|     | |
 | |  __  ___ | |__   ___
 | | |_ |/ _ \| '_ \ / _ \
 | |__| | (_) | |_) | (_) |
@@ -8520,12 +8522,12 @@ EOF
             set_colors 2 8
             read -rd '' ascii_data <<'EOF'
 ${c1}    _______
- _ \______ -
-| \  ___  \ |
+ _ \\______ -
+| \\  ___  \\ |
 | | /   \ | |
 | | \___/ | |
-| \______ \_|
- -_______\
+| \\______ \\_|
+ -_______\\
 EOF
         ;;
 

neofetch.1

@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
-.TH NEOFETCH "1" "January 2019" "Neofetch 5.0.1" "User Commands"
+.TH NEOFETCH "1" "January 2019" "Neofetch 6.0.0" "User Commands"
 .SH NAME
 Neofetch \- A fast, highly customizable system info script
 .SH SYNOPSIS
@@ -217,8 +217,8 @@ Possible values: bar, infobar, barinfo, off
 .TP
 \fB\-\-backend\fR backend
 Which image backend to use.
-Possible values: 'ascii', 'caca', 'jp2a', 'iterm2', 'off',
-\&'sixel', 'tycat', 'w3m'
+Possible values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2',
+\&'off', 'sixel', 'tycat', 'w3m'
 .TP
 \fB\-\-source\fR source
 Which image or ascii file to use.
@@ -233,6 +233,9 @@ NEW: neofetch \fB\-\-ascii\fR "$(fortune | cowsay \fB\-W\fR 30)"
 \fB\-\-caca\fR source
 Shortcut to use 'caca' backend.
 .TP
+\fB\-\-chafa\fR source
+Shortcut to use 'chafa' backend.
+.TP
 \fB\-\-iterm2\fR source
 Shortcut to use 'iterm2' backend.
 .TP