From afd8e56d589b8e3167f1b226f6ca64e81e10707e Mon Sep 17 00:00:00 2001 From: chance <29938254+yslgirl@users.noreply.github.com> Date: Sun, 10 Sep 2017 23:46:08 -0600 Subject: [PATCH 0001/1133] add macOS High Sierra support --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 55c125f91..b596272ac 100755 --- a/neofetch +++ b/neofetch @@ -176,6 +176,7 @@ get_distro() { "10.10"*) codename="OS X Yosemite" ;; "10.11"*) codename="OS X El Capitan" ;; "10.12"*) codename="macOS Sierra" ;; + "10.13"*) codename="macOS High Sierra" ;; *) codename="macOS" ;; esac distro="$codename $osx_version $osx_build" @@ -186,7 +187,7 @@ get_distro() { case "$osx_version" in "10."[4-7]*) distro="${distro/${codename}/Mac OS X}" ;; "10."[8-9]* | "10.1"[0-1]*) distro="${distro/${codename}/OS X}" ;; - "10.12"*) distro="${distro/${codename}/macOS}" ;; + "10.1"[2-3]*) distro="${distro/${codename}/macOS}" ;; esac distro="${distro/ ${osx_build}}" ;; From 8d8b2da8903a5c16172bcce0992ff070a15af16a Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 12 Sep 2017 15:02:13 +0200 Subject: [PATCH 0002/1133] Font: Fix KDE font, #821 --- neofetch | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 55c125f91..ed2e3eaf1 100755 --- a/neofetch +++ b/neofetch @@ -1617,7 +1617,12 @@ get_style() { kde_config_file="${kde_config_dir}/kdeglobals" kde_theme="$(grep "^${kde}" "$kde_config_file")" - kde_theme="${kde_theme/${kde}*=}" + kde_theme="${kde_theme/*=}" + if [[ "$kde" == "font" ]]; then + kde_font_size="${kde_theme#*,}" + kde_font_size="${kde_font_size/,*}" + kde_theme="${kde_theme/,*} ${kde_theme/*,} ${kde_font_size}" + fi kde_theme="$(uppercase "$kde_theme") [KDE], " else err "Theme: KDE config files not found, skipping." From 8493805edaab48032c83a1d858fb6de53c0fa928 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Thu, 14 Sep 2017 10:22:30 +1000 Subject: [PATCH 0003/1133] docs: New changelog --- CHANGELOG.md | 120 --------------------------------------------------- 1 file changed, 120 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f41f143a..e96520195 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,122 +1,2 @@ ## Contributors -- **[@konimex](https://github.com/konimex)** -- **[@mstraube](https://github.com/mstraube)** -- **[@dominiklohmann](https://github.com/dominiklohmann)** -- **[@ybden](https://github.com/ybden)** -- **[@lexruee](https://github.com/lexruee)** -- **[@AMDmi3](https://github.com/AMDmi3)** -- **[@deadda7a](https://github.com/deadda7a)** -- **[@winneon](https://github.com/winneon)** -- **[@DamnWidget](https://github.com/DamnWidget)** - - -## General - -- Config file now has a `.conf` suffix. -- Neofetch now assumes target directories (config file and ASCII directory) at install time, this fixes problems with systems such as NixOS. -- `stdout` mode is now reimplemented. - - This mode prints the information in plain text. - - You can use it with `--stdout`. - - Example: https://gist.github.com/dylanaraps/151c205322cf3acae62661b76464a3f7 -- Fixed prompt location if color blocks are disabled. -- Make makefile more portable. **[@AMDmi3](https://github.com/AMDmi3)** - - -## Operating System - -- Added support for AryaLinux. **[@mstraube](https://github.com/mstraube)** -- Added support for Amazon Linux AMI. -- Added support for Artix Linux. **[@DamnWidget](https://github.com/DamnWidget)** -- Added support for Endless OS. -- Added support for Sabotage Linux. -- Added support for Siduction. **[@lexruee](https://github.com/lexruee)** -- Added support for Source Mage. -- Added support for Parsix GNU/Linux. **[@mstraube](https://github.com/mstraube)** -- Added support for Nurunner. **[@mstraube](https://github.com/mstraube)** -- Fixed Raspbian being detected as ChromeOS. - - -## Images - -- [w3m] Fixed w3m-img not found on NixOS. -- Added support for using all image types as input. - - Neofetch now supports `svg`, `tiff` etc. - - -## ASCII - -- Added small Debian. -- Added small FreeBSD. -- Added small macOS. -- Added small NixOS. - - -## Info - -**GPU Driver** - -- [Linux] Added a new info function (*off by default*) to display the GPU Driver currently in use. -- Add `info "GPU Driver" gpu_driver` to your config to use it. - -**CPU** - -- [Linux] Fixed inaccurate output on ARM SoC devices. -- [Linux] Fixed CPU speed not appearing on PowerPC systems. -- [NetBSD] Added support for CPU temperature. (NOTE: This only supports newer Intel processors) -- Fixed inaccurate speed output in systems with CPU speed less than 1 GHz. -- Deprecated `cpu_shorthand` in favor of `cpu_brand`. - -**GPU** - -- [Linux] Filter out duplicate entries. - -**Model** - -- Added support for QEMU/KVM. -- Renamed subtitle to `Host:`. - -**Uptime** - -- [AIX/IRIX] Fixed Neofetch crashing when calculating uptime. - -**Terminal** - -- [SSH] Fixed infinite loop if neofetch is run on non-interactive shells. - -**Terminal Font** - -- Added support for LXTerminal. **[@mstraube](https://github.com/mstraube)** -- Added support for GNUStep Terminal. **[@mstraube](https://github.com/mstraube)** -- Fixed Xfce4-terminal font output when system-wide font is used. **[@mstraube](https://github.com/mstraube)** -- Fixed MATE-Terminal issue. **[@mstraube](https://github.com/mstraube)** -- Fixed URxvt font detection failing if `.` is used. **[@winneon](https://github.com/winneon)** - -**Theme** - -- [Qt/KDE] Fixed inaccurate theme naming. **[@mstraube](https://github.com/mstraube)** -- [Qt/KDE] GTK theme is now shows as well. - -**Window Manager** - -- [macOS] Added support for `chunkwm`. **[@dominiklohmann](https://github.com/dominiklohmann)** -- Fix incorrect output when using WindowMaker. **[@mstraube](https://github.com/mstraube)** - -**Song** - -- Added support for Pogo. **[@mstraube](https://github.com/mstraube)** -- Fixed bug with players not being found. - -**Battery** - -- Added battery support for Thinkpads and other devices that use the `CMB` naming for batteries. **[@deadda7a](https://github.com/deadda7a)** - - -## Images - -- Fixed division by 0 error in XTerm. - -## Screenshot - -- Use `maim` over `scrot`. **[@ybden](https://github.com/ybden)** -- Fixed `scrot_cmd` arguments not being used. **[@winneon](https://github.com/winneon)** From b633ce9a0c3b1b274061cbde93674f1860c680fc Mon Sep 17 00:00:00 2001 From: dylan araps Date: Thu, 14 Sep 2017 10:23:03 +1000 Subject: [PATCH 0004/1133] version: bump --- config/config.conf | 2 +- neofetch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.conf b/config/config.conf index 7152efe41..e43f89f5b 100644 --- a/config/config.conf +++ b/config/config.conf @@ -729,4 +729,4 @@ stdout="off" # # NOTE: Don't change this value, neofetch reads this to determine # how to handle backwards compatibility. -config_version="3.3.0" +config_version="3.3.1-git" diff --git a/neofetch b/neofetch index ebc98882c..98a760d67 100755 --- a/neofetch +++ b/neofetch @@ -9,7 +9,7 @@ # https://github.com/dylanaraps/ # Neofetch version. -version="3.3.0" +version="3.3.1-git" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" From 15879c8df80be26e049fb2e9e2c1f075cee46ced Mon Sep 17 00:00:00 2001 From: dylan araps Date: Fri, 15 Sep 2017 08:16:51 +1000 Subject: [PATCH 0005/1133] distro: Fix Gentoo detection error. --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 98a760d67..965ef86d6 100755 --- a/neofetch +++ b/neofetch @@ -160,6 +160,7 @@ get_distro() { fi fi distro="$(trim_quotes "$distro")" + distro="${distro/'NAME='}" ;; "Mac OS X") From 8fa1abd0c2f73dacc726628949b7cee25199efff Mon Sep 17 00:00:00 2001 From: dylan araps Date: Sat, 16 Sep 2017 09:18:33 +1000 Subject: [PATCH 0006/1133] docs: CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e96520195..c7cb1023a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,6 @@ ## Contributors + +## OS + +- Fixed detection bug with Gentoo. From eea725b8aa6c6df129914b849c51cb74d4587c35 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 16 Sep 2017 21:17:22 +0200 Subject: [PATCH 0007/1133] Song: Add support for Elisa --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 965ef86d6..ef339bfc2 100755 --- a/neofetch +++ b/neofetch @@ -1411,7 +1411,7 @@ get_song() { player="$(ps x | awk '!(/ awk|Helper|Cache|ibus|indicator/) && /mpd|mopidy|cmus|mocp|spotify|\ Google Play|iTunes.app|rhythmbox|banshee|amarok|deadbeef|audacious|\ xmms2d|gnome-music|lollypop|clementine|pragha|exaile|juk|bluemindo|\ -guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo/ {printf $5 " " $6; exit}')" +guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " " $6; exit}')" get_song_dbus() { # Multiple players use an almost identical dbus command to get the information. @@ -1442,6 +1442,7 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo/ {printf $5 " " $6; "yarock"*) get_song_dbus "yarock" ;; "deepin-music"*) get_song_dbus "deepinmusic" ;; "tomahawk"*) get_song_dbus "tomahawk" ;; + "elisa"*) get_song_dbus "elisa" ;; "audacious"*) song="$(audtool current-song)" From c1dac903993236760b06c44574fd0f51d014b9eb Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Mon, 18 Sep 2017 14:29:35 +0700 Subject: [PATCH 0008/1133] Model: Remove more unneeded outputs --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 7999b78f2..20ae3720a 100755 --- a/neofetch +++ b/neofetch @@ -345,6 +345,7 @@ get_model() { model="${model//Default string}" model="${model//Not Specified}" model="${model//Type1ProductConfigId}" + model="${model//INVALID}" case "$model" in "Standard PC"*) model="KVM/QEMU (${model})" ;; From f03ecddc13339a2c87ac8df1d59b6650866cb166 Mon Sep 17 00:00:00 2001 From: Chris Weeks Date: Thu, 21 Sep 2017 17:56:12 +1200 Subject: [PATCH 0009/1133] Create coreos logo --- ascii/distro/coreos | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 ascii/distro/coreos diff --git a/ascii/distro/coreos b/ascii/distro/coreos new file mode 100644 index 000000000..0f83f2aa2 --- /dev/null +++ b/ascii/distro/coreos @@ -0,0 +1,20 @@ +${c1} ..... + .';:cccccccc:;'. + ':ccccclc${c3}lllllllll${c1}cc:. + .;cccccccc${c3}lllllllllllllll${c1}c, + ;clllccccc${c3}llllllllllllllllll${c1}c, + .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: + ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: + :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, + .ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c + .lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. + .lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. + .cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc + :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; + .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc + .cllllllllllclcccclccclccllllcllc + :cllllllllccclcllllllllllllcc; + .cccccccccccccclcccccccccc:. + .;cccclccccccllllllccc,. + .';ccccclllccc:;.. + ..... From cbece346f857a697e1816be0f8881af1b2f28c0e Mon Sep 17 00:00:00 2001 From: Chris Weeks Date: Thu, 21 Sep 2017 18:07:27 +1200 Subject: [PATCH 0010/1133] Update neofetch --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index 20ae3720a..8637b161e 100755 --- a/neofetch +++ b/neofetch @@ -3202,6 +3202,11 @@ get_distro_colors() { ascii_file="cloveros" ;; + "Container Linux by CoreOS"*) + set_colors 4 7 1 + ascii_file="coreos" + ;; + "crux_small") set_colors 4 5 7 6 ascii_file="crux_small" From 11aa52e08850b6cbc3e72288606bf7f1b393ab9f Mon Sep 17 00:00:00 2001 From: Chris Weeks Date: Fri, 22 Sep 2017 10:28:56 +1200 Subject: [PATCH 0011/1133] Remove single space on each line of ascii art --- ascii/distro/coreos | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/ascii/distro/coreos b/ascii/distro/coreos index 0f83f2aa2..605d50506 100644 --- a/ascii/distro/coreos +++ b/ascii/distro/coreos @@ -1,20 +1,20 @@ -${c1} ..... - .';:cccccccc:;'. - ':ccccclc${c3}lllllllll${c1}cc:. - .;cccccccc${c3}lllllllllllllll${c1}c, - ;clllccccc${c3}llllllllllllllllll${c1}c, - .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: - ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: - :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, - .ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c - .lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. - .lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. - .cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc - :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; - .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc - .cllllllllllclcccclccclccllllcllc - :cllllllllccclcllllllllllllcc; - .cccccccccccccclcccccccccc:. - .;cccclccccccllllllccc,. - .';ccccclllccc:;.. - ..... +${c1} ..... + .';:cccccccc:;'. + ':ccccclc${c3}lllllllll${c1}cc:. + .;cccccccc${c3}lllllllllllllll${c1}c, + ;clllccccc${c3}llllllllllllllllll${c1}c, + .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: + ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: + :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, +.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c +.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. +.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. +.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc + :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; + .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc + .cllllllllllclcccclccclccllllcllc + :cllllllllccclcllllllllllllcc; + .cccccccccccccclcccccccccc:. + .;cccclccccccllllllccc,. + .';ccccclllccc:;.. + ..... From 5caac4a91af7db6ce98ccbee29a62a807e8864f9 Mon Sep 17 00:00:00 2001 From: Tom Hutchings Date: Mon, 25 Sep 2017 18:27:35 +0100 Subject: [PATCH 0012/1133] tiny fix for WM always being detected as Kwm on macOS --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8637b161e..415bd32d8 100755 --- a/neofetch +++ b/neofetch @@ -706,7 +706,7 @@ get_wm() { else case "$os" in "Mac OS X") - ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hunkwm')" + ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm')" case "$ps_line" in *"kwm"*) wm="Kwm" ;; From fd04aa14aefa71f3f4289d4d657418e449fab25a Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Tue, 26 Sep 2017 08:49:21 +0700 Subject: [PATCH 0013/1133] docs: CHANGELOG --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index c7cb1023a..0bd817361 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ ## Contributors +[**@yslgirl**](https://github.com/yslgirl) + ## OS - Fixed detection bug with Gentoo. +- Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) From 9b94195ed92fe086bb95a1bd8b6e726028ef4e69 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sat, 7 Oct 2017 16:18:07 +1100 Subject: [PATCH 0014/1133] add album to song name for some players --- neofetch | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 0ce2959d3..82ec4cfa4 100755 --- a/neofetch +++ b/neofetch @@ -1423,7 +1423,7 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' \ string:'Metadata' |\ awk -F 'string "' '/string|array/ {printf "%s",$2; next}{print ""}' |\ - awk -F '"' '/artist/ {a=$2} /title/ {t=$2} END{print a " - " t}' + awk -F '"' '/artist/ {a=$2} /album"/ {b=$2} /title/ {t=$2} END{print a " - " b " - " t}' )" } @@ -1450,13 +1450,14 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " song="$(audtool current-song)" # Remove Album from 'Artist - Album - Title' - song="${song/-* -/-}" + #song="${song/-* -/-}" [[ -z "$song" ]] && get_song_dbus "audacious" ;; "cmus"*) song="$(cmus-remote -Q | awk '/tag artist/ {$1=$2=""; print; print " - "}\ + /tag album/ {$1=$2=""; print; print " - "}\ /tag title/ {$1=$2=""; print}')" ;; @@ -1465,14 +1466,16 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " "Linux") get_song_dbus "spotify" ;; "Mac OS X") - song="$(osascript -e 'tell application "Spotify" to artist of current track as \ + song="$(osascript -e 'tell application "Spotify" to artist of current track as¬ + string & " - " & album of current track as¬ string & " - " & name of current track as string')" ;; esac ;; "itunes"*) - song="$(osascript -e 'tell application "iTunes" to artist of current track as \ + song="$(osascript -e 'tell application "iTunes" to artist of current track as¬ + string & " - " & album of current track as¬ string & " - " & name of current track as string')" ;; @@ -1514,13 +1517,16 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " [[ "$(trim "$song")" == "-" ]] && unset -v song - # Display Artist and Title on separate lines. + # Display Artist, Album and Title on separate lines. if [[ "$song_shorthand" == "on" && "$song" ]]; then artist="${song/ -*}" + album="${song#*- }" + album="${album% -*}" song="${song/*-}" if [[ "$song" != "$artist" ]]; then prin "Artist" "$artist" + prin "Album" "$album" prin "Song" "$song" else prin "$subtitle" "$song" From f9d881e9051a266cc113565213a89165b3ca696a Mon Sep 17 00:00:00 2001 From: dylan araps Date: Tue, 10 Oct 2017 08:29:55 +1100 Subject: [PATCH 0015/1133] image: Fix bug with getting wallpaper from feh. --- neofetch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 0ce2959d3..2fbd68980 100755 --- a/neofetch +++ b/neofetch @@ -2492,7 +2492,9 @@ get_wallpaper() { *) if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then - image="$(awk -F\' '/feh/ {printf $2}' "${HOME}/.fehbg")" + image="$(< "${HOME}/.fehbg")" + image="${image#*\'}" + image="${image%\'*}" elif type -p nitrogen >/dev/null; then image="$(awk -F'=' '/file/ {printf $2;exit;}' \ From b763c31ad73acc297c4cf318e42fd3489c5e347b Mon Sep 17 00:00:00 2001 From: dylan araps Date: Tue, 10 Oct 2017 08:44:09 +1100 Subject: [PATCH 0016/1133] image: Fix bug with getting wallpaper from feh. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2fbd68980..06e36695b 100755 --- a/neofetch +++ b/neofetch @@ -2492,7 +2492,7 @@ get_wallpaper() { *) if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then - image="$(< "${HOME}/.fehbg")" + image="$(awk '{print $NF}' "${HOME}/.fehbg")" image="${image#*\'}" image="${image%\'*}" From b57cdee02acecc2a45c388608400c552da28be6e Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 11 Oct 2017 08:49:07 +1100 Subject: [PATCH 0017/1133] image: Fix bug with getting wallpaper from feh. --- neofetch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 06e36695b..9edd4d102 100755 --- a/neofetch +++ b/neofetch @@ -2492,9 +2492,7 @@ get_wallpaper() { *) if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then - image="$(awk '{print $NF}' "${HOME}/.fehbg")" - image="${image#*\'}" - image="${image%\'*}" + image="$(awk -F\' '/feh/ {printf $(NF-1)}' "${HOME}/.fehbg")" elif type -p nitrogen >/dev/null; then image="$(awk -F'=' '/file/ {printf $2;exit;}' \ From f1052a8e73c6fb07447da4bba1890d67887aa149 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 13 Oct 2017 13:35:10 +1100 Subject: [PATCH 0018/1133] fix cmus album output (hopefully) --- neofetch | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 82ec4cfa4..e66781533 100755 --- a/neofetch +++ b/neofetch @@ -1427,6 +1427,8 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " )" } + player="cmus" + case "${player/*\/}" in "mpd"* | "mopidy"*) song="$(mpc current)" ;; "mocp"*) song="$(mocp -Q "%artist - %song")" ;; @@ -1456,9 +1458,11 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " ;; "cmus"*) - song="$(cmus-remote -Q | awk '/tag artist/ {$1=$2=""; print; print " - "}\ - /tag album/ {$1=$2=""; print; print " - "}\ - /tag title/ {$1=$2=""; print}')" + song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; + /tag artist/ {$1=$2=""; sub(" ", ""); a=$0}\ + /tag album/ {$1=$2=""; sub(" ", ""); b=$0}\ + /tag title/ {$1=$2=""; sub(" ", ""); t=$0}\ + END { print a " - " b " - " t }')" ;; "spotify"*) From 1f482d786c21bc1fd339a6505fc93c48f90faff5 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 13 Oct 2017 13:38:08 +1100 Subject: [PATCH 0019/1133] remove a debug line for cmus (oops) --- neofetch | 2 -- 1 file changed, 2 deletions(-) diff --git a/neofetch b/neofetch index e66781533..e244e7549 100755 --- a/neofetch +++ b/neofetch @@ -1427,8 +1427,6 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " )" } - player="cmus" - case "${player/*\/}" in "mpd"* | "mopidy"*) song="$(mpc current)" ;; "mocp"*) song="$(mocp -Q "%artist - %song")" ;; From 952f2e5b2256a4535c43bebccef099dc91a3c0db Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 13 Oct 2017 14:24:56 +1100 Subject: [PATCH 0020/1133] fix Install Date for macOS --- neofetch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 0ce2959d3..2614c1236 100755 --- a/neofetch +++ b/neofetch @@ -2254,7 +2254,13 @@ get_install_date() { return ;; - *) install_date="$(ls -dlctT "$install_file" | awk '{printf $9 " " $6 " "$7 " " $8}')" ;; + *) + if [[ "$os" == "Mac OS X" ]]; then + install_date="$(ls -dlctuT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" + else + install_date="$(ls -dlctT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" + fi + ;; esac install_date="${install_date//-/ }" From 3cac29c804d763352db07e37a996e474d2719240 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 13 Oct 2017 14:32:58 +1100 Subject: [PATCH 0021/1133] Change -u to -U in macOS install date --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2614c1236..f578ba7cb 100755 --- a/neofetch +++ b/neofetch @@ -2256,7 +2256,7 @@ get_install_date() { *) if [[ "$os" == "Mac OS X" ]]; then - install_date="$(ls -dlctuT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" + install_date="$(ls -dlctUT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" else install_date="$(ls -dlctT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" fi From 123d1652ff0549505acb1f30abbc7d37b7ccb3f1 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 13 Oct 2017 14:44:22 +1100 Subject: [PATCH 0022/1133] fix line length to be under 100 chars in macOS install date --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f578ba7cb..2636d8ed8 100755 --- a/neofetch +++ b/neofetch @@ -2256,7 +2256,7 @@ get_install_date() { *) if [[ "$os" == "Mac OS X" ]]; then - install_date="$(ls -dlctUT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" + install_date="$(ls -dlctUT "$install_file" | awk '{printf $9 " " $6 " "$7 " " $8}')" else install_date="$(ls -dlctT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" fi From 75148f63eeb6ec1f8d0c902d8c26d9f9901c0911 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 13 Oct 2017 15:08:28 +1100 Subject: [PATCH 0023/1133] docs: CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bd817361..332793cac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,11 @@ ## Contributors [**@yslgirl**](https://github.com/yslgirl) +[**@iandrewt**](https://github.com/iandrewt) ## OS - Fixed detection bug with Gentoo. - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) +- Fixed Install Date bug with macOS. [**@iandrewt**](https://github.com/iandrewt) From f6c362f5a16b92cb64be2c4cdfa02d49078c0ce3 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 15 Oct 2017 07:21:40 +0700 Subject: [PATCH 0024/1133] Install Date: Use a separate case for MacOS ls --- neofetch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 77d2ecde0..5a3ac83e0 100755 --- a/neofetch +++ b/neofetch @@ -2254,12 +2254,12 @@ get_install_date() { return ;; + *"HLOPRSTUWabc"*) # macOS ls + install_date="$(ls -dlctUT "$install_file" | awk '{printf $9 " " $6 " "$7 " " $8}')" + ;; + *) - if [[ "$os" == "Mac OS X" ]]; then - install_date="$(ls -dlctUT "$install_file" | awk '{printf $9 " " $6 " "$7 " " $8}')" - else - install_date="$(ls -dlctT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" - fi + install_date="$(ls -dlctT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" ;; esac From 51ff3d1c8853c58cfc4c56b9f155c68245c0d421 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 15 Oct 2017 07:26:27 +0700 Subject: [PATCH 0025/1133] docs: CHANGELOG --- CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 332793cac..31a6495bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ ## Contributors -[**@yslgirl**](https://github.com/yslgirl) -[**@iandrewt**](https://github.com/iandrewt) +- [**@yslgirl**](https://github.com/yslgirl) +- [**@iandrewt**](https://github.com/iandrewt) +- [**@chrisweeksnz**](https://github.com/chrisweeksnz) ## OS @@ -9,3 +10,4 @@ - Fixed detection bug with Gentoo. - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Fixed Install Date bug with macOS. [**@iandrewt**](https://github.com/iandrewt) +- Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) From a26fd76ca6a3f466bd4652e4a6150c52cbbf3925 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Mon, 16 Oct 2017 07:42:37 +1100 Subject: [PATCH 0026/1133] OS: Added support for Lunar Linux. --- ascii/distro/lunar | 13 +++++++++++++ neofetch | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 ascii/distro/lunar diff --git a/ascii/distro/lunar b/ascii/distro/lunar new file mode 100644 index 000000000..26bd295c3 --- /dev/null +++ b/ascii/distro/lunar @@ -0,0 +1,13 @@ +${c1}`-. `-. + -ohys/-` `:+shy/` + -omNNdyo/` :+shmNNy/` + ${c3} - + /mMmo + hMMMN` + .NMMs + ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` + /:.` ${c3}/${c1} `.:/` +${c3} __ + | | _ _ ___ ___ ___ + | |__| | | | .'| _| + |_____|___|_|_|__,|_| diff --git a/neofetch b/neofetch index 9edd4d102..20dcb0e1a 100755 --- a/neofetch +++ b/neofetch @@ -3388,6 +3388,11 @@ get_distro_colors() { ascii_file="lubuntu" ;; + "Lunar"*) + set_colors 4 7 3 + ascii_file="lunar" + ;; + "mac"*"_small") set_colors 2 3 1 5 4 ascii_file="mac_small" From 3217b921e5c57c101b8a07604aae00fab051e6b0 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Tue, 17 Oct 2017 22:47:12 +1100 Subject: [PATCH 0027/1133] WM: Fix chunkwm being detected as Kwm on macOS --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 4de22a6a6..c5135ea49 100755 --- a/neofetch +++ b/neofetch @@ -710,8 +710,8 @@ get_wm() { ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm')" case "$ps_line" in - *"kwm"*) wm="Kwm" ;; *"chunkwm"*) wm="chunkwm" ;; + *"kwm"*) wm="Kwm" ;; *"Amethyst"*) wm="Amethyst" ;; *"Spectacle"*) wm="Spectacle" ;; *) wm="Quartz Compositor" ;; From 468c49efe7322a0d2dedb8501c53582873547bc2 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Tue, 17 Oct 2017 22:51:44 +1100 Subject: [PATCH 0028/1133] docs: CHANGELOG --- CHANGELOG.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31a6495bf..a6baba06d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,5 +9,13 @@ - Fixed detection bug with Gentoo. - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) -- Fixed Install Date bug with macOS. [**@iandrewt**](https://github.com/iandrewt) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) + +## Info + +**Window Manager** + +- [macOS] Fixed chunkwm being detected as Kwm. [**@iandrewt**](https://github.com/iandrewt) + +**Install Date** +- [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt) From f7dc4441fc5f12cd0051f60f9cdada6adcdf7d27 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Tue, 17 Oct 2017 23:13:36 +1100 Subject: [PATCH 0029/1133] gpu_driver: Add macOS (Nvidia) support --- config/config.conf | 2 +- neofetch | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/config/config.conf b/config/config.conf index e43f89f5b..f0d7cdb93 100644 --- a/config/config.conf +++ b/config/config.conf @@ -26,7 +26,7 @@ print_info() { info "GPU" gpu info "Memory" memory - # info "GPU Driver" gpu_driver # Linux only + # info "GPU Driver" gpu_driver # Linux/macOS only # info "CPU Usage" cpu_usage # info "Disk" disk # info "Battery" battery diff --git a/neofetch b/neofetch index c5135ea49..5b561a73e 100755 --- a/neofetch +++ b/neofetch @@ -2280,6 +2280,13 @@ get_gpu_driver() { '/Display|3D|VGA/{nr[NR+2]}; NR in nr {printf $2 ", "}')" gpu_driver="${gpu_driver%, }" ;; + "Mac OS X") + if [[ "$(kextstat | grep "GeForceWeb")" != "" ]]; then + gpu_driver="Nvidia Web Driver" + else + gpu_driver="macOS Default Graphics Driver" + fi + ;; esac } From 1ab898e94452232d550d5fe500235300d009d735 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 18 Oct 2017 11:25:27 +1100 Subject: [PATCH 0030/1133] resolution: Fix errors on non-retina screens [macOS] Added a check to see if the plist file we use for checking the scale factor exists --- neofetch | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 5b561a73e..8924c80fa 100755 --- a/neofetch +++ b/neofetch @@ -1540,14 +1540,18 @@ get_resolution() { awk '/Resolution:/ {printf $2"x"$4" @ "$6"Hz, "}')" fi - scale_factor="$(PlistBuddy -c "Print DisplayAnyUserSets:0:0:Resolution" \ - /Library/Preferences/com.apple.windowserver.plist)" + if [[ -e "/Library/Preferences/com.apple.windowserver.plist" ]]; then + scale_factor="$(PlistBuddy -c "Print DisplayAnyUserSets:0:0:Resolution" \ + /Library/Preferences/com.apple.windowserver.plist)" + else + scale_factor="" + fi # If no refresh rate is empty. [[ "$resolution" == *"@ Hz"* ]] && \ resolution="${resolution//@ Hz}" - ((${scale_factor%.*} == 2)) && \ + [[ "${scale_factor%.*}" == 2 ]] && \ resolution="${resolution// @/@2x @}" if [[ "$refresh_rate" == "off" ]]; then From 322acffb952600214ddaee2c3c6a709ec3940cf4 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 18 Oct 2017 11:28:41 +1100 Subject: [PATCH 0031/1133] docs: CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6baba06d..d7bf9400b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,4 +18,9 @@ - [macOS] Fixed chunkwm being detected as Kwm. [**@iandrewt**](https://github.com/iandrewt) **Install Date** + - [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt) + +**Resolution** + +- [macOS] Fixed errors on non-retina screens. [**@iandrewt**](https://github.com/iandrewt) From 4f3f0f73c0bae09fad45a37aabb6704f302e3b11 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 18 Oct 2017 14:37:00 +1100 Subject: [PATCH 0032/1133] distro: fix whitespace for High Sierra --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8924c80fa..8b9818371 100755 --- a/neofetch +++ b/neofetch @@ -177,7 +177,7 @@ get_distro() { "10.10"*) codename="OS X Yosemite" ;; "10.11"*) codename="OS X El Capitan" ;; "10.12"*) codename="macOS Sierra" ;; - "10.13"*) codename="macOS High Sierra" ;; + "10.13"*) codename="macOS High Sierra" ;; *) codename="macOS" ;; esac distro="$codename $osx_version $osx_build" From 434a4d4fb76cfc57813beb0ca351b9146c08befc Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 18 Oct 2017 14:57:05 +1100 Subject: [PATCH 0033/1133] model: add new iOS devices --- neofetch | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 8b9818371..5c9c54868 100755 --- a/neofetch +++ b/neofetch @@ -279,13 +279,16 @@ get_model() { "iPhone OS") case "$machine_arch" in "iPad1,1") model="iPad" ;; - "iPad2,"[1-4]) model="iPad2" ;; - "iPad3,"[1-3]) model="iPad3" ;; - "iPad3,"[4-6]) model="iPad4" ;; + "iPad2,"[1-4]) model="iPad 2" ;; + "iPad3,"[1-3]) model="iPad 3" ;; + "iPad3,"[4-6]) model="iPad 4" ;; + "iPad6,"[11-12]) model="iPad 5" ;; "iPad4,"[1-3]) model="iPad Air" ;; "iPad5,"[3-4]) model="iPad Air 2" ;; "iPad6,"[7-8]) model="iPad Pro (12.9 Inch)" ;; "iPad6,"[3-4]) model="iPad Pro (9.7 Inch)" ;; + "iPad7,"[1-2]) model="iPad Pro 2 (12.9 Inch)" ;; + "iPad7,"[3-4]) model="iPad Pro (10.5 Inch)" ;; "iPad2,"[5-7]) model="iPad mini" ;; "iPad4,"[4-6]) model="iPad mini 2" ;; "iPad4,"[7-9]) model="iPad mini 3" ;; @@ -306,6 +309,9 @@ get_model() { "iPhone8,4") model="iPhone SE" ;; "iPhone9,1" | "iPhone9,3") model="iPhone 7" ;; "iPhone9,2" | "iPhone9,4") model="iPhone 7 Plus" ;; + "iPhone10,1" | "iPhone10,4") model="iPhone 8" ;; + "iPhone10,2" | "iPhone10,5") model="iPhone 8 Plus" ;; + "iPhone10,3" | "iPhone10,6") model="iPhone X" ;; "iPod1,1") model="iPod touch" ;; "ipod2,1") model="iPod touch 2G" ;; From 87140464fcaf2cc762a456302c2965f420501ba8 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 18 Oct 2017 14:58:37 +1100 Subject: [PATCH 0034/1133] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7bf9400b..560033d08 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - Fixed detection bug with Gentoo. - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) +- Added support for 2017 iOS devices [**@iandrewt**](https://github.com/iandrewt) ## Info From 402ac0bc00ae72fe31760fabff79f4e242a8c262 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 18 Oct 2017 16:17:52 +1100 Subject: [PATCH 0035/1133] model: fix SC2102 on iPad --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 5c9c54868..9e66c4bcc 100755 --- a/neofetch +++ b/neofetch @@ -282,7 +282,7 @@ get_model() { "iPad2,"[1-4]) model="iPad 2" ;; "iPad3,"[1-3]) model="iPad 3" ;; "iPad3,"[4-6]) model="iPad 4" ;; - "iPad6,"[11-12]) model="iPad 5" ;; + "iPad6,11" | "iPad 6,12") model="iPad 5" ;; "iPad4,"[1-3]) model="iPad Air" ;; "iPad5,"[3-4]) model="iPad Air 2" ;; "iPad6,"[7-8]) model="iPad Pro (12.9 Inch)" ;; From 857cbb21b48375b437ca7164238cf877f6502d05 Mon Sep 17 00:00:00 2001 From: natemaia Date: Thu, 26 Oct 2017 02:01:55 -0700 Subject: [PATCH 0036/1133] Update archlabs distro ascii art --- ascii/distro/archlabs | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/ascii/distro/archlabs b/ascii/distro/archlabs index 8e0b840ea..74f8a026c 100644 --- a/ascii/distro/archlabs +++ b/ascii/distro/archlabs @@ -1,18 +1,21 @@ -${c1} sy - h--d - d---: - :----/N - :------/N - N/----:---+ - N/---+/ :--:o - N/--:/ ::::s - +--- ::::s - N+---+ ::::s - N+----o +:o s::::s - N/----:: s:::s h:::::s - N/----:::y::::+ o::::::o - N/---::::::::::s d::::::::+N - /--::::::::::::dd::::::::::+N - :-:::/+syhd NNN N dhys+/:::/ - d::+ydN /s+/d -arc y\\. +${c1} 'c' + 'kKk, + .dKKKx. + .oKXKXKd. + .l0XXXXKKo. + c0KXXXXKX0l. + :0XKKOxxOKX0l. + :OXKOc. .c0XX0l. + :OK0o. ${c4}...${c1}'dKKX0l. + :OX0c ${c4};xOx'${c1}'dKXX0l. + :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. + c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. + .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. + .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. + .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. + .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. + .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' + 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' + 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, + ,xko:'. ${c4}.. ${c1} .':okx; + .,'. .',. From 98e2a0db99046f8e7163061be90f1eaf37fbdf34 Mon Sep 17 00:00:00 2001 From: Jesse Liles Date: Thu, 2 Nov 2017 16:13:55 -0400 Subject: [PATCH 0037/1133] Added Pop\!_OS distribution --- ascii/distro/pop_os | 21 +++++++++++++++++++++ neofetch | 5 +++++ 2 files changed, 26 insertions(+) create mode 100644 ascii/distro/pop_os diff --git a/ascii/distro/pop_os b/ascii/distro/pop_os new file mode 100644 index 000000000..a399f18f2 --- /dev/null +++ b/ascii/distro/pop_os @@ -0,0 +1,21 @@ +${c1} ///////////// + ///////////////////// + ///////${c2}*767${c1}//////////////// + //////${c2}7676767676*${c1}////////////// + /////${c2}76767${c1}//${c2}7676767${c1}////////////// + /////${c2}767676${c1}///${c2}*76767${c1}/////////////// + ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// +/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// +//////////${c2}76767676767${c1}////${c2}76767${c1}///////// +///////////${c2}76767676${c1}//////${c2}7676${c1}////////// +////////////,${c2}7676${c1},///////${c2}767${c1}/////////// +/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// +///////////////${c2}7676${c1}//////////////////// + ///////////////${c2}7676${c1}///${c2}767${c1}//////////// + //////////////////////${c2}'${c1}//////////// + //////${c2}.7676767676767676767,${c1}////// + /////${c2}767676767676767676767${c1}///// + /////////////////////////// + ///////////////////// + ///////////// + diff --git a/neofetch b/neofetch index 9e66c4bcc..11eccc984 100755 --- a/neofetch +++ b/neofetch @@ -3571,6 +3571,11 @@ get_distro_colors() { ascii_file="peppermint" ;; + "Pop!_OS"*) + set_colors 6 7 + ascii_file="pop_os" + ;; + "Porteus"*) set_colors 6 7 ascii_file="porteus" From 498991b106e83d08348a211acdfe8f90c5a6ac2b Mon Sep 17 00:00:00 2001 From: Maulik Mistry Date: Fri, 3 Nov 2017 02:26:31 -0700 Subject: [PATCH 0038/1133] Added color updates for Kubuntu logo. --- ascii/distro/kubuntu | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ascii/distro/kubuntu b/ascii/distro/kubuntu index 3f7126c15..6302ff0f7 100644 --- a/ascii/distro/kubuntu +++ b/ascii/distro/kubuntu @@ -1,20 +1,20 @@ ${c1} `.:/ossyyyysso/:. .:oyyyyyyyyyyyyyyyyyyo:` - -oyyyyyyyo-``/yyyyyyysyyyyo- - -syyyyyyyyyy` +yyyy/` `/yyyys- - +yyys/./syyyy: ..-` /yyyyyy+ - `oyyyy: `:syys+oooo+:. .yyyyyyyyo` - +yyyyyy/ `/yyyyyyyyyyys/` /sssssyyy+ --yyyyyyyy- -syyyyyyyyyyyyyys- syyy- -oyyyyso+: .yyyyyyyyyyyyyyyyyy. `.+yyyo -yyys /yyyyyyyyyyyyyyyyyysosyyyyyyyy -yyys.` /yyyyyyyyyyyyyyyyyyyyyyyyyyyyy -oyyyyyso: .yyyyyyyyyyyyyyyyyy.`.-:/syyyo --yyyyyyyy. -syyyyyyyyyyyyyys- syyy- - +yyyyyy: `syyyyyyyyyyys/` /o+++oyyy+ - `oyyyy. -syyy++oooo+/. oyyyyyyyyo - +yyys/-oyyyys` `..` -yyyyyyy+ - -syyyyyyyyy: .syyy/` `syyyys- - -oyyyyyyy:.`-yyyyyys+syyyyo- + -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- + -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- + oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo + `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` + oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- +oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy +oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- + oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo + `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo + oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo + -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- + -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- ./oyyyyyyyyyyyyyyyyyyo/. `.:/oosyyyysso/:.` From d21f9e928dc62bd32a8aba835f78f84d4ef4cbb4 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 8 Nov 2017 07:20:25 +1100 Subject: [PATCH 0039/1133] model: Fix garbage --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 9e66c4bcc..f2546c77d 100755 --- a/neofetch +++ b/neofetch @@ -353,6 +353,7 @@ get_model() { model="${model//Not Specified}" model="${model//Type1ProductConfigId}" model="${model//INVALID}" + model="${model//�}" case "$model" in "Standard PC"*) model="KVM/QEMU (${model})" ;; From dd8ee366b125ed4e2af654c99184c38618dd4f2c Mon Sep 17 00:00:00 2001 From: Mitch Weaver <20451170+MitchWeaver@users.noreply.github.com> Date: Sat, 18 Nov 2017 23:52:55 +0100 Subject: [PATCH 0040/1133] add neofetch --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 06e36695b..1ca4506a3 100755 --- a/neofetch +++ b/neofetch @@ -544,6 +544,9 @@ get_packages() { package_dir=(/var/db/paludis/repositories/{cross-installed,installed}/*/data/*) packages="$((packages+=$(ls -d -1 "${package_dir[@]}" | wc -l)))" fi + + type -p butch >/dev/null && \ + packages="$((packages+=$(butch list | wc -l)))" if type -p pkg >/dev/null; then case "$kernel_name" in From 744dd463300591692fd3481709b2d411f683e921 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Mon, 13 Nov 2017 22:37:29 +0100 Subject: [PATCH 0041/1133] ascii: add LEDE --- ascii/distro/lede | 9 +++++++++ neofetch | 5 +++++ 2 files changed, 14 insertions(+) create mode 100644 ascii/distro/lede diff --git a/ascii/distro/lede b/ascii/distro/lede new file mode 100644 index 000000000..b1af94951 --- /dev/null +++ b/ascii/distro/lede @@ -0,0 +1,9 @@ + ${c1} _________ + / /\ + / LE / \ + / DE / \ + /________/ LE \ + \ \ DE / + \ LE \ / + \ DE \ / + \________\/ diff --git a/neofetch b/neofetch index 9c8ad885a..a1e515a5a 100755 --- a/neofetch +++ b/neofetch @@ -3397,6 +3397,11 @@ get_distro_colors() { ascii_file="kubuntu" ;; + "LEDE"*) + set_colors 4 7 1 + ascii_file="lede" + ;; + "Linux") set_colors fg 8 3 ascii_file="linux" From 63df9687db98e2fbc86e184e7edac43668fd8895 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sun, 19 Nov 2017 16:49:49 +0100 Subject: [PATCH 0042/1133] distro: fix trueos detection --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9c8ad885a..38be3f15e 100755 --- a/neofetch +++ b/neofetch @@ -153,7 +153,7 @@ get_distro() { # Workarounds for FreeBSD based distros. [[ -f "/etc/pcbsd-lang" ]] && distro="PCBSD" - [[ -f "/etc/rc.conf.trueos" ]] && distro="TrueOS" + [[ -f "/etc/trueos-lang" ]] && distro="TrueOS" # /etc/pacbsd-release is an empty file [[ -f "/etc/pacbsd-release" ]] && distro="PacBSD" From a1e684388480f213eee2e54e12bd92c52e43983d Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Wed, 22 Nov 2017 22:08:11 +0100 Subject: [PATCH 0043/1133] disk: change Haiku's df detection 'blocks' keyword is also present in busybox' df. Busybox' df also has -P and -h flags, so it can be detected as normal df. 'Tracker' keyword seems to be exclusive to Haiku's df. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9c8ad885a..f129394cc 100755 --- a/neofetch +++ b/neofetch @@ -2032,7 +2032,7 @@ get_disk() { # Get "df" version. df_version="$(df --version 2>&1)" case "$df_version" in - *"blocks"*) # Haiku + *"Tracker"*) # Haiku err "Your version of df cannot be used due to the non-standard flags" return ;; From acdd75220e1e6cda9146104fe8017adb9be8265f Mon Sep 17 00:00:00 2001 From: StarryTony Date: Thu, 23 Nov 2017 01:55:08 +0000 Subject: [PATCH 0044/1133] fix in mac can not make_thumbnail # fix in mac high Sierra cannot replace '/' with '_', optionally can use ${image//\//_} --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9c8ad885a..79d7bf7fa 100755 --- a/neofetch +++ b/neofetch @@ -2686,7 +2686,8 @@ get_image_size() { make_thumbnail() { # Name the thumbnail using variables so we can # use it later. - image_name="$crop_mode-$crop_offset-$width-$height-${image//'/'/_}" + # fix in mac cannot replace '/' with '_', optionally can use ${image//\//_} + image_name="$crop_mode-$crop_offset-$width-$height-${image##*/}" # Handle file extensions. case "${image##*.}" in From c3d47ece7de5ac775c5557e0d24b889b7fd2ef98 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 26 Nov 2017 19:00:29 +0700 Subject: [PATCH 0045/1133] docs: CHANGELOG --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 560033d08..3b658c5c4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,14 +3,18 @@ - [**@yslgirl**](https://github.com/yslgirl) - [**@iandrewt**](https://github.com/iandrewt) - [**@chrisweeksnz**](https://github.com/chrisweeksnz) +- [**@dawidd6**](https://github.com/dawidd6) +- [**@MitchWeaver**](https://github.com/MitchWeaver) ## OS - Fixed detection bug with Gentoo. +- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) - Added support for 2017 iOS devices [**@iandrewt**](https://github.com/iandrewt) +- Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) ## Info @@ -22,6 +26,10 @@ - [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt) +**Package Manager** + +- Added detection for Sabotage Linux's `butch` [**@MitchWeaver**](https://github.com/MitchWeaver) + **Resolution** - [macOS] Fixed errors on non-retina screens. [**@iandrewt**](https://github.com/iandrewt) From fe9933f54421211658a413d5a8aa94741e7961c0 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 3 Dec 2017 19:52:03 +0700 Subject: [PATCH 0046/1133] Image mode (MacOS): Fixed garbage letter appeared in iTerm2 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 157cf3865..4ac54a4c0 100755 --- a/neofetch +++ b/neofetch @@ -3003,7 +3003,7 @@ prin() { string="${subtitle_color}${bold}${string}" # Print the info. - printf "%b\n" "${text_padding:+\033[${text_padding}C}${zws}${string}${reset}" + printf "%b\n" "${text_padding:+\033[${text_padding}C}${zws}${string}${reset} " # Calculate info height. ((++info_height)) @@ -3016,7 +3016,7 @@ get_underline() { if [[ "$underline_enabled" == "on" ]]; then printf -v underline "%${length}s" printf "%b%b\n" "${text_padding:+\033[${text_padding}C}${zws}${underline_color}" \ - "${underline// /$underline_char}${reset}" + "${underline// /$underline_char}${reset} " unset -v length fi prin=1 From ed99973989ea8f8026df3d40a169652f6f29d621 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 3 Dec 2017 19:54:02 +0700 Subject: [PATCH 0047/1133] docs: CHANGELOG --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3b658c5c4..5427d5fce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - [**@chrisweeksnz**](https://github.com/chrisweeksnz) - [**@dawidd6**](https://github.com/dawidd6) - [**@MitchWeaver**](https://github.com/MitchWeaver) +- [**@StarryTony**](https://github.com/StarryTony) ## OS @@ -16,6 +17,12 @@ - Added support for 2017 iOS devices [**@iandrewt**](https://github.com/iandrewt) - Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) + +## Images + +- [MacOS/iTerm2] Fixed thumbnail not appearing (replaced by placeholder) [**@StarryTony**](https://github.com/StarryTony) + + ## Info **Window Manager** From 39cda4f29fe3d77107a97fe7d71d7c0094ac9fe0 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 3 Dec 2017 19:54:50 +0700 Subject: [PATCH 0048/1133] Misc: Remove comment --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index 4ac54a4c0..d420429c5 100755 --- a/neofetch +++ b/neofetch @@ -2689,7 +2689,6 @@ get_image_size() { make_thumbnail() { # Name the thumbnail using variables so we can # use it later. - # fix in mac cannot replace '/' with '_', optionally can use ${image//\//_} image_name="$crop_mode-$crop_offset-$width-$height-${image##*/}" # Handle file extensions. From 1e8f12dd4a876fd2b8868641e506efde9a4e683c Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 08:38:11 +1100 Subject: [PATCH 0049/1133] gpu_driver: Add version to NVIDIA output --- neofetch | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index d420429c5..6124c6016 100755 --- a/neofetch +++ b/neofetch @@ -551,9 +551,9 @@ get_packages() { package_dir=(/var/db/paludis/repositories/{cross-installed,installed}/*/data/*) packages="$((packages+=$(ls -d -1 "${package_dir[@]}" | wc -l)))" fi - + type -p butch >/dev/null && \ - packages="$((packages+=$(butch list | wc -l)))" + packages="$((packages+=$(butch list | wc -l)))" if type -p pkg >/dev/null; then case "$kernel_name" in @@ -2293,10 +2293,16 @@ get_gpu_driver() { gpu_driver="$(lspci -nnk | awk -F ': ' \ '/Display|3D|VGA/{nr[NR+2]}; NR in nr {printf $2 ", "}')" gpu_driver="${gpu_driver%, }" + + if [[ "$gpu_driver" == *"nvidia"* ]]; then + gpu_driver="$(< /proc/driver/nvidia/version)" + gpu_driver="${gpu_driver/*Module }" + gpu_driver="NVIDIA ${gpu_driver/ *}" + fi ;; "Mac OS X") if [[ "$(kextstat | grep "GeForceWeb")" != "" ]]; then - gpu_driver="Nvidia Web Driver" + gpu_driver="NVIDIA Web Driver" else gpu_driver="macOS Default Graphics Driver" fi From ca49b178fe9cdf50b8de1d15a24a4cbcbdc6cd8a Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 08:43:05 +1100 Subject: [PATCH 0050/1133] de: Add GNOME version --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 6124c6016..07ad1a994 100755 --- a/neofetch +++ b/neofetch @@ -689,6 +689,7 @@ get_de() { *"xfce5"*) de="Xfce5" ;; *"xfce"*) de="Xfce" ;; *"mate"*) de="MATE" ;; + *"GNOME"*) de="GNOME $(gnome-shell --version)" ;; esac # Log that the function was run. From db21981373737c0865ba5bce475b652aeca2e761 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 08:45:47 +1100 Subject: [PATCH 0051/1133] de: Fix GNOME bug --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 07ad1a994..9cbf8441f 100755 --- a/neofetch +++ b/neofetch @@ -689,7 +689,10 @@ get_de() { *"xfce5"*) de="Xfce5" ;; *"xfce"*) de="Xfce" ;; *"mate"*) de="MATE" ;; - *"GNOME"*) de="GNOME $(gnome-shell --version)" ;; + *"GNOME"*) + de="$(gnome-shell --version)" + de="${de/Shell }" + ;; esac # Log that the function was run. From 8540a2f1e30a1233aca663bf23ebb5141630f4d6 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 08:56:33 +1100 Subject: [PATCH 0052/1133] cpu_temp: Detect CPU temperature file. --- neofetch | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9cbf8441f..a2db57110 100755 --- a/neofetch +++ b/neofetch @@ -926,7 +926,12 @@ get_cpu() { esac speed_dir="/sys/devices/system/cpu/cpu0/cpufreq" - temp_dir="/sys/class/hwmon/hwmon0/temp1_input" + + # Select the right temperature file. + for temp_dir in /sys/class/hwmon/*; do + [[ "$(< "${temp_dir}/name")" =~ (coretemp|fam15h_power) ]] && \ + { temp_dir="${temp_dir}/temp1_input"; break; } + done # Get CPU speed. if [[ -d "$speed_dir" ]]; then From c43ffb028e83a0c855a453abed911b862e3d2532 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 10:29:14 +1100 Subject: [PATCH 0053/1133] image: Make (--size none) keep original image aspect ratio. --- neofetch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neofetch b/neofetch index a2db57110..e73f5dbf5 100755 --- a/neofetch +++ b/neofetch @@ -2690,6 +2690,12 @@ get_image_size() { width="${size%% *}" height="${size##* }" crop_mode="none" + + while (( "$width" >= ("$term_width" / 2) || + "$height" >= "$term_height" )); do + width="$((width / 2))" + height="$((height / 2))" + done ;; *) image_size="${image_size/px}" ;; From 7fc4f84217c101c49636732912e32e74d7ce6e2e Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 11:08:10 +1100 Subject: [PATCH 0054/1133] wm_theme: Fixed sawfish detection --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e73f5dbf5..8a920205d 100755 --- a/neofetch +++ b/neofetch @@ -758,7 +758,7 @@ get_wm_theme() { ;; "Sawfish") - wm_theme="$(awk -F ")" '/\(quote default-frame-style/ {print $2}' \ + wm_theme="$(awk -F "'|)" '!/^;/ && /default-frame-style/ {a=$(NF-1)} END{print a}') \ "${HOME}/.sawfish/custom")" ;; From ed05c6460b9aa3cd1eb0b5168b5d363db5f429f1 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 11:19:53 +1100 Subject: [PATCH 0055/1133] general: Add command used to run neofetch to verbose output. --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 8a920205d..235342997 100755 --- a/neofetch +++ b/neofetch @@ -4764,6 +4764,9 @@ main() { # Take a screenshot. [[ "$scrot" == "on" ]] && take_scrot + # Add neofetch command to verbose output. + err "Neofetch command: $0 $*" + # Show error messages. [[ "$verbose" == "on" ]] && printf "%b" "$err" >&2 From 9b5d75907bac74ebdb96381e7e662e6ca55f838d Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 11:30:17 +1100 Subject: [PATCH 0056/1133] general: Add neofetch version to verbose output. --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 235342997..c9c26da07 100755 --- a/neofetch +++ b/neofetch @@ -4764,8 +4764,9 @@ main() { # Take a screenshot. [[ "$scrot" == "on" ]] && take_scrot - # Add neofetch command to verbose output. + # Add neofetch info to verbose output. err "Neofetch command: $0 $*" + err "Neofetch version: $version" # Show error messages. [[ "$verbose" == "on" ]] && printf "%b" "$err" >&2 From c5c4f901ba9b001d0cd991606c746ca1ffccd7cb Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 11:31:12 +1100 Subject: [PATCH 0057/1133] general: Add config version to verbose output --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index c9c26da07..c8bc85e86 100755 --- a/neofetch +++ b/neofetch @@ -4767,6 +4767,7 @@ main() { # Add neofetch info to verbose output. err "Neofetch command: $0 $*" err "Neofetch version: $version" + err "Neofetch config: $config_version" # Show error messages. [[ "$verbose" == "on" ]] && printf "%b" "$err" >&2 From 9f263fe1849d0a6a78232682368f9f4b9e650190 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 11:42:10 +1100 Subject: [PATCH 0058/1133] general: Fixed extra trailing prompt newline --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c8bc85e86..0f419aa17 100755 --- a/neofetch +++ b/neofetch @@ -4098,7 +4098,7 @@ dynamic_prompt() { fi # Set the prompt location. - ((lines > 0)) && printf "%b" "\033[${lines}B" + ((lines > 1)) && printf "%b" "\033[${lines}B" } old_functions() { From a2290b739897c65086e4d885e1dd7c303a302239 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 11:48:49 +1100 Subject: [PATCH 0059/1133] cpu_temp: $temp is an environment variable on Windows. --- neofetch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index 0f419aa17..e84ed1b69 100755 --- a/neofetch +++ b/neofetch @@ -949,8 +949,8 @@ get_cpu() { # Get CPU temp. if [[ -f "$temp_dir" ]]; then - temp="$(< "$temp_dir")" - temp="$((temp * 100 / 10000))" + deg="$(< "$temp_dir")" + deg="$((deg * 100 / 10000))" fi # Get CPU cores. @@ -1013,12 +1013,12 @@ get_cpu() { # Get CPU temp. case "$kernel_name" in "FreeBSD"* | "DragonFly"* | "NetBSD"*) - temp="$(sysctl -n dev.cpu.0.temperature)" - temp="${temp/C}" + deg="$(sysctl -n dev.cpu.0.temperature)" + deg="${deg/C}" ;; "OpenBSD"* | "Bitrig"*) - temp="$(sysctl -n hw.sensors.lm0.temp0)" - temp="${temp/ degC}" + deg="$(sysctl -n hw.sensors.lm0.temp0)" + deg="${deg/ degC}" ;; esac ;; @@ -1135,15 +1135,15 @@ get_cpu() { fi # Add CPU temp to the output. - if [[ "$cpu_temp" != "off" && "$temp" ]]; then - temp="${temp//.}" + if [[ "$cpu_temp" != "off" && "$deg" ]]; then + deg="${deg//.}" # Convert to Fahrenheit if enabled - [[ "$cpu_temp" == "F" ]] && temp="$((temp * 90 / 50 + 320))" + [[ "$cpu_temp" == "F" ]] && deg="$((deg * 90 / 50 + 320))" # Format the output - temp="[${temp/${temp: -1}}.${temp: -1}°${cpu_temp:-C}]" - cpu="$cpu $temp" + deg="[${deg/${deg: -1}}.${deg: -1}°${cpu_temp:-C}]" + cpu="$cpu $deg" fi } From 8762403de9fc0648fbb941a1de599891d318ba61 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Wed, 13 Dec 2017 14:43:21 +1100 Subject: [PATCH 0060/1133] wm_theme: Fix sawfish theme. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e84ed1b69..065a7ea6f 100755 --- a/neofetch +++ b/neofetch @@ -758,7 +758,7 @@ get_wm_theme() { ;; "Sawfish") - wm_theme="$(awk -F "'|)" '!/^;/ && /default-frame-style/ {a=$(NF-1)} END{print a}') \ + wm_theme="$(awk -F '\\(quote|\\)' '/default-frame-style/ {print $(NF-4)}' \ "${HOME}/.sawfish/custom")" ;; From 6711ebc91f9bea32a6c2c75b56324f35ca691925 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Sat, 16 Dec 2017 15:51:07 +1100 Subject: [PATCH 0061/1133] image: Added pixterm backend. --- config/config.conf | 2 +- neofetch | 20 +++++++++++++++----- neofetch.1 | 7 +++++-- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/config/config.conf b/config/config.conf index f0d7cdb93..aadbf8252 100644 --- a/config/config.conf +++ b/config/config.conf @@ -543,7 +543,7 @@ disk_display="off" # Image backend. # # Default: 'ascii' -# Values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'tycat', 'w3m' +# Values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m' # Flag: --backend image_backend="ascii" diff --git a/neofetch b/neofetch index 065a7ea6f..a2c33551a 100755 --- a/neofetch +++ b/neofetch @@ -2374,7 +2374,8 @@ image_backend() { "ascii") get_ascii ;; "off") image_backend="off" ;; - "caca" | "catimg" | "jp2a" | "iterm2" | "termpix" | "tycat" | "w3m" | "sixel") + "caca" | "catimg" | "jp2a" | "iterm2" | "termpix" |\ + "tycat" | "w3m" | "sixel" | "pixterm") get_image_source if [[ ! -f "$image" ]]; then @@ -2400,7 +2401,7 @@ image_backend() { *) err "Image: Unknown image backend specified '$image_backend'." err "Image: Valid backends are: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', - 'off', 'sixel', 'termpix', 'tycat', 'w3m')" + 'off', 'sixel', 'pixterm', 'termpix', 'tycat', 'w3m')" err "Image: Falling back to ascii mode." get_ascii ;; @@ -2800,8 +2801,16 @@ display_image() { to_off "Image: jp2a failed to display the image." ;; + "pixterm") + pixterm -tc "$((width / font_width))" \ + -tr "$((height / font_height))" \ + "$image" ||\ + to_off "Image: pixterm failed to display the image." + ;; + "sixel") - img2sixel -w "$width" "$image" || to_off "Image: libsixel failed to display the image." + img2sixel -w "$width" "$image" ||\ + to_off "Image: libsixel failed to display the image." ;; "termpix") @@ -4430,6 +4439,7 @@ IMAGE BACKEND: --catimg source Shortcut to use 'catimg' backend. --iterm2 source Shortcut to use 'iterm2' backend. --jp2a source Shortcut to use 'jp2a' backend. + --pixterm source Shortcut to use 'pixterm' backend. --sixel source Shortcut to use 'sixel' backend. --termpix source Shortcut to use 'termpix' backend. --tycat source Shortcut to use 'tycat' backend. @@ -4645,8 +4655,8 @@ get_args() { # Image backend "--backend") image_backend="$2" ;; "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--sixel" |\ - "--termpix" | "--tycat" | "--w3m") + "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--sixel" | "--termpix" | "--tycat" | "--w3m") image_backend="${1/--}" case "$2" in "-"* | "") ;; diff --git a/neofetch.1 b/neofetch.1 index 160b99055..33958fb11 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.4. -.TH NEOFETCH "1" "September 2017" "Neofetch 3.3.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.5. +.TH NEOFETCH "1" "December 2017" "Neofetch 3.3.1-git" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -207,6 +207,9 @@ Shortcut to use 'iterm2' backend. \fB\-\-jp2a\fR source Shortcut to use 'jp2a' backend. .TP +\fB\-\-pixterm\fR source +Shortcut to use 'pixterm' backend. +.TP \fB\-\-sixel\fR source Shortcut to use 'sixel' backend. .TP From a9df517fd41edc34af8a05e55c8fdf0ce54b61d2 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Sun, 17 Dec 2017 20:08:05 +1100 Subject: [PATCH 0062/1133] wm: Add support for way-cooler --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index a2c33551a..e4adc5c99 100755 --- a/neofetch +++ b/neofetch @@ -716,7 +716,11 @@ get_wm() { # Fallback for Wayland wms. [[ "$wm" == "xwlc" ]] && \ - wm="$(ps -e | grep -m 1 -o -F -e "sway" -e "orbment" -e "velox" -e "orbital")" + wm="$(ps -e | grep -m 1 -o -F -e "sway" \ + -e "orbment" \ + -e "velox" \ + -e "orbital" \ + -e "way-cooler")" else case "$os" in From 80a34bdf28801b05bc45fdba3d4ca641205f1980 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Sun, 17 Dec 2017 20:08:30 +1100 Subject: [PATCH 0063/1133] wm: Remove uneeded velox detection --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index e4adc5c99..1724d6c39 100755 --- a/neofetch +++ b/neofetch @@ -718,7 +718,6 @@ get_wm() { [[ "$wm" == "xwlc" ]] && \ wm="$(ps -e | grep -m 1 -o -F -e "sway" \ -e "orbment" \ - -e "velox" \ -e "orbital" \ -e "way-cooler")" From 9ad9d4d75e368736649ef45d3ffbe68c4eaa6033 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Sun, 17 Dec 2017 20:43:41 +1100 Subject: [PATCH 0064/1133] wm: Better wayland detection --- neofetch | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index 1724d6c39..7fb09fd90 100755 --- a/neofetch +++ b/neofetch @@ -677,7 +677,7 @@ get_de() { esac # Fallback to using xprop. - [[ -n "$DISPLAY" && -z "$de" ]] && \ + [[ "$DISPLAY" && -z "$de" ]] && \ de="$(xprop -root | awk '/KDE_SESSION_VERSION|^_MUFFIN|xfce4|xfce5/')" # Format strings. @@ -703,7 +703,30 @@ get_wm() { # If function was run, stop here. ((wm_run == 1)) && return - if [[ -n "$DISPLAY" && "$os" != "Mac OS X" ]]; then + if [[ "$WAYLAND_DISPLAY" ]]; then + if [[ "$SWAYSOCK" ]]; then + wm="sway" + + else + wm="$(ps -e | grep -m 1 -o -F -e "asc" \ + -e "fireplace" \ + -e "grefsen" \ + -e "mazecompositor" \ + -e "maynard" \ + -e "motorcar" \ + -e "orbment" \ + -e "orbital" \ + -e "perceptia" \ + -e "rustland" \ + -e "velox" \ + -e "wavy" \ + -e "wayhouse" \ + -e "way-cooler" \ + -e "westford" \ + -e "weston")" + fi + + elif [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" id="${id##* }" wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)" @@ -714,13 +737,6 @@ get_wm() { # Window Maker does not set _NET_WM_NAME [[ "$wm" =~ "WINDOWMAKER" ]] && wm="wmaker" - # Fallback for Wayland wms. - [[ "$wm" == "xwlc" ]] && \ - wm="$(ps -e | grep -m 1 -o -F -e "sway" \ - -e "orbment" \ - -e "orbital" \ - -e "way-cooler")" - else case "$os" in "Mac OS X") @@ -1634,7 +1650,7 @@ get_style() { # Fix weird output when the function is run multiple times. unset gtk2_theme gtk3_theme theme path - if [[ -n "$DISPLAY" && "$os" != "Mac OS X" ]]; then + if [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then # Get DE if user has disabled the function. ((de_run != 1)) && get_de From 4870a863ac3c3f2ab818eb38b44bb23cc3a03935 Mon Sep 17 00:00:00 2001 From: dylan araps Date: Sun, 17 Dec 2017 21:10:48 +1100 Subject: [PATCH 0065/1133] wm: cleanup --- neofetch | 51 +++++++++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/neofetch b/neofetch index 7fb09fd90..05c441cd1 100755 --- a/neofetch +++ b/neofetch @@ -704,27 +704,24 @@ get_wm() { ((wm_run == 1)) && return if [[ "$WAYLAND_DISPLAY" ]]; then - if [[ "$SWAYSOCK" ]]; then - wm="sway" - - else - wm="$(ps -e | grep -m 1 -o -F -e "asc" \ - -e "fireplace" \ - -e "grefsen" \ - -e "mazecompositor" \ - -e "maynard" \ - -e "motorcar" \ - -e "orbment" \ - -e "orbital" \ - -e "perceptia" \ - -e "rustland" \ - -e "velox" \ - -e "wavy" \ - -e "wayhouse" \ - -e "way-cooler" \ - -e "westford" \ - -e "weston")" - fi + wm="$(ps -e | grep -m 1 -o -F \ + -e "asc" \ + -e "fireplace" \ + -e "grefsen" \ + -e "mazecompositor" \ + -e "maynard" \ + -e "motorcar" \ + -e "orbment" \ + -e "orbital" \ + -e "perceptia" \ + -e "rustland" \ + -e "sway" \ + -e "velox" \ + -e "wavy" \ + -e "wayhouse" \ + -e "way-cooler" \ + -e "westford" \ + -e "weston")" elif [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" @@ -752,11 +749,13 @@ get_wm() { ;; "Windows") - wm="$(tasklist | grep -m 1 -o -F -e "bugn" \ - -e "Windawesome" \ - -e "blackbox" \ - -e "emerge" \ - -e "litestep")" + wm="$(tasklist | grep -m 1 -o -F \ + -e "bugn" \ + -e "Windawesome" \ + -e "blackbox" \ + -e "emerge" \ + -e "litestep")" + [[ "$wm" == "blackbox" ]] && wm="bbLean (Blackbox)" wm="${wm:+$wm, }Explorer" ;; From 2e5384581f86c46de5fdb81829916f8bb1baa1db Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 17 Dec 2017 21:41:27 +1100 Subject: [PATCH 0066/1133] Update CHANGELOG.md --- CHANGELOG.md | 57 ++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5427d5fce..30a557daf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,25 +14,62 @@ - Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) -- Added support for 2017 iOS devices [**@iandrewt**](https://github.com/iandrewt) +- Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) - Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) +- Added support for Pop!\_OS. [**@jliles**](https://github.com/jliles) +- Added support for Lunar Linux. -## Images +## General + +- Added more info to verbose mode for debugging. +- Fixed bug in prompt location calculation. + + +## Ascii + +- Added color updates for Kubuntu logo. **Maulik Mistry** + -- [MacOS/iTerm2] Fixed thumbnail not appearing (replaced by placeholder) [**@StarryTony**](https://github.com/StarryTony) +## Images +- [MacOS/iTerm2] Fixed thumbnail not appearing. [**@StarryTony**](https://github.com/StarryTony) +- Fixed bug with getting wallpaper from feh. +- Added `pixterm` backend. ## Info +**Desktop Environment** + +- Added GNOME version. + **Window Manager** -- [macOS] Fixed chunkwm being detected as Kwm. [**@iandrewt**](https://github.com/iandrewt) +- Added support for most (*if not all*) current Wayland compositors/window manager's. +- [macOS] Fixed `chunkwm` being detected as `Kwm`. [**@iandrewt**](https://github.com/iandrewt) + +**Window Manager Theme** + +- Fixed `sawfish` detection. **Install Date** - [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt) +**Theme** + +- Fixed KDE font issue. [**@mstraube**](https://github.com/mstraube) + +**CPU** + +- [linux] Detect the correct temperature file to use. +- [windows] Removed `$temp` usage as it's an envar. + +**GPU** + +- [linux] Added driver version to NVIDIA output. +- [macOS] Added NVIDIA support. [**@iandrewt**](https://github.com/iandrewt) + **Package Manager** - Added detection for Sabotage Linux's `butch` [**@MitchWeaver**](https://github.com/MitchWeaver) @@ -40,3 +77,15 @@ **Resolution** - [macOS] Fixed errors on non-retina screens. [**@iandrewt**](https://github.com/iandrewt) + +**Song** + +- Added support for Elisa. [**@mstraube**](https://github.com/mstraube) + +**Model** + +- Remove more unneeded outputs. [**@konimex**](https://github.com/konimex) + +**Disk** + +- Update Haiku's detection. [**@dawidd6**](https://github.com/dawidd6) From 6e20dfe75926d06ad5c1bbeba8fbd663048da429 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 22 Dec 2017 10:11:45 +1100 Subject: [PATCH 0067/1133] DE/WM: Added support for TDE --- neofetch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 1724d6c39..9987bc352 100755 --- a/neofetch +++ b/neofetch @@ -114,7 +114,7 @@ get_distro() { elif type -p tazpkg >/dev/null; then distro="SliTaz $(< /etc/slitaz-release)" - elif type -p kpm > /dev/null; then + elif type -p kpt /dev/null && type -p kpm > /dev/null; then distro="KSLinux" elif [[ -d "/system/app/" && -d "/system/priv-app" ]]; then @@ -476,6 +476,7 @@ get_packages() { # This solves issues with neofetch opening the "pacman" game. local PATH=":${PATH}:" local PATH="${PATH/':/usr/games:'/:}" + local PATH="${PATH/':/opt/trinity/bin:'/:}" local PATH="${PATH%:}" local PATH="${PATH#:}" @@ -666,6 +667,9 @@ get_de() { elif [[ "$MATE_DESKTOP_SESSION_ID" ]]; then de="MATE" + + elif [[ "$TDE_FULL_SESSION" ]]; then + de="Trinity" fi # When a window manager is started from a display manager @@ -683,7 +687,6 @@ get_de() { # Format strings. case "$de" in "KDE_SESSION_VERSION"*) de="KDE${de/* = }" ;; - *"TDE_FULL_SESSION"*) de="Trinity" ;; *"MUFFIN"* | "Cinnamon") de="$(cinnamon --version)"; de="${de:-Cinnamon}" ;; *"xfce4"*) de="Xfce4" ;; *"xfce5"*) de="Xfce5" ;; @@ -707,7 +710,7 @@ get_wm() { id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" id="${id##* }" wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)" - wm="${wm/*_NET_WM_NAME = }" + wm="${wm/*WM_NAME = }" wm="${wm/\"}" wm="${wm/\"*}" From 11a2adc8edfeb21d96bd25dc60007e61f8eb8a26 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 22 Dec 2017 10:22:03 +1100 Subject: [PATCH 0068/1133] packages: Fix kpm --- neofetch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 8f2868ebc..b719da294 100755 --- a/neofetch +++ b/neofetch @@ -476,7 +476,6 @@ get_packages() { # This solves issues with neofetch opening the "pacman" game. local PATH=":${PATH}:" local PATH="${PATH/':/usr/games:'/:}" - local PATH="${PATH/':/opt/trinity/bin:'/:}" local PATH="${PATH%:}" local PATH="${PATH#:}" @@ -488,9 +487,6 @@ get_packages() { type -p dpkg >/dev/null && \ packages="$((packages+=$(dpkg --get-selections | grep -cv deinstall$)))" - type -p kpm >/dev/null && \ - packages="$((packages+=$(kpm --get-selections | grep -cv deinstall$)))" - type -p pkgtool >/dev/null && \ packages="$((packages+=$(ls -1 /var/log/packages | wc -l)))" @@ -547,6 +543,9 @@ get_packages() { type -p alps >/dev/null && \ packages="$((packages+=$(alps showinstalled | wc -l)))" + ` + [[ "$distro" == "KSLinux" ]] && type -p kpm >/dev/null && \ + packages="$((packages+=$(kpm --get-selections | grep -cv deinstall$)))" if type -p cave >/dev/null; then package_dir=(/var/db/paludis/repositories/{cross-installed,installed}/*/data/*) From 77596ea868d51d1828fcfbb378c81c52582fab75 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 22 Dec 2017 10:26:48 +1100 Subject: [PATCH 0069/1133] TDE: Better fix --- neofetch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index b719da294..18d81c3a3 100755 --- a/neofetch +++ b/neofetch @@ -114,7 +114,8 @@ get_distro() { elif type -p tazpkg >/dev/null; then distro="SliTaz $(< /etc/slitaz-release)" - elif type -p kpt /dev/null && type -p kpm > /dev/null; then + elif type -p kpt >/dev/null && \ + type -p kpm >/dev/null; then distro="KSLinux" elif [[ -d "/system/app/" && -d "/system/priv-app" ]]; then @@ -543,8 +544,9 @@ get_packages() { type -p alps >/dev/null && \ packages="$((packages+=$(alps showinstalled | wc -l)))" - ` - [[ "$distro" == "KSLinux" ]] && type -p kpm >/dev/null && \ + + type -p kpt >/dev/null && \ + type -p kpm >/dev/null && \ packages="$((packages+=$(kpm --get-selections | grep -cv deinstall$)))" if type -p cave >/dev/null; then From f2300d33062fe337b7f39ef8a8452bb4e7ab1333 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 22 Dec 2017 10:42:58 +1100 Subject: [PATCH 0070/1133] gpu [intel]: Show driver version if glxinfo isn't installed --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 18d81c3a3..acf517e47 100755 --- a/neofetch +++ b/neofetch @@ -1244,9 +1244,12 @@ get_gpu() { ;; *"intel"*) - gpu="$(glxinfo | grep "Device:.*Intel")" + type -p glxinfo >/dev/null && \ + gpu="$(glxinfo | grep "Device:.*Intel")" + gpu="${gpu/*Intel/Intel}" gpu="${gpu/'(R)'}" + gpu="${gpu/'Corporation'}" gpu="${gpu/ \(*}" [[ -z "$(trim "$gpu")" ]] && gpu="Intel Integrated Graphics" From 8c277ac74aaefbeb4981838acb60c62036ddbf4a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 25 Dec 2017 08:39:47 +1100 Subject: [PATCH 0071/1133] general: Swap sequences from \033 to \e --- neofetch | 60 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/neofetch b/neofetch index acf517e47..642cfbca6 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="\033[0m" +reset="\\e[0m" # DETECT INFORMATION @@ -2356,9 +2356,9 @@ get_cols() { # Generate the string. for ((start; start<=end; start++)); do case "$start" in - [0-6]) blocks+="${reset}\033[3${start}m\033[4${start}m${block_width}" ;; - 7) blocks+="${reset}\033[3${start}m\033[4${start}m${block_width}" ;; - *) blocks2+="\033[38;5;${start}m\033[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 @@ -2371,12 +2371,12 @@ get_cols() { # Add newlines to the string. cols="${cols%%'nl'}" - cols="${cols//nl/\\n\\033[${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" "\033[${text_padding}C${zws}${cols}" + printf "%b\n" "\\e[${text_padding}C${zws}${cols}" fi unset -v blocks blocks2 cols @@ -2433,7 +2433,7 @@ image_backend() { esac # Set cursor position next image/ascii. - [[ "$image_backend" != "off" ]] && printf "%b" "\033[${lines:-0}A\033[9999999D" + [[ "$image_backend" != "off" ]] && printf "%b" "\\e[${lines:-0}A\\e[9999999D" } get_ascii() { @@ -2621,14 +2621,14 @@ get_term_size() { # so we have to use a slightly different sequence to # get the terminal size. if [[ -n "$TMUX" ]]; then - printf "%b" "\033Ptmux;\033\033[14t\033\033[c\033\\" + printf "%b" "\\ePtmux;\\e\\e[14t\\e\\e[c\\e\\" read_flags=(-d c) elif [[ "$image_backend" == "tycat" ]]; then - printf "%b" "\033}qs\000" + printf "%b" "\\e}qs\000" else - printf "%b" "\033[14t\033[c" + printf "%b" "\\e[14t\\e[c" read_flags=(-d c) fi @@ -2647,7 +2647,7 @@ get_term_size() { term_width="${term_size[2]/t*}" fi - # Get terminal width/height if \033[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)" @@ -2845,10 +2845,10 @@ display_image() { "iterm2") image="$(base64 < "$image")" - iterm_cmd="\033]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="\033Ptmux;\033${iterm_cmd}\033\\" + [[ -n "$TMUX" ]] && iterm_cmd="\\ePtmux;\\e${iterm_cmd}\\e\\" printf "%b\a\n" "$iterm_cmd" ;; @@ -2884,7 +2884,7 @@ to_ascii() { get_ascii # Set cursor position next image/ascii. - printf "%b" "\033[${lines:-0}A\033[9999999D" + printf "%b" "\\e[${lines:-0}A\\e[9999999D" } to_off() { @@ -3044,7 +3044,7 @@ prin() { string="${2:-$1}" local subtitle_color="$info_color" fi - string="$(trim "${string//$'\033[0m'}")" + string="$(trim "${string//$'\\e[0m'}")" # Log length if it doesn't exist. if [[ -z "$length" ]]; then @@ -3057,7 +3057,7 @@ prin() { string="${subtitle_color}${bold}${string}" # Print the info. - printf "%b\n" "${text_padding:+\033[${text_padding}C}${zws}${string}${reset} " + printf "%b\n" "${text_padding:+\\e[${text_padding}C}${zws}${string}${reset} " # Calculate info height. ((++info_height)) @@ -3069,7 +3069,7 @@ prin() { get_underline() { if [[ "$underline_enabled" == "on" ]]; then printf -v underline "%${length}s" - printf "%b%b\n" "${text_padding:+\033[${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 @@ -3090,12 +3090,12 @@ get_line_break() { get_bold() { case "$ascii_bold" in - "on") ascii_bold="\033[1m" ;; + "on") ascii_bold="\\e[1m" ;; "off") ascii_bold="" ;; esac case "$bold" in - "on") bold="\033[1m" ;; + "on") bold="\\e[1m" ;; "off") bold="" ;; esac } @@ -3124,10 +3124,10 @@ trim_quotes() { } strip_sequences() { - strip="${1//$'\033['3[0-9]m}" - strip="${strip//$'\033['38\;5\;[0-9]m}" - strip="${strip//$'\033['38\;5\;[0-9][0-9]m}" - strip="${strip//$'\033['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" } @@ -3926,9 +3926,9 @@ set_text_colors() { color() { case "$1" in - [0-6]) printf "%b" "${reset}\033[3${1}m" ;; - 7 | "fg") printf "%b" "\033[37m${reset}" ;; - *) printf "%b" "\033[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 } @@ -3951,7 +3951,7 @@ stdout() { } err() { - err+="$(color 1)[!]\033[0m $1\n" + err+="$(color 1)[!]\\e[0m $1\n" } get_full_path() { @@ -4132,7 +4132,7 @@ dynamic_prompt() { fi # Set the prompt location. - ((lines > 1)) && printf "%b" "\033[${lines}B" + ((lines > 1)) && printf "%b" "\\e[${lines}B" } old_functions() { @@ -4780,10 +4780,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 "\033[?25h\033[?7h"' EXIT + trap 'printf "\\e[?25h\\e[?7h"' EXIT # Hide the cursor and disable line wrap. - printf "\033[?25l\033[?7l" + printf "\\e[?25l\\e[?7l" fi image_backend From a53cbdbc14d68c6b3d740b17fbbabeb8ff56a0eb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 25 Dec 2017 11:04:50 +1100 Subject: [PATCH 0072/1133] general: Fix prompt on openBSD --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 642cfbca6..92890228a 100755 --- a/neofetch +++ b/neofetch @@ -4132,7 +4132,11 @@ dynamic_prompt() { fi # Set the prompt location. - ((lines > 1)) && printf "%b" "\\e[${lines}B" + if ((lines > 1)) && [[ "$kernel_name" != "OpenBSD" ]]; then + printf "%b" "\\e[${lines}B" + else + tput cub "$lines" + fi } old_functions() { From 5ffd5149b4224cffd7642832c6070366b0956db5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 25 Dec 2017 19:25:54 +1100 Subject: [PATCH 0073/1133] memory [openbsd]: Fix crash --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 92890228a..cc992c4b2 100755 --- a/neofetch +++ b/neofetch @@ -1411,7 +1411,7 @@ get_memory() { # Mem used. case "$kernel_name" in - "OpenBSD"*) mem_used="$(($(vmstat | awk 'END{printf $4}') / 1024))" ;; + "OpenBSD"*) mem_used="$(($(vmstat | awk -F ' |M' 'END{printf $4}') / 1024))" ;; *) mem_used="$((mem_total - mem_free))" ;; esac ;; From beee0203d08cb37a6b393249b24bf641f4c74c96 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 25 Dec 2017 19:27:57 +1100 Subject: [PATCH 0074/1133] general: Fix prompt on openBSD --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index cc992c4b2..25feae3f0 100755 --- a/neofetch +++ b/neofetch @@ -4135,7 +4135,7 @@ dynamic_prompt() { if ((lines > 1)) && [[ "$kernel_name" != "OpenBSD" ]]; then printf "%b" "\\e[${lines}B" else - tput cub "$lines" + tput cud "$lines" fi } From 21cc7bab938c6865988035266f2b374b2d61b5ed Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 26 Dec 2017 07:20:50 +1100 Subject: [PATCH 0075/1133] general: Fix prompt on openBSD --- neofetch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 25feae3f0..6a742f196 100755 --- a/neofetch +++ b/neofetch @@ -4132,10 +4132,11 @@ dynamic_prompt() { fi # Set the prompt location. - if ((lines > 1)) && [[ "$kernel_name" != "OpenBSD" ]]; then - printf "%b" "\\e[${lines}B" - else - tput cud "$lines" + if ((lines > 1)); then + case "$kernel_name" in + "OpenBSD") tput cud "$lines" ;; + *) printf "%b" "\\e[${lines}B" ;; + esac fi } From dc929a65949d08586c4e95f236b89e7f78c88d1a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 26 Dec 2017 07:38:11 +1100 Subject: [PATCH 0076/1133] memory: Fix crash on OpenBSD --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6a742f196..977ead291 100755 --- a/neofetch +++ b/neofetch @@ -1411,7 +1411,10 @@ get_memory() { # Mem used. case "$kernel_name" in - "OpenBSD"*) mem_used="$(($(vmstat | awk -F ' |M' 'END{printf $4}') / 1024))" ;; + "OpenBSD"*) + mem_used="$(vmstat | awk 'END{printf $4}')" + mem_used="$((${mem_used/M} / 1024))" + ;; *) mem_used="$((mem_total - mem_free))" ;; esac ;; From 8ff013e73446a90b57943446921f8bd89d6c4db2 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 25 Dec 2017 09:31:04 +0100 Subject: [PATCH 0077/1133] song: add album for some players pogo exaile quodlibet pragha amarok deadbeef qmmp xmms2d mocp rhythmbox banshee mpd --- neofetch | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/neofetch b/neofetch index e244e7549..d7e6b4220 100755 --- a/neofetch +++ b/neofetch @@ -1428,13 +1428,13 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " } case "${player/*\/}" in - "mpd"* | "mopidy"*) song="$(mpc current)" ;; - "mocp"*) song="$(mocp -Q "%artist - %song")" ;; + "mpd"* | "mopidy"*) song="$(mpc -f '%artist% - %album% - %title%' current)" ;; + "mocp"*) song="$(mocp -Q "%artist - %album - %song")" ;; "google play"*) song="$(gpmdp-remote current)" ;; - "rhythmbox"*) song="$(rhythmbox-client --print-playing)" ;; - "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% - %title%')" ;; - "xmms2d"*) song="$(xmms2 current -f '${artist} - ${title}')" ;; - "qmmp"*) song="$(qmmp --nowplaying '%p - %t')" ;; + "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta - %at - %tt')" ;; + "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% - %album% - %title%')" ;; + "xmms2d"*) song="$(xmms2 current -f '${artist} - ${album} - ${title}')" ;; + "qmmp"*) song="$(qmmp --nowplaying '%p - %a - %t')" ;; "gnome-music"*) get_song_dbus "GnomeMusic" ;; "lollypop"*) get_song_dbus "Lollypop" ;; "clementine"*) get_song_dbus "clementine" ;; @@ -1448,10 +1448,6 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " "audacious"*) song="$(audtool current-song)" - - # Remove Album from 'Artist - Album - Title' - #song="${song/-* -/-}" - [[ -z "$song" ]] && get_song_dbus "audacious" ;; @@ -1482,41 +1478,46 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " ;; "banshee"*) - song="$(banshee --query-artist --query-title |\ - awk -F':' '/^artist/ {a=$2} /^title/ {t=$2} END{print a " - " t}')" + song="$(banshee --query-artist --query-album --query-title |\ + awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} + END{print a " - " b " - "t}')" ;; "amarok"*) song="$(qdbus org.kde.amarok /Player GetMetadata |\ - awk -F':' '/^artist/ {a=$2} /^title/ {t=$2} END{print a " - " t}')" + awk -F':' '/^artist:/ {a=$2} /^album:/ {b=$2} /^title:/ {t=$2} + END{print a " - " b " - " t}')" ;; "pragha"*) - song="$(pragha -c | awk -F':' '/^artist/ {a=$2} /^title/ {t=$2} END{print a " - " t}')" + song="$(pragha -c | awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} + END{print a " - " b " - " t}')" ;; "exaile"*) song="$(dbus-send --print-reply --dest=org.exaile.Exaile /org/exaile/Exaile \ - org.exaile.Exaile.Query | awk -F':|,' '{if ($6 && $4) printf $6 " -" $4}')" + org.exaile.Exaile.Query | + awk -F':|,' '{if ($6 && $8 && $4) printf $6 " -" $8 " -" $4}')" ;; "quodlibet"*) song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \ /net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\ - awk -F'"' '/artist/ {getline; a=$2} \ - /title/ {getline; t=$2} END{print a " - " t}')" + awk -F'"' '/artist/ {getline; a=$2} /album/ {getline; b=$2} + /title/ {getline; t=$2} END{print a " - " b " - " t}')" ;; "pogo"*) song="$(dbus-send --print-reply --dest=org.mpris.pogo /Player \ org.freedesktop.MediaPlayer.GetMetadata | - awk -F'"' '/string "artist"/ {getline; a=$2} /string "title"/ {getline; t=$2} \ - END{print a " - " t}')" + awk -F'"' '/string "artist"/ {getline; a=$2} /string "album"/ {getline; b=$2} \ + /string "title"/ {getline; t=$2} END{print a " - " b " - " t}')" ;; - *) mpc >/dev/null 2>&1 && song="$(mpc current)" ;; + *) mpc >/dev/null 2>&1 && song="$(mpc -f '%artist% - %album% - %title%' current)" ;; esac + # TODO: adjust for album: "$(trim "$song")" == "- -" [[ "$(trim "$song")" == "-" ]] && unset -v song # Display Artist, Album and Title on separate lines. From 31ccd633d28773bec4993eed93f9c5aeb06c7789 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 26 Dec 2017 09:22:03 +0100 Subject: [PATCH 0078/1133] song: fix cmus album --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d7e6b4220..f8c7691ee 100755 --- a/neofetch +++ b/neofetch @@ -1454,7 +1454,7 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " "cmus"*) song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; /tag artist/ {$1=$2=""; sub(" ", ""); a=$0}\ - /tag album/ {$1=$2=""; sub(" ", ""); b=$0}\ + /tag album / {$1=$2=""; sub(" ", ""); b=$0}\ /tag title/ {$1=$2=""; sub(" ", ""); t=$0}\ END { print a " - " b " - " t }')" ;; From 21f1faec6222c62fc44d025e5a3e3c8b9dba66d9 Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Sun, 31 Dec 2017 14:50:28 -0500 Subject: [PATCH 0079/1133] Support added for FreeMiNT on Atari computers and clones/VMs --- ascii/distro/gem | 19 ++++++++++ neofetch | 97 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 113 insertions(+), 3 deletions(-) create mode 100644 ascii/distro/gem diff --git a/ascii/distro/gem b/ascii/distro/gem new file mode 100644 index 000000000..d69ae9384 --- /dev/null +++ b/ascii/distro/gem @@ -0,0 +1,19 @@ + + + ${c1} ## + ## ######### + #### ## + #### #### ## + #### #### ## ## + #### #### ## ## + #### #### ## ## ## + #### ###### + ###### ## ## #### + #### ################ + #### ## #### + ## #### ###### + ## ## #### #### + ## ## ## ## ## #### + #### ## ## ## + + diff --git a/neofetch b/neofetch index 977ead291..4d629770c 100755 --- a/neofetch +++ b/neofetch @@ -44,6 +44,7 @@ get_os() { "MINIX") os="MINIX" ;; "AIX") os="AIX" ;; "IRIX64") os="IRIX" ;; + "FreeMiNT") os="FreeMiNT" ;; *) printf "%s\n" "Unknown OS detected: '$kernel_name', aborting..." >&2 printf "%s\n" "Open an issue on GitHub to add support for your OS." >&2 @@ -230,6 +231,10 @@ get_distro() { "IRIX") distro="IRIX ${kernel_version}" ;; + + "FreeMiNT") + distro="FreeMiNT" + ;; esac distro="${distro//Enterprise Server}" @@ -238,7 +243,7 @@ get_distro() { # Get OS architecture. case "$os" in - "Solaris" | "AIX" | "Haiku" | "IRIX") machine_arch="$(uname -p)" ;; + "Solaris" | "AIX" | "Haiku" | "IRIX" | "FreeMiNT") machine_arch="$(uname -p)" ;; *) machine_arch="$(uname -m)" ;; esac @@ -340,6 +345,10 @@ get_model() { "AIX") model="$(/usr/bin/uname -M)" ;; + + "FreeMiNT") + model="$(sysctl -n hw.model)" + ;; esac # Remove dummy OEM info. @@ -426,6 +435,13 @@ get_uptime() { h="${h#0}" t="${t#0}" seconds="$((d*86400 + h*3600 + ${t%%:*}*60 + ${t#*:}))" ;; + + "FreeMiNT") + boot="$(sysctl -n kern.boottime)" + now="$(date +%s)" + seconds="$((now - boot))" + ;; + esac days="$((seconds / 60 / 60 / 24)) days" @@ -604,6 +620,12 @@ get_packages() { "IRIX") packages="$(($(versions -b | wc -l)-3))" ;; + + "FreeMiNT") + type -p rpm >/dev/null && \ + packages="$((packages+=$(rpm -qa | wc -l)))" + ;; + esac ((packages == 0)) && unset packages @@ -653,6 +675,26 @@ get_de() { esac ;; + "FreeMiNT") + get_wm + + if [ -e /proc/thing* ]; then + de="Thing" + elif [ -e /proc/jinnee* ]; then + de="Jinnee" + elif [ -e /proc/tera* ]; then + de="Teradesk" + elif [ -e /proc/mdesk ]; then + de="mDesk" + elif [ -e /proc/neod* ]; then + de="NeoDesk" + elif [ -e /proc/zdesk* ]; then + de="zDesk" + else + de="Atari" + fi + ;; + *) ((wm_run != 1)) && get_wm @@ -727,7 +769,7 @@ get_wm() { -e "westford" \ -e "weston")" - elif [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then + elif [[ "$DISPLAY" && "$os" != "Mac OS X" && "$os" != "FreeMiNT" ]]; then id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" id="${id##* }" wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)" @@ -763,6 +805,21 @@ get_wm() { [[ "$wm" == "blackbox" ]] && wm="bbLean (Blackbox)" wm="${wm:+$wm, }Explorer" ;; + + "FreeMiNT") + if [ -e /proc/xaaes* ]; then + wm="XaAES" + elif [ -e /proc/myaes* ]; then + wm="MyAES" + elif [ -e /proc/naes* ]; then + wm="N.AES" + elif [ -e /proc/geneva* ]; then + wm="Geneva" + else + wm="Atari AES" + fi + ;; + esac fi @@ -1104,6 +1161,12 @@ get_cpu() { # Get CPU cores. cores="$(sysconf NPROC_ONLN)" ;; + + "FreeMiNT") + cpu="$(cat /kern/cpuinfo | awk -F':' '/CPU:/ {printf $2}')" + speed="$(cat /kern/cpuinfo | awk -F':' '/Clocking:/ {printf $2}' | awk -F'.' '{ printf $1 }')" + ;; + esac # Remove un-needed patterns from cpu output. @@ -1188,7 +1251,8 @@ get_cpu_usage() { "Haiku") cores="$(sysinfo -cpu | grep -c -F 'CPU #')" ;; "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; "AIX") cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" ;; - "IRIX") cores="$(sysconf NPROC_ONLN)" + "IRIX") cores="$(sysconf NPROC_ONLN)" ;; + "FreeMiNT") cores="$(sysctl -n hw.ncpu)" esac fi @@ -1445,6 +1509,15 @@ get_memory() { mem_free="$((mem_stat[5] / 1024))" mem_used="$((mem_total - mem_free))" ;; + + "FreeMiNT") + mem_total="$(cat /kern/meminfo | awk -F ':|kB' '/MemTotal:/ {printf $2}')" + mem_free="$(cat /kern/meminfo | awk -F ':|kB' '/MemFree:/ {printf $2}')" + mem_used="$(( mem_total - mem_free ))" + mem_total="$(( mem_total / 1024 ))" + mem_used="$(( mem_used / 1024 ))" + ;; + esac memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB}" @@ -1833,6 +1906,11 @@ get_term() { *) term="${TERM_PROGRAM/\.app}" ;; esac + # Most likely TosWin2 on FreeMiNT - quick check + if [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]]; then + term="TosWin2" + fi + # Check $PPID for terminal emulator. while [[ -z "$term" ]]; do if [[ "$SSH_CONNECTION" ]]; then @@ -2384,6 +2462,12 @@ get_cols() { unset -v blocks blocks2 cols + # TosWin2 on FreeMiNT is terrible at this, + # so we'll reset colors arbitrarily + if [ "${term}" == "TosWin2" ]; then + printf "%b\n" "\\e[30;47m" + fi + # Tell info() that we printed manually. prin=1 } @@ -3368,6 +3452,13 @@ get_distro_colors() { ascii_file="freebsd" ;; + "FreeMiNT"*) + # Don't explicitly set colors since + # TosWin2 doesn't reset well + # set_colors 0 + ascii_file="gem" + ;; + "Frugalware"*) set_colors 4 7 1 ascii_file="frugalware" From 69c219e351db5f3cf78447409cdaddd46fc7f845 Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Mon, 1 Jan 2018 12:20:07 -0500 Subject: [PATCH 0080/1133] Formatting fixes and awk improvements for FreeMiNT. Changed method for finding DE and WM processes in FreeMiNT. --- ascii/distro/gem | 34 +++++++++++------------- neofetch | 69 ++++++++++++++++++++---------------------------- 2 files changed, 43 insertions(+), 60 deletions(-) diff --git a/ascii/distro/gem b/ascii/distro/gem index d69ae9384..49c8849d8 100644 --- a/ascii/distro/gem +++ b/ascii/distro/gem @@ -1,19 +1,15 @@ - - - ${c1} ## - ## ######### - #### ## - #### #### ## - #### #### ## ## - #### #### ## ## - #### #### ## ## ## - #### ###### - ###### ## ## #### - #### ################ - #### ## #### - ## #### ###### - ## ## #### #### - ## ## ## ## ## #### - #### ## ## ## - - +${c1} ## + ## ######### + #### ## + #### #### ## +#### #### ## ## + #### #### ## ## + #### #### ## ## ## + #### ###### + ###### ## ## #### + #### ################ + #### ## #### + ## #### ###### + ## ## #### #### + ## ## ## ## ## #### + #### ## ## ## diff --git a/neofetch b/neofetch index 4d629770c..d01c63dd6 100755 --- a/neofetch +++ b/neofetch @@ -441,7 +441,6 @@ get_uptime() { now="$(date +%s)" seconds="$((now - boot))" ;; - esac days="$((seconds / 60 / 60 / 24)) days" @@ -625,7 +624,6 @@ get_packages() { type -p rpm >/dev/null && \ packages="$((packages+=$(rpm -qa | wc -l)))" ;; - esac ((packages == 0)) && unset packages @@ -678,21 +676,16 @@ get_de() { "FreeMiNT") get_wm - if [ -e /proc/thing* ]; then - de="Thing" - elif [ -e /proc/jinnee* ]; then - de="Jinnee" - elif [ -e /proc/tera* ]; then - de="Teradesk" - elif [ -e /proc/mdesk ]; then - de="mDesk" - elif [ -e /proc/neod* ]; then - de="NeoDesk" - elif [ -e /proc/zdesk* ]; then - de="zDesk" - else - de="Atari" - fi + for possibles in "$(ls /proc)"; do + case "$possibles" in + *thing*) de="Thing" ;; + *jinnee*) de="Jinnee" ;; + *tera*) de="Teradesk" ;; + *neod*) de="NeoDesk" ;; + *zdesk*) de="zDesk" ;; + *mdesk*) de="mDesk" ;; + esac + done ;; *) @@ -807,19 +800,16 @@ get_wm() { ;; "FreeMiNT") - if [ -e /proc/xaaes* ]; then - wm="XaAES" - elif [ -e /proc/myaes* ]; then - wm="MyAES" - elif [ -e /proc/naes* ]; then - wm="N.AES" - elif [ -e /proc/geneva* ]; then - wm="Geneva" - else - wm="Atari AES" - fi + wm="Atari AES" + for possibles in "$(ls /proc | awk -F'[ .]' '/aes|geneva/ {print $1}')"; do + case "$possibles" in + *xaaes*) wm="XaAES" ;; + *myaes*) wm="MyAES" ;; + *naes*) wm="N.AES" ;; + geneva) wm="Geneva" ;; + esac + done ;; - esac fi @@ -1163,10 +1153,9 @@ get_cpu() { ;; "FreeMiNT") - cpu="$(cat /kern/cpuinfo | awk -F':' '/CPU:/ {printf $2}')" - speed="$(cat /kern/cpuinfo | awk -F':' '/Clocking:/ {printf $2}' | awk -F'.' '{ printf $1 }')" + cpu="$(awk -F':' '/CPU:/ {printf $2}' /kern/cpuinfo)" + speed="$(awk -F'[:.]' '/Clocking:/ {printf $2}' /kern/cpuinfo)" ;; - esac # Remove un-needed patterns from cpu output. @@ -1511,11 +1500,11 @@ get_memory() { ;; "FreeMiNT") - mem_total="$(cat /kern/meminfo | awk -F ':|kB' '/MemTotal:/ {printf $2}')" - mem_free="$(cat /kern/meminfo | awk -F ':|kB' '/MemFree:/ {printf $2}')" - mem_used="$(( mem_total - mem_free ))" - mem_total="$(( mem_total / 1024 ))" - mem_used="$(( mem_used / 1024 ))" + mem_total="$(awk -F ':|kB' '/MemTotal:/ {printf $2}' /kern/meminfo)" + mem_free="$(awk -F ':|kB' '/MemFree:/ {printf $2}' /kern/meminfo)" + mem_used="$((mem_total - mem_free))" + mem_total="$((mem_total / 1024))" + mem_used="$((mem_used / 1024))" ;; esac @@ -1907,9 +1896,8 @@ get_term() { esac # Most likely TosWin2 on FreeMiNT - quick check - if [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]]; then + [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && \ term="TosWin2" - fi # Check $PPID for terminal emulator. while [[ -z "$term" ]]; do @@ -2464,9 +2452,8 @@ get_cols() { # TosWin2 on FreeMiNT is terrible at this, # so we'll reset colors arbitrarily - if [ "${term}" == "TosWin2" ]; then + [[ "$term" == "TosWin2" ]] && \ printf "%b\n" "\\e[30;47m" - fi # Tell info() that we printed manually. prin=1 From a0bd43f1f83a78017b193dc8647c5c8fbc5ecde8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 3 Jan 2018 11:37:03 +1100 Subject: [PATCH 0081/1133] docs: README --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 16ad5e919..b7d1dab4d 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,16 @@ # Neofetch + + Packaging status + + [![Gitter](https://badges.gitter.im/dylanaraps/fetch.svg)](https://gitter.im/dylanaraps/fetch?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) + Neofetch is a CLI system information tool written in BASH. Neofetch displays information about your system next to an image, your OS logo, or any ASCII file of your choice. The main purpose of Neofetch is to be used in screenshots to show other users what OS/Distro you're running, what Theme/Icons you're using etc. Neofetch is highly customizable through the use of command line flags or the user config file. There are over 50 config options to mess around with and there's the `print_info()` function and friends which let you add your own custom info. From 7798974bc0112090a3ec3241241dd8ed9e0e7e3b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 3 Jan 2018 11:51:33 +1100 Subject: [PATCH 0082/1133] docs: README --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b7d1dab4d..2c83e022f 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,8 @@ For more information: **https://github.com/dylanaraps/neofetch/wiki** -![neofetch screenshot](https://u.teknik.io/KlBsD.png) +neofetch +neofetch ## Dependencies From dc936b5b236ddc028399430899bdfc97ad281224 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 3 Jan 2018 11:52:48 +1100 Subject: [PATCH 0083/1133] docs: README --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2c83e022f..0ee83bcac 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ For more information: **https://github.com/dylanaraps/neofetch/wiki** -neofetch -neofetch +neofetch +neofetch ## Dependencies From 82875114fe79fac4cbbc74296f47046b60ca5c9b Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Tue, 2 Jan 2018 20:33:54 -0500 Subject: [PATCH 0084/1133] Additional FreeMiNT simplifications. Added careful fix for CPU clocking check on FreeMiNT. --- neofetch | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/neofetch b/neofetch index d01c63dd6..429e3f70b 100755 --- a/neofetch +++ b/neofetch @@ -412,7 +412,7 @@ get_uptime() { seconds="${seconds/.*}" ;; - "Mac OS X" | "iPhone OS" | "BSD") + "Mac OS X" | "iPhone OS" | "BSD" | "FreeMiNT") boot="$(sysctl -n kern.boottime)" boot="${boot/'{ sec = '}" boot="${boot/,*}" @@ -435,12 +435,6 @@ get_uptime() { h="${h#0}" t="${t#0}" seconds="$((d*86400 + h*3600 + ${t%%:*}*60 + ${t#*:}))" ;; - - "FreeMiNT") - boot="$(sysctl -n kern.boottime)" - now="$(date +%s)" - seconds="$((now - boot))" - ;; esac days="$((seconds / 60 / 60 / 24)) days" @@ -676,8 +670,8 @@ get_de() { "FreeMiNT") get_wm - for possibles in "$(ls /proc)"; do - case "$possibles" in + for files in /proc/*; do + case "$files" in *thing*) de="Thing" ;; *jinnee*) de="Jinnee" ;; *tera*) de="Teradesk" ;; @@ -801,8 +795,8 @@ get_wm() { "FreeMiNT") wm="Atari AES" - for possibles in "$(ls /proc | awk -F'[ .]' '/aes|geneva/ {print $1}')"; do - case "$possibles" in + for files in /proc/*; do + case "$files" in *xaaes*) wm="XaAES" ;; *myaes*) wm="MyAES" ;; *naes*) wm="N.AES" ;; @@ -1154,7 +1148,7 @@ get_cpu() { "FreeMiNT") cpu="$(awk -F':' '/CPU:/ {printf $2}' /kern/cpuinfo)" - speed="$(awk -F'[:.]' '/Clocking:/ {printf $2}' /kern/cpuinfo)" + speed="$(awk -F '[:.M]' '/Clocking:/ {printf $2}' /kern/cpuinfo)" ;; esac @@ -1500,8 +1494,9 @@ get_memory() { ;; "FreeMiNT") - mem_total="$(awk -F ':|kB' '/MemTotal:/ {printf $2}' /kern/meminfo)" - mem_free="$(awk -F ':|kB' '/MemFree:/ {printf $2}' /kern/meminfo)" + mem="$(awk -F ':|kB' '/MemTotal:|MemFree:/ {printf $2, " "}' /kern/meminfo)" + mem_free="${mem/* }" + mem_total="${mem/ *}" mem_used="$((mem_total - mem_free))" mem_total="$((mem_total / 1024))" mem_used="$((mem_used / 1024))" From 0f4fcc46df41898a07172dc2c926ffacfb286abd Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Wed, 3 Jan 2018 20:16:08 -0500 Subject: [PATCH 0085/1133] Minor comment updates in FreeMiNT sections. --- neofetch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 429e3f70b..f8e88c34e 100755 --- a/neofetch +++ b/neofetch @@ -2446,7 +2446,7 @@ get_cols() { unset -v blocks blocks2 cols # TosWin2 on FreeMiNT is terrible at this, - # so we'll reset colors arbitrarily + # so we'll reset colors arbitrarily. [[ "$term" == "TosWin2" ]] && \ printf "%b\n" "\\e[30;47m" @@ -3436,8 +3436,7 @@ get_distro_colors() { "FreeMiNT"*) # Don't explicitly set colors since - # TosWin2 doesn't reset well - # set_colors 0 + # TosWin2 doesn't reset well. ascii_file="gem" ;; From 0c8b0974feface8790b1f78358704fcff9082ef1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 4 Jan 2018 18:17:42 +1100 Subject: [PATCH 0086/1133] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0ee83bcac..12954b09c 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Neofetch is a CLI system information tool written in BASH. Neofetch displays inf Neofetch is highly customizable through the use of command line flags or the user config file. There are over 50 config options to mess around with and there's the `print_info()` function and friends which let you add your own custom info. -Neofetch can be used on any OS that has BASH 3.2+, it's just a matter of adding support. If your OS/Distro isn't in the list below, feel free to open an issue on the repo and I'll gladly add support. Neofetch currently supports `Linux`, `MacOS`, `iOS`, `BSD`, `Solaris`, `Android`, `Haiku`, `GNU Hurd`, `MINIX`, `AIX`, `IRIX`, and `Windows (Cygwin/MSYS2/MinGW/Windows 10 Linux subsystem)`. +Neofetch can be used on any OS that has BASH 3.2+, it's just a matter of adding support. If your OS/Distro isn't in the list below, feel free to open an issue on the repo and I'll gladly add support. Neofetch currently supports `Linux`, `MacOS`, `iOS`, `BSD`, `Solaris`, `Android`, `Haiku`, `GNU Hurd`, `MINIX`, `AIX`, `IRIX`, `FreeMint`, and `Windows (Cygwin/MSYS2/MinGW/Windows 10 Linux subsystem)`. For more information: From a9ed7835d509e2e55cc383ab6072b2b432d94f4a Mon Sep 17 00:00:00 2001 From: szfcbr Date: Fri, 5 Jan 2018 05:44:44 +0100 Subject: [PATCH 0087/1133] OS: detect 32-bit IRIX --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f8e88c34e..bb24eb004 100755 --- a/neofetch +++ b/neofetch @@ -43,7 +43,7 @@ get_os() { "Haiku") os="Haiku" ;; "MINIX") os="MINIX" ;; "AIX") os="AIX" ;; - "IRIX64") os="IRIX" ;; + "IRIX64" | "IRIX") os="IRIX" ;; "FreeMiNT") os="FreeMiNT" ;; *) printf "%s\n" "Unknown OS detected: '$kernel_name', aborting..." >&2 From 6c3b0136dee6f44b24e80a70eb88b8a3b83747d6 Mon Sep 17 00:00:00 2001 From: szfcbr Date: Fri, 5 Jan 2018 06:32:14 +0100 Subject: [PATCH 0088/1133] Shells: add support for tcsh --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index f8e88c34e..0c248db6b 100755 --- a/neofetch +++ b/neofetch @@ -640,6 +640,10 @@ get_shell() { shell="${shell/version}" ;; + "tcsh") + shell+="$("$SHELL" -c 'printf "%s" "$tcsh"')" + ;; + *) shell+="$("$SHELL" --version 2>&1)" shell="${shell/ "${shell_name}"}" From d296741ac2914da848f44c9efc853ab1b8f0b8b4 Mon Sep 17 00:00:00 2001 From: szfcbr Date: Fri, 5 Jan 2018 07:05:47 +0100 Subject: [PATCH 0089/1133] Revert "OS: detect 32-bit IRIX" This reverts commit a9ed7835d509e2e55cc383ab6072b2b432d94f4a. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index bb24eb004..f8e88c34e 100755 --- a/neofetch +++ b/neofetch @@ -43,7 +43,7 @@ get_os() { "Haiku") os="Haiku" ;; "MINIX") os="MINIX" ;; "AIX") os="AIX" ;; - "IRIX64" | "IRIX") os="IRIX" ;; + "IRIX64") os="IRIX" ;; "FreeMiNT") os="FreeMiNT" ;; *) printf "%s\n" "Unknown OS detected: '$kernel_name', aborting..." >&2 From 1000547569b514de13e6dbfe8364b947c57ba2f0 Mon Sep 17 00:00:00 2001 From: szfcbr Date: Fri, 5 Jan 2018 07:07:59 +0100 Subject: [PATCH 0090/1133] OS: detect 32-bit IRIX --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f8e88c34e..a9feae920 100755 --- a/neofetch +++ b/neofetch @@ -43,7 +43,7 @@ get_os() { "Haiku") os="Haiku" ;; "MINIX") os="MINIX" ;; "AIX") os="AIX" ;; - "IRIX64") os="IRIX" ;; + "IRIX"*) os="IRIX" ;; "FreeMiNT") os="FreeMiNT" ;; *) printf "%s\n" "Unknown OS detected: '$kernel_name', aborting..." >&2 From dac53545f7a2bd1c0a347940dd1025017103a189 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 9 Jan 2018 11:25:24 +1100 Subject: [PATCH 0091/1133] merge master --- README.md | 3 ++ ascii/distro/gem | 15 +++++++++ neofetch | 86 +++++++++++++++++++++++++++++++++++++++++++++--- 3 files changed, 99 insertions(+), 5 deletions(-) create mode 100644 ascii/distro/gem diff --git a/README.md b/README.md index 12954b09c..93d37e0b9 100644 --- a/README.md +++ b/README.md @@ -95,3 +95,6 @@ Donations will allow me to spend more time working on `neofetch`. If you like `neofetch` and want to give back in some way you can donate here: **https://patreon.com/dyla** + + +hey rtexel diff --git a/ascii/distro/gem b/ascii/distro/gem new file mode 100644 index 000000000..49c8849d8 --- /dev/null +++ b/ascii/distro/gem @@ -0,0 +1,15 @@ +${c1} ## + ## ######### + #### ## + #### #### ## +#### #### ## ## + #### #### ## ## + #### #### ## ## ## + #### ###### + ###### ## ## #### + #### ################ + #### ## #### + ## #### ###### + ## ## #### #### + ## ## ## ## ## #### + #### ## ## ## diff --git a/neofetch b/neofetch index 977ead291..cb0e8fded 100755 --- a/neofetch +++ b/neofetch @@ -43,7 +43,8 @@ get_os() { "Haiku") os="Haiku" ;; "MINIX") os="MINIX" ;; "AIX") os="AIX" ;; - "IRIX64") os="IRIX" ;; + "IRIX"*) os="IRIX" ;; + "FreeMiNT") os="FreeMiNT" ;; *) printf "%s\n" "Unknown OS detected: '$kernel_name', aborting..." >&2 printf "%s\n" "Open an issue on GitHub to add support for your OS." >&2 @@ -230,6 +231,10 @@ get_distro() { "IRIX") distro="IRIX ${kernel_version}" ;; + + "FreeMiNT") + distro="FreeMiNT" + ;; esac distro="${distro//Enterprise Server}" @@ -238,7 +243,7 @@ get_distro() { # Get OS architecture. case "$os" in - "Solaris" | "AIX" | "Haiku" | "IRIX") machine_arch="$(uname -p)" ;; + "Solaris" | "AIX" | "Haiku" | "IRIX" | "FreeMiNT") machine_arch="$(uname -p)" ;; *) machine_arch="$(uname -m)" ;; esac @@ -340,6 +345,10 @@ get_model() { "AIX") model="$(/usr/bin/uname -M)" ;; + + "FreeMiNT") + model="$(sysctl -n hw.model)" + ;; esac # Remove dummy OEM info. @@ -403,7 +412,7 @@ get_uptime() { seconds="${seconds/.*}" ;; - "Mac OS X" | "iPhone OS" | "BSD") + "Mac OS X" | "iPhone OS" | "BSD" | "FreeMiNT") boot="$(sysctl -n kern.boottime)" boot="${boot/'{ sec = '}" boot="${boot/,*}" @@ -604,6 +613,11 @@ get_packages() { "IRIX") packages="$(($(versions -b | wc -l)-3))" ;; + + "FreeMiNT") + type -p rpm >/dev/null && \ + packages="$((packages+=$(rpm -qa | wc -l)))" + ;; esac ((packages == 0)) && unset packages @@ -626,6 +640,10 @@ get_shell() { shell="${shell/version}" ;; + "tcsh") + shell+="$("$SHELL" -c 'printf "%s" "$tcsh"')" + ;; + *) shell+="$("$SHELL" --version 2>&1)" shell="${shell/ "${shell_name}"}" @@ -653,6 +671,21 @@ get_de() { esac ;; + "FreeMiNT") + get_wm + + for files in /proc/*; do + case "$files" in + *thing*) de="Thing" ;; + *jinnee*) de="Jinnee" ;; + *tera*) de="Teradesk" ;; + *neod*) de="NeoDesk" ;; + *zdesk*) de="zDesk" ;; + *mdesk*) de="mDesk" ;; + esac + done + ;; + *) ((wm_run != 1)) && get_wm @@ -727,7 +760,7 @@ get_wm() { -e "westford" \ -e "weston")" - elif [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then + elif [[ "$DISPLAY" && "$os" != "Mac OS X" && "$os" != "FreeMiNT" ]]; then id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" id="${id##* }" wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)" @@ -763,6 +796,18 @@ get_wm() { [[ "$wm" == "blackbox" ]] && wm="bbLean (Blackbox)" wm="${wm:+$wm, }Explorer" ;; + + "FreeMiNT") + wm="Atari AES" + for files in /proc/*; do + case "$files" in + *xaaes*) wm="XaAES" ;; + *myaes*) wm="MyAES" ;; + *naes*) wm="N.AES" ;; + geneva) wm="Geneva" ;; + esac + done + ;; esac fi @@ -1104,6 +1149,11 @@ get_cpu() { # Get CPU cores. cores="$(sysconf NPROC_ONLN)" ;; + + "FreeMiNT") + cpu="$(awk -F':' '/CPU:/ {printf $2}' /kern/cpuinfo)" + speed="$(awk -F '[:.M]' '/Clocking:/ {printf $2}' /kern/cpuinfo)" + ;; esac # Remove un-needed patterns from cpu output. @@ -1188,7 +1238,8 @@ get_cpu_usage() { "Haiku") cores="$(sysinfo -cpu | grep -c -F 'CPU #')" ;; "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; "AIX") cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" ;; - "IRIX") cores="$(sysconf NPROC_ONLN)" + "IRIX") cores="$(sysconf NPROC_ONLN)" ;; + "FreeMiNT") cores="$(sysctl -n hw.ncpu)" esac fi @@ -1445,6 +1496,16 @@ get_memory() { mem_free="$((mem_stat[5] / 1024))" mem_used="$((mem_total - mem_free))" ;; + + "FreeMiNT") + mem="$(awk -F ':|kB' '/MemTotal:|MemFree:/ {printf $2, " "}' /kern/meminfo)" + mem_free="${mem/* }" + mem_total="${mem/ *}" + mem_used="$((mem_total - mem_free))" + mem_total="$((mem_total / 1024))" + mem_used="$((mem_used / 1024))" + ;; + esac memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB}" @@ -1833,6 +1894,10 @@ get_term() { *) term="${TERM_PROGRAM/\.app}" ;; esac + # Most likely TosWin2 on FreeMiNT - quick check + [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && \ + term="TosWin2" + # Check $PPID for terminal emulator. while [[ -z "$term" ]]; do if [[ "$SSH_CONNECTION" ]]; then @@ -2384,6 +2449,11 @@ get_cols() { unset -v blocks blocks2 cols + # TosWin2 on FreeMiNT is terrible at this, + # so we'll reset colors arbitrarily. + [[ "$term" == "TosWin2" ]] && \ + printf "%b\n" "\\e[30;47m" + # Tell info() that we printed manually. prin=1 } @@ -3368,6 +3438,12 @@ get_distro_colors() { ascii_file="freebsd" ;; + "FreeMiNT"*) + # Don't explicitly set colors since + # TosWin2 doesn't reset well. + ascii_file="gem" + ;; + "Frugalware"*) set_colors 4 7 1 ascii_file="frugalware" From 8e21a69ea0c01f59f44e5e912adac725e0b047e6 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Fri, 12 Jan 2018 21:18:13 +0100 Subject: [PATCH 0092/1133] distro: fix OpenWrt/LEDE detection --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index cb0e8fded..b6a1037d6 100755 --- a/neofetch +++ b/neofetch @@ -122,8 +122,8 @@ get_distro() { elif [[ -d "/system/app/" && -d "/system/priv-app" ]]; then distro="Android $(getprop ro.build.version.release)" - elif [[ -f "/etc/os-release" || -f "/usr/lib/os-release" ]]; then - files=("/etc/os-release" "/usr/lib/os-release") + elif [[ -f "/etc/os-release" || -f "/usr/lib/os-release" || -f "/etc/openwrt_release" ]]; then + files=("/etc/os-release" "/usr/lib/os-release" "/etc/openwrt_release") # Source the os-release file for file in "${files[@]}"; do From 1506d3840f910ed4ebe65e39d80ceccf7832b79b Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Sat, 13 Jan 2018 16:53:20 +0100 Subject: [PATCH 0093/1133] indent if conditions + remove some trailing spaces --- neofetch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index b6a1037d6..66daa1a04 100755 --- a/neofetch +++ b/neofetch @@ -122,7 +122,9 @@ get_distro() { elif [[ -d "/system/app/" && -d "/system/priv-app" ]]; then distro="Android $(getprop ro.build.version.release)" - elif [[ -f "/etc/os-release" || -f "/usr/lib/os-release" || -f "/etc/openwrt_release" ]]; then + elif [[ -f "/etc/os-release" || \ + -f "/usr/lib/os-release" || \ + -f "/etc/openwrt_release" ]]; then files=("/etc/os-release" "/usr/lib/os-release" "/etc/openwrt_release") # Source the os-release file @@ -231,7 +233,7 @@ get_distro() { "IRIX") distro="IRIX ${kernel_version}" ;; - + "FreeMiNT") distro="FreeMiNT" ;; @@ -682,7 +684,7 @@ get_de() { *neod*) de="NeoDesk" ;; *zdesk*) de="zDesk" ;; *mdesk*) de="mDesk" ;; - esac + esac done ;; @@ -805,7 +807,7 @@ get_wm() { *myaes*) wm="MyAES" ;; *naes*) wm="N.AES" ;; geneva) wm="Geneva" ;; - esac + esac done ;; esac @@ -1239,7 +1241,7 @@ get_cpu_usage() { "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; "AIX") cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" ;; "IRIX") cores="$(sysconf NPROC_ONLN)" ;; - "FreeMiNT") cores="$(sysctl -n hw.ncpu)" + "FreeMiNT") cores="$(sysctl -n hw.ncpu)" esac fi From c81e01405ebf0bdea72521bf5386db3a1c3de13c Mon Sep 17 00:00:00 2001 From: rage311 Date: Tue, 16 Jan 2018 12:36:29 -0700 Subject: [PATCH 0094/1133] Changed OpenBSD CPU temp retrieval to take into account machines that only expose cpu0.temp0 instead of lm0.temp0 --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 66daa1a04..10016076f 100755 --- a/neofetch +++ b/neofetch @@ -1086,8 +1086,9 @@ get_cpu() { deg="${deg/C}" ;; "OpenBSD"* | "Bitrig"*) - deg="$(sysctl -n hw.sensors.lm0.temp0)" - deg="${deg/ degC}" + deg_var="$(sysctl hw.sensors | grep -m1 temp0 | cut -d'=' -f1)" + deg="$(sysctl -n $deg_var)" + deg="${deg/0 degC}" ;; esac ;; From 96676ca4d5c8bf54aea579511366cf36630fe910 Mon Sep 17 00:00:00 2001 From: rage311 Date: Tue, 16 Jan 2018 12:46:25 -0700 Subject: [PATCH 0095/1133] Fixed OpenBSD mem_used value --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 10016076f..fdff930b3 100755 --- a/neofetch +++ b/neofetch @@ -1466,9 +1466,10 @@ get_memory() { # Mem used. case "$kernel_name" in "OpenBSD"*) - mem_used="$(vmstat | awk 'END{printf $4}')" - mem_used="$((${mem_used/M} / 1024))" + mem_used="$(vmstat | awk 'END{printf $3}')" + mem_used="${mem_used/M}" ;; + *) mem_used="$((mem_total - mem_free))" ;; esac ;; From 9984c51882dc3f7b1d2028ad427f84e7cb257c56 Mon Sep 17 00:00:00 2001 From: rage311 Date: Tue, 16 Jan 2018 12:48:33 -0700 Subject: [PATCH 0096/1133] Fixed indentation inconsistency --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index fdff930b3..32b5640ac 100755 --- a/neofetch +++ b/neofetch @@ -3788,7 +3788,7 @@ get_distro_colors() { ascii_file="scientific" ;; - "Siduction"*) + "Siduction"*) set_colors 4 4 ascii_file="siduction" ;; From 840a6534582f7b4248e3bd702dc1d699246be27f Mon Sep 17 00:00:00 2001 From: rage311 Date: Tue, 16 Jan 2018 13:33:58 -0700 Subject: [PATCH 0097/1133] Changed OpenBSD cpu temp logic to grep specifically for lm0 or cpu0 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 32b5640ac..c57e77541 100755 --- a/neofetch +++ b/neofetch @@ -1086,7 +1086,7 @@ get_cpu() { deg="${deg/C}" ;; "OpenBSD"* | "Bitrig"*) - deg_var="$(sysctl hw.sensors | grep -m1 temp0 | cut -d'=' -f1)" + deg_var="$(sysctl hw.sensors | grep -m1 -E 'lm0.temp0|cpu0.temp0' | cut -d'=' -f1)" deg="$(sysctl -n $deg_var)" deg="${deg/0 degC}" ;; From c9f910f526824c9e7019b1818d22f9dd132865a3 Mon Sep 17 00:00:00 2001 From: rage311 Date: Wed, 17 Jan 2018 12:52:24 -0700 Subject: [PATCH 0098/1133] Changed OpenBSD temperature extraction from grep/cut to awk --- neofetch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index c57e77541..ccab3ccdc 100755 --- a/neofetch +++ b/neofetch @@ -1086,9 +1086,8 @@ get_cpu() { deg="${deg/C}" ;; "OpenBSD"* | "Bitrig"*) - deg_var="$(sysctl hw.sensors | grep -m1 -E 'lm0.temp0|cpu0.temp0' | cut -d'=' -f1)" - deg="$(sysctl -n $deg_var)" - deg="${deg/0 degC}" + deg="$(sysctl hw.sensors | awk -F '=| degC' '/lm0.temp|cpu0.temp/ {print $2; exit}')" + deg="${deg/00/0}" ;; esac ;; From 64c80b7fc1168dde59a77a6dca05c859b0a1c0c0 Mon Sep 17 00:00:00 2001 From: rage311 Date: Mon, 22 Jan 2018 12:13:16 -0700 Subject: [PATCH 0099/1133] Broke up line that was over 100 chars long --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index ccab3ccdc..8df42edcf 100755 --- a/neofetch +++ b/neofetch @@ -1086,7 +1086,8 @@ get_cpu() { deg="${deg/C}" ;; "OpenBSD"* | "Bitrig"*) - deg="$(sysctl hw.sensors | awk -F '=| degC' '/lm0.temp|cpu0.temp/ {print $2; exit}')" + deg="$(sysctl hw.sensors | \ + awk -F '=| degC' '/lm0.temp|cpu0.temp/ {print $2; exit}')" deg="${deg/00/0}" ;; esac From 59c0d7362567181a0cb66299c7fef2d252068567 Mon Sep 17 00:00:00 2001 From: Herdiansyah Date: Tue, 23 Jan 2018 07:25:51 +0700 Subject: [PATCH 0100/1133] Update CHANGELOG.md --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 30a557daf..8bf369fc2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [**@dawidd6**](https://github.com/dawidd6) - [**@MitchWeaver**](https://github.com/MitchWeaver) - [**@StarryTony**](https://github.com/StarryTony) +- [**@rage311**](https://github.com/rage311) ## OS @@ -64,12 +65,17 @@ - [linux] Detect the correct temperature file to use. - [windows] Removed `$temp` usage as it's an envar. +- [OpenBSD] Fixed CPU temperature that fails to appear in some systems. [**@rage311**](https://github.com/rage311) **GPU** - [linux] Added driver version to NVIDIA output. - [macOS] Added NVIDIA support. [**@iandrewt**](https://github.com/iandrewt) +**Memory** + +- [OpenBSD] Fixed memory usage values. [**@rage311**](https://github.com/rage311) + **Package Manager** - Added detection for Sabotage Linux's `butch` [**@MitchWeaver**](https://github.com/MitchWeaver) From 33fce465251545c543dff22e5ff3ea855ce5fc46 Mon Sep 17 00:00:00 2001 From: matoro Date: Mon, 29 Jan 2018 10:30:53 -0500 Subject: [PATCH 0101/1133] fix battery detection on Windows --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8df42edcf..b7035759f 100755 --- a/neofetch +++ b/neofetch @@ -2261,7 +2261,7 @@ get_battery() { "Windows") battery="$(wmic Path Win32_Battery get EstimatedChargeRemaining)" battery="${battery/EstimatedChargeRemaining}" - [[ "$(trim "$battery")" ]] && battery="%" + [[ "$(trim "$battery")" ]] && battery="$(trim "$battery")%" ;; "Haiku") From d4177592c19a6e73d0f58b5a1e97f37f63f1eb34 Mon Sep 17 00:00:00 2001 From: matoro Date: Mon, 29 Jan 2018 17:52:57 -0500 Subject: [PATCH 0102/1133] simplify check as per review --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index b7035759f..6e966d3a8 100755 --- a/neofetch +++ b/neofetch @@ -2261,7 +2261,7 @@ get_battery() { "Windows") battery="$(wmic Path Win32_Battery get EstimatedChargeRemaining)" battery="${battery/EstimatedChargeRemaining}" - [[ "$(trim "$battery")" ]] && battery="$(trim "$battery")%" + batttery=“$(trim “$battery”)%” ;; "Haiku") From 613ab7439a8877763c00d4595e3a1a7785576b2a Mon Sep 17 00:00:00 2001 From: matoro Date: Mon, 29 Jan 2018 19:16:08 -0500 Subject: [PATCH 0103/1133] fix unicode quotes --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6e966d3a8..3aa5d4707 100755 --- a/neofetch +++ b/neofetch @@ -2261,7 +2261,7 @@ get_battery() { "Windows") battery="$(wmic Path Win32_Battery get EstimatedChargeRemaining)" battery="${battery/EstimatedChargeRemaining}" - batttery=“$(trim “$battery”)%” + batttery="$(trim "$battery")%" ;; "Haiku") From 2071fe608c473b0f3418bc85c99d50329b760757 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 31 Jan 2018 15:03:18 +0100 Subject: [PATCH 0104/1133] anarchy --- ascii/distro/anarchy | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 ascii/distro/anarchy diff --git a/ascii/distro/anarchy b/ascii/distro/anarchy new file mode 100644 index 000000000..27a48aca8 --- /dev/null +++ b/ascii/distro/anarchy @@ -0,0 +1,30 @@ + + .. + .. + :.. + :+++. + .:::+++++++::. + .:+######++++######+:. + .+#########+++++##########:. + .+##########+++++++#+#########+. + +###########+++++++++############: + +##########++++++#++++#+###########+ + +###########+++++###++++#+###########+ + :##########+#++++####++++#+############: + ###########+++++#####+++++#+###++######+ + .##########++++++#####++++++++++++#######. + .##########+++++++++++++++++++###########. + #####++++++++++++++###++++++++#########+ + :###++++++++++#########+++++++#########: + +######+++++##########++++++++#######+ + +####+++++###########+++++++++#####+ + :##++++++############++++++++++##: + .++++++#############+++++++++++. + :++++###############+++++++:: + .++. .:+##############+++++++.. + .:. ..::++++++::..:+++++. + . .:+++. + .:: + .. + .. + From 9b7066ad5e1573e4a75daa35b474e5f20f201b29 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 31 Jan 2018 15:04:10 +0100 Subject: [PATCH 0105/1133] Create calculate --- ascii/distro/calculate | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 ascii/distro/calculate diff --git a/ascii/distro/calculate b/ascii/distro/calculate new file mode 100644 index 000000000..08798c03e --- /dev/null +++ b/ascii/distro/calculate @@ -0,0 +1,23 @@ + + ...... + ,,+++++++,. + .,,,....,,,+**+,,. + ............,++++,,, + ............... + ......,,,........ + .....+*#####+,,,*+. + .....,*###############,..,,,,,,.. + ......,*#################*..,,,,,..,,,.. + .,,....*####################+***+,,,,...,++, + .,,..,..*#####################*, + ,+,.+*..*#######################. + ,+,,+*+..,#######################* + .,++++++. ..+##**###################+ + ..... ..+##***#################*. + .,.*#*****##############*. + ..,,**********#####****+. + .,++*****++*****************+++++,. + ,++++++**+++++***********+++++++++, + .,,,,++++,.. .,,,,,.....,+++,.,, + + From 40c079eb193be7449f8ac4ec302d2ef7f4f06f0a Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 31 Jan 2018 15:05:07 +0100 Subject: [PATCH 0106/1133] Create nutyx --- ascii/distro/nutyx | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 ascii/distro/nutyx diff --git a/ascii/distro/nutyx b/ascii/distro/nutyx new file mode 100644 index 000000000..f095b82a4 --- /dev/null +++ b/ascii/distro/nutyx @@ -0,0 +1,29 @@ + + + + . + . + ... + ... + .... .........--. + ..-++-----....--++++++---. + .-++++++-. .-++++++++++++-----.. + .--... .++..-+++--.....-++++++++++--.. + . .-+-. .**- .... ..-+----.. + .+++. .*+. + -++-----. + .+++++- ++. .*+. .....-+++-----. + -+++-++. .+. .-+***++***++--++++. . + -+-. -- -. -*- ...... ..--. + .-. .+- . -+. + . .+- +. + -- -- + -+----. .- + -++-.+. . + .++. -- + +. ----. + . .+. .. + - . + . + + + From aa074c3f4b8635949304ddfab1ed5cefc3627884 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 31 Jan 2018 15:17:12 +0100 Subject: [PATCH 0107/1133] Add files via upload --- neofetch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/neofetch b/neofetch index 3aa5d4707..c7a285f20 100755 --- a/neofetch +++ b/neofetch @@ -3241,6 +3241,11 @@ get_distro_colors() { ascii_file="amazon" ;; + "Anarchy"*) + set_colors 4 6 + ascii_file="anarchy" + ;; + "Android"*) set_colors 2 7 ascii_file="android" @@ -3332,6 +3337,11 @@ get_distro_colors() { ascii_file="bunsenlabs" ;; + "Calculate"*) + set_colors 0 3 + ascii_file="calculate" + ;; + "CentOS"*) set_colors 3 2 4 5 7 ascii_file="centos" @@ -3638,6 +3648,11 @@ get_distro_colors() { ascii_file="nurunner" ;; + "NuTyX"*) + set_colors 4 + ascii_file="nutyx" + ;; + "OBRevenge"*) set_colors 1 7 3 ascii_file="obrevenge" From 2cecb142e1bc651427e0590672144b609714f903 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 1 Feb 2018 12:14:03 +1100 Subject: [PATCH 0108/1133] misc: cleanup --- CHANGELOG.md | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bf369fc2..65e71d4be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,24 +7,33 @@ - [**@MitchWeaver**](https://github.com/MitchWeaver) - [**@StarryTony**](https://github.com/StarryTony) - [**@rage311**](https://github.com/rage311) +- [**@matoro**](https://github.com/matoro) +- [**@szfcbr**](https://github.com/szfcbr) +- [**@ArmstrongJ**](https://github.com/ArmstrongJ) ## OS -- Fixed detection bug with Gentoo. -- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) - Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) - Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) - Added support for Pop!\_OS. [**@jliles**](https://github.com/jliles) - Added support for Lunar Linux. +- Added support for 32-bit IRIX. [**@szfcbr**](https://github.com/szfcbr) +- Added support for FreeMINT. [**@ArmstrongJ**](https://github.com/ArmstrongJ) +- Fixed detection bug with Gentoo. +- Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) ## General - Added more info to verbose mode for debugging. - Fixed bug in prompt location calculation. +- Fixed prompt bug in OpenBSD. +- Swapped sequences from `\033` to `\e`. ## Ascii @@ -35,7 +44,7 @@ ## Images - [MacOS/iTerm2] Fixed thumbnail not appearing. [**@StarryTony**](https://github.com/StarryTony) -- Fixed bug with getting wallpaper from feh. +- Fixed bug with getting wallpaper from feh. - Added `pixterm` backend. ## Info @@ -43,6 +52,7 @@ **Desktop Environment** - Added GNOME version. +- Added support for TDE. **Window Manager** @@ -70,6 +80,7 @@ **GPU** - [linux] Added driver version to NVIDIA output. +- [linux] Added driver version to Intel output. - [macOS] Added NVIDIA support. [**@iandrewt**](https://github.com/iandrewt) **Memory** @@ -95,3 +106,11 @@ **Disk** - Update Haiku's detection. [**@dawidd6**](https://github.com/dawidd6) + +**Battery** + +- Fixed Windows detection. [**@matoro**](https://github.com/matoro) + +**Shell** + +- Added support for `tcsh`. [**@szfcbr**](https://github.com/szfcbr) From 7a543e8fa6902a3d946a4b912c898546eb794db9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 2 Feb 2018 09:24:48 +1100 Subject: [PATCH 0109/1133] general: Revert problamatic lines to over 100 chars long. --- .travis.yml | 2 +- neofetch | 17 +++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 388082b0e..735dceeb7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,4 +24,4 @@ script: # 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. - - if grep '.\{101\}' neofetch; then (exit 1); else (exit 0); fi + # - if grep '.\{101\}' neofetch; then (exit 1); else (exit 0); fi diff --git a/neofetch b/neofetch index 3aa5d4707..8dd79d3ee 100755 --- a/neofetch +++ b/neofetch @@ -1522,10 +1522,7 @@ get_memory() { } get_song() { - player="$(ps x | awk '!(/ awk|Helper|Cache|ibus|indicator/) && /mpd|mopidy|cmus|mocp|spotify|\ -Google Play|iTunes.app|rhythmbox|banshee|amarok|deadbeef|audacious|\ -xmms2d|gnome-music|lollypop|clementine|pragha|exaile|juk|bluemindo|\ -guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " " $6; exit}')" + player="$(ps x | awk '!(/ awk|Helper|Cache|ibus|indicator/) && /mpd|mopidy|cmus|mocp|[Ss]potify|Google Play|iTunes.app|rhythmbox|banshee|amarok|deadbeef|audacious|xmms2d|gnome-music|lollypop|clementine|pragha|exaile|juk|bluemindo|guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " " $6; exit}')" get_song_dbus() { # Multiple players use an almost identical dbus command to get the information. @@ -1577,15 +1574,13 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " "Linux") get_song_dbus "spotify" ;; "Mac OS X") - song="$(osascript -e 'tell application "Spotify" to artist of current track as \ - string & " - " & name of current track as string')" + song="$(osascript -e 'tell application "Spotify" to artist of current track as string & " - " & name of current track as string')" ;; esac ;; "itunes"*) - song="$(osascript -e 'tell application "iTunes" to artist of current track as \ - string & " - " & name of current track as string')" + song="$(osascript -e 'tell application "iTunes" to artist of current track as string & " - " & name of current track as string')" ;; "banshee"*) @@ -1941,8 +1936,7 @@ get_term_font() { ;; "Apple_Terminal") - term_font="$(osascript -e 'tell application "Terminal" to \ - font name of window frontmost')" + term_font="$(osascript -e 'tell application "Terminal" to font name of window frontmost')" ;; "iTerm2") @@ -1953,8 +1947,7 @@ get_term_font() { # See: https://groups.google.com/forum/#!topic/iterm2-discuss/0tO3xZ4Zlwg local current_profile_name profiles_count profile_name diff_font none_ascii - current_profile_name="$(osascript -e 'tell application "iTerm2" to profile name \ - of current session of current window')" + current_profile_name="$(osascript -e 'tell application "iTerm2" to profile name of current session of current window')" # Warning: Dynamic profiles are not taken into account here! # https://www.iterm2.com/documentation-dynamic-profiles.html From bac9dcf3f4a347f8364d293a38d8d1390994be7d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 2 Feb 2018 09:46:18 +1100 Subject: [PATCH 0110/1133] song: Use grep instead of awk. --- neofetch | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8dd79d3ee..c23cf9851 100755 --- a/neofetch +++ b/neofetch @@ -1522,7 +1522,36 @@ get_memory() { } get_song() { - player="$(ps x | awk '!(/ awk|Helper|Cache|ibus|indicator/) && /mpd|mopidy|cmus|mocp|[Ss]potify|Google Play|iTunes.app|rhythmbox|banshee|amarok|deadbeef|audacious|xmms2d|gnome-music|lollypop|clementine|pragha|exaile|juk|bluemindo|guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " " $6; exit}')" + player="$(ps -e | grep -m 1 -o -F \ + -e "Google Play" \ + -e "Spotify" \ + -e "amarok" \ + -e "audacious" \ + -e "banshee" \ + -e "bluemindo" \ + -e "clementine" \ + -e "cmus" \ + -e "deadbeef" \ + -e "deepin-music" \ + -e "elisa" \ + -e "exaile" \ + -e "gnome-music" \ + -e "guayadeque" \ + -e "iTunes.app" \ + -e "juk" \ + -e "lollypop" \ + -e "mocp" \ + -e "mopidy" \ + -e "mpd" \ + -e "pogo" \ + -e "pragha" \ + -e "qmmp" \ + -e "quodlibet" \ + -e "rhythmbox" \ + -e "spotify" \ + -e "tomahawk" \ + -e "xmms2d" \ + -e "yarock")" get_song_dbus() { # Multiple players use an almost identical dbus command to get the information. From b76513d7b6461294a5b65a1c83156d2a7a935a7c Mon Sep 17 00:00:00 2001 From: Joseph Durel Date: Thu, 1 Feb 2018 19:52:23 -0500 Subject: [PATCH 0111/1133] Change `osascript` calls to use heredocs so they don't extend beyond 100 chars --- neofetch | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index c23cf9851..d0eea8bea 100755 --- a/neofetch +++ b/neofetch @@ -1603,13 +1603,23 @@ get_song() { "Linux") get_song_dbus "spotify" ;; "Mac OS X") - song="$(osascript -e 'tell application "Spotify" to artist of current track as string & " - " & name of current track as string')" + song="$(osascript < Date: Thu, 1 Feb 2018 21:58:06 -0500 Subject: [PATCH 0112/1133] Detect iTunes/Spotify successfully when the other is not running --- neofetch | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index d0eea8bea..f737c0561 100755 --- a/neofetch +++ b/neofetch @@ -1522,7 +1522,7 @@ get_memory() { } get_song() { - player="$(ps -e | grep -m 1 -o -F \ + player="$(ps -e | grep -m 1 -o \ -e "Google Play" \ -e "Spotify" \ -e "amarok" \ @@ -1537,7 +1537,7 @@ get_song() { -e "exaile" \ -e "gnome-music" \ -e "guayadeque" \ - -e "iTunes.app" \ + -e "iTunes$" \ -e "juk" \ -e "lollypop" \ -e "mocp" \ @@ -1604,9 +1604,11 @@ get_song() { "Mac OS X") song="$(osascript < Date: Thu, 1 Feb 2018 22:01:22 -0500 Subject: [PATCH 0113/1133] Fix `uppercase()` outputting nothing under `bash` < v4 --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f737c0561..283009628 100755 --- a/neofetch +++ b/neofetch @@ -3255,7 +3255,11 @@ strip_sequences() { } uppercase() { - ((bash_version >= 4)) && printf "%s" "${1^}" + if ((bash_version >= 4)); then + printf "%s" "${1^}" + else + echo $1 + fi } # COLORS From 80d7cef7a01e2db803e3bdfdd43a7e8c8f2fbb0a Mon Sep 17 00:00:00 2001 From: Joseph Durel Date: Thu, 1 Feb 2018 22:01:35 -0500 Subject: [PATCH 0114/1133] Add macOS Light/Dark theme detection --- neofetch | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 283009628..cd8078259 100755 --- a/neofetch +++ b/neofetch @@ -926,14 +926,21 @@ get_wm_theme() { ;; "Quartz Compositor") - wm_theme="$(PlistBuddy -c "Print AppleAquaColorVariant" \ - "${HOME}/Library/Preferences/.GlobalPreferences.plist")" + global_preferences="${HOME}/Library/Preferences/.GlobalPreferences.plist" + wm_theme="$(PlistBuddy -c "Print AppleInterfaceStyle" "$global_preferences")" + wm_theme_color="$(PlistBuddy -c "Print AppleAquaColorVariant" "$global_preferences")" - if [[ -z "$wm_theme" ]] || ((wm_theme == 1)); then - wm_theme="Blue" + if [[ -z "$wm_theme" ]]; then + wm_theme="Light" + fi + + if [[ -z "$wm_theme_color" ]] || ((wm_theme_color == 1)); then + wm_theme_color="Blue" else - wm_theme="Graphite" + wm_theme_color="Graphite" fi + + wm_theme="$wm_theme_color ($wm_theme)" ;; *"Explorer") From 9e4434e5e5163aeb1bc94c15dcd4de223d1c5993 Mon Sep 17 00:00:00 2001 From: Joseph Durel Date: Thu, 1 Feb 2018 22:26:18 -0500 Subject: [PATCH 0115/1133] Add missing double-quotes in `uppercase()` fix --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index cd8078259..b460019f8 100755 --- a/neofetch +++ b/neofetch @@ -3265,7 +3265,7 @@ uppercase() { if ((bash_version >= 4)); then printf "%s" "${1^}" else - echo $1 + echo "$1" fi } From d8addb3e3b16ec20a07cf3aa0ffd9ba556854202 Mon Sep 17 00:00:00 2001 From: Joseph Durel Date: Thu, 1 Feb 2018 23:28:02 -0500 Subject: [PATCH 0116/1133] =?UTF-8?q?Change=20`echo`=20=E2=86=92=20`printf?= =?UTF-8?q?`=20for=20consistency?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index b460019f8..d8f856e8c 100755 --- a/neofetch +++ b/neofetch @@ -3265,7 +3265,7 @@ uppercase() { if ((bash_version >= 4)); then printf "%s" "${1^}" else - echo "$1" + printf "%s" "$1" fi } From eb062afe957ddc081c0d112f536c816ac7384d89 Mon Sep 17 00:00:00 2001 From: Joseph Durel Date: Thu, 1 Feb 2018 23:43:03 -0500 Subject: [PATCH 0117/1133] Align heredoc AppleScript strings to `osascript` calls --- neofetch | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/neofetch b/neofetch index d8f856e8c..c710775d7 100755 --- a/neofetch +++ b/neofetch @@ -1611,11 +1611,12 @@ get_song() { "Mac OS X") song="$(osascript < Date: Thu, 1 Feb 2018 23:46:50 -0500 Subject: [PATCH 0118/1133] =?UTF-8?q?Full=20`if`=20=E2=86=92=20single=20li?= =?UTF-8?q?ne=20for=20macOS=20Light=20theme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- neofetch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/neofetch b/neofetch index c710775d7..91bf857b3 100755 --- a/neofetch +++ b/neofetch @@ -930,9 +930,7 @@ get_wm_theme() { wm_theme="$(PlistBuddy -c "Print AppleInterfaceStyle" "$global_preferences")" wm_theme_color="$(PlistBuddy -c "Print AppleAquaColorVariant" "$global_preferences")" - if [[ -z "$wm_theme" ]]; then - wm_theme="Light" - fi + [[ -z "$wm_theme" ]] && wm_theme="Light" if [[ -z "$wm_theme_color" ]] || ((wm_theme_color == 1)); then wm_theme_color="Blue" From 8f25d0190bde4b4d912a96defc8ace64da9c8d59 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 2 Feb 2018 16:49:32 +0100 Subject: [PATCH 0119/1133] Add files via upload --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index c7a285f20..bcfb125aa 100755 --- a/neofetch +++ b/neofetch @@ -3242,7 +3242,7 @@ get_distro_colors() { ;; "Anarchy"*) - set_colors 4 6 + set_colors 7 4 ascii_file="anarchy" ;; @@ -3338,7 +3338,7 @@ get_distro_colors() { ;; "Calculate"*) - set_colors 0 3 + set_colors 7 3 ascii_file="calculate" ;; @@ -3649,7 +3649,7 @@ get_distro_colors() { ;; "NuTyX"*) - set_colors 4 + set_colors 4 1 ascii_file="nutyx" ;; @@ -3863,7 +3863,7 @@ get_distro_colors() { ascii_file="tails" ;; - "Trisquel"*) + "Trisquel"*) set_colors 4 6 ascii_file="trisquel" ;; From 09a3b135a0864ad8472b41862cc04bc26f701421 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 2 Feb 2018 16:51:53 +0100 Subject: [PATCH 0120/1133] Add files via upload --- ascii/distro/anarchy | 58 ++++++++++++++++++++---------------------- ascii/distro/calculate | 43 +++++++++++++++---------------- ascii/distro/nutyx | 52 +++++++++++++++++-------------------- 3 files changed, 71 insertions(+), 82 deletions(-) diff --git a/ascii/distro/anarchy b/ascii/distro/anarchy index 27a48aca8..d0f5a1402 100644 --- a/ascii/distro/anarchy +++ b/ascii/distro/anarchy @@ -1,30 +1,28 @@ - - .. - .. - :.. - :+++. - .:::+++++++::. - .:+######++++######+:. - .+#########+++++##########:. - .+##########+++++++#+#########+. - +###########+++++++++############: - +##########++++++#++++#+###########+ - +###########+++++###++++#+###########+ - :##########+#++++####++++#+############: - ###########+++++#####+++++#+###++######+ - .##########++++++#####++++++++++++#######. - .##########+++++++++++++++++++###########. - #####++++++++++++++###++++++++#########+ - :###++++++++++#########+++++++#########: - +######+++++##########++++++++#######+ - +####+++++###########+++++++++#####+ - :##++++++############++++++++++##: - .++++++#############+++++++++++. - :++++###############+++++++:: - .++. .:+##############+++++++.. - .:. ..::++++++::..:+++++. - . .:+++. - .:: - .. - .. - + ${c2}..${c1} + ${c2}..${c1} + ${c2}:..${c1} + ${c2}:+++.${c1} + .:::++${c2}++++${c1}+::. + .:+######${c2}++++${c1}######+:. + .+#########${c2}+++++${c1}##########:. + .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. + +###########${c2}+++++++++${c1}############: + +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ + +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ + :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: + ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ +.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. +.##########${c2}+++++++++++++++++++${c1}###########. + #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ + :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: + +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ + +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ + :##${c2}++++++${c1}############${c2}++++++++++${c1}##: + .${c2}++++++${c1}#############${c2}++++++++++${c1}+. + :${c2}++++${c1}###############${c2}+++++++${c1}:: + .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. + ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. + ${c2}.${c1} ${c2}.:+++${c1}. + ${c2}.:${c1}: + ${c2}..${c1} + ${c2}..${c1} \ No newline at end of file diff --git a/ascii/distro/calculate b/ascii/distro/calculate index 08798c03e..a6b256c4b 100644 --- a/ascii/distro/calculate +++ b/ascii/distro/calculate @@ -1,23 +1,20 @@ - - ...... - ,,+++++++,. - .,,,....,,,+**+,,. - ............,++++,,, - ............... - ......,,,........ - .....+*#####+,,,*+. - .....,*###############,..,,,,,,.. - ......,*#################*..,,,,,..,,,.. - .,,....*####################+***+,,,,...,++, - .,,..,..*#####################*, - ,+,.+*..*#######################. - ,+,,+*+..,#######################* - .,++++++. ..+##**###################+ - ..... ..+##***#################*. - .,.*#*****##############*. - ..,,**********#####****+. - .,++*****++*****************+++++,. - ,++++++**+++++***********+++++++++, - .,,,,++++,.. .,,,,,.....,+++,.,, - - +${c1} ...... + ,,+++++++,. + .,,,....,,,${c2}+**+,,.${c1} + ............,${c2}++++,,,${c1} + ............... + ......,,,........ + .....+*#####+,,,*+. + .....,*###############,..,,,,,,.. + ......,*#################*..,,,,,..,,,.. + .,,....*####################+***+,,,,...,++, + .,,..,..*#####################*, + ,+,.+*..*#######################. + ,+,,+*+..,########################* +.,++++++. ..+##**###################+ +..... ..+##***#################*. + .,.*#*****##############*. + ..,,*********#####****+. + ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} + ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} + ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} \ No newline at end of file diff --git a/ascii/distro/nutyx b/ascii/distro/nutyx index f095b82a4..84a6cc5a9 100644 --- a/ascii/distro/nutyx +++ b/ascii/distro/nutyx @@ -1,29 +1,23 @@ - - - - . - . - ... - ... - .... .........--. - ..-++-----....--++++++---. - .-++++++-. .-++++++++++++-----.. - .--... .++..-+++--.....-++++++++++--.. - . .-+-. .**- .... ..-+----.. - .+++. .*+. + -++-----. - .+++++- ++. .*+. .....-+++-----. - -+++-++. .+. .-+***++***++--++++. . - -+-. -- -. -*- ...... ..--. - .-. .+- . -+. - . .+- +. - -- -- - -+----. .- - -++-.+. . - .++. -- - +. ----. - . .+. .. - - . - . - - - +${c1} . + . + ... + ... + .... .........--. + ..-++-----....--++++++---. + .-++++++-. .-++++++++++++-----.. + .--... .++..-+++--.....-++++++++++--.. + . .-+-. .**- .... ..-+----.. + .+++. .*+. + -++-----. + .+++++- ++. .*+. .....-+++-----. + -+++-++. .+. .-+***++***++--++++. . + -+-. -- -. -*- ...... ..--. +.-. .+- . -+. +. .+- +. + -- -- + -+----. .- + -++-.+. . + .++. -- + +. ----. + . .+. .. + - . + . \ No newline at end of file From 175adb7560e28d5d4b04828aa632a2954b8b71fa Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 2 Feb 2018 17:00:44 +0100 Subject: [PATCH 0121/1133] Add files via upload --- CHANGELOG.md | 25 ++++++++++++++++++++++--- neofetch | 48 +++++++++++++++++++++++++++++++++++------------- 2 files changed, 57 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8bf369fc2..65e71d4be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,24 +7,33 @@ - [**@MitchWeaver**](https://github.com/MitchWeaver) - [**@StarryTony**](https://github.com/StarryTony) - [**@rage311**](https://github.com/rage311) +- [**@matoro**](https://github.com/matoro) +- [**@szfcbr**](https://github.com/szfcbr) +- [**@ArmstrongJ**](https://github.com/ArmstrongJ) ## OS -- Fixed detection bug with Gentoo. -- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) - Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) - Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) - Added support for Pop!\_OS. [**@jliles**](https://github.com/jliles) - Added support for Lunar Linux. +- Added support for 32-bit IRIX. [**@szfcbr**](https://github.com/szfcbr) +- Added support for FreeMINT. [**@ArmstrongJ**](https://github.com/ArmstrongJ) +- Fixed detection bug with Gentoo. +- Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) ## General - Added more info to verbose mode for debugging. - Fixed bug in prompt location calculation. +- Fixed prompt bug in OpenBSD. +- Swapped sequences from `\033` to `\e`. ## Ascii @@ -35,7 +44,7 @@ ## Images - [MacOS/iTerm2] Fixed thumbnail not appearing. [**@StarryTony**](https://github.com/StarryTony) -- Fixed bug with getting wallpaper from feh. +- Fixed bug with getting wallpaper from feh. - Added `pixterm` backend. ## Info @@ -43,6 +52,7 @@ **Desktop Environment** - Added GNOME version. +- Added support for TDE. **Window Manager** @@ -70,6 +80,7 @@ **GPU** - [linux] Added driver version to NVIDIA output. +- [linux] Added driver version to Intel output. - [macOS] Added NVIDIA support. [**@iandrewt**](https://github.com/iandrewt) **Memory** @@ -95,3 +106,11 @@ **Disk** - Update Haiku's detection. [**@dawidd6**](https://github.com/dawidd6) + +**Battery** + +- Fixed Windows detection. [**@matoro**](https://github.com/matoro) + +**Shell** + +- Added support for `tcsh`. [**@szfcbr**](https://github.com/szfcbr) diff --git a/neofetch b/neofetch index bcfb125aa..daf4f6f53 100755 --- a/neofetch +++ b/neofetch @@ -1522,10 +1522,36 @@ get_memory() { } get_song() { - player="$(ps x | awk '!(/ awk|Helper|Cache|ibus|indicator/) && /mpd|mopidy|cmus|mocp|spotify|\ -Google Play|iTunes.app|rhythmbox|banshee|amarok|deadbeef|audacious|\ -xmms2d|gnome-music|lollypop|clementine|pragha|exaile|juk|bluemindo|\ -guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " " $6; exit}')" + player="$(ps -e | grep -m 1 -o -F \ + -e "Google Play" \ + -e "Spotify" \ + -e "amarok" \ + -e "audacious" \ + -e "banshee" \ + -e "bluemindo" \ + -e "clementine" \ + -e "cmus" \ + -e "deadbeef" \ + -e "deepin-music" \ + -e "elisa" \ + -e "exaile" \ + -e "gnome-music" \ + -e "guayadeque" \ + -e "iTunes.app" \ + -e "juk" \ + -e "lollypop" \ + -e "mocp" \ + -e "mopidy" \ + -e "mpd" \ + -e "pogo" \ + -e "pragha" \ + -e "qmmp" \ + -e "quodlibet" \ + -e "rhythmbox" \ + -e "spotify" \ + -e "tomahawk" \ + -e "xmms2d" \ + -e "yarock")" get_song_dbus() { # Multiple players use an almost identical dbus command to get the information. @@ -1577,15 +1603,13 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " "Linux") get_song_dbus "spotify" ;; "Mac OS X") - song="$(osascript -e 'tell application "Spotify" to artist of current track as \ - string & " - " & name of current track as string')" + song="$(osascript -e 'tell application "Spotify" to artist of current track as string & " - " & name of current track as string')" ;; esac ;; "itunes"*) - song="$(osascript -e 'tell application "iTunes" to artist of current track as \ - string & " - " & name of current track as string')" + song="$(osascript -e 'tell application "iTunes" to artist of current track as string & " - " & name of current track as string')" ;; "banshee"*) @@ -1941,8 +1965,7 @@ get_term_font() { ;; "Apple_Terminal") - term_font="$(osascript -e 'tell application "Terminal" to \ - font name of window frontmost')" + term_font="$(osascript -e 'tell application "Terminal" to font name of window frontmost')" ;; "iTerm2") @@ -1953,8 +1976,7 @@ get_term_font() { # See: https://groups.google.com/forum/#!topic/iterm2-discuss/0tO3xZ4Zlwg local current_profile_name profiles_count profile_name diff_font none_ascii - current_profile_name="$(osascript -e 'tell application "iTerm2" to profile name \ - of current session of current window')" + current_profile_name="$(osascript -e 'tell application "iTerm2" to profile name of current session of current window')" # Warning: Dynamic profiles are not taken into account here! # https://www.iterm2.com/documentation-dynamic-profiles.html @@ -3863,7 +3885,7 @@ get_distro_colors() { ascii_file="tails" ;; - "Trisquel"*) + "Trisquel"*) set_colors 4 6 ascii_file="trisquel" ;; From 2ba3fc014ebc89e887eccff339ca8a0c0d19b633 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 3 Feb 2018 09:05:41 +1100 Subject: [PATCH 0122/1133] misc: cleanup --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 65e71d4be..20f077cda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ - [**@matoro**](https://github.com/matoro) - [**@szfcbr**](https://github.com/szfcbr) - [**@ArmstrongJ**](https://github.com/ArmstrongJ) +- [**@robertwolter**](https://github.com/robertwolter) ## OS @@ -22,6 +23,9 @@ - Added support for Lunar Linux. - Added support for 32-bit IRIX. [**@szfcbr**](https://github.com/szfcbr) - Added support for FreeMINT. [**@ArmstrongJ**](https://github.com/ArmstrongJ) +- Added support for Anarchy Linux. [**@robertwolter**](https://github.com/robertwolter) +- Added support for Calculate Linux. [**@robertwolter**](https://github.com/robertwolter) +- Added support for NuTyX. [**@robertwolter**](https://github.com/robertwolter) - Fixed detection bug with Gentoo. - Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) - Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) From a2f44749afb0a255086181efa5de51965d4f8643 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 3 Feb 2018 09:10:57 +1100 Subject: [PATCH 0123/1133] misc: cleanup --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 20f077cda..ce3e3d467 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ - [**@szfcbr**](https://github.com/szfcbr) - [**@ArmstrongJ**](https://github.com/ArmstrongJ) - [**@robertwolter**](https://github.com/robertwolter) +- [**@JadeMatrix**](https://github.com/JadeMatrix) ## OS @@ -37,6 +38,8 @@ - Added more info to verbose mode for debugging. - Fixed bug in prompt location calculation. - Fixed prompt bug in OpenBSD. +- Fixed broken AppleScript blocks. [**@JadeMatrix**](https://github.com/JadeMatrix) +- Fixed function not working in bash 3. [**@JadeMatrix**](https://github.com/JadeMatrix) - Swapped sequences from `\033` to `\e`. @@ -66,6 +69,7 @@ **Window Manager Theme** - Fixed `sawfish` detection. +- [macOS] Now detects Light/Dark theme. [**@JadeMatrix**](https://github.com/JadeMatrix) **Install Date** @@ -102,6 +106,7 @@ **Song** - Added support for Elisa. [**@mstraube**](https://github.com/mstraube) +- macOS detection is now more reliable. [**@JadeMatrix**](https://github.com/JadeMatrix) **Model** From 877a975a32881633716c7ac9e4ba981f28980719 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 6 Feb 2018 12:29:02 +1100 Subject: [PATCH 0124/1133] OS: Added support for ArchMerge. Closes #907 --- ascii/distro/archmerge | 20 ++++++++++++++++++++ neofetch | 5 +++++ 2 files changed, 25 insertions(+) create mode 100644 ascii/distro/archmerge diff --git a/ascii/distro/archmerge b/ascii/distro/archmerge new file mode 100644 index 000000000..c849851ec --- /dev/null +++ b/ascii/distro/archmerge @@ -0,0 +1,20 @@ +${c1} y: + sMN- + +MMMm` + /MMMMMd` + :NMMMMMMy + -NMMMMMMMMs + .NMMMMMMMMMM+ + .mMMMMMMMMMMMM+ + oNMMMMMMMMMMMMM+ + `+:-+NMMMMMMMMMMMM+ + .sNMNhNMMMMMMMMMMMM/ + `hho/sNMMMMMMMMMMMMMMM/ + `.`omMMmMMMMMMMMMMMMMMMM+ + .mMNdshMMMMd+::oNMMMMMMMMMo + .mMMMMMMMMM+ `yMMMMMMMMMs + .NMMMMMMMMM/ yMMMMMMMMMy + -NMMMMMMMMMh `mNMMMMMMMMd` + /NMMMNds+:.` `-/oymMMMm. + +Mmy/. `:smN: +/+. -o. diff --git a/neofetch b/neofetch index 3789b7f01..01724887a 100755 --- a/neofetch +++ b/neofetch @@ -3354,6 +3354,11 @@ get_distro_colors() { ascii_file="arch_xferience" ;; + "ArchMerge"*) + set_colors 6 6 7 1 + ascii_file="archmerge" + ;; + "Arch"*) set_colors 6 6 7 1 ascii_file="arch" From 899a8d7ce58236826920c6fc0fa3a2494142493f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 6 Feb 2018 12:30:07 +1100 Subject: [PATCH 0125/1133] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce3e3d467..8408cc0af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ ## OS +- Added support for ArchMerge. - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) - Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) From 97660df3b871f1e3290c8fd2feae3dfa489d94b5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 11 Feb 2018 08:44:22 +1100 Subject: [PATCH 0126/1133] OS: Added support for magpieOS. Closes #912, #908 --- ascii/distro/magpieos | 20 ++++++++++++++++++++ neofetch | 5 +++++ 2 files changed, 25 insertions(+) create mode 100644 ascii/distro/magpieos diff --git a/ascii/distro/magpieos b/ascii/distro/magpieos new file mode 100644 index 000000000..6859d96b2 --- /dev/null +++ b/ascii/distro/magpieos @@ -0,0 +1,20 @@ +${c1} ;00000 :000Ol + .x00kk00: O0kk00k; + l00: :00. o0k :O0k. + .k0k. x${c2}d$dddd${c1}k' .d00; + k0k. ${c2}.dddddl ${c1}o00, + o00. ${c2}':cc:. ${c1}d0O +.00l ,00. +l00. d0x +k0O .:k0o +O0k ;dO0000d. +k0O .O0O${c2}xxxxk${c1}00: +o00. k0O${c2}dddddd${c1}occ +'00l x0O${c2}dddddo${c3};..${c1} + x00. .x00${c2}kxxd${c3}:..${c1} + .O0x .:oxxx${c4}Okl.${c1} + .x0d ${c4},xx,${c1} + .:o. ${c4}.xd ckd${c1} + .. ${c4}dxl .xx; + :xxolldxd' + ;oxdl. diff --git a/neofetch b/neofetch index 01724887a..920c4ccad 100755 --- a/neofetch +++ b/neofetch @@ -3650,6 +3650,11 @@ get_distro_colors() { ascii_file="mageia" ;; + "MagpieOS"*) + set_colors 2 1 3 5 + ascii_file="magpieos" + ;; + "Manjaro"*) set_colors 2 7 ascii_file="manjaro" From 023e3ee8910654d93a43ffd3ddbf743427c36b62 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 11 Feb 2018 08:45:50 +1100 Subject: [PATCH 0127/1133] docs: Changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8408cc0af..b92a2a5c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ ## OS - Added support for ArchMerge. +- Added support for MagpieOS. - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) - Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) From 56821a30e49f0f7230f784ac734579e64ecd67cc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 11 Feb 2018 08:51:58 +1100 Subject: [PATCH 0128/1133] term_font: Add more paths for Alacritty. Closes #911 --- .travis.yml | 2 +- neofetch | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 735dceeb7..388082b0e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,4 +24,4 @@ script: # 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. - # - if grep '.\{101\}' neofetch; then (exit 1); else (exit 0); fi + - if grep '.\{101\}' neofetch; then (exit 1); else (exit 0); fi diff --git a/neofetch b/neofetch index 920c4ccad..d14e23f08 100755 --- a/neofetch +++ b/neofetch @@ -1978,8 +1978,18 @@ get_term_font() { case "$term" in "alacritty"*) + if [[ -f "${XDG_CONFIG_HOME}/alacritty.yml" ]]; then + alacritty_file="${XDG_CONFIG_HOME}/alacritty.yml" + + elif [[ -f "${XDG_CONFIG_HOME}/alacritty/alacritty.yml" ]]; then + alacritty_file="${XDG_CONFIG_HOME}/alacritty/alacritty.yml" + + elif [[ -f "${HOME}/.alacritty.yml" ]]; then + alacritty_file="${HOME}/.alacritty.yml" + fi + term_font="$(awk -F ':|#' '/normal:/ {getline; print}' \ - "${XDG_CONFIG_HOME}/alacritty/alacritty.yml")" + "$alacritty_file")" term_font="${term_font/*family:}" term_font="${term_font/$'\n'*}" term_font="${term_font/\#*}" From 91d2edf7c8a40dafd8a9008cff807418dd0c69f1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 11 Feb 2018 08:52:37 +1100 Subject: [PATCH 0129/1133] docs: CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b92a2a5c9..18a845eac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -125,3 +125,7 @@ **Shell** - Added support for `tcsh`. [**@szfcbr**](https://github.com/szfcbr) + +**Terminal Font** + +- Added more paths for Alacritty. From c9146d9eee0508c5882d8310cf5357ba9ef862af Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 12 Feb 2018 08:41:12 +1100 Subject: [PATCH 0130/1133] OS: Added support for postmarketos --- ascii/distro/postmarketos | 17 +++++++++++++++++ neofetch | 5 +++++ 2 files changed, 22 insertions(+) create mode 100644 ascii/distro/postmarketos diff --git a/ascii/distro/postmarketos b/ascii/distro/postmarketos new file mode 100644 index 000000000..a2ebc838f --- /dev/null +++ b/ascii/distro/postmarketos @@ -0,0 +1,17 @@ +${c1} ss + `hMMh` + .dMMMMd. + -NMMMMMMN- + /MMMMMMMMMN/ + hMMMMMMMMMMMo + y+`mMMmdNMMMMMMy + `dMM-.-:- .mMMMMMMh` + .mMMMMMMd` `dMMMMMMm. + :NMMMMMMy yMMMMMMN: + /MMMMMMMo oMMMmdmN/ + oMMMMMMM/ /MN.-/:-. + `yMMMMMMN- -:.NMMMMy` + `dMMMMMMM- -/////////////dMMMMMMd` + -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- + :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: ++MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ diff --git a/neofetch b/neofetch index d14e23f08..759258c38 100755 --- a/neofetch +++ b/neofetch @@ -3820,6 +3820,11 @@ get_distro_colors() { ascii_file="porteus" ;; + "PostMarketOS"*) + set_colors 2 7 + ascii_file="postmarketos" + ;; + "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) set_colors 4 7 ascii_file="puppy" From 4dd9cc15f0413b908cdc6516a3b0746957eb59bd Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 12 Feb 2018 08:43:22 +1100 Subject: [PATCH 0131/1133] misc: prompt --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 759258c38..9d19b9683 100755 --- a/neofetch +++ b/neofetch @@ -4308,7 +4308,7 @@ dynamic_prompt() { return else [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" - lines="$((lines - info_height))" + lines="$((lines - info_height + 1))" fi # Set the prompt location. From d32fdce5061075960b22c7c1c768543e58840f84 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 12 Feb 2018 08:43:43 +1100 Subject: [PATCH 0132/1133] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 18a845eac..118168873 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ - Added support for ArchMerge. - Added support for MagpieOS. +- Added support for PostMarketOS. - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) - Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) From 6d549cd459f11d9e60a553d51e8a5969e3205f5c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 12 Feb 2018 13:07:21 +1100 Subject: [PATCH 0133/1133] wm: Added support for non-EWMH WMs --- neofetch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/neofetch b/neofetch index 9d19b9683..db2db7628 100755 --- a/neofetch +++ b/neofetch @@ -773,6 +773,13 @@ get_wm() { # Window Maker does not set _NET_WM_NAME [[ "$wm" =~ "WINDOWMAKER" ]] && wm="wmaker" + # Fallback for non-EWMH WMs. + [[ -z "$wm" ]] && \ + wm="$(ps -e | grep -m 1 -o -F \ + -e "catwm" \ + -e "monsterwm" \ + -e "tinywm")" + else case "$os" in "Mac OS X") From 8a17129ad2575558560f4711da5d30ef50dd06d8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 12 Feb 2018 13:07:49 +1100 Subject: [PATCH 0134/1133] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 118168873..6b75a0476 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,6 +67,7 @@ **Window Manager** - Added support for most (*if not all*) current Wayland compositors/window manager's. +- Added support for some non-EWMH window managers. - [macOS] Fixed `chunkwm` being detected as `Kwm`. [**@iandrewt**](https://github.com/iandrewt) **Window Manager Theme** From 4f9fe67a4380746c83ac6a5a2815b33a7c44a0ef Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 20 Feb 2018 16:27:54 +0100 Subject: [PATCH 0135/1133] OS: Add support for Hyperbola GNU/Linux-libre --- ascii/distro/hyperbola | 16 ++++++++++++++++ neofetch | 5 +++++ 2 files changed, 21 insertions(+) create mode 100644 ascii/distro/hyperbola diff --git a/ascii/distro/hyperbola b/ascii/distro/hyperbola new file mode 100644 index 000000000..5e0133591 --- /dev/null +++ b/ascii/distro/hyperbola @@ -0,0 +1,16 @@ +${c1} WW + KX W + WO0W NX0O + NOO0NW WNXK0OOKW + W0OOOOOOOOOOOOKN + N0OOOOOOO0KXW + WNXXXNW + NXK00000KN + WNK0OOOOOOOOOO0W + NK0OOOOOOOOOOOOOO0W + X0OOOOOOO00KK00OOOOOK + X0OOOO0KNWW WX0OO0W + X0OO0XNW KOOW + N00KNW KOW + NKXN W0W +WW W diff --git a/neofetch b/neofetch index db2db7628..52965e16d 100755 --- a/neofetch +++ b/neofetch @@ -3592,6 +3592,11 @@ get_distro_colors() { ascii_file="haiku" ;; + "Hyperbola"*) + set_colors 8 + ascii_file="hyperbola" + ;; + "Kali"*) set_colors 4 8 ascii_file="kali" From 1ef776519e69f64bf4cb880b94e45a712cb18518 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 21 Feb 2018 09:55:58 +1100 Subject: [PATCH 0136/1133] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b75a0476..fd53eb6d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -19,6 +19,7 @@ - Added support for ArchMerge. - Added support for MagpieOS. - Added support for PostMarketOS. +- Added support for Hyperbola GNU/Linux-libre [**@mstraube**](https://github.com/mstraube) - Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) - Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) - Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) From 0a9c58655a26e93d4892f5e737aa9b1a898f9e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Birger=20J=2E=20Nord=C3=B8lum?= Date: Tue, 27 Feb 2018 13:57:03 +0100 Subject: [PATCH 0137/1133] Fix minor indent bug --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 52965e16d..d0f158a3c 100755 --- a/neofetch +++ b/neofetch @@ -4661,7 +4661,7 @@ IMAGE BACKEND: --catimg source Shortcut to use 'catimg' backend. --iterm2 source Shortcut to use 'iterm2' backend. --jp2a source Shortcut to use 'jp2a' backend. - --pixterm source Shortcut to use 'pixterm' backend. + --pixterm source Shortcut to use 'pixterm' backend. --sixel source Shortcut to use 'sixel' backend. --termpix source Shortcut to use 'termpix' backend. --tycat source Shortcut to use 'tycat' backend. From 0cbdd6963e53386e173a01c3851c9fcee17758fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Birger=20J=2E=20Nord=C3=B8lum?= Date: Mon, 26 Feb 2018 14:56:07 +0100 Subject: [PATCH 0138/1133] Added font support for kitty terminal --- neofetch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/neofetch b/neofetch index 52965e16d..5907861ba 100755 --- a/neofetch +++ b/neofetch @@ -2071,6 +2071,22 @@ END term_font="$(trim_quotes "$term_font")" ;; + "kitty"*) + if [[ -f "${KITTY_CONFIG_DIRECTORY}/kitty/kitty.conf" ]]; then + kitty_file="${KITTY_CONFIG_DIRECTORY}/kitty/kitty.conf" + elif [[ -f "${XDG_CONFIG_HOME}/kitty/kitty.conf" ]]; then + kitty_file="${XDG_CONFIG_HOME}/kitty/kitty.conf" + elif [[ -f "${HOME}/.config/kitty/kitty.conf" ]]; then + kitty_file="${HOME}/.config/kitty/kitty.conf" + elif [[ -f "${HOME}/Library/Preferences/kitty/kitty.conf" ]]; then + kitty_file="${HOME}/Library/Preferences/kitty/kitty.conf" + fi + + term_font="$(awk '/font_family/ { $1 = ""; gsub(/^[[:space:]]/, ""); font = $0 } \ + /font_size/ { size = $2 } END { print font " " size}' \ + "${kitty_file}")" + ;; + "konsole"*) # Get Process ID of current konsole window / tab child="$(get_ppid "$$")" From 169de34ee6f48592d633b13ded548344d963a9ee Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 28 Feb 2018 07:54:35 +1100 Subject: [PATCH 0139/1133] image: [catimg] Don't force res. Closes #921 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 52965e16d..83deb7922 100755 --- a/neofetch +++ b/neofetch @@ -2964,7 +2964,7 @@ display_image() { ;; "catimg") - catimg -w "$((width * 2 / font_width))" -r 0 "$image" ||\ + catimg -w "$((width * 2 / font_width))" "$image" ||\ to_off "Image: catimg failed to display the image." ;; From 4f04acbb003f7d61c26f658cd142cc02d6185f4c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 28 Feb 2018 07:55:07 +1100 Subject: [PATCH 0140/1133] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fd53eb6d4..93335c116 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,6 +57,7 @@ - [MacOS/iTerm2] Fixed thumbnail not appearing. [**@StarryTony**](https://github.com/StarryTony) - Fixed bug with getting wallpaper from feh. - Added `pixterm` backend. +- Don't force resolution in `catimg`. ## Info From 9694f80f2891e9133ab83f8036c0f74d1e2eba03 Mon Sep 17 00:00:00 2001 From: Mitch Weaver <20451170+MitchWeaver@users.noreply.github.com> Date: Mon, 5 Mar 2018 01:12:44 +0100 Subject: [PATCH 0141/1133] add new DragonFly BSD logo, move old logo to dragonfly_old, add dragonfly_small --- ascii/distro/dragonflybsd | 33 +++++++++++++++------------------ ascii/distro/dragonflybsd_old | 18 ++++++++++++++++++ ascii/distro/dragonflybsd_small | 4 ++++ neofetch | 10 ++++++++++ 4 files changed, 47 insertions(+), 18 deletions(-) create mode 100644 ascii/distro/dragonflybsd_old create mode 100644 ascii/distro/dragonflybsd_small diff --git a/ascii/distro/dragonflybsd b/ascii/distro/dragonflybsd index 3276d4f05..7ccc14bc3 100644 --- a/ascii/distro/dragonflybsd +++ b/ascii/distro/dragonflybsd @@ -1,18 +1,15 @@ - ${c1} | - .-. - ${c3} ()${c1}I${c3}() - ${c1} "==.__:-:__.==" - "==.__/~|~\__.==" - "==._( Y )_.==" - ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. -( ..=${c1}\\=${c1}/${c2}=.. ) - `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` - `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` - .-~` /${c1}|=|${c2}\ `~-. - .~` / ${c1}|=|${c2} \ `~. - .-~` .' ${c1}|=|${c2} `. `~-. - (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) - `~"~"` ${c1} |=|${c2} `"~"~` - ${c1} /=\\ - \\=/ - ^ +${c2},--, ${c1}| ${c2},--, +${c2}| `-, ${c1},^, ${c2},-' | +${c2} `, `-, ${c3}(/ \) ${c2},-' ,' +${c2} `-, `-,${c1}/ \${c2},-' ,-' +${c2} `------${c1}( )${c2}------' +${c2} ,----------${c1}( )${c2}----------, +${c2} | _,-${c1}( )${c2}-,_ | +${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' +${c1} | | + | | + | | + | | + | | + | | + `|' diff --git a/ascii/distro/dragonflybsd_old b/ascii/distro/dragonflybsd_old new file mode 100644 index 000000000..3276d4f05 --- /dev/null +++ b/ascii/distro/dragonflybsd_old @@ -0,0 +1,18 @@ + ${c1} | + .-. + ${c3} ()${c1}I${c3}() + ${c1} "==.__:-:__.==" + "==.__/~|~\__.==" + "==._( Y )_.==" + ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. +( ..=${c1}\\=${c1}/${c2}=.. ) + `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` + `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` + .-~` /${c1}|=|${c2}\ `~-. + .~` / ${c1}|=|${c2} \ `~. + .-~` .' ${c1}|=|${c2} `. `~-. + (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) + `~"~"` ${c1} |=|${c2} `"~"~` + ${c1} /=\\ + \\=/ + ^ diff --git a/ascii/distro/dragonflybsd_small b/ascii/distro/dragonflybsd_small new file mode 100644 index 000000000..3a48a9250 --- /dev/null +++ b/ascii/distro/dragonflybsd_small @@ -0,0 +1,4 @@ +${c2}(\${c3}"${c2}/) +${c2}(/${c1}|${c2}\) +${c1} | + | diff --git a/neofetch b/neofetch index f6379e6e5..4b74ceccf 100755 --- a/neofetch +++ b/neofetch @@ -3496,6 +3496,16 @@ get_distro_colors() { ascii_file="dracos" ;; + "dragonfly_old"*) + set_colors 1 7 3 + ascii_file="dragonflybsd_old" + ;; + + "dragonfly_small"*) + set_colors 1 7 3 + ascii_file="dragonflybsd_small" + ;; + "DragonFly"*) set_colors 1 7 3 ascii_file="dragonflybsd" From 7d231b88fa95b72fd3238426d33082f26a4a5283 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 8 Mar 2018 11:11:42 +1100 Subject: [PATCH 0142/1133] misc: cleanup --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index 904cecc87..11392b19d 100755 --- a/neofetch +++ b/neofetch @@ -2074,12 +2074,16 @@ END "kitty"*) if [[ -f "${KITTY_CONFIG_DIRECTORY}/kitty/kitty.conf" ]]; then kitty_file="${KITTY_CONFIG_DIRECTORY}/kitty/kitty.conf" + elif [[ -f "${XDG_CONFIG_HOME}/kitty/kitty.conf" ]]; then kitty_file="${XDG_CONFIG_HOME}/kitty/kitty.conf" + elif [[ -f "${HOME}/.config/kitty/kitty.conf" ]]; then kitty_file="${HOME}/.config/kitty/kitty.conf" + elif [[ -f "${HOME}/Library/Preferences/kitty/kitty.conf" ]]; then kitty_file="${HOME}/Library/Preferences/kitty/kitty.conf" + fi term_font="$(awk '/font_family/ { $1 = ""; gsub(/^[[:space:]]/, ""); font = $0 } \ From e39cbbff32c6a0d3b053ad0c51e47ceb61c34c77 Mon Sep 17 00:00:00 2001 From: Mitch Weaver <20451170+MitchWeaver@users.noreply.github.com> Date: Wed, 7 Mar 2018 04:37:29 +0100 Subject: [PATCH 0143/1133] fix pacman name conflict bug change to type paclog-pkglist typo --- neofetch | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/neofetch b/neofetch index 4b74ceccf..725c71e39 100755 --- a/neofetch +++ b/neofetch @@ -484,16 +484,9 @@ get_uptime() { } get_packages() { - # Remove /usr/games from $PATH. - # This solves issues with neofetch opening the "pacman" game. - local PATH=":${PATH}:" - local PATH="${PATH/':/usr/games:'/:}" - local PATH="${PATH%:}" - local PATH="${PATH#:}" - case "$os" in "Linux" | "BSD" | "iPhone OS" | "Solaris") - type -p pacman >/dev/null && \ + type -p paclog-pkglist >/dev/null && \ packages="$(pacman -Qq --color never | wc -l)" type -p dpkg >/dev/null && \ From 3b34a78c4cb1505e30491b4d262e9b9327cec676 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Tue, 20 Mar 2018 07:10:37 +0700 Subject: [PATCH 0144/1133] OS: Separate Windows 10 into its own if clause --- neofetch | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 11392b19d..a74ee28df 100755 --- a/neofetch +++ b/neofetch @@ -58,15 +58,7 @@ get_distro() { case "$os" in "Linux" | "BSD" | "MINIX") - if [[ "$(< /proc/version)" == *"Microsoft"* || - "$kernel_version" == *"Microsoft"* ]]; then - case "$distro_shorthand" in - "on") distro="$(lsb_release -sir) [Windows 10]" ;; - "tiny") distro="Windows 10" ;; - *) distro="$(lsb_release -sd) on Windows 10" ;; - esac - - elif [[ "$(< /proc/version)" == *"chrome-bot"* || -f "/dev/cros_ec" ]]; then + if [[ "$(< /proc/version)" == *"chrome-bot"* || -f "/dev/cros_ec" ]]; then case "$distro_shorthand" in "on") distro="$(lsb_release -sir) [Chrome OS]" ;; "tiny") distro="Chrome OS" ;; @@ -163,6 +155,15 @@ get_distro() { [[ -f "/etc/pacbsd-release" ]] && distro="PacBSD" fi fi + + if [[ "$(< /proc/version)" == *"Microsoft"* || + "$kernel_version" == *"Microsoft"* ]]; then + case "$distro_shorthand" in + "on") distro+=" [Windows 10]" ;; + "tiny") distro="Windows 10" ;; + *) distro+=" on Windows 10" ;; + esac + fi distro="$(trim_quotes "$distro")" distro="${distro/'NAME='}" ;; From e4abb3a98489beff49cfa73861d30ec40ad45587 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Tue, 20 Mar 2018 07:41:05 +0700 Subject: [PATCH 0145/1133] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93335c116..d7e6c3bd1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -104,6 +104,7 @@ **Package Manager** - Added detection for Sabotage Linux's `butch` [**@MitchWeaver**](https://github.com/MitchWeaver) +- Changed `pacman` detection to fix issues in other distros. [**@MitchWeaver**](https://github.com/MitchWeaver) **Resolution** From 97c02742c194e2ba836c16213e8b944f9e09f8b7 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 20 Mar 2018 22:31:12 +0100 Subject: [PATCH 0146/1133] Distro: Add support for openSUSE Tumbleweed Closes #930 --- ascii/distro/tumbleweed | 13 +++++++++++++ neofetch | 5 +++++ 2 files changed, 18 insertions(+) create mode 100644 ascii/distro/tumbleweed diff --git a/ascii/distro/tumbleweed b/ascii/distro/tumbleweed new file mode 100644 index 000000000..37ee33ad4 --- /dev/null +++ b/ascii/distro/tumbleweed @@ -0,0 +1,13 @@ +${c2} ...... + .,cdxxxoc,. .:kKMMMNWMMMNk:. + cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. + ;WMK;. .lKMMNM, :NMK, .OMW; + cMW; 'WMMMN ,XMK, oMM' +.MMc ..;l. xMN: KM0 +'MM. 'NMO oMM +.MM, .kMMl xMN + KM0 .kMM0. .dl:,.. .WMd + .XM0. ,OMMK, OMMMK. .XMK + oWMO:. .;xNMMk, NNNMKl. .xWMx + :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, + ..... .:dOOXXKOxl, diff --git a/neofetch b/neofetch index 478c5122e..88207b9bf 100755 --- a/neofetch +++ b/neofetch @@ -3965,6 +3965,11 @@ get_distro_colors() { ascii_file="solaris" ;; + "openSUSE Tumbleweed"*) + set_colors 2 7 + ascii_file="tumbleweed" + ;; + "openSUSE"* | "open SUSE"* | "SUSE"*) set_colors 2 7 ascii_file="suse" From deae19ac50a21ec1bf73d4e34011b7864a6bec9a Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Wed, 21 Mar 2018 06:45:37 +0700 Subject: [PATCH 0147/1133] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index d7e6c3bd1..158237e91 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,6 +31,7 @@ - Added support for Anarchy Linux. [**@robertwolter**](https://github.com/robertwolter) - Added support for Calculate Linux. [**@robertwolter**](https://github.com/robertwolter) - Added support for NuTyX. [**@robertwolter**](https://github.com/robertwolter) +- Added suport for openSUSE Tumbleweed. [**@robertwolter**](http://github.com/robertwolter) - Fixed detection bug with Gentoo. - Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) - Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) From 39cd3ede324e919ba58ff33a72dd3c840039ed1f Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sat, 24 Mar 2018 15:30:00 +0700 Subject: [PATCH 0148/1133] Distro: Separate ChromeOS detection --- neofetch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index a74ee28df..3130af756 100755 --- a/neofetch +++ b/neofetch @@ -58,14 +58,7 @@ get_distro() { case "$os" in "Linux" | "BSD" | "MINIX") - if [[ "$(< /proc/version)" == *"chrome-bot"* || -f "/dev/cros_ec" ]]; then - case "$distro_shorthand" in - "on") distro="$(lsb_release -sir) [Chrome OS]" ;; - "tiny") distro="Chrome OS" ;; - *) distro="$(lsb_release -sd) on Chrome OS" ;; - esac - - elif [[ -f "/etc/redstar-release" ]]; then + if [[ -f "/etc/redstar-release" ]]; then case "$distro_shorthand" in "on" | "tiny") distro="Red Star OS" ;; *) distro="Red Star OS $(awk -F'[^0-9*]' '$0=$2' /etc/redstar-release)" @@ -163,7 +156,15 @@ get_distro() { "tiny") distro="Windows 10" ;; *) distro+=" on Windows 10" ;; esac + + elif [[ "$(< /proc/version)" == *"chrome-bot"* || -f "/dev/cros_ec" ]]; then + case "$distro_shorthand" in + "on") distro+=" [Chrome OS]" ;; + "tiny") distro="Chrome OS" ;; + *) distro+=" on Chrome OS" ;; + esac fi + distro="$(trim_quotes "$distro")" distro="${distro/'NAME='}" ;; From 741493714b5c4675732a48e522ce6d25cefd7341 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sat, 24 Mar 2018 15:33:08 +0700 Subject: [PATCH 0149/1133] docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93335c116..4b954858c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,7 @@ - Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) - Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) - Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with Windows Subsystem for Linux and Crouton when an OS without lsb_release is installed. ## General From 7fbab49ec3a5a5b0ef06da4d248ca9fffc19dcd7 Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Tue, 27 Mar 2018 21:28:45 +0100 Subject: [PATCH 0150/1133] Fix kitty font_size regex --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8bebbaa6a..8b9fb91ae 100755 --- a/neofetch +++ b/neofetch @@ -2082,7 +2082,7 @@ END fi term_font="$(awk '/font_family/ { $1 = ""; gsub(/^[[:space:]]/, ""); font = $0 } \ - /font_size/ { size = $2 } END { print font " " size}' \ + /\s?font_size\s/ { size = $2 } END { print font " " size}' \ "${kitty_file}")" ;; From a1044d728fd0260d66461a8cb357066a7b63b6e4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 1 Apr 2018 14:30:06 +1000 Subject: [PATCH 0151/1133] general: Swap echo to printf --- neofetch | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 8bebbaa6a..bd1f2ccf3 100755 --- a/neofetch +++ b/neofetch @@ -3263,19 +3263,10 @@ get_bold() { } trim() { - # When a string is passed to "echo" all trailing and leading - # whitespace is removed and inside the string multiple spaces are - # condensed into single spaces. - # - # The "set -f/+f" is here so that "echo" doesn't cause any expansion - # of special characters. - # - # The whitespace trim doesn't work with multiline strings so we use - # "${1//[[:space:]]/ }" to remove newlines before we trim the whitespace. - set -f - # shellcheck disable=2086 - builtin echo -E ${1//[[:space:]]/ } + # shellcheck disable=2048,2086 + set -- $* + printf "%s\\n" "${*//[[:space:]]/ }" set +f } From 3734821eb510a85997f8f623a69b161012f42a83 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 2 Apr 2018 07:42:22 +1000 Subject: [PATCH 0152/1133] general: Added option to manually specify music player. Closes #934 --- config/config.conf | 39 +++++++++++++++++++++++++++++++++++++++ neofetch | 7 +++++++ 2 files changed, 46 insertions(+) diff --git a/config/config.conf b/config/config.conf index aadbf8252..de542872b 100644 --- a/config/config.conf +++ b/config/config.conf @@ -348,6 +348,45 @@ disk_subtitle="mount" # Song +# Manually specify a music player. +# +# Default: 'auto' +# Values: 'auto', 'player-name' +# Flag: --music_player +# +# Available values for 'player-name': +# +# Google Play +# Spotify +# amarok +# audacious +# banshee +# bluemindo +# clementine +# cmus +# deadbeef +# deepin-music +# elisa +# exaile +# gnome-music +# guayadeque +# iTunes$ +# juk +# lollypop +# mocp +# mopidy +# mpd +# pogo +# pragha +# qmmp +# quodlibet +# rhythmbox +# spotify +# tomahawk +# xmms2d +# yarock +music_player="auto" + # Print the Artist and Title on separate lines # # Default: 'off' diff --git a/neofetch b/neofetch index bd1f2ccf3..a720ff378 100755 --- a/neofetch +++ b/neofetch @@ -1560,6 +1560,10 @@ get_song() { -e "xmms2d" \ -e "yarock")" + [[ "$music_player" && "$music_player" != "auto" ]] && \ + player="$music_player" + + get_song_dbus() { # Multiple players use an almost identical dbus command to get the information. # This function saves us using the same command throughout the function. @@ -4637,6 +4641,8 @@ INFO: --ip_host url URL to query for public IP --song_shorthand on/off Print the Artist/Title on separate lines + --music_player player-name Manually specify a player to use. + Available values are listed in the config file --install_time on/off Enable/Disable showing the time in Install Date output. --install_time_format 12h/24h Set time format in Install Date to be 12 hour or 24 hour. @@ -4822,6 +4828,7 @@ get_args() { "--shell_version") shell_version="$2" ;; "--ip_host") public_ip_host="$2" ;; "--song_shorthand") song_shorthand="$2" ;; + "--music_player") music_player="$2" ;; "--install_time") install_time="$2" ;; "--install_time_format") install_time_format="$2" ;; "--cpu_temp") From 648b5fb75ebe799a95ab77e44213d4062822318b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 2 Apr 2018 07:51:27 +1000 Subject: [PATCH 0153/1133] cpu: Fixed incorrect name. Closes #926 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index a720ff378..585a4b3d1 100755 --- a/neofetch +++ b/neofetch @@ -1178,7 +1178,7 @@ get_cpu() { cpu="${cpu//Six-Core}" cpu="${cpu//Eight-Core}" cpu="${cpu//, * Compute Cores}" - cpu="${cpu//Core}" + cpu="${cpu//Core / }" cpu="${cpu//(\"AuthenticAMD\"*)}" cpu="${cpu//with Radeon * Graphics}" cpu="${cpu//, altivec supported}" From 790401c6eafc66f319aab572c94b24802ef8194f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 2 Apr 2018 10:05:12 +1000 Subject: [PATCH 0154/1133] OS: Fix ChromeOS detection. --- neofetch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neofetch b/neofetch index 585a4b3d1..4f27f25fd 100755 --- a/neofetch +++ b/neofetch @@ -107,6 +107,12 @@ get_distro() { elif [[ -d "/system/app/" && -d "/system/priv-app" ]]; then distro="Android $(getprop ro.build.version.release)" + # Chrome OS doesn't conform to the /etc/*-release standard. + # While the file is a series of variables they can't be sourced + # by the shell since the values aren't quoted. + elif [[ -f "/etc/lsb-release" && "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then + distro="$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release)" + elif [[ -f "/etc/os-release" || \ -f "/usr/lib/os-release" || \ -f "/etc/openwrt_release" ]]; then From 380e793c62178d1ef5c36be755d24ee973cdc8ce Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Mon, 2 Apr 2018 01:07:43 +0100 Subject: [PATCH 0155/1133] Correctly handle XTerm.vt100.faceName --- neofetch | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8bebbaa6a..a963a16db 100755 --- a/neofetch +++ b/neofetch @@ -2183,12 +2183,25 @@ END ;; "urxvt" | "urxvtd" | "rxvt-unicode" | "xterm") - term_font="$(grep -i "${term/d}\**\.*font" < <(xrdb -query))" + xrdb="$(xrdb -query)" + term_font="$(grep -i "${term/d}\**\.*font" <<< "$xrdb")" term_font="${term_font/*"*font:"}" term_font="${term_font/*".font:"}" term_font="${term_font/*"*.font:"}" term_font="$(trim "$term_font")" + if [[ -z "$term_font" && "$term" == "xterm" ]]; then + term_font="$(grep -E '^XTerm.vt100.faceName' <<< "$xrdb")" + term_font="${term_font/*"faceName:"}" + term_font="$(trim "$term_font")" + fi + + # xft: isn't required at the beginning so we prepend it if it's missing + if [[ "${term_font:0:1}" != "-" && \ + "${term_font:0:4}" != "xft:" ]]; then + term_font="xft:$term_font" + fi + # Xresources has two different font formats, this checks which # one is in use and formats it accordingly. case "$term_font" in From 155c1398b94ffd36567c019498fbfbe47ca6a599 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 2 Apr 2018 10:09:45 +1000 Subject: [PATCH 0156/1133] cpu: More junk --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index bd13540d4..2db6b734e 100755 --- a/neofetch +++ b/neofetch @@ -1191,6 +1191,7 @@ get_cpu() { cpu="${cpu//FPU*}" cpu="${cpu//Chip Revision*}" cpu="${cpu//Technologies, Inc}" + cpu="${cpu//Integrated Graphics Controller}" # Trim spaces from core and speed output cores="${cores//[[:space:]]}" From 564fdaeabf35f57168ad6430892a715b3281d549 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 2 Apr 2018 10:11:11 +1000 Subject: [PATCH 0157/1133] cpu: More junk --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index 2db6b734e..bd13540d4 100755 --- a/neofetch +++ b/neofetch @@ -1191,7 +1191,6 @@ get_cpu() { cpu="${cpu//FPU*}" cpu="${cpu//Chip Revision*}" cpu="${cpu//Technologies, Inc}" - cpu="${cpu//Integrated Graphics Controller}" # Trim spaces from core and speed output cores="${cores//[[:space:]]}" From adbe230f827562847e06fb204d5c2fa96da91eb1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 2 Apr 2018 10:12:35 +1000 Subject: [PATCH 0158/1133] gpu: More junk --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index bd13540d4..f62ffa9e4 100755 --- a/neofetch +++ b/neofetch @@ -1318,6 +1318,7 @@ get_gpu() { gpu="${gpu/'(R)'}" gpu="${gpu/'Corporation'}" gpu="${gpu/ \(*}" + gpu="${gpu/Integrated Graphics Controller}" [[ -z "$(trim "$gpu")" ]] && gpu="Intel Integrated Graphics" ;; From 641202155c1b3b7db9f81916257a80f820d51e6e Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Mon, 2 Apr 2018 01:22:03 +0100 Subject: [PATCH 0159/1133] Remove trim --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index a963a16db..38171a62b 100755 --- a/neofetch +++ b/neofetch @@ -2193,7 +2193,6 @@ END if [[ -z "$term_font" && "$term" == "xterm" ]]; then term_font="$(grep -E '^XTerm.vt100.faceName' <<< "$xrdb")" term_font="${term_font/*"faceName:"}" - term_font="$(trim "$term_font")" fi # xft: isn't required at the beginning so we prepend it if it's missing From 286310acc937652d6f9f0748d9fca32310a6987b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 2 Apr 2018 16:21:50 +1000 Subject: [PATCH 0160/1133] misc: cleanup --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index f62ffa9e4..49f8f6010 100755 --- a/neofetch +++ b/neofetch @@ -1570,7 +1570,6 @@ get_song() { [[ "$music_player" && "$music_player" != "auto" ]] && \ player="$music_player" - get_song_dbus() { # Multiple players use an almost identical dbus command to get the information. # This function saves us using the same command throughout the function. From 9f48d18332e0ecbf339ee8300a00940e8256db69 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 5 Apr 2018 07:54:37 +1000 Subject: [PATCH 0161/1133] cpu: Fix #939 --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index f8ec478b8..b1450e386 100755 --- a/neofetch +++ b/neofetch @@ -1191,6 +1191,7 @@ get_cpu() { cpu="${cpu//FPU*}" cpu="${cpu//Chip Revision*}" cpu="${cpu//Technologies, Inc}" + cpu="${cpu//Core2/Core 2}" # Trim spaces from core and speed output cores="${cores//[[:space:]]}" From 2e83e6f775b6ce20fb861fd47c80d8d87f4d9dc0 Mon Sep 17 00:00:00 2001 From: "Khoa D. Cao" Date: Thu, 5 Apr 2018 19:06:38 +0700 Subject: [PATCH 0162/1133] Fix a typo --- config/config.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/config.conf b/config/config.conf index de542872b..39a8b0e86 100644 --- a/config/config.conf +++ b/config/config.conf @@ -684,7 +684,7 @@ crop_offset="center" # --size image_size="auto" -# Ggap between image and text +# Gap between image and text # # Default: '3' # Values: 'num', '-num' From 519af6c5c53ff74ab2ce51ab1fe0c796a0348889 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 6 Apr 2018 08:15:30 +1000 Subject: [PATCH 0163/1133] docs: CHANGELOG --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index be3bf1a09..911c7cfb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ - [**@ArmstrongJ**](https://github.com/ArmstrongJ) - [**@robertwolter**](https://github.com/robertwolter) - [**@JadeMatrix**](https://github.com/JadeMatrix) +- [**@MindTooth**](https://github.com/MindTooth) +- [**@aidanharris**](https://github.com/aidanharris) +- [**@khoacao96**](https://github.com/khoacao96) ## OS @@ -37,6 +40,7 @@ - Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) - Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) - Fixed detection bug with Windows Subsystem for Linux and Crouton when an OS without lsb_release is installed. +- Fixed ChromeOS detection. ## General @@ -47,11 +51,15 @@ - Fixed broken AppleScript blocks. [**@JadeMatrix**](https://github.com/JadeMatrix) - Fixed function not working in bash 3. [**@JadeMatrix**](https://github.com/JadeMatrix) - Swapped sequences from `\033` to `\e`. +- Fixed Pacman name conflict with the game. [**@MitchWeaver**](https://github.com/MitchWeaver) +- Removed the last `echo` in the script. +- Fixed typo. [**@khoacao96**](https://github.com/khoacao96) ## Ascii - Added color updates for Kubuntu logo. **Maulik Mistry** +- Added new DragonflyBSD log. [**@MitchWeaver**](https://github.com/MitchWeaver) ## Images @@ -114,6 +122,7 @@ **Song** +- Added option to manually specify the player to use. - Added support for Elisa. [**@mstraube**](https://github.com/mstraube) - macOS detection is now more reliable. [**@JadeMatrix**](https://github.com/JadeMatrix) @@ -136,3 +145,6 @@ **Terminal Font** - Added more paths for Alacritty. +- Added font support for Kitty. [**@MindTooth**](https://github.com/MindTooth) +- Fixed Kitty `font_size` regex. [**@aidanharris**](https://github.com/aidanharris) +- Added support for `XTerm.vt11.facename`. [**@aidanharris**](https://github.com/aidanharris) From b4921092c8767313670df183ea301e21188d2c13 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 6 Apr 2018 08:33:12 +1000 Subject: [PATCH 0164/1133] version: bump --- config/config.conf | 2 +- neofetch | 2 +- neofetch.1 | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/config/config.conf b/config/config.conf index 39a8b0e86..4215642bd 100644 --- a/config/config.conf +++ b/config/config.conf @@ -768,4 +768,4 @@ stdout="off" # # NOTE: Don't change this value, neofetch reads this to determine # how to handle backwards compatibility. -config_version="3.3.1-git" +config_version="3.4.0" diff --git a/neofetch b/neofetch index b1450e386..809d4a14a 100755 --- a/neofetch +++ b/neofetch @@ -9,7 +9,7 @@ # https://github.com/dylanaraps/ # Neofetch version. -version="3.3.1-git" +version="3.4.0" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" diff --git a/neofetch.1 b/neofetch.1 index 33958fb11..3dc89b8e3 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.5. -.TH NEOFETCH "1" "December 2017" "Neofetch 3.3.1-git" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. +.TH NEOFETCH "1" "April 2018" "Neofetch 3.4.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -118,6 +118,10 @@ URL to query for public IP \fB\-\-song_shorthand\fR on/off Print the Artist/Title on separate lines .TP +\fB\-\-music_player\fR player\-name +Manually specify a player to use. +Available values are listed in the config file +.TP \fB\-\-install_time\fR on/off Enable/Disable showing the time in Install Date output. .TP From f25b76a0a5ade63a05abbc8bda678e93faf52a16 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 6 Apr 2018 08:45:23 +1000 Subject: [PATCH 0165/1133] docs: CHANGELOG --- CHANGELOG.md | 148 --------------------------------------------- config/config.conf | 2 +- neofetch | 2 +- neofetch.1 | 2 +- 4 files changed, 3 insertions(+), 151 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 911c7cfb1..e96520195 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,150 +1,2 @@ ## Contributors -- [**@yslgirl**](https://github.com/yslgirl) -- [**@iandrewt**](https://github.com/iandrewt) -- [**@chrisweeksnz**](https://github.com/chrisweeksnz) -- [**@dawidd6**](https://github.com/dawidd6) -- [**@MitchWeaver**](https://github.com/MitchWeaver) -- [**@StarryTony**](https://github.com/StarryTony) -- [**@rage311**](https://github.com/rage311) -- [**@matoro**](https://github.com/matoro) -- [**@szfcbr**](https://github.com/szfcbr) -- [**@ArmstrongJ**](https://github.com/ArmstrongJ) -- [**@robertwolter**](https://github.com/robertwolter) -- [**@JadeMatrix**](https://github.com/JadeMatrix) -- [**@MindTooth**](https://github.com/MindTooth) -- [**@aidanharris**](https://github.com/aidanharris) -- [**@khoacao96**](https://github.com/khoacao96) - - -## OS - -- Added support for ArchMerge. -- Added support for MagpieOS. -- Added support for PostMarketOS. -- Added support for Hyperbola GNU/Linux-libre [**@mstraube**](https://github.com/mstraube) -- Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) -- Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) -- Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) -- Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) -- Added support for Pop!\_OS. [**@jliles**](https://github.com/jliles) -- Added support for Lunar Linux. -- Added support for 32-bit IRIX. [**@szfcbr**](https://github.com/szfcbr) -- Added support for FreeMINT. [**@ArmstrongJ**](https://github.com/ArmstrongJ) -- Added support for Anarchy Linux. [**@robertwolter**](https://github.com/robertwolter) -- Added support for Calculate Linux. [**@robertwolter**](https://github.com/robertwolter) -- Added support for NuTyX. [**@robertwolter**](https://github.com/robertwolter) -- Added suport for openSUSE Tumbleweed. [**@robertwolter**](http://github.com/robertwolter) -- Fixed detection bug with Gentoo. -- Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) -- Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) -- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) -- Fixed detection bug with Windows Subsystem for Linux and Crouton when an OS without lsb_release is installed. -- Fixed ChromeOS detection. - - -## General - -- Added more info to verbose mode for debugging. -- Fixed bug in prompt location calculation. -- Fixed prompt bug in OpenBSD. -- Fixed broken AppleScript blocks. [**@JadeMatrix**](https://github.com/JadeMatrix) -- Fixed function not working in bash 3. [**@JadeMatrix**](https://github.com/JadeMatrix) -- Swapped sequences from `\033` to `\e`. -- Fixed Pacman name conflict with the game. [**@MitchWeaver**](https://github.com/MitchWeaver) -- Removed the last `echo` in the script. -- Fixed typo. [**@khoacao96**](https://github.com/khoacao96) - - -## Ascii - -- Added color updates for Kubuntu logo. **Maulik Mistry** -- Added new DragonflyBSD log. [**@MitchWeaver**](https://github.com/MitchWeaver) - - -## Images - -- [MacOS/iTerm2] Fixed thumbnail not appearing. [**@StarryTony**](https://github.com/StarryTony) -- Fixed bug with getting wallpaper from feh. -- Added `pixterm` backend. -- Don't force resolution in `catimg`. - -## Info - -**Desktop Environment** - -- Added GNOME version. -- Added support for TDE. - -**Window Manager** - -- Added support for most (*if not all*) current Wayland compositors/window manager's. -- Added support for some non-EWMH window managers. -- [macOS] Fixed `chunkwm` being detected as `Kwm`. [**@iandrewt**](https://github.com/iandrewt) - -**Window Manager Theme** - -- Fixed `sawfish` detection. -- [macOS] Now detects Light/Dark theme. [**@JadeMatrix**](https://github.com/JadeMatrix) - -**Install Date** - -- [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt) - -**Theme** - -- Fixed KDE font issue. [**@mstraube**](https://github.com/mstraube) - -**CPU** - -- [linux] Detect the correct temperature file to use. -- [windows] Removed `$temp` usage as it's an envar. -- [OpenBSD] Fixed CPU temperature that fails to appear in some systems. [**@rage311**](https://github.com/rage311) - -**GPU** - -- [linux] Added driver version to NVIDIA output. -- [linux] Added driver version to Intel output. -- [macOS] Added NVIDIA support. [**@iandrewt**](https://github.com/iandrewt) - -**Memory** - -- [OpenBSD] Fixed memory usage values. [**@rage311**](https://github.com/rage311) - -**Package Manager** - -- Added detection for Sabotage Linux's `butch` [**@MitchWeaver**](https://github.com/MitchWeaver) -- Changed `pacman` detection to fix issues in other distros. [**@MitchWeaver**](https://github.com/MitchWeaver) - -**Resolution** - -- [macOS] Fixed errors on non-retina screens. [**@iandrewt**](https://github.com/iandrewt) - -**Song** - -- Added option to manually specify the player to use. -- Added support for Elisa. [**@mstraube**](https://github.com/mstraube) -- macOS detection is now more reliable. [**@JadeMatrix**](https://github.com/JadeMatrix) - -**Model** - -- Remove more unneeded outputs. [**@konimex**](https://github.com/konimex) - -**Disk** - -- Update Haiku's detection. [**@dawidd6**](https://github.com/dawidd6) - -**Battery** - -- Fixed Windows detection. [**@matoro**](https://github.com/matoro) - -**Shell** - -- Added support for `tcsh`. [**@szfcbr**](https://github.com/szfcbr) - -**Terminal Font** - -- Added more paths for Alacritty. -- Added font support for Kitty. [**@MindTooth**](https://github.com/MindTooth) -- Fixed Kitty `font_size` regex. [**@aidanharris**](https://github.com/aidanharris) -- Added support for `XTerm.vt11.facename`. [**@aidanharris**](https://github.com/aidanharris) diff --git a/config/config.conf b/config/config.conf index 4215642bd..d754e0230 100644 --- a/config/config.conf +++ b/config/config.conf @@ -768,4 +768,4 @@ stdout="off" # # NOTE: Don't change this value, neofetch reads this to determine # how to handle backwards compatibility. -config_version="3.4.0" +config_version="3.4.1-git" diff --git a/neofetch b/neofetch index 809d4a14a..4e4ae6f6c 100755 --- a/neofetch +++ b/neofetch @@ -9,7 +9,7 @@ # https://github.com/dylanaraps/ # Neofetch version. -version="3.4.0" +version="3.4.1-git" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" diff --git a/neofetch.1 b/neofetch.1 index 3dc89b8e3..51d4cec47 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "April 2018" "Neofetch 3.4.0" "User Commands" +.TH NEOFETCH "1" "April 2018" "Neofetch 3.4.1-git" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From 4083770a6ba4cc1957f0522d3acf016f66ab5446 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 6 Apr 2018 15:11:53 +1000 Subject: [PATCH 0166/1133] ascii: Strip esc chars when calculating length. Closes #942 --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 4e4ae6f6c..1b455e567 100755 --- a/neofetch +++ b/neofetch @@ -2653,6 +2653,9 @@ get_ascii() { print+="$line \n" # Calculate size of ascii file in line length / line count. + line="${line//[??;?;??m}" + line="${line//[??;?;???m}" + line="${line//}" line="${line//\$\{??\}}" line="${line//\\\\/\\}" ((${#line} > ascii_length)) && ascii_length="${#line}" From 59e0ac82a79ebea29469664424602b7ff0a128f1 Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Sun, 8 Apr 2018 18:30:42 +0100 Subject: [PATCH 0167/1133] Font detection for suckless terminal (st) --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 1b455e567..bb5e337d7 100755 --- a/neofetch +++ b/neofetch @@ -2178,6 +2178,32 @@ END "${XDG_CONFIG_HOME}/sakura/sakura.conf")" ;; + "st") + if term_font="$(ps -o command= -p $parent | grep -E '\-f\s?.*?:?')"; then + term_font="${term_font/*-f/}" + term_font="${term_font/ -*/}" + else + binary="" + + # On Linux we can get the exact path to the running binary through the procfs + # on other systems we just have to guess and assume `st` is invoked from somewhere + # in the users $PATH + [[ -L /proc/$parent/exe ]] && binary="/proc/$parent/exe" + [[ -z "$binary" ]] && binary="$(command -v st)" + + # Grep the output of strings on the `st` binary for anything that looks vaguely + # like a font definition. NOTE: There is a slight limitation in this approach. + # Technically "Font Name" is a valid font. As it doesn't specify any font options + # though it is hard to match it correctly amongst the rest of the noise. + [[ -n "$binary" ]] && \ + term_font="$(strings "$binary" | \ + grep -E '(pixelsize=|size=|antialias=|autohint=)' | head -1)" + fi + + term_font="${term_font/xft:}" + term_font="${term_font/:*}" + ;; + "terminology") term_font="$(strings "${XDG_CONFIG_HOME}/terminology/config/standard/base.cfg" |\ awk '/^font\.name$/{print a}{a=$0}')" From 9d4a127f72d936f32507ec103d3ef46c7a4cb864 Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Sun, 8 Apr 2018 19:09:06 +0100 Subject: [PATCH 0168/1133] Keep shellcheck happy --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index bb5e337d7..4b101c49d 100755 --- a/neofetch +++ b/neofetch @@ -2179,7 +2179,7 @@ END ;; "st") - if term_font="$(ps -o command= -p $parent | grep -E '\-f\s?.*?:?')"; then + if term_font="$(ps -o command= -p "$parent" | grep -E '\-f\s?.*?:?')"; then term_font="${term_font/*-f/}" term_font="${term_font/ -*/}" else From ee815f9c6651423ae93f8ead237ebc99e2373c06 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 9 Apr 2018 09:51:23 +1000 Subject: [PATCH 0169/1133] gpu: Fixed duplicate intel bug. --- neofetch | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 1b455e567..40f1de052 100755 --- a/neofetch +++ b/neofetch @@ -1284,13 +1284,21 @@ get_gpu() { {if(!seen[a[i]]++) print a[i]}}')) IFS="$old_ifs" - # Number the GPUs if more than one exists. - ((${#gpus[@]} > 1)) && gpu_num=1 + # Remove duplicate Intel Graphics outputs. + # This fixes cases where the outputs are both + # Intel but not entirely identical. + # + # Checking the first two array elements should + # be safe since there won't be 2 intel outputs if + # there's a dedicated GPU in play. + [[ "${gpus[0]}" == *Intel* && \ + "${gpus[1]}" == *Intel* ]] && \ + unset -v "gpus[0]" for gpu in "${gpus[@]}"; do # GPU shorthand tests. - [[ "$gpu_type" == "dedicated" && "$gpu" =~ (i|I)ntel ]] ||\ - [[ "$gpu_type" == "integrated" && ! "$gpu" =~ (i|I)ntel ]] && \ + [[ "$gpu_type" == "dedicated" && "$gpu" == *Intel* ]] || \ + [[ "$gpu_type" == "integrated" && ! "$gpu" == *Intel* ]] && \ { unset -v gpu; continue; } case "$gpu" in @@ -1336,7 +1344,6 @@ get_gpu() { fi prin "${subtitle:+${subtitle}${gpu_name}}" "$gpu" - ((++gpu_num)) done return From eea18cf68cb6a38dc2ed286d3c6ddce77957702a Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Mon, 9 Apr 2018 07:04:40 +0700 Subject: [PATCH 0170/1133] 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 40f1de052..d249a5b7e 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 0171/1133] Misc: exclude SC1117 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 388082b0e..bbef3e9c0 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 8fc70c980186dfe9ee21072de79263b80d65e1d5 Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Tue, 10 Apr 2018 02:55:08 +0000 Subject: [PATCH 0172/1133] Refactor Code --- neofetch | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index 4b101c49d..23af5eeb9 100755 --- a/neofetch +++ b/neofetch @@ -2179,17 +2179,15 @@ END ;; "st") - if term_font="$(ps -o command= -p "$parent" | grep -E '\-f\s?.*?:?')"; then + term_font="$(ps -o command= -p "$parent" | grep -F -- "-f")" + if [[ "$term_font" ]]; then term_font="${term_font/*-f/}" term_font="${term_font/ -*/}" else - binary="" - # On Linux we can get the exact path to the running binary through the procfs - # on other systems we just have to guess and assume `st` is invoked from somewhere - # in the users $PATH - [[ -L /proc/$parent/exe ]] && binary="/proc/$parent/exe" - [[ -z "$binary" ]] && binary="$(command -v st)" + # (in case `st` is launched from outside of $PATH) on other systems we just + # have to guess and assume `st` is invoked from somewhere in the users $PATH + [[ -L /proc/$parent/exe ]] && binary="/proc/$parent/exe" || binary="$(type -p st)" # Grep the output of strings on the `st` binary for anything that looks vaguely # like a font definition. NOTE: There is a slight limitation in this approach. @@ -2197,7 +2195,7 @@ END # though it is hard to match it correctly amongst the rest of the noise. [[ -n "$binary" ]] && \ term_font="$(strings "$binary" | \ - grep -E '(pixelsize=|size=|antialias=|autohint=)' | head -1)" + grep -F -m 1 -e "pixelsize=" -e "size=" -e "antialias=" -e "autohint=")" fi term_font="${term_font/xft:}" From 7f722a1b0f8ba33b489101246925e1bdafaabd31 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Tue, 10 Apr 2018 13:09:02 +0700 Subject: [PATCH 0173/1133] docs: changelog --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e96520195..e419f4b92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,2 +1,8 @@ ## Contributors + +## Info + +**Title** + +- Fixed unexpected backslash being inserted on some systems From 0302d8eb9bc070eee2b84a3e8611c3c20cc94b6a Mon Sep 17 00:00:00 2001 From: Aidan Harris Date: Tue, 10 Apr 2018 08:54:06 +0000 Subject: [PATCH 0174/1133] Set parent if it's unset --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 23af5eeb9..1f9487856 100755 --- a/neofetch +++ b/neofetch @@ -2179,6 +2179,8 @@ END ;; "st") + [[ -z "$parent" ]] && parent="$(get_ppid "$PPID")" + term_font="$(ps -o command= -p "$parent" | grep -F -- "-f")" if [[ "$term_font" ]]; then term_font="${term_font/*-f/}" From ab76a50739373a10201f83794e13f085de6372ec Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 12 Apr 2018 08:53:46 +1000 Subject: [PATCH 0175/1133] theme: Fix issues with gsettings. Closes #949 --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 40f1de052..12201e75c 100755 --- a/neofetch +++ b/neofetch @@ -23,6 +23,9 @@ export LANG=C # Add more paths to $PATH. export PATH="/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec:${PATH}" +# Fix issues with gsettings. +export GIO_EXTRA_MODULES="/usr/lib/x86_64-linux-gnu/gio/modules/" + # Set no case match. shopt -s nocasematch From c80ace768438699a32804dcae68a96d0a271b819 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 12 Apr 2018 08:56:12 +1000 Subject: [PATCH 0176/1133] args: Simplify version output. --- neofetch | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/neofetch b/neofetch index ef57019e0..2b2987fd7 100755 --- a/neofetch +++ b/neofetch @@ -4803,35 +4803,9 @@ Report bugs to https://github.com/dylanaraps/neofetch/issues exit 1 } -version() { printf "%s" "\ -Neofetch $version - -Copyright (c) 2016-2017 Dylan Araps - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the 'Software'), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -Written by Dylan Araps with help from the following people: - -https://github.com/dylanaraps/neofetch/contributors - -" -exit 1 +version() { + printf "%s\\n" "Neofetch $version" + exit 1 } get_args() { From f7cf1073c61e7debd39da48363f87b6c14272056 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 08:13:36 +1000 Subject: [PATCH 0177/1133] wallpaper: Add support for pywal. --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2b2987fd7..078898140 100755 --- a/neofetch +++ b/neofetch @@ -2757,7 +2757,10 @@ END ;; *) - if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then + if [[ -f "${HOME}/.cache/wal/wal" ]]; then + image="$(< "${HOME}/.cache/wal/wal")" + + elif type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then image="$(awk -F\' '/feh/ {printf $(NF-1)}' "${HOME}/.fehbg")" elif type -p nitrogen >/dev/null; then From 8253bd7e9a320d5a573e90d1d7c2a740ef28c4b8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 08:18:08 +1000 Subject: [PATCH 0178/1133] wallpaper: Add support for pywal. --- neofetch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 078898140..2e89f4f4c 100755 --- a/neofetch +++ b/neofetch @@ -2744,6 +2744,11 @@ END # Get DE if user has disabled the function. ((de_run != 1)) && get_de + if type -p wal >/dev/null && [[ -f "${HOME}/.cache/wal/wal" ]]; then + image="$(< "${HOME}/.cache/wal/wal")" + return + fi + case "$de" in "MATE"*) image="$(gsettings get org.mate.background picture-filename)" ;; "Xfce"*) @@ -2757,10 +2762,7 @@ END ;; *) - if [[ -f "${HOME}/.cache/wal/wal" ]]; then - image="$(< "${HOME}/.cache/wal/wal")" - - elif type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then + if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then image="$(awk -F\' '/feh/ {printf $(NF-1)}' "${HOME}/.fehbg")" elif type -p nitrogen >/dev/null; then From 0bc4a5bd30f747aeb35a837ad9c6799ef6afd1e9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 08:24:11 +1000 Subject: [PATCH 0179/1133] travis: Simplify config --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index bbef3e9c0..f96df785f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,6 @@ language: bash sudo: required -addons: - apt: - sources: - - debian-sid - packages: - - shellcheck - os: - linux - osx From 67873db7982a644048cb7e93652c6941a71deb25 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 08:29:56 +1000 Subject: [PATCH 0180/1133] docs: CHANGELOG --- CHANGELOG.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e419f4b92..f05b191ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,24 @@ ## Contributors +## General + +- Simplified `--version` output. +- Fixed theme issues by setting `GIO_EXTRA_MODULES`. + + +## Images + +- Added `wal`/`pywal` support to get the current wallpaper. + + ## Info **Title** -- Fixed unexpected backslash being inserted on some systems +- Fixed unexpected backslash being inserted on some systems. + +**GPU** + +- Fixed duplicate Intel GPUs. + From 55de3a4201aa16f8febda3bb0cd1fdc812320799 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 08:40:28 +1000 Subject: [PATCH 0181/1133] general: cleanup --- neofetch | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 4c630b126..d39765741 100755 --- a/neofetch +++ b/neofetch @@ -2189,12 +2189,12 @@ END ;; "st") - [[ -z "$parent" ]] && parent="$(get_ppid "$PPID")" - term_font="$(ps -o command= -p "$parent" | grep -F -- "-f")" + if [[ "$term_font" ]]; then term_font="${term_font/*-f/}" term_font="${term_font/ -*/}" + else # On Linux we can get the exact path to the running binary through the procfs # (in case `st` is launched from outside of $PATH) on other systems we just @@ -2206,8 +2206,11 @@ END # Technically "Font Name" is a valid font. As it doesn't specify any font options # though it is hard to match it correctly amongst the rest of the noise. [[ -n "$binary" ]] && \ - term_font="$(strings "$binary" | \ - grep -F -m 1 -e "pixelsize=" -e "size=" -e "antialias=" -e "autohint=")" + term_font="$(strings "$binary" | grep -F -m 1 \ + -e "pixelsize=" \ + -e "size=" \ + -e "antialias=" \ + -e "autohint=")" fi term_font="${term_font/xft:}" From 9d6e8d2c8ca871606c7f1a26623f9d89dcf4ce21 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 08:41:27 +1000 Subject: [PATCH 0182/1133] docs: CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f05b191ad..6ba81d349 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ ## Contributors +- [**@aidanharris**](https://github.com/aidanharris) + ## General @@ -22,3 +24,6 @@ - Fixed duplicate Intel GPUs. +**Terminal Font** + +- Added support for `st`. [**@aidanharris**](https://github.com/aidanharris) From 16b5157d22b9ba8a969f2362e3935dece154010e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 08:47:58 +1000 Subject: [PATCH 0183/1133] docs: CHANGELOG --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 93d37e0b9..9a5b20622 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,6 @@ Packaging status -[![Gitter](https://badges.gitter.im/dylanaraps/fetch.svg)](https://gitter.im/dylanaraps/fetch?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) From 2e8e69a120020241683bd8d0b777509718b77829 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 09:32:12 +1000 Subject: [PATCH 0184/1133] general: Cleanup --- neofetch | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index d39765741..c536d0e9f 100755 --- a/neofetch +++ b/neofetch @@ -1281,11 +1281,10 @@ get_gpu() { case "$os" in "Linux") # Read GPUs into array. - IFS=$'\n' - gpus=($(lspci -mm | awk -F '\\"|\\" \\"|\\(' \ - '/"Display|"3D|"VGA/ {a[$0] = $3 " " $4} END{for(i in a) - {if(!seen[a[i]]++) print a[i]}}')) - IFS="$old_ifs" + gpu_cmd="$(lspci -mm | awk -F '\\"|\\" \\"|\\(' \ + '/"Display|"3D|"VGA/ {a[$0] = $3 " " $4} END{for(i in a) + {if(!seen[a[i]]++) print a[i]}}')" + IFS=$'\n' read -d "" -ra gpus <<< "$gpu_cmd" # Remove duplicate Intel Graphics outputs. # This fixes cases where the outputs are both @@ -2296,10 +2295,8 @@ get_disk() { # Create an array called 'disks' where each element is a separate line from # df's output. We then unset the first element which removes the column titles. - IFS=$'\n' - disks=($(df "${df_flags[@]}" "${disk_show[@]:-/}")) - unset 'disks[0]' - IFS="$old_ifs" + IFS=$'\n' read -d "" -ra disks <<< "$(df "${df_flags[@]}" "${disk_show[@]:-/}")" + unset "disks[0]" # Stop here if 'df' fails to print disk info. if [[ -z "${disks[*]}" ]]; then @@ -2309,7 +2306,7 @@ get_disk() { for disk in "${disks[@]}"; do # Create a second array and make each element split at whitespace this time. - disk_info=($disk) + IFS=" " read -ra disk_info <<< "$disk" disk_perc="${disk_info[4]/'%'}" case "$df_version" in @@ -4507,7 +4504,7 @@ old_options() { cache_uname() { # Cache the output of uname so we don't # have to spawn it multiple times. - uname=($(uname -sr)) + IFS=" " read -ra uname <<< "$(uname -sr)" kernel_name="${uname[0]}" kernel_version="${uname[1]}" @@ -4837,11 +4834,6 @@ Report bugs to https://github.com/dylanaraps/neofetch/issues exit 1 } -version() { - printf "%s\\n" "Neofetch $version" - exit 1 -} - get_args() { # Check the commandline flags early for '--config'. [[ "$*" != *--config* ]] && get_user_config @@ -5019,7 +5011,10 @@ get_args() { "-v") verbose="on" ;; "-vv") set -x; verbose="on" ;; "--help") usage ;; - "--version") version ;; + "--version") + printf "%s\\n" "Neofetch $version" + exit 1 + ;; "--gen-man") help2man -n "A fast, highly customizable system info script" \ -N ./neofetch -o neofetch.1 From e91648ad67cc6323671cab127a097356fea76a48 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 09:35:28 +1000 Subject: [PATCH 0185/1133] general: Remove old_ifs. --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index c536d0e9f..a9c366c81 100755 --- a/neofetch +++ b/neofetch @@ -14,7 +14,6 @@ version="3.4.1-git" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/.config}" -old_ifs="$IFS" # Speed up script by not using unicode. export LC_ALL=C From aa8c6c55f6be1ea1f69b82ca5bb549e445eae519 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 09:40:44 +1000 Subject: [PATCH 0186/1133] general: Remove unsafe splitting. --- neofetch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index a9c366c81..4faac5524 100755 --- a/neofetch +++ b/neofetch @@ -1510,7 +1510,8 @@ get_memory() { ;; "AIX") - mem_stat=($(svmon -G -O unit=MB)) + IFS=" " read -ra mem_stat <<< "$(svmon -G -O unit=MB)" + mem_total="${mem_stat[11]/.*}" mem_free="${mem_stat[16]/.*}" mem_used="$((mem_total - mem_free))" @@ -1518,7 +1519,9 @@ get_memory() { ;; "IRIX") - mem_stat=($(pmem | head -1)) + IFS=$'\n' read -d "" -ra mem_cmd <<< "$(pmem)" + IFS=" " read -ra mem_stat <<< "${mem_cmd[0]}" + mem_total="$((mem_stat[3] / 1024))" mem_free="$((mem_stat[5] / 1024))" mem_used="$((mem_total - mem_free))" From cef3202ea5572dda15a748116d27a247c620b9e1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 14 Apr 2018 09:49:12 +1000 Subject: [PATCH 0187/1133] general: Remove unsafe splitting. --- neofetch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index a9c366c81..d11840053 100755 --- a/neofetch +++ b/neofetch @@ -2525,7 +2525,7 @@ get_install_date() { install_date="${install_date//-/ }" install_date="${install_date%:*}" - install_date=($install_date) + IFS=" " read -ra install_date <<< "$install_date" install_date="$(convert_time "${install_date[@]}")" } @@ -3189,7 +3189,7 @@ scrot_program() { # falling back to OS specific screenshot tools. if [[ -n "$DISPLAY" ]]; then if [[ "$scrot_cmd" != "auto" ]] && type -p "${scrot_cmd%% *}" >/dev/null; then - scrot_program=($scrot_cmd) + IFS=" " read -ra scrot_program <<< "$scrot_cmd" elif type -p maim >/dev/null; then scrot_program=(maim) @@ -4874,7 +4874,7 @@ get_args() { case "$arg" in "--disk_show") ;; "-"*) break ;; - *) disk_show+=($arg) + *) disk_show+=("$arg") ;; esac done ;; @@ -4898,7 +4898,7 @@ get_args() { for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do case "$arg" in "-"*) break ;; - *) colors+=($arg) + *) colors+=("$arg") ;; esac done colors+=(7 7 7 7 7 7) @@ -4966,7 +4966,7 @@ get_args() { for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do case "$arg" in "-"*) break ;; - *) ascii_colors+=($arg) + *) ascii_colors+=("$arg") esac done ascii_colors+=(7 7 7 7 7 7) From 82cc8ebb6e068030c6c6a2b7bc6edc82359dde77 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 15 Apr 2018 19:54:36 +1000 Subject: [PATCH 0188/1133] general: Fixed issue on AIX. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 4faac5524..e78510dbe 100755 --- a/neofetch +++ b/neofetch @@ -1510,7 +1510,7 @@ get_memory() { ;; "AIX") - IFS=" " read -ra mem_stat <<< "$(svmon -G -O unit=MB)" + IFS=$'\n'"| " read -d "" -ra mem_stat <<< "$(svmon -G -O unit=MB)" mem_total="${mem_stat[11]/.*}" mem_free="${mem_stat[16]/.*}" From 41fd2df411788895e1f890e86dd387f6e6087016 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 15 Apr 2018 20:06:33 +1000 Subject: [PATCH 0189/1133] memory: simplify --- neofetch | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index e78510dbe..7de767788 100755 --- a/neofetch +++ b/neofetch @@ -1434,18 +1434,10 @@ get_memory() { "Linux" | "Windows") # MemUsed = Memtotal + Shmem - MemFree - Buffers - Cached - SReclaimable # Source: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716 - while IFS=":" read -r a b; do - case "$a" in - "MemTotal") mem_used="$((mem_used+=${b/kB}))"; mem_total="${b/kB}" ;; - "Shmem") mem_used="$((mem_used+=${b/kB}))" ;; - "MemFree" | "Buffers" | "Cached" | "SReclaimable") - mem_used="$((mem_used-=${b/kB}))" - ;; - esac - done < /proc/meminfo + IFS=$'\n'"|:|kB" read -d "" -ra mem < /proc/meminfo - mem_used="$((mem_used / 1024))" - mem_total="$((mem_total / 1024))" + mem_used="$(((mem[1] + mem[64] - mem[4] - mem[11] - mem[14]- mem[70]) / 1024))" + mem_total="$((mem[1] / 1024))" ;; "Mac OS X" | "iPhone OS") From d7172fa89b3b057c14808608d7cc32c747b83dbb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 15 Apr 2018 20:10:42 +1000 Subject: [PATCH 0190/1133] memory: simplify --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 7de767788..bacdc9ee4 100755 --- a/neofetch +++ b/neofetch @@ -1432,10 +1432,10 @@ get_gpu() { get_memory() { case "$os" in "Linux" | "Windows") + IFS=$'\n'":kB" read -d "" -ra mem < /proc/meminfo + # MemUsed = Memtotal + Shmem - MemFree - Buffers - Cached - SReclaimable # Source: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716 - IFS=$'\n'"|:|kB" read -d "" -ra mem < /proc/meminfo - mem_used="$(((mem[1] + mem[64] - mem[4] - mem[11] - mem[14]- mem[70]) / 1024))" mem_total="$((mem[1] / 1024))" ;; From 4212e83fe0cbe46be5fa1c17deee64451b26bbc6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 15 Apr 2018 20:17:01 +1000 Subject: [PATCH 0191/1133] memory: simplify --- neofetch | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index bacdc9ee4..e78510dbe 100755 --- a/neofetch +++ b/neofetch @@ -1432,12 +1432,20 @@ get_gpu() { get_memory() { case "$os" in "Linux" | "Windows") - IFS=$'\n'":kB" read -d "" -ra mem < /proc/meminfo - # MemUsed = Memtotal + Shmem - MemFree - Buffers - Cached - SReclaimable # Source: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716 - mem_used="$(((mem[1] + mem[64] - mem[4] - mem[11] - mem[14]- mem[70]) / 1024))" - mem_total="$((mem[1] / 1024))" + while IFS=":" read -r a b; do + case "$a" in + "MemTotal") mem_used="$((mem_used+=${b/kB}))"; mem_total="${b/kB}" ;; + "Shmem") mem_used="$((mem_used+=${b/kB}))" ;; + "MemFree" | "Buffers" | "Cached" | "SReclaimable") + mem_used="$((mem_used-=${b/kB}))" + ;; + esac + done < /proc/meminfo + + mem_used="$((mem_used / 1024))" + mem_total="$((mem_total / 1024))" ;; "Mac OS X" | "iPhone OS") From 039a9a81a98384f99ca89f17063a50aad76a619d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:28:01 +1000 Subject: [PATCH 0192/1133] docs: README --- README.md | 59 ++++++------------------------------------------------- 1 file changed, 6 insertions(+), 53 deletions(-) diff --git a/README.md b/README.md index 9a5b20622..d6256485f 100644 --- a/README.md +++ b/README.md @@ -9,66 +9,23 @@ [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) +Neofetch is a command-line system information tool written in `bash 3.2+`. Neofetch displays information about your operating system, software and hardware in an aesthetic and visually pleasing way. -Neofetch is a CLI system information tool written in BASH. Neofetch displays information about your system next to an image, your OS logo, or any ASCII file of your choice. The main purpose of Neofetch is to be used in screenshots to show other users what OS/Distro you're running, what Theme/Icons you're using etc. +The information by default is displayed alongside your operating system's logo. You can further configure Neofetch to instead use an image, a custom ASCII file, your wallpaper or nothing at all. -Neofetch is highly customizable through the use of command line flags or the user config file. There are over 50 config options to mess around with and there's the `print_info()` function and friends which let you add your own custom info. +You can further configure Neofetch to display exactly what you want it to. Through the use of command-line flags and the configuration file you can change existing information outputs or add your own custom ones. -Neofetch can be used on any OS that has BASH 3.2+, it's just a matter of adding support. If your OS/Distro isn't in the list below, feel free to open an issue on the repo and I'll gladly add support. Neofetch currently supports `Linux`, `MacOS`, `iOS`, `BSD`, `Solaris`, `Android`, `Haiku`, `GNU Hurd`, `MINIX`, `AIX`, `IRIX`, `FreeMint`, and `Windows (Cygwin/MSYS2/MinGW/Windows 10 Linux subsystem)`. +Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added. For more information: -**https://github.com/dylanaraps/neofetch/wiki** +[\[Dependencies\](https://github.com/dylanaraps/neofetch/wiki/Dependencies) [\[Installation\](https://github.com/dylanaraps/neofetch/wiki/Installation) [\[Wiki\](https://github.com/dylanaraps/neofetch/wiki) + neofetch neofetch -## Dependencies - -https://github.com/dylanaraps/neofetch/wiki/Dependencies - - -## Installation - -https://github.com/dylanaraps/neofetch/wiki/Installation - - -## Post Install - - -### Using the config file - -Neofetch will by default create a config file at `$HOME/.config/neofetch/config` and this file contains all of the script's options/settings. The config file allows you to keep your customizations between script versions and allows you to easily share your customizations with other people. - -You can launch the script without a config file by using the flag `--config none` and you can specify a custom config location using `--config path/to/config`. - -See this wiki page for the default config: https://github.com/dylanaraps/neofetch/wiki/Config-File - - -### Customizing what info gets displayed - -https://github.com/dylanaraps/neofetch/wiki/Customizing-Info - - -### Customizing the script using a custom alias - -If you don't want to use the config file you can customize almost everything using launch flags. - -Here's an example neofetch alias: - -```sh -alias neofetch2="neofetch \ ---config off \ ---block_range 1 8 \ ---bold off \ ---uptime_shorthand on \ ---gtk_shorthand on \ ---colors 4 1 8 8 8 7 \ -" -``` - - ## Thanks Thanks to: @@ -86,7 +43,6 @@ Thanks to: - Tiny ASCII logos - ## Donate Donations will allow me to spend more time working on `neofetch`. @@ -94,6 +50,3 @@ Donations will allow me to spend more time working on `neofetch`. If you like `neofetch` and want to give back in some way you can donate here: **https://patreon.com/dyla** - - -hey rtexel From 226cbbf0d8c66e71ec8e6c630319a07d1237ca2a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:29:20 +1000 Subject: [PATCH 0193/1133] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d6256485f..c7bab7457 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, For more information: -[\[Dependencies\](https://github.com/dylanaraps/neofetch/wiki/Dependencies) [\[Installation\](https://github.com/dylanaraps/neofetch/wiki/Installation) [\[Wiki\](https://github.com/dylanaraps/neofetch/wiki) +[[Dependencies(https://github.com/dylanaraps/neofetch/wiki/Dependencies)] [[Installation(https://github.com/dylanaraps/neofetch/wiki/Installation)] [[Wiki](https://github.com/dylanaraps/neofetch/wiki)] neofetch From 787d272faaf8b16a83b19b9b4c49e41d530960e7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:30:18 +1000 Subject: [PATCH 0194/1133] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c7bab7457..db4c46a4e 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, For more information: -[[Dependencies(https://github.com/dylanaraps/neofetch/wiki/Dependencies)] [[Installation(https://github.com/dylanaraps/neofetch/wiki/Installation)] [[Wiki](https://github.com/dylanaraps/neofetch/wiki)] +\[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation(https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] neofetch From fb5afb1188c47f75ec029714e628bc06de41787a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:31:19 +1000 Subject: [PATCH 0195/1133] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index db4c46a4e..6e212a690 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, For more information: -\[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation(https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] +\[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] neofetch From 93d4315215415770ae5435e2cc1db1c205702d35 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:31:56 +1000 Subject: [PATCH 0196/1133] docs: README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 6e212a690..f86a1545e 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] +
+ neofetch neofetch From dc4199f96bec2ba5f7f952d097c958de6ecd1198 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:32:29 +1000 Subject: [PATCH 0197/1133] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f86a1545e..9a979f2b7 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] -
+

neofetch From 6cd5d3c4c4be661006ebb8b9b5fcb3640de6a48b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:33:11 +1000 Subject: [PATCH 0198/1133] docs: README --- README.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/README.md b/README.md index 9a979f2b7..676bf7335 100644 --- a/README.md +++ b/README.md @@ -17,12 +17,7 @@ You can further configure Neofetch to display exactly what you want it to. Throu Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added. -For more information: - -\[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] - -

- +For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] neofetch neofetch From edeac1c369e3133452a31bbae81efd2f8665ec8d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:34:08 +1000 Subject: [PATCH 0199/1133] docs: README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 676bf7335..4451776be 100644 --- a/README.md +++ b/README.md @@ -19,6 +19,8 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] +

+ neofetch neofetch From 29311f9e23eef17b8eb55a398c36fa7866c43d7b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:38:22 +1000 Subject: [PATCH 0200/1133] docs: README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4451776be..03d5f159f 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,8 @@ Neofetch is a command-line system information tool written in `bash 3.2+`. Neofetch displays information about your operating system, software and hardware in an aesthetic and visually pleasing way. +The overall purpose of Neofetch is to be used in screen-shots of your system. Neofetch shows the information other people want to see. There are other tools available for proper system statistic/diagnostics. + The information by default is displayed alongside your operating system's logo. You can further configure Neofetch to instead use an image, a custom ASCII file, your wallpaper or nothing at all. You can further configure Neofetch to display exactly what you want it to. Through the use of command-line flags and the configuration file you can change existing information outputs or add your own custom ones. From fed5b870b7bd40b0411e7049ae0fa81fbe804c2d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:38:50 +1000 Subject: [PATCH 0201/1133] docs: README --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 03d5f159f..6ca3d9cef 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,6 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] -

neofetch neofetch From 4dedae1fe4e964ec6fd07838710ddceca60357eb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:45:41 +1000 Subject: [PATCH 0202/1133] docs: README --- README.md | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 6ca3d9cef..13516ebe1 100644 --- a/README.md +++ b/README.md @@ -26,21 +26,28 @@ For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetc neofetch -## Thanks +## In the press + +- https://www.omgubuntu.co.uk/2016/11/neofetch-terminal-system-info-app +- https://www.omgubuntu.co.uk/2017/01/neofetch-3-0-released +- https://www.omgubuntu.co.uk/2016/12/cli-system-tool-neofetch-2-0-released +- https://linuxconfig.org/how-to-display-system-information-with-neofetch +- https://www.ostechnix.com/neofetch-display-linux-systems-information/ +- https://www.tecmint.com/neofetch-shows-linux-system-information-with-logo/ +- https://www.maketecheasier.com/display-system-information-neofetch-linux/ +- https://www.cyberciti.biz/howto/neofetch-awesome-system-info-bash-script-for-linux-unix-macos/ +- https://www.2daygeek.com/neofetch-display-linux-systems-information-ascii-distribution-logo-terminal/ +- https://www.techrepublic.com/article/how-to-get-all-the-information-you-need-about-your-linux-machine-with-a-single-command/ +- https://www.lffl.org/2016/11/neofetch-le-informazioni-sistema-sul-terminale-stile.html +- https://lamiradadelreplicante.com/2016/05/15/la-informacion-de-tu-sistema-en-la-terminal-con-neofetch/ + -Thanks to: +## Thanks - [Contributors](https://github.com/dylanaraps/neofetch/contributors) - - Thanks for making Neofetch better, I really appreciate it. - [Packagers](https://github.com/dylanaraps/neofetch/issues/115) - - Thanks for maintaining Neofetch packages. -- Users - - Thanks for using Neofetch! -- [Screenfetch](https://github.com/KittyKatt/screenFetch): - - We've used some snippets as a base for a few functions in this script. - - Some of the ASCII logos. -- [ufetch](https://github.com/jschx/ufetch): - - Tiny ASCII logos +- [Screenfetch](https://github.com/KittyKatt/screenFetch) +- [ufetch](https://github.com/jschx/ufetch) ## Donate From edea757f47e76b97f92d78679b3c98b1c8b28b40 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:47:15 +1000 Subject: [PATCH 0203/1133] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 13516ebe1..3a5952733 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetc neofetch -## In the press +## Articles - https://www.omgubuntu.co.uk/2016/11/neofetch-terminal-system-info-app - https://www.omgubuntu.co.uk/2017/01/neofetch-3-0-released From cbe998b13580f2bfc93530617dda75ce051bdbb2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:47:46 +1000 Subject: [PATCH 0204/1133] docs: README --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 3a5952733..d7fc23b7e 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,4 @@ For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetc Donations will allow me to spend more time working on `neofetch`. -If you like `neofetch` and want to give back in some way you can donate here: - -**https://patreon.com/dyla** +If you like `neofetch` and want to give back in some way you can donate here: **https://patreon.com/dyla** From ac06c87de0fbd2405bab3d3670b1c9e9f6c84a88 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:48:09 +1000 Subject: [PATCH 0205/1133] docs: README --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d7fc23b7e..892ab2bea 100644 --- a/README.md +++ b/README.md @@ -28,18 +28,18 @@ For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetc ## Articles +- https://lamiradadelreplicante.com/2016/05/15/la-informacion-de-tu-sistema-en-la-terminal-con-neofetch/ +- https://linuxconfig.org/how-to-display-system-information-with-neofetch +- https://www.2daygeek.com/neofetch-display-linux-systems-information-ascii-distribution-logo-terminal/ +- https://www.cyberciti.biz/howto/neofetch-awesome-system-info-bash-script-for-linux-unix-macos/ +- https://www.lffl.org/2016/11/neofetch-le-informazioni-sistema-sul-terminale-stile.html +- https://www.maketecheasier.com/display-system-information-neofetch-linux/ - https://www.omgubuntu.co.uk/2016/11/neofetch-terminal-system-info-app -- https://www.omgubuntu.co.uk/2017/01/neofetch-3-0-released - https://www.omgubuntu.co.uk/2016/12/cli-system-tool-neofetch-2-0-released -- https://linuxconfig.org/how-to-display-system-information-with-neofetch +- https://www.omgubuntu.co.uk/2017/01/neofetch-3-0-released - https://www.ostechnix.com/neofetch-display-linux-systems-information/ -- https://www.tecmint.com/neofetch-shows-linux-system-information-with-logo/ -- https://www.maketecheasier.com/display-system-information-neofetch-linux/ -- https://www.cyberciti.biz/howto/neofetch-awesome-system-info-bash-script-for-linux-unix-macos/ -- https://www.2daygeek.com/neofetch-display-linux-systems-information-ascii-distribution-logo-terminal/ - https://www.techrepublic.com/article/how-to-get-all-the-information-you-need-about-your-linux-machine-with-a-single-command/ -- https://www.lffl.org/2016/11/neofetch-le-informazioni-sistema-sul-terminale-stile.html -- https://lamiradadelreplicante.com/2016/05/15/la-informacion-de-tu-sistema-en-la-terminal-con-neofetch/ +- https://www.tecmint.com/neofetch-shows-linux-system-information-with-logo/ ## Thanks From ef0056e57d84d87d4e6cdffc5b50e5e76117bed8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:52:34 +1000 Subject: [PATCH 0206/1133] general: Cleanup --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 892ab2bea..76d88ca8a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Neofetch - Packaging status + Packaging status [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) @@ -22,8 +22,8 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] -neofetch -neofetch +neofetch +neofetch ## Articles From 305d9556ec150f767249a44d7022927863cbc6f1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 08:56:00 +1000 Subject: [PATCH 0207/1133] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 76d88ca8a..b33688880 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ You can further configure Neofetch to display exactly what you want it to. Throu Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added. -For more information: \[[**Dependencies**](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[**Installation**](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[**Wiki**](https://github.com/dylanaraps/neofetch/wiki)\] +### For more information: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] neofetch From 3c3e17ad2b82bdb4e87ebcd52e8c6781b8703c8a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 09:05:14 +1000 Subject: [PATCH 0208/1133] docs: README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index b33688880..6c1d65549 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,7 @@ [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) +[![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) From 6d1ae8fe233a65308c4685e4924a1d3ee389e5b2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 09:14:53 +1000 Subject: [PATCH 0209/1133] docs: README --- README.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6c1d65549..d37eb2c4a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Neofetch - Packaging status + Packaging status [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) @@ -18,15 +18,13 @@ The information by default is displayed alongside your operating system's logo. You can further configure Neofetch to display exactly what you want it to. Through the use of command-line flags and the configuration file you can change existing information outputs or add your own custom ones. -Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added. +Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added.
### For more information: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] - neofetch neofetch - ## Articles - https://lamiradadelreplicante.com/2016/05/15/la-informacion-de-tu-sistema-en-la-terminal-con-neofetch/ From 970c4dfc294443c2b77d63272c71ab276a82c4a8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 09:15:39 +1000 Subject: [PATCH 0210/1133] docs: README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d37eb2c4a..966fdb67e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Neofetch - Packaging status + Packaging status [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) From 8fcc19c4d4650b4a30f73f63792f2244ebf884da Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 13:57:38 +1000 Subject: [PATCH 0211/1133] wm: Added support for more Wayland Compositors --- neofetch | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index f1f4fbed6..ba76a5949 100755 --- a/neofetch +++ b/neofetch @@ -747,21 +747,28 @@ get_wm() { if [[ "$WAYLAND_DISPLAY" ]]; then wm="$(ps -e | grep -m 1 -o -F \ + -e "arcan" \ -e "asc" \ + -e "clayland" \ -e "fireplace" \ + -e "greenfield" \ -e "grefsen" \ - -e "mazecompositor" \ + -e "lipstick" \ -e "maynard" \ + -e "mazecompositor" \ -e "motorcar" \ - -e "orbment" \ -e "orbital" \ + -e "orbment" \ -e "perceptia" \ -e "rustland" \ -e "sway" \ + -e "ulubis" \ -e "velox" \ -e "wavy" \ - -e "wayhouse" \ -e "way-cooler" \ + -e "wayfire" \ + -e "wayhouse" \ + -e "westeros" \ -e "westford" \ -e "weston")" From 9870c90a98d154dff2e33315853eeecf063f9aed Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 16 Apr 2018 13:58:35 +1000 Subject: [PATCH 0212/1133] wm: Added support for more Wayland Compositors --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index ba76a5949..e77dcc256 100755 --- a/neofetch +++ b/neofetch @@ -750,6 +750,7 @@ get_wm() { -e "arcan" \ -e "asc" \ -e "clayland" \ + -e "dwc" \ -e "fireplace" \ -e "greenfield" \ -e "grefsen" \ From 74cec3b30f1025a9918aea3a691f069478bebfa8 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Wed, 18 Apr 2018 20:33:38 +0200 Subject: [PATCH 0213/1133] Fix packages count for exherbo Installed packages data is stored in /var/db/paludis/installed/data/* and the cross-installed packages data is stored in /var/db/paludis/cross-installed/arch/data/* where arch could be every cpu arch supported by exherbo. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e77dcc256..98761f86b 100755 --- a/neofetch +++ b/neofetch @@ -564,7 +564,7 @@ get_packages() { packages="$((packages+=$(kpm --get-selections | grep -cv deinstall$)))" if type -p cave >/dev/null; then - package_dir=(/var/db/paludis/repositories/{cross-installed,installed}/*/data/*) + package_dir=(/var/db/paludis/repositories/{cross-installed/*,installed}/data/*) packages="$((packages+=$(ls -d -1 "${package_dir[@]}" | wc -l)))" fi From c32ccb7fcfc5254da4865b1af13a02bf0c4b2824 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 19 Apr 2018 10:22:54 +1000 Subject: [PATCH 0214/1133] docs: CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ba81d349..5a21ad1ee 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## Contributors - [**@aidanharris**](https://github.com/aidanharris) +- [**@DanySpin97**](https://github.com/DanySpin97) ## General @@ -27,3 +28,7 @@ **Terminal Font** - Added support for `st`. [**@aidanharris**](https://github.com/aidanharris) + +**Packages** + +- Fixed package count in Exherbo. [**@DanySpin97**](https://github.com/DanySpin97) From 745f568a94ff42ac135e3e29460d061bf2a49aa9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 19 Apr 2018 10:25:37 +1000 Subject: [PATCH 0215/1133] wm: Added support for dwm --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 98761f86b..e97281e7c 100755 --- a/neofetch +++ b/neofetch @@ -788,6 +788,7 @@ get_wm() { [[ -z "$wm" ]] && \ wm="$(ps -e | grep -m 1 -o -F \ -e "catwm" \ + -e "dwm" \ -e "monsterwm" \ -e "tinywm")" From 38e929967fcba4f1bd790a77e1d937f7761b7ff3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 19 Apr 2018 10:27:01 +1000 Subject: [PATCH 0216/1133] docs: CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a21ad1ee..a2a85417e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,3 +32,7 @@ **Packages** - Fixed package count in Exherbo. [**@DanySpin97**](https://github.com/DanySpin97) + +**Window Manager** + +- Added support for detecting `dwm`. From 2606e4b1d6c431efc2a9bea4f0bec2385ad805f2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 20 Apr 2018 07:48:41 +1000 Subject: [PATCH 0217/1133] image: Added kitty backend. Closes #953 --- neofetch | 12 +++++++++--- neofetch.1 | 27 +++------------------------ 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/neofetch b/neofetch index e97281e7c..c54e99d56 100755 --- a/neofetch +++ b/neofetch @@ -2629,7 +2629,7 @@ image_backend() { "off") image_backend="off" ;; "caca" | "catimg" | "jp2a" | "iterm2" | "termpix" |\ - "tycat" | "w3m" | "sixel" | "pixterm") + "tycat" | "w3m" | "sixel" | "pixterm" | "kitty") get_image_source if [[ ! -f "$image" ]]; then @@ -2654,7 +2654,7 @@ image_backend() { *) err "Image: Unknown image backend specified '$image_backend'." - err "Image: Valid backends are: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', + err "Image: Valid backends are: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'kitty', 'off', 'sixel', 'pixterm', 'termpix', 'tycat', 'w3m')" err "Image: Falling back to ascii mode." get_ascii @@ -3066,6 +3066,11 @@ display_image() { to_off "Image: jp2a failed to display the image." ;; + "kitty") + kitty icat --align left --place "${width}x${height}@${xoffset}x${yoffset}" "$image" ||\ + to_off "Image: kitty failed to display the image." + ;; + "pixterm") pixterm -tc "$((width / font_width))" \ -tr "$((height / font_height))" \ @@ -4762,6 +4767,7 @@ IMAGE BACKEND: --catimg source Shortcut to use 'catimg' backend. --iterm2 source Shortcut to use 'iterm2' backend. --jp2a source Shortcut to use 'jp2a' backend. + --kitty source Shortcut to use 'kitty' backend. --pixterm source Shortcut to use 'pixterm' backend. --sixel source Shortcut to use 'sixel' backend. --termpix source Shortcut to use 'termpix' backend. @@ -4949,7 +4955,7 @@ get_args() { "--backend") image_backend="$2" ;; "--source") image_source="$2" ;; "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ - "--sixel" | "--termpix" | "--tycat" | "--w3m") + "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") image_backend="${1/--}" case "$2" in "-"* | "") ;; diff --git a/neofetch.1 b/neofetch.1 index 51d4cec47..d43db1d83 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -211,6 +211,9 @@ Shortcut to use 'iterm2' backend. \fB\-\-jp2a\fR source Shortcut to use 'jp2a' backend. .TP +\fB\-\-kitty\fR source +Shortcut to use 'kitty' backend. +.TP \fB\-\-pixterm\fR source Shortcut to use 'pixterm' backend. .TP @@ -338,29 +341,5 @@ Display a verbose log for error reporting. .TP \fB\-\-gen\-man\fR Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) -.SH AUTHOR -Written by Dylan Araps with help from the following people: -.PP -https://github.com/dylanaraps/neofetch/contributors .SH "REPORTING BUGS" Report bugs to https://github.com/dylanaraps/neofetch/issues -.SH COPYRIGHT -Copyright \(co 2016\-2017 Dylan Araps -.PP -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the 'Software'), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: -.PP -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. -.PP -THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. From 1b7169935358e8c7e2c4263508aaa0fbacbd8573 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 20 Apr 2018 07:49:42 +1000 Subject: [PATCH 0218/1133] docs: CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a2a85417e..879f55eaa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - [**@aidanharris**](https://github.com/aidanharris) - [**@DanySpin97**](https://github.com/DanySpin97) +- [**@SolitudeSF**](https://github.com/SolitudeSF) ## General @@ -13,6 +14,7 @@ ## Images - Added `wal`/`pywal` support to get the current wallpaper. +- Added `kitty` image backend. [**@SolitudeSF**](https://github.com/SolitudeSF) ## Info From 944968cf69aa8a93b78d9c278237b6e1ca4b402b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 20 Apr 2018 08:13:01 +1000 Subject: [PATCH 0219/1133] wm: Added WM version. --- config/config.conf | 11 +++++++++++ neofetch | 11 +++++++++++ neofetch.1 | 3 +++ 3 files changed, 25 insertions(+) diff --git a/config/config.conf b/config/config.conf index d754e0230..65d01d492 100644 --- a/config/config.conf +++ b/config/config.conf @@ -303,6 +303,17 @@ gtk3="on" public_ip_host="http://ident.me" +# Window Manager + + +# Show Window Manager Version. +# +# Default: 'off' +# Values: 'on', off +# Flag: --wm_version +wm_version="off" + + # Disk diff --git a/neofetch b/neofetch index c54e99d56..dc7a01adc 100755 --- a/neofetch +++ b/neofetch @@ -792,6 +792,15 @@ get_wm() { -e "monsterwm" \ -e "tinywm")" + if [[ "$wm_version" == "on" ]]; then + wmv="$wm $("${wm,,}" --version || "${wm,,}" -v)" + wmv="${wmv/$wm $wm/$wm}" + wmv="${wmv/copyright*}" + wmv="${wmv/version }" + wmv="${wmv/©*}" + wmv="${wmv/(c)*}" + wm="$wmv" + fi else case "$os" in "Mac OS X") @@ -4699,6 +4708,7 @@ INFO: NOTE: This only supports Linux. + --wm_version on/off Show/Hide Window Manager version. --gtk_shorthand on/off Shorten output of gtk theme/icons --gtk2 on/off Enable/Disable gtk2 theme/font/icons output --gtk3 on/off Enable/Disable gtk3 theme/font/icons output @@ -4869,6 +4879,7 @@ get_args() { "--cpu_brand") cpu_brand="$2" ;; "--gpu_brand") gpu_brand="$2" ;; "--gpu_type") gpu_type="$2" ;; + "--wm_version") wm_version="$2" ;; "--refresh_rate") refresh_rate="$2" ;; "--gtk_shorthand") gtk_shorthand="$2" ;; "--gtk2") gtk2="$2" ;; diff --git a/neofetch.1 b/neofetch.1 index d43db1d83..391cb7d6d 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -81,6 +81,9 @@ Which GPU to display. (all, dedicated, integrated) .IP NOTE: This only supports Linux. .TP +\fB\-\-wm_version\fR on/off +Show/Hide Window Manager version. +.TP \fB\-\-gtk_shorthand\fR on/off Shorten output of gtk theme/icons .TP From aa7ec8b529fc6e298f9fcfe34ec383f335708c59 Mon Sep 17 00:00:00 2001 From: SolitudeSF Date: Fri, 20 Apr 2018 00:47:15 +0300 Subject: [PATCH 0220/1133] Add 'setroot' wallpaper fetching --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index c54e99d56..66669e01e 100755 --- a/neofetch +++ b/neofetch @@ -2802,6 +2802,11 @@ END if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then image="$(awk -F\' '/feh/ {printf $(NF-1)}' "${HOME}/.fehbg")" + elif type -p setroot >/dev/null && \ + [[ -f "${XDG_CONFIG_HOME}/setroot/.setroot-restore" ]]; then + image="$(awk -F\' '/setroot/ {printf $(NF-1)}' \ + "${XDG_CONFIG_HOME}/setroot/.setroot-restore")" + elif type -p nitrogen >/dev/null; then image="$(awk -F'=' '/file/ {printf $2;exit;}' \ "${XDG_CONFIG_HOME}/nitrogen/bg-saved.cfg")" From 5c5824489753cbdeedd63662473f4cf52936a78a Mon Sep 17 00:00:00 2001 From: Kayant Date: Sat, 21 Apr 2018 12:20:57 +0100 Subject: [PATCH 0221/1133] cpu_temp: Add support for Zen processors This adds support for Zen based processors(AMD family 17h) like the Ryzen series using the k10temp module. This requires either having a patched kernel with the hwmon updates see - lkml.org/lkml/2017/9/6/684 Or kernel 4.15+ where the patch was merged. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 66669e01e..5e60a9619 100755 --- a/neofetch +++ b/neofetch @@ -1022,7 +1022,7 @@ get_cpu() { # Select the right temperature file. for temp_dir in /sys/class/hwmon/*; do - [[ "$(< "${temp_dir}/name")" =~ (coretemp|fam15h_power) ]] && \ + [[ "$(< "${temp_dir}/name")" =~ (coretemp|fam15h_power|k10temp) ]] && \ { temp_dir="${temp_dir}/temp1_input"; break; } done From 1bd9f1759cc5d626f21bc9088c1505ba23dc850f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 22 Apr 2018 11:01:18 +1000 Subject: [PATCH 0222/1133] general: Cleanup --- neofetch | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index 5e60a9619..a64080385 100755 --- a/neofetch +++ b/neofetch @@ -2928,11 +2928,7 @@ get_term_size() { get_image_size() { # This functions determines the size to make # the thumbnail image. - - # Get terminal lines and columns. - term_blocks="$(stty size)" - columns="${term_blocks/* }" - lines="${term_blocks/ *}" + read -r lines columns <<< "$(stty size)" # Calculate font size. font_width="$((term_width / columns))" @@ -2957,9 +2953,7 @@ get_image_size() { "none") # Get image size so that we can do a better crop. - size="$(identify -format "%w %h" "$image")" - width="${size%% *}" - height="${size##* }" + read -r width height <<< "$(identify -format "%w %h" "$image")" crop_mode="none" while (( "$width" >= ("$term_width" / 2) || @@ -2997,14 +2991,8 @@ make_thumbnail() { if [[ ! -f "$thumbnail_dir/$image_name" ]]; then # Get image size so that we can do a better crop. if [[ -z "$size" ]]; then - size="$(identify -format "%w %h" "$image")" - og_width="${size%% *}" - og_height="${size##* }" - - # This checks to see if height is greater than width - # so we can do a better crop of portrait images. - size="$og_height" - ((og_height > og_width)) && size="$og_width" + read -r og_width og_height <<< "$(identify -format "%w %h" "$image")" + ((og_height > og_width)) && size="$og_width" || size="$og_height" fi case "$crop_mode" in From c354ddcd761e2da6efe54598b4c31f062b802aa0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 22 Apr 2018 11:09:05 +1000 Subject: [PATCH 0223/1133] Distro: Show release info by default. --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index a64080385..89fd57087 100755 --- a/neofetch +++ b/neofetch @@ -76,9 +76,9 @@ get_distro() { case "$distro_shorthand" in "on") lsb_flags="-sir" ;; "tiny") lsb_flags="-si" ;; - *) lsb_flags="-sd" ;; + *) lsb_flags="-sdr" ;; esac - distro="$(lsb_release $lsb_flags)" + distro="$(lsb_release "$lsb_flags")" elif [[ -f "/etc/GoboLinuxVersion" ]]; then case "$distro_shorthand" in From f9f4e54c2dc805d7c5f043610ef5da395aeeb701 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 22 Apr 2018 11:11:57 +1000 Subject: [PATCH 0224/1133] docs: CHANGELOG --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 879f55eaa..5760b4a0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ - [**@aidanharris**](https://github.com/aidanharris) - [**@DanySpin97**](https://github.com/DanySpin97) - [**@SolitudeSF**](https://github.com/SolitudeSF) +- [**@Kayant**](https://github.com/Kayant) ## General @@ -23,6 +24,10 @@ - Fixed unexpected backslash being inserted on some systems. +**CPU** + +- Added temperature support for Zen processors. [**@Kayant**](https://github.com/Kayant) + **GPU** - Fixed duplicate Intel GPUs. From 6901a3ff8ba11b4ae4ad867a9b3f2ce968344be3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 22 Apr 2018 18:12:38 +1000 Subject: [PATCH 0225/1133] distro: Revert change --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 89fd57087..26247a7aa 100755 --- a/neofetch +++ b/neofetch @@ -76,7 +76,7 @@ get_distro() { case "$distro_shorthand" in "on") lsb_flags="-sir" ;; "tiny") lsb_flags="-si" ;; - *) lsb_flags="-sdr" ;; + *) lsb_flags="-sd" ;; esac distro="$(lsb_release "$lsb_flags")" From 3ed7327ef38c1b18dec51d6878dc0c85d8686b72 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 24 Apr 2018 23:43:07 +0200 Subject: [PATCH 0226/1133] Add files via upload --- neofetch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/neofetch b/neofetch index 26247a7aa..e3fe9188f 100755 --- a/neofetch +++ b/neofetch @@ -3428,6 +3428,11 @@ get_distro_colors() { ascii_file="apricity" ;; + "ArcoLinux"*) + set_colors 7 4 + ascii_file="arcolinux" + ;; + "arch_small") set_colors 6 7 1 ascii_file="arch_small" @@ -3729,6 +3734,11 @@ get_distro_colors() { ascii_file="lede" ;; + "Linux Lite"*) + set_colors fg 8 3 + ascii_file="linuxlite" + ;; + "Linux") set_colors fg 8 3 ascii_file="linux" From 46dbd934dd67767687d3edfd45299d995227742a Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 24 Apr 2018 23:43:36 +0200 Subject: [PATCH 0227/1133] Add files via upload --- ascii/distro/arcolinux | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 ascii/distro/arcolinux diff --git a/ascii/distro/arcolinux b/ascii/distro/arcolinux new file mode 100644 index 000000000..0a42c6ad4 --- /dev/null +++ b/ascii/distro/arcolinux @@ -0,0 +1,20 @@ +${c2} /- + ooo: + yoooo/ + yooooooo + yooooooooo + yooooooooooo + .yooooooooooooo + .oooooooooooooooo + .oooooooarcoooooooo + .ooooooooo-oooooooooo + .ooooooooo- oooooooooo + :ooooooooo. :ooooooooo + :ooooooooo. :ooooooooo + :oooarcooo .oooarcooo + :ooooooooy .ooooooooo + :ooooooooo ${c1}/ooooooooooooooooooo${c2} + :ooooooooo ${c1}.-ooooooooooooooooo.${c2} + ooooooooo- ${c1}-ooooooooooooo.${c2} + ooooooooo- ${c1}.-oooooooooo.${c2} +ooooooooo. ${c1}-ooooooooo${c2} \ No newline at end of file From 540de7173a57e46ab7200117bb6375676f4648e0 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 25 Apr 2018 00:40:01 +0200 Subject: [PATCH 0228/1133] Add files via upload --- neofetch | 5 ----- 1 file changed, 5 deletions(-) diff --git a/neofetch b/neofetch index e3fe9188f..92c17f03d 100755 --- a/neofetch +++ b/neofetch @@ -3734,11 +3734,6 @@ get_distro_colors() { ascii_file="lede" ;; - "Linux Lite"*) - set_colors fg 8 3 - ascii_file="linuxlite" - ;; - "Linux") set_colors fg 8 3 ascii_file="linux" From dcd7171c920f45c92f5bfae18e8846c0d3e969e1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 25 Apr 2018 11:32:52 +1000 Subject: [PATCH 0229/1133] docs: update --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5760b4a0b..b623a9dae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,16 @@ ## Contributors + - [**@aidanharris**](https://github.com/aidanharris) - [**@DanySpin97**](https://github.com/DanySpin97) - [**@SolitudeSF**](https://github.com/SolitudeSF) - [**@Kayant**](https://github.com/Kayant) +- [**@robertwolter**](https://github.com/robertwolter) + + +## Operating System + +- Added support for ArcoLinux. ## General @@ -16,6 +23,7 @@ - Added `wal`/`pywal` support to get the current wallpaper. - Added `kitty` image backend. [**@SolitudeSF**](https://github.com/SolitudeSF) +- Added `setroot` wallpaper support. [**@SolitudeSF**](https://github.com/SolitudeSF) ## Info From da94f65b8c0fbe2cc15109ef8a73b7f183edddc4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 25 Apr 2018 11:39:03 +1000 Subject: [PATCH 0230/1133] gpu: Fix ATI/AMD branding issue. --- neofetch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 92c17f03d..b94fb27c3 100755 --- a/neofetch +++ b/neofetch @@ -1313,6 +1313,8 @@ get_gpu() { case "$gpu" in *"advanced"*) + brand="${gpu/*AMD*/AMD}" + brand="${brand:-${gpu/*ATI*/ATi}}" gpu="${gpu/'[AMD/ATI]' }" gpu="${gpu/'[AMD]' }" gpu="${gpu/OEM }" @@ -1320,7 +1322,7 @@ get_gpu() { gpu="${gpu/ \/ *}" gpu="${gpu/*\[}" gpu="${gpu/\]*}" - gpu="AMD $gpu" + gpu="$brand $gpu" ;; *"nvidia"*) From 0d89e1a400851a157d65eb3cd59416d97a66df01 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 25 Apr 2018 11:42:11 +1000 Subject: [PATCH 0231/1133] gpu: Fix ATI/AMD branding issue. --- neofetch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index b94fb27c3..c70c2516c 100755 --- a/neofetch +++ b/neofetch @@ -1313,8 +1313,10 @@ get_gpu() { case "$gpu" in *"advanced"*) - brand="${gpu/*AMD*/AMD}" + brand="${gpu/*AMD*ATI*/AMD ATI}" + brand="${brand:-${gpu/*AMD*/AMD}}" brand="${brand:-${gpu/*ATI*/ATi}}" + gpu="${gpu/'[AMD/ATI]' }" gpu="${gpu/'[AMD]' }" gpu="${gpu/OEM }" From b87300d87aaadddd83a977d1d9558df2cd0cf6ad Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 25 Apr 2018 13:23:47 +1000 Subject: [PATCH 0232/1133] image: [w3m] Fix issue with zws not being applied to get_cols --- neofetch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 92c17f03d..16000a8f2 100755 --- a/neofetch +++ b/neofetch @@ -2640,7 +2640,7 @@ image_backend() { get_term_size if [[ "$term_width" ]] && ((term_width >= 1)); then - clear + printf "\e[2J\e[H" else to_ascii "Image: Failed to find terminal window size." err "Image: Check the 'Images in the terminal' wiki page for more info," @@ -2649,6 +2649,9 @@ image_backend() { get_image_size make_thumbnail + + [[ "$image_backend" == *"w3m"* ]] && zws="\xE2\x80\x8B\x20" + display_image ;; @@ -2662,7 +2665,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 "\e[${lines:-0}A\e[9999999D" } get_ascii() { @@ -3105,8 +3108,6 @@ display_image() { printf "%b\n" "0;1;$xoffset;$yoffset;$width;$height;;;;;$image\n4;\n3;" |\ "${w3m_img_path:-false}" -bg "$background_color" >/dev/null 2>&1 ||\ to_off "Image: w3m-img failed to display the image." - - zws="\xE2\x80\x8B\x20" ;; esac } From 327e639eff7f393ff366faae38b530c814273195 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Fri, 27 Apr 2018 11:54:38 +0200 Subject: [PATCH 0233/1133] de: fix Unity in 18.04 --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 16000a8f2..d59d64d13 100755 --- a/neofetch +++ b/neofetch @@ -697,6 +697,7 @@ get_de() { if [[ "$XDG_CURRENT_DESKTOP" ]]; then de="${XDG_CURRENT_DESKTOP/'X-'}" de="${de/Budgie:GNOME/Budgie}" + de="${de/:Unity7:ubuntu}" elif [[ "$DESKTOP_SESSION" ]]; then de="${DESKTOP_SESSION##*/}" From 53e557dcd73a41583e937c04c986015a9dd4910e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 27 Apr 2018 22:16:07 +1000 Subject: [PATCH 0234/1133] general: Fix tests --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 16000a8f2..808ba7dd0 100755 --- a/neofetch +++ b/neofetch @@ -2665,7 +2665,7 @@ image_backend() { esac # Set cursor position next image/ascii. - [[ "$image_backend" != "off" ]] && printf "\e[${lines:-0}A\e[9999999D" + [[ "$image_backend" != "off" ]] && printf "%b" "\e[${lines:-0}A\e[9999999D" } get_ascii() { From d92fd6931fbbfecfd47a6f445d93be4d50b4f008 Mon Sep 17 00:00:00 2001 From: Anthony Cerruti Date: Fri, 27 Apr 2018 15:44:47 -0700 Subject: [PATCH 0235/1133] Update Android ascii This is so it looks more uniform with the other arts. --- ascii/distro/android | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/ascii/distro/android b/ascii/distro/android index 17e7ff306..cb9d43e88 100644 --- a/ascii/distro/android +++ b/ascii/distro/android @@ -1,13 +1,20 @@ -${c1} ╲ ▁▂▂▂▁ ╱ - ▄███████▄ - ▄██${c2} ${c1}███${c2} ${c1}██▄ - ▄███████████▄ -▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄ █▄ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ - █████████████ - ███████████ - ██ ██ - ██ ██ +${c1} `y` `y` + `h+shdmmdhs+h` + `omMMMMMMMMMMMMmo` + +NMM${c2}os${c1}MMMMMMMM${c2}so${c1}MMN+ + oMMMMmmMMMMMMMMmmMMMM+ + `MMMMMMMMMMMMMMMMMMMMMN` +`+o+``yyyyyyyyyyyyyyyyyyyyyy`.+o+` +mMMMN.MMMMMMMMMMMMMMMMMMMMMM.NMMMm +NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN +NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN +NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN +NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN +NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN +sMMMy`MMMMMMMMMMMMMMMMMMMMMM`yMMMs + .` `MMMMMMMMMMMMMMMMMMMMMM` `. + oNMMMMMMMMMMMMMMMMMMNo + ``yMMMM+``+MMMMy`` + yMMMM/ /MMMMy + yMMMM/ /MMMMy + -dMMh` `hMMd- From 73410969531ea87a0c82863ac72e5e895c767e3c Mon Sep 17 00:00:00 2001 From: Anthony Cerruti Date: Fri, 27 Apr 2018 16:04:51 -0700 Subject: [PATCH 0236/1133] Remove width set --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index 808ba7dd0..cf46cb3a8 100755 --- a/neofetch +++ b/neofetch @@ -3406,7 +3406,6 @@ get_distro_colors() { "Android"*) set_colors 2 7 ascii_file="android" - ascii_length_force=19 ;; "Antergos"*) From 3c26a10bd45ef8103baaf5678d19dfa3601d2562 Mon Sep 17 00:00:00 2001 From: Anthony Cerruti Date: Fri, 27 Apr 2018 17:34:27 -0700 Subject: [PATCH 0237/1133] Make art slightly smaller --- ascii/distro/android | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/ascii/distro/android b/ascii/distro/android index cb9d43e88..a838f99a6 100644 --- a/ascii/distro/android +++ b/ascii/distro/android @@ -1,20 +1,18 @@ -${c1} `y` `y` - `h+shdmmdhs+h` - `omMMMMMMMMMMMMmo` - +NMM${c2}os${c1}MMMMMMMM${c2}so${c1}MMN+ - oMMMMmmMMMMMMMMmmMMMM+ - `MMMMMMMMMMMMMMMMMMMMMN` -`+o+``yyyyyyyyyyyyyyyyyyyyyy`.+o+` -mMMMN.MMMMMMMMMMMMMMMMMMMMMM.NMMMm -NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN -NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN -NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN -NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN -NMMMM.MMMMMMMMMMMMMMMMMMMMMM.MMMMN -sMMMy`MMMMMMMMMMMMMMMMMMMMMM`yMMMs - .` `MMMMMMMMMMMMMMMMMMMMMM` `. - oNMMMMMMMMMMMMMMMMMMNo - ``yMMMM+``+MMMMy`` - yMMMM/ /MMMMy - yMMMM/ /MMMMy - -dMMh` `hMMd- +${c1} -o o- + +hydNNNNdyh+ + +mMMMMMMMMMMMMm+ + `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` + hMMMMMMMMMMMMMMMMMMh + .. yyyyyyyyyyyyyyyyyyyy .. +.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +-MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- + +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ + mMMMMMMMMMMMMMMMMMMm + `/++MMMMh++hMMMM++/` + MMMMo oMMMM + MMMMo oMMMM + oNMm- -mMNs From 89f6bae27c3b29f6bb67a1364e499580605de890 Mon Sep 17 00:00:00 2001 From: Anthony Cerruti Date: Fri, 27 Apr 2018 17:49:53 -0700 Subject: [PATCH 0238/1133] Fix small typo --- ascii/distro/android | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ascii/distro/android b/ascii/distro/android index a838f99a6..610622ddd 100644 --- a/ascii/distro/android +++ b/ascii/distro/android @@ -1,4 +1,4 @@ -${c1} -o o- +${c1} -o o- +hydNNNNdyh+ +mMMMMMMMMMMMMm+ `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` From 1d5d679ec6031eab3ac93cc6359db4d8f7a74954 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 30 Apr 2018 16:16:08 +1000 Subject: [PATCH 0239/1133] docs: update --- CHANGELOG.md | 11 +++++++++++ README.md | 1 + 2 files changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b623a9dae..ef80e2eda 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ - [**@SolitudeSF**](https://github.com/SolitudeSF) - [**@Kayant**](https://github.com/Kayant) - [**@robertwolter**](https://github.com/robertwolter) +- [**@TsundereBug**](https://github.com/TsundereBug) +- [**@dawidd6**](https://github.com/dawidd6) ## Operating System @@ -26,6 +28,11 @@ - Added `setroot` wallpaper support. [**@SolitudeSF**](https://github.com/SolitudeSF) +## Ascii + +- Updated Android ascii art to better work on non-unicode terminals. [**@TsundereBug**](https://github.com/TsundereBug) + + ## Info **Title** @@ -48,6 +55,10 @@ - Fixed package count in Exherbo. [**@DanySpin97**](https://github.com/DanySpin97) +**Desktop Environment** + +- Fixed Unity output in Ubuntu 18.04. [**@dawidd6**](https://github.com/dawidd6) + **Window Manager** - Added support for detecting `dwm`. diff --git a/README.md b/README.md index 966fdb67e..aeaeb73fc 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ You can further configure Neofetch to display exactly what you want it to. Throu Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added.
+ ### For more information: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] neofetch From cdb576479e0f561075737061c07be0af6607d6cb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 30 Apr 2018 16:18:24 +1000 Subject: [PATCH 0240/1133] macOS: Fix memory bug. --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 7c7ad8048..f793a1e71 100755 --- a/neofetch +++ b/neofetch @@ -1463,6 +1463,7 @@ get_memory() { mem_wired="$(vm_stat | awk '/wired/ { print $4 }')" mem_active="$(vm_stat | awk '/active / { printf $3 }')" mem_compressed="$(vm_stat | awk '/occupied/ { printf $5 }')" + mem_compressed="${mem_compressed:-0}" mem_used="$(((${mem_wired//.} + ${mem_active//.} + ${mem_compressed//.}) * 4 / 1024))" ;; From 7dbb157a8085d655b9826ef255f2407bbc4b83b7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 1 May 2018 19:25:19 +1000 Subject: [PATCH 0241/1133] wm: Show version for KDE and dwm. --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index dc7a01adc..d35fe6256 100755 --- a/neofetch +++ b/neofetch @@ -793,8 +793,12 @@ get_wm() { -e "tinywm")" if [[ "$wm_version" == "on" ]]; then - wmv="$wm $("${wm,,}" --version || "${wm,,}" -v)" + wmv="$wm $("${wm,,}" --version || \ + "${wm,,}" -v || \ + "${wm,,}_x11" -v)" || \ + "${wm,,}_wayland" -v")" wmv="${wmv/$wm $wm/$wm}" + wmv="${wmv/$wm $wm-/$wm}" wmv="${wmv/copyright*}" wmv="${wmv/version }" wmv="${wmv/©*}" From ed237bfcbc801ee513f47318beb1a26d25dec1c0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 1 May 2018 19:30:18 +1000 Subject: [PATCH 0242/1133] wm: Added support for aewm --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d35fe6256..7284307f5 100755 --- a/neofetch +++ b/neofetch @@ -798,7 +798,7 @@ get_wm() { "${wm,,}_x11" -v)" || \ "${wm,,}_wayland" -v")" wmv="${wmv/$wm $wm/$wm}" - wmv="${wmv/$wm $wm-/$wm}" + wmv="${wmv/$wm ${wm}?/$wm}" wmv="${wmv/copyright*}" wmv="${wmv/version }" wmv="${wmv/©*}" From 2bb8a30a4918dc64e6f73345d196b631c0cf8325 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 1 May 2018 19:41:44 +1000 Subject: [PATCH 0243/1133] wm: Added support for more window managers. --- neofetch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 7284307f5..4749c3ccd 100755 --- a/neofetch +++ b/neofetch @@ -792,17 +792,16 @@ get_wm() { -e "monsterwm" \ -e "tinywm")" - if [[ "$wm_version" == "on" ]]; then - wmv="$wm $("${wm,,}" --version || \ - "${wm,,}" -v || \ - "${wm,,}_x11" -v)" || \ - "${wm,,}_wayland" -v")" + if [[ "$wm_version" == "on" && "$wm" ]]; then + wmv="$("${wm,,}" --version || "${wm,,}" -v 2>&1)" + wmv="$wm ${wmv:-$("${wm,,}_x11" -v || "${wm,,}_wayland" -v)}" + wmv="${wmv/$wm ${wm}?/$wm }" wmv="${wmv/$wm $wm/$wm}" - wmv="${wmv/$wm ${wm}?/$wm}" wmv="${wmv/copyright*}" wmv="${wmv/version }" wmv="${wmv/©*}" wmv="${wmv/(c)*}" + wmv="${wmv/ : }" wm="$wmv" fi else From 70b1fe169cdc341865a2a597a669d8cfd35c3e6c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:05:49 +1000 Subject: [PATCH 0244/1133] config: Inline config file. --- config/config.conf | 782 ------------------------------------------- neofetch | 814 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 790 insertions(+), 806 deletions(-) delete mode 100644 config/config.conf diff --git a/config/config.conf b/config/config.conf deleted file mode 100644 index 65d01d492..000000000 --- a/config/config.conf +++ /dev/null @@ -1,782 +0,0 @@ -# Neofetch config file -# https://github.com/dylanaraps/neofetch - - -# See this wiki page for more info: -# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info -print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "Memory" memory - - # info "GPU Driver" gpu_driver # Linux/macOS only - # info "CPU Usage" cpu_usage - # info "Disk" disk - # info "Battery" battery - # info "Font" font - # info "Song" song - # info "Local IP" local_ip - # info "Public IP" public_ip - # info "Users" users - # info "Install Date" install_date - # info "Locale" locale # This only works on glibc systems. - - info line_break - info cols - info line_break -} - - -# Kernel - - -# Shorten the output of the kernel function. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --kernel_shorthand -# Supports: Everything except *BSDs (except PacBSD and PC-BSD) -# -# Example: -# on: '4.8.9-1-ARCH' -# off: 'Linux 4.8.9-1-ARCH' -kernel_shorthand="on" - - -# Distro - - -# Shorten the output of the distro function -# -# Default: 'off' -# Values: 'on', 'off', 'tiny' -# Flag: --distro_shorthand -# Supports: Everything except Windows and Haiku -distro_shorthand="off" - -# Show/Hide OS Architecture. -# Show 'x86_64', 'x86' and etc in 'Distro:' output. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --os_arch -# -# Example: -# on: 'Arch Linux x86_64' -# off: 'Arch Linux' -os_arch="on" - - -# Uptime - - -# Shorten the output of the uptime function -# -# Default: 'on' -# Values: 'on', 'off', 'tiny' -# Flag: --uptime_shorthand -# -# Example: -# on: '2 days, 10 hours, 3 mins' -# off: '2 days, 10 hours, 3 minutes' -# tiny: '2d 10h 3m' -uptime_shorthand="on" - - -# Shell - - -# Show the path to $SHELL -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --shell_path -# -# Example: -# on: '/bin/bash' -# off: 'bash' -shell_path="off" - -# Show $SHELL version -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --shell_version -# -# Example: -# on: 'bash 4.4.5' -# off: 'bash' -shell_version="on" - - -# CPU - - -# CPU speed type -# -# Default: 'bios_limit' -# Values: 'scaling_cur_freq', 'scaling_min_freq', 'scaling_max_freq', 'bios_limit'. -# Flag: --speed_type -# Supports: Linux with 'cpufreq' -# NOTE: Any file in '/sys/devices/system/cpu/cpu0/cpufreq' can be used as a value. -speed_type="bios_limit" - -# CPU speed shorthand -# -# Default: 'off' -# Values: 'on', 'off'. -# Flag: --speed_shorthand. -# NOTE: This flag is not supported in systems with CPU speed less than 1 GHz -# -# Example: -# on: 'i7-6500U (4) @ 3.1GHz' -# off: 'i7-6500U (4) @ 3.100GHz' -speed_shorthand="off" - -# Enable/Disable CPU brand in output. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --cpu_brand -# -# Example: -# on: 'Intel i7-6500U' -# off: 'i7-6500U (4)' -cpu_brand="on" - -# CPU Speed -# Hide/Show CPU speed. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --cpu_speed -# -# Example: -# on: 'Intel i7-6500U (4) @ 3.1GHz' -# off: 'Intel i7-6500U (4)' -cpu_speed="on" - -# CPU Cores -# Display CPU cores in output -# -# Default: 'logical' -# Values: 'logical', 'physical', 'off' -# Flag: --cpu_cores -# Support: 'physical' doesn't work on BSD. -# -# Example: -# logical: 'Intel i7-6500U (4) @ 3.1GHz' (All virtual cores) -# physical: 'Intel i7-6500U (2) @ 3.1GHz' (All physical cores) -# off: 'Intel i7-6500U @ 3.1GHz' -cpu_cores="logical" - -# CPU Temperature -# Hide/Show CPU temperature. -# Note the temperature is added to the regular CPU function. -# -# Default: 'off' -# Values: 'C', 'F', 'off' -# Flag: --cpu_temp -# Supports: Linux, BSD -# NOTE: For FreeBSD and NetBSD-based systems, you'll need to enable -# coretemp kernel module. This only supports newer Intel processors. -# -# Example: -# C: 'Intel i7-6500U (4) @ 3.1GHz [27.2°C]' -# F: 'Intel i7-6500U (4) @ 3.1GHz [82.0°F]' -# off: 'Intel i7-6500U (4) @ 3.1GHz' -cpu_temp="off" - - -# GPU - - -# Enable/Disable GPU Brand -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gpu_brand -# -# Example: -# on: 'AMD HD 7950' -# off: 'HD 7950' -gpu_brand="on" - -# Which GPU to display -# -# Default: 'all' -# Values: 'all', 'dedicated', 'integrated' -# Flag: --gpu_type -# Supports: Linux -# -# Example: -# all: -# GPU1: AMD HD 7950 -# GPU2: Intel Integrated Graphics -# -# dedicated: -# GPU1: AMD HD 7950 -# -# integrated: -# GPU1: Intel Integrated Graphics -gpu_type="all" - - -# Resolution - - -# Display refresh rate next to each monitor -# Default: 'off' -# Values: 'on', 'off' -# Flag: --refresh_rate -# Supports: Doesn't work on Windows. -# -# Example: -# on: '1920x1080 @ 60Hz' -# off: '1920x1080' -refresh_rate="off" - - -# Gtk Theme / Icons / Font - - -# Shorten output of GTK Theme / Icons / Font -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --gtk_shorthand -# -# Example: -# on: 'Numix, Adwaita' -# off: 'Numix [GTK2], Adwaita [GTK3]' -gtk_shorthand="off" - - -# Enable/Disable gtk2 Theme / Icons / Font -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gtk2 -# -# Example: -# on: 'Numix [GTK2], Adwaita [GTK3]' -# off: 'Adwaita [GTK3]' -gtk2="on" - -# Enable/Disable gtk3 Theme / Icons / Font -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gtk3 -# -# Example: -# on: 'Numix [GTK2], Adwaita [GTK3]' -# off: 'Numix [GTK2]' -gtk3="on" - - -# IP Address - - -# Website to ping for the public IP -# -# Default: 'http://ident.me' -# Values: 'url' -# Flag: --ip_host -public_ip_host="http://ident.me" - - -# Window Manager - - -# Show Window Manager Version. -# -# Default: 'off' -# Values: 'on', off -# Flag: --wm_version -wm_version="off" - - -# Disk - - -# Which disks to display. -# The values can be any /dev/sdXX, mount point or directory. -# NOTE: By default we only show the disk info for '/'. -# -# Default: '/' -# Values: '/', '/dev/sdXX', '/path/to/drive'. -# Flag: --disk_show -# -# Example: -# disk_show=('/' '/dev/sdb1'): -# 'Disk (/): 74G / 118G (66%)' -# 'Disk (/mnt/Videos): 823G / 893G (93%)' -# -# disk_show=('/'): -# 'Disk (/): 74G / 118G (66%)' -# -disk_show=('/') - -# Disk subtitle. -# What to append to the Disk subtitle. -# -# Default: 'mount' -# Values: 'mount', 'name', 'dir' -# Flag: --disk_subtitle -# -# Example: -# name: 'Disk (/dev/sda1): 74G / 118G (66%)' -# 'Disk (/dev/sdb2): 74G / 118G (66%)' -# -# mount: 'Disk (/): 74G / 118G (66%)' -# 'Disk (/mnt/Local Disk): 74G / 118G (66%)' -# 'Disk (/mnt/Videos): 74G / 118G (66%)' -# -# dir: 'Disk (/): 74G / 118G (66%)' -# 'Disk (Local Disk): 74G / 118G (66%)' -# 'Disk (Videos): 74G / 118G (66%)' -disk_subtitle="mount" - - -# Song - - -# Manually specify a music player. -# -# Default: 'auto' -# Values: 'auto', 'player-name' -# Flag: --music_player -# -# Available values for 'player-name': -# -# Google Play -# Spotify -# amarok -# audacious -# banshee -# bluemindo -# clementine -# cmus -# deadbeef -# deepin-music -# elisa -# exaile -# gnome-music -# guayadeque -# iTunes$ -# juk -# lollypop -# mocp -# mopidy -# mpd -# pogo -# pragha -# qmmp -# quodlibet -# rhythmbox -# spotify -# tomahawk -# xmms2d -# yarock -music_player="auto" - -# Print the Artist and Title on separate lines -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --song_shorthand -# -# Example: -# on: 'Artist: The Fratellis' -# 'Song: Chelsea Dagger' -# -# off: 'Song: The Fratellis - Chelsea Dagger' -song_shorthand="off" - - -# Install Date - - -# Whether to show the time in the output -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --install_time -# -# Example: -# on: 'Thu 14 Apr 2016 11:50 PM' -# off: 'Thu 14 Apr 2016' -install_time="on" - -# Set time format in the output -# -# Default: '24h' -# Values: '12h', '24h' -# Flag: --install_time_format -# -# Example: -# 12h: 'Thu 14 Apr 2016 11:50 PM' -# 24h: 'Thu 14 Apr 2016 23:50' -install_time_format="12h" - - -# Text Colors - - -# Text Colors -# -# Default: 'distro' -# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' -# Flag: --colors -# -# Each number represents a different part of the text in -# this order: 'title', '@', 'underline', 'subtitle', 'colon', 'info' -# -# Example: -# colors=(distro) - Text is colored based on Distro colors. -# colors=(4 6 1 8 8 6) - Text is colored in the order above. -colors=(distro) - - -# Text Options - - -# Toggle bold text -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --bold -bold="on" - -# Enable/Disable Underline -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --underline -underline_enabled="on" - -# Underline character -# -# Default: '-' -# Values: 'string' -# Flag: --underline_char -underline_char="-" - - -# Color Blocks - - -# Color block range -# The range of colors to print. -# -# Default: '0', '7' -# Values: 'num' -# Flag: --block_range -# -# Example: -# -# Display colors 0-7 in the blocks. (8 colors) -# neofetch --block_range 0 7 -# -# Display colors 0-15 in the blocks. (16 colors) -# neofetch --block_range 0 15 -block_range=(0 7) - -# Toggle color blocks -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --color_blocks -color_blocks="on" - -# Color block width in spaces -# -# Default: '3' -# Values: 'num' -# Flag: --block_width -block_width=3 - -# Color block height in lines -# -# Default: '1' -# Values: 'num' -# Flag: --block_height -block_height=1 - - -# Progress Bars - - -# Bar characters -# -# Default: '-', '=' -# Values: 'string', 'string' -# Flag: --bar_char -# -# Example: -# neofetch --bar_char 'elapsed' 'total' -# neofetch --bar_char '-' '=' -bar_char_elapsed="-" -bar_char_total="=" - -# Toggle Bar border -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --bar_border -bar_border="on" - -# Progress bar length in spaces -# Number of chars long to make the progress bars. -# -# Default: '15' -# Values: 'num' -# Flag: --bar_length -bar_length=15 - -# Progress bar colors -# When set to distro, uses your distro's logo colors. -# -# Default: 'distro', 'distro' -# Values: 'distro', 'num' -# Flag: --bar_colors -# -# Example: -# neofetch --bar_colors 3 4 -# neofetch --bar_colors distro 5 -bar_color_elapsed="distro" -bar_color_total="distro" - - -# Info display -# Display a bar with the info. -# -# Default: 'off' -# Values: 'bar', 'infobar', 'barinfo', 'off' -# Flags: --cpu_display -# --memory_display -# --battery_display -# --disk_display -# -# Example: -# bar: '[---=======]' -# infobar: 'info [---=======]' -# barinfo: '[---=======] info' -# off: 'info' -cpu_display="off" -memory_display="off" -battery_display="off" -disk_display="off" - - -# Backend Settings - - -# Image backend. -# -# Default: 'ascii' -# Values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m' -# Flag: --backend -image_backend="ascii" - -# Image Source -# -# Which image or ascii file to display. -# -# Default: 'auto' -# Values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/' -# Flag: --source -# -# NOTE: 'auto' will pick the best image source for whatever image backend is used. -# In ascii mode, distro ascii art will be used and in an image mode, your -# wallpaper will be used. -image_source="auto" - - -# Ascii Options - - -# Ascii distro -# Which distro's ascii art to display. -# -# Default: 'auto' -# Values: 'auto', 'distro_name' -# Flag: --ascii_distro -# -# NOTE: Arch and Ubuntu have 'old' logo variants. -# Change this to 'arch_old' or 'ubuntu_old' to use the old logos. -# NOTE: Ubuntu has flavor variants. -# Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME' or 'Ubuntu-Budgie' to use the flavors. -# NOTE: Arch, Crux and Gentoo have a smaller logo variant. -# Change this to 'arch_small', 'crux_small' or 'gentoo_small' to use the small logos. -ascii_distro="auto" - -# Ascii Colors -# -# Default: 'distro' -# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' -# Flag: --ascii_colors -# -# Example: -# ascii_colors=(distro) - Ascii is colored based on Distro colors. -# ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors. -ascii_colors=(distro) - -# Bold ascii logo -# Whether or not to bold the ascii logo. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --ascii_bold -ascii_bold="on" - - -# Image Options - - -# Image loop -# Setting this to on will make neofetch redraw the image constantly until -# Ctrl+C is pressed. This fixes display issues in some terminal emulators. -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --loop -image_loop="off" - -# Thumbnail directory -# -# Default: '~/.cache/thumbnails/neofetch' -# Values: 'dir' -thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch" - -# Crop mode -# -# Default: 'normal' -# Values: 'normal', 'fit', 'fill' -# Flag: --crop_mode -# -# See this wiki page to learn about the fit and fill options. -# https://github.com/dylanaraps/neofetch/wiki/What-is-Waifu-Crop%3F -crop_mode="normal" - -# Crop offset -# Note: Only affects 'normal' crop mode. -# -# Default: 'center' -# Values: 'northwest', 'north', 'northeast', 'west', 'center' -# 'east', 'southwest', 'south', 'southeast' -# Flag: --crop_offset -crop_offset="center" - -# Image size -# The image is half the terminal width by default. -# -# Default: 'auto' -# Values: 'auto', '00px', '00%', 'none' -# Flags: --image_size -# --size -image_size="auto" - -# Gap between image and text -# -# Default: '3' -# Values: 'num', '-num' -# Flag: --gap -gap=3 - -# Image offsets -# Only works with the w3m backend. -# -# Default: '0' -# Values: 'px' -# Flags: --xoffset -# --yoffset -yoffset=0 -xoffset=0 - -# Image background color -# Only works with the w3m backend. -# -# Default: '' -# Values: 'color', 'blue' -# Flag: --bg_color -background_color= - - -# Scrot Options - - -# Whether or not to always take a screenshot -# You can manually take a screenshot with "--scrot" or "-s" -# -# Default: 'off' -# Values: 'on', 'off' -# Flags: --scrot -# -s -scrot="off" - -# Screenshot Program -# Neofetch will automatically use whatever screenshot tool -# is installed on your system. -# -# If 'neofetch -v' says that it couldn't find a screenshot -# tool or you're using a custom tool then you can change -# the option below to a custom command. -# -# Default: 'auto' -# Values: 'auto' 'cmd -flags' -# Flag: --scrot_cmd -scrot_cmd="auto" - -# Screenshot Filename -# What to name the screenshots -# -# Default: 'neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png' -# Values: 'string' -# Flag: --scrot_name -scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png" - -# Image upload host -# Where to upload the image. -# -# Default: 'teknik' -# Values: 'imgur', 'teknik' -# Flag: --image_host -# -# NOTE: If you'd like another image host to be added to Neofetch. -# Open an issue on github. -image_host="teknik" - - -# Misc Options - -# Stdout mode -# Turn off all colors and disables image backend (ASCII/Image). -# Useful for piping into another command. -# Default: 'off' -# Values: 'on', 'off' -stdout="off" - -# Config version. -# -# NOTE: Don't change this value, neofetch reads this to determine -# how to handle backwards compatibility. -config_version="3.4.1-git" diff --git a/neofetch b/neofetch index 4749c3ccd..30328a8bb 100755 --- a/neofetch +++ b/neofetch @@ -31,6 +31,789 @@ shopt -s nocasematch # Reset colors and bold. reset="\e[0m" +# Neofetch default config. +readarray -t config <<'EOM' +# See this wiki page for more info: +# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info +print_info() { + info title + info underline + + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "Memory" memory + + # info "GPU Driver" gpu_driver # Linux/macOS only + # info "CPU Usage" cpu_usage + # info "Disk" disk + # info "Battery" battery + # info "Font" font + # info "Song" song + # info "Local IP" local_ip + # info "Public IP" public_ip + # info "Users" users + # info "Install Date" install_date + # info "Locale" locale # This only works on glibc systems. + + info line_break + info cols + info line_break +} + + +# Kernel + + +# Shorten the output of the kernel function. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --kernel_shorthand +# Supports: Everything except *BSDs (except PacBSD and PC-BSD) +# +# Example: +# on: '4.8.9-1-ARCH' +# off: 'Linux 4.8.9-1-ARCH' +kernel_shorthand="on" + + +# Distro + + +# Shorten the output of the distro function +# +# Default: 'off' +# Values: 'on', 'off', 'tiny' +# Flag: --distro_shorthand +# Supports: Everything except Windows and Haiku +distro_shorthand="off" + +# Show/Hide OS Architecture. +# Show 'x86_64', 'x86' and etc in 'Distro:' output. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --os_arch +# +# Example: +# on: 'Arch Linux x86_64' +# off: 'Arch Linux' +os_arch="on" + + +# Uptime + + +# Shorten the output of the uptime function +# +# Default: 'on' +# Values: 'on', 'off', 'tiny' +# Flag: --uptime_shorthand +# +# Example: +# on: '2 days, 10 hours, 3 mins' +# off: '2 days, 10 hours, 3 minutes' +# tiny: '2d 10h 3m' +uptime_shorthand="on" + + +# Shell + + +# Show the path to $SHELL +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --shell_path +# +# Example: +# on: '/bin/bash' +# off: 'bash' +shell_path="off" + +# Show $SHELL version +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --shell_version +# +# Example: +# on: 'bash 4.4.5' +# off: 'bash' +shell_version="on" + + +# CPU + + +# CPU speed type +# +# Default: 'bios_limit' +# Values: 'scaling_cur_freq', 'scaling_min_freq', 'scaling_max_freq', 'bios_limit'. +# Flag: --speed_type +# Supports: Linux with 'cpufreq' +# NOTE: Any file in '/sys/devices/system/cpu/cpu0/cpufreq' can be used as a value. +speed_type="bios_limit" + +# CPU speed shorthand +# +# Default: 'off' +# Values: 'on', 'off'. +# Flag: --speed_shorthand. +# NOTE: This flag is not supported in systems with CPU speed less than 1 GHz +# +# Example: +# on: 'i7-6500U (4) @ 3.1GHz' +# off: 'i7-6500U (4) @ 3.100GHz' +speed_shorthand="off" + +# Enable/Disable CPU brand in output. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --cpu_brand +# +# Example: +# on: 'Intel i7-6500U' +# off: 'i7-6500U (4)' +cpu_brand="on" + +# CPU Speed +# Hide/Show CPU speed. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --cpu_speed +# +# Example: +# on: 'Intel i7-6500U (4) @ 3.1GHz' +# off: 'Intel i7-6500U (4)' +cpu_speed="on" + +# CPU Cores +# Display CPU cores in output +# +# Default: 'logical' +# Values: 'logical', 'physical', 'off' +# Flag: --cpu_cores +# Support: 'physical' doesn't work on BSD. +# +# Example: +# logical: 'Intel i7-6500U (4) @ 3.1GHz' (All virtual cores) +# physical: 'Intel i7-6500U (2) @ 3.1GHz' (All physical cores) +# off: 'Intel i7-6500U @ 3.1GHz' +cpu_cores="logical" + +# CPU Temperature +# Hide/Show CPU temperature. +# Note the temperature is added to the regular CPU function. +# +# Default: 'off' +# Values: 'C', 'F', 'off' +# Flag: --cpu_temp +# Supports: Linux, BSD +# NOTE: For FreeBSD and NetBSD-based systems, you'll need to enable +# coretemp kernel module. This only supports newer Intel processors. +# +# Example: +# C: 'Intel i7-6500U (4) @ 3.1GHz [27.2°C]' +# F: 'Intel i7-6500U (4) @ 3.1GHz [82.0°F]' +# off: 'Intel i7-6500U (4) @ 3.1GHz' +cpu_temp="off" + + +# GPU + + +# Enable/Disable GPU Brand +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --gpu_brand +# +# Example: +# on: 'AMD HD 7950' +# off: 'HD 7950' +gpu_brand="on" + +# Which GPU to display +# +# Default: 'all' +# Values: 'all', 'dedicated', 'integrated' +# Flag: --gpu_type +# Supports: Linux +# +# Example: +# all: +# GPU1: AMD HD 7950 +# GPU2: Intel Integrated Graphics +# +# dedicated: +# GPU1: AMD HD 7950 +# +# integrated: +# GPU1: Intel Integrated Graphics +gpu_type="all" + + +# Resolution + + +# Display refresh rate next to each monitor +# Default: 'off' +# Values: 'on', 'off' +# Flag: --refresh_rate +# Supports: Doesn't work on Windows. +# +# Example: +# on: '1920x1080 @ 60Hz' +# off: '1920x1080' +refresh_rate="off" + + +# Gtk Theme / Icons / Font + + +# Shorten output of GTK Theme / Icons / Font +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --gtk_shorthand +# +# Example: +# on: 'Numix, Adwaita' +# off: 'Numix [GTK2], Adwaita [GTK3]' +gtk_shorthand="off" + + +# Enable/Disable gtk2 Theme / Icons / Font +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --gtk2 +# +# Example: +# on: 'Numix [GTK2], Adwaita [GTK3]' +# off: 'Adwaita [GTK3]' +gtk2="on" + +# Enable/Disable gtk3 Theme / Icons / Font +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --gtk3 +# +# Example: +# on: 'Numix [GTK2], Adwaita [GTK3]' +# off: 'Numix [GTK2]' +gtk3="on" + + +# IP Address + + +# Website to ping for the public IP +# +# Default: 'http://ident.me' +# Values: 'url' +# Flag: --ip_host +public_ip_host="http://ident.me" + + +# Window Manager + + +# Show Window Manager Version. +# +# Default: 'off' +# Values: 'on', off +# Flag: --wm_version +wm_version="off" + + +# Disk + + +# Which disks to display. +# The values can be any /dev/sdXX, mount point or directory. +# NOTE: By default we only show the disk info for '/'. +# +# Default: '/' +# Values: '/', '/dev/sdXX', '/path/to/drive'. +# Flag: --disk_show +# +# Example: +# disk_show=('/' '/dev/sdb1'): +# 'Disk (/): 74G / 118G (66%)' +# 'Disk (/mnt/Videos): 823G / 893G (93%)' +# +# disk_show=('/'): +# 'Disk (/): 74G / 118G (66%)' +# +disk_show=('/') + +# Disk subtitle. +# What to append to the Disk subtitle. +# +# Default: 'mount' +# Values: 'mount', 'name', 'dir' +# Flag: --disk_subtitle +# +# Example: +# name: 'Disk (/dev/sda1): 74G / 118G (66%)' +# 'Disk (/dev/sdb2): 74G / 118G (66%)' +# +# mount: 'Disk (/): 74G / 118G (66%)' +# 'Disk (/mnt/Local Disk): 74G / 118G (66%)' +# 'Disk (/mnt/Videos): 74G / 118G (66%)' +# +# dir: 'Disk (/): 74G / 118G (66%)' +# 'Disk (Local Disk): 74G / 118G (66%)' +# 'Disk (Videos): 74G / 118G (66%)' +disk_subtitle="mount" + + +# Song + + +# Manually specify a music player. +# +# Default: 'auto' +# Values: 'auto', 'player-name' +# Flag: --music_player +# +# Available values for 'player-name': +# +# Google Play +# Spotify +# amarok +# audacious +# banshee +# bluemindo +# clementine +# cmus +# deadbeef +# deepin-music +# elisa +# exaile +# gnome-music +# guayadeque +# iTunes$ +# juk +# lollypop +# mocp +# mopidy +# mpd +# pogo +# pragha +# qmmp +# quodlibet +# rhythmbox +# spotify +# tomahawk +# xmms2d +# yarock +music_player="auto" + +# Print the Artist and Title on separate lines +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --song_shorthand +# +# Example: +# on: 'Artist: The Fratellis' +# 'Song: Chelsea Dagger' +# +# off: 'Song: The Fratellis - Chelsea Dagger' +song_shorthand="off" + + +# Install Date + + +# Whether to show the time in the output +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --install_time +# +# Example: +# on: 'Thu 14 Apr 2016 11:50 PM' +# off: 'Thu 14 Apr 2016' +install_time="on" + +# Set time format in the output +# +# Default: '24h' +# Values: '12h', '24h' +# Flag: --install_time_format +# +# Example: +# 12h: 'Thu 14 Apr 2016 11:50 PM' +# 24h: 'Thu 14 Apr 2016 23:50' +install_time_format="12h" + + +# Text Colors + + +# Text Colors +# +# Default: 'distro' +# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' +# Flag: --colors +# +# Each number represents a different part of the text in +# this order: 'title', '@', 'underline', 'subtitle', 'colon', 'info' +# +# Example: +# colors=(distro) - Text is colored based on Distro colors. +# colors=(4 6 1 8 8 6) - Text is colored in the order above. +colors=(distro) + + +# Text Options + + +# Toggle bold text +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --bold +bold="on" + +# Enable/Disable Underline +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --underline +underline_enabled="on" + +# Underline character +# +# Default: '-' +# Values: 'string' +# Flag: --underline_char +underline_char="-" + + +# Color Blocks + + +# Color block range +# The range of colors to print. +# +# Default: '0', '7' +# Values: 'num' +# Flag: --block_range +# +# Example: +# +# Display colors 0-7 in the blocks. (8 colors) +# neofetch --block_range 0 7 +# +# Display colors 0-15 in the blocks. (16 colors) +# neofetch --block_range 0 15 +block_range=(0 7) + +# Toggle color blocks +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --color_blocks +color_blocks="on" + +# Color block width in spaces +# +# Default: '3' +# Values: 'num' +# Flag: --block_width +block_width=3 + +# Color block height in lines +# +# Default: '1' +# Values: 'num' +# Flag: --block_height +block_height=1 + + +# Progress Bars + + +# Bar characters +# +# Default: '-', '=' +# Values: 'string', 'string' +# Flag: --bar_char +# +# Example: +# neofetch --bar_char 'elapsed' 'total' +# neofetch --bar_char '-' '=' +bar_char_elapsed="-" +bar_char_total="=" + +# Toggle Bar border +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --bar_border +bar_border="on" + +# Progress bar length in spaces +# Number of chars long to make the progress bars. +# +# Default: '15' +# Values: 'num' +# Flag: --bar_length +bar_length=15 + +# Progress bar colors +# When set to distro, uses your distro's logo colors. +# +# Default: 'distro', 'distro' +# Values: 'distro', 'num' +# Flag: --bar_colors +# +# Example: +# neofetch --bar_colors 3 4 +# neofetch --bar_colors distro 5 +bar_color_elapsed="distro" +bar_color_total="distro" + + +# Info display +# Display a bar with the info. +# +# Default: 'off' +# Values: 'bar', 'infobar', 'barinfo', 'off' +# Flags: --cpu_display +# --memory_display +# --battery_display +# --disk_display +# +# Example: +# bar: '[---=======]' +# infobar: 'info [---=======]' +# barinfo: '[---=======] info' +# off: 'info' +cpu_display="off" +memory_display="off" +battery_display="off" +disk_display="off" + + +# Backend Settings + + +# Image backend. +# +# Default: 'ascii' +# Values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m' +# Flag: --backend +image_backend="ascii" + +# Image Source +# +# Which image or ascii file to display. +# +# Default: 'auto' +# Values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/' +# Flag: --source +# +# NOTE: 'auto' will pick the best image source for whatever image backend is used. +# In ascii mode, distro ascii art will be used and in an image mode, your +# wallpaper will be used. +image_source="auto" + + +# Ascii Options + + +# Ascii distro +# Which distro's ascii art to display. +# +# Default: 'auto' +# Values: 'auto', 'distro_name' +# Flag: --ascii_distro +# +# NOTE: Arch and Ubuntu have 'old' logo variants. +# Change this to 'arch_old' or 'ubuntu_old' to use the old logos. +# NOTE: Ubuntu has flavor variants. +# Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME' or 'Ubuntu-Budgie' to use the flavors. +# NOTE: Arch, Crux and Gentoo have a smaller logo variant. +# Change this to 'arch_small', 'crux_small' or 'gentoo_small' to use the small logos. +ascii_distro="auto" + +# Ascii Colors +# +# Default: 'distro' +# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' +# Flag: --ascii_colors +# +# Example: +# ascii_colors=(distro) - Ascii is colored based on Distro colors. +# ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors. +ascii_colors=(distro) + +# Bold ascii logo +# Whether or not to bold the ascii logo. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --ascii_bold +ascii_bold="on" + + +# Image Options + + +# Image loop +# Setting this to on will make neofetch redraw the image constantly until +# Ctrl+C is pressed. This fixes display issues in some terminal emulators. +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --loop +image_loop="off" + +# Thumbnail directory +# +# Default: '~/.cache/thumbnails/neofetch' +# Values: 'dir' +thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch" + +# Crop mode +# +# Default: 'normal' +# Values: 'normal', 'fit', 'fill' +# Flag: --crop_mode +# +# See this wiki page to learn about the fit and fill options. +# https://github.com/dylanaraps/neofetch/wiki/What-is-Waifu-Crop%3F +crop_mode="normal" + +# Crop offset +# Note: Only affects 'normal' crop mode. +# +# Default: 'center' +# Values: 'northwest', 'north', 'northeast', 'west', 'center' +# 'east', 'southwest', 'south', 'southeast' +# Flag: --crop_offset +crop_offset="center" + +# Image size +# The image is half the terminal width by default. +# +# Default: 'auto' +# Values: 'auto', '00px', '00%', 'none' +# Flags: --image_size +# --size +image_size="auto" + +# Gap between image and text +# +# Default: '3' +# Values: 'num', '-num' +# Flag: --gap +gap=3 + +# Image offsets +# Only works with the w3m backend. +# +# Default: '0' +# Values: 'px' +# Flags: --xoffset +# --yoffset +yoffset=0 +xoffset=0 + +# Image background color +# Only works with the w3m backend. +# +# Default: '' +# Values: 'color', 'blue' +# Flag: --bg_color +background_color= + + +# Scrot Options + + +# Whether or not to always take a screenshot +# You can manually take a screenshot with "--scrot" or "-s" +# +# Default: 'off' +# Values: 'on', 'off' +# Flags: --scrot +# -s +scrot="off" + +# Screenshot Program +# Neofetch will automatically use whatever screenshot tool +# is installed on your system. +# +# If 'neofetch -v' says that it couldn't find a screenshot +# tool or you're using a custom tool then you can change +# the option below to a custom command. +# +# Default: 'auto' +# Values: 'auto' 'cmd -flags' +# Flag: --scrot_cmd +scrot_cmd="auto" + +# Screenshot Filename +# What to name the screenshots +# +# Default: 'neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png' +# Values: 'string' +# Flag: --scrot_name +scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png" + +# Image upload host +# Where to upload the image. +# +# Default: 'teknik' +# Values: 'imgur', 'teknik' +# Flag: --image_host +# +# NOTE: If you'd like another image host to be added to Neofetch. +# Open an issue on github. +image_host="teknik" + + +# Misc Options + +# Stdout mode +# Turn off all colors and disables image backend (ASCII/Image). +# Useful for piping into another command. +# Default: 'off' +# Values: 'on', 'off' +stdout="off" + +# Config version. +# +# NOTE: Don't change this value, neofetch reads this to determine +# how to handle backwards compatibility. +config_version="3.4.1-git" +EOM + + # DETECT INFORMATION get_os() { @@ -4290,22 +5073,6 @@ get_full_path() { [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" } -get_default_config() { - if [[ -f "CONFDIR/config.conf" ]]; then - default_config="CONFDIR/config.conf" - - else - [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" - default_config="${script_dir%/*}/config/config.conf" - fi - - if source "$default_config"; then - err "Config: Sourced default config. (${default_config})" - else - err "Config: Default config not found, continuing..." - fi -} - get_user_config() { # Check $config_file. if [[ -f "$config_file" ]]; then @@ -4324,15 +5091,11 @@ get_user_config() { elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - elif [[ -f "CONFDIR/config.conf" ]]; then - cp "CONFDIR/config.conf" "${XDG_CONFIG_HOME}/neofetch" - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - else - [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" - - cp "${script_dir%/*}/config/config.conf" "${XDG_CONFIG_HOME}/neofetch" config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + + # The config file doesn't exist, create it. + printf "%s\n" "${config[@]}" > "$config_file" fi source "$config_file" @@ -5060,7 +5823,10 @@ get_args() { main() { cache_uname get_os - get_default_config + + # Load default config. + source /dev/stdin < <(printf "%s\\n" "${config[@]}") + get_args "$@" [[ "$verbose" != "on" ]] && exec 2>/dev/null get_distro From 836ab52e6a44b7c9b77e1562370faa46124afaaa Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:09:58 +1000 Subject: [PATCH 0245/1133] general: Removed changes from other branch --- neofetch | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/neofetch b/neofetch index 30328a8bb..36ff242c0 100755 --- a/neofetch +++ b/neofetch @@ -334,16 +334,6 @@ gtk3="on" public_ip_host="http://ident.me" -# Window Manager - - -# Show Window Manager Version. -# -# Default: 'off' -# Values: 'on', off -# Flag: --wm_version -wm_version="off" - # Disk @@ -1575,18 +1565,6 @@ get_wm() { -e "monsterwm" \ -e "tinywm")" - if [[ "$wm_version" == "on" && "$wm" ]]; then - wmv="$("${wm,,}" --version || "${wm,,}" -v 2>&1)" - wmv="$wm ${wmv:-$("${wm,,}_x11" -v || "${wm,,}_wayland" -v)}" - wmv="${wmv/$wm ${wm}?/$wm }" - wmv="${wmv/$wm $wm/$wm}" - wmv="${wmv/copyright*}" - wmv="${wmv/version }" - wmv="${wmv/©*}" - wmv="${wmv/(c)*}" - wmv="${wmv/ : }" - wm="$wmv" - fi else case "$os" in "Mac OS X") @@ -5474,7 +5452,6 @@ INFO: NOTE: This only supports Linux. - --wm_version on/off Show/Hide Window Manager version. --gtk_shorthand on/off Shorten output of gtk theme/icons --gtk2 on/off Enable/Disable gtk2 theme/font/icons output --gtk3 on/off Enable/Disable gtk3 theme/font/icons output @@ -5645,7 +5622,6 @@ get_args() { "--cpu_brand") cpu_brand="$2" ;; "--gpu_brand") gpu_brand="$2" ;; "--gpu_type") gpu_type="$2" ;; - "--wm_version") wm_version="$2" ;; "--refresh_rate") refresh_rate="$2" ;; "--gtk_shorthand") gtk_shorthand="$2" ;; "--gtk2") gtk2="$2" ;; From 00c9c0e3d8e420e315e2fbb6503918bc2019d1db Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:10:50 +1000 Subject: [PATCH 0246/1133] docs: update --- neofetch.1 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 391cb7d6d..b0bcd8ac1 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "April 2018" "Neofetch 3.4.1-git" "User Commands" +.TH NEOFETCH "1" "May 2018" "Neofetch 3.4.1-git" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -81,9 +81,6 @@ Which GPU to display. (all, dedicated, integrated) .IP NOTE: This only supports Linux. .TP -\fB\-\-wm_version\fR on/off -Show/Hide Window Manager version. -.TP \fB\-\-gtk_shorthand\fR on/off Shorten output of gtk theme/icons .TP From 28fe414fb6e65b1956cb2bb1e1824730f0d48722 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:32:59 +1000 Subject: [PATCH 0247/1133] general: Start inlining ascii. --- neofetch | 1023 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 861 insertions(+), 162 deletions(-) diff --git a/neofetch b/neofetch index 36ff242c0..07b053bdf 100755 --- a/neofetch +++ b/neofetch @@ -3450,19 +3450,6 @@ get_ascii() { # Fallback to distro ascii mode if source is an image. [[ "$image_source" =~ \.(png|jpg|jpe|jpeg|gif)$ ]] && \ err "Image: Source is image file but ascii backend was selected. Using distro ascii." - - if [[ -d "ASCIIDIR" ]]; then - ascii_dir="ASCIIDIR" - else - [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" - ascii_dir="${script_dir%/*}/ascii/distro" - fi - - image_source="${ascii_dir}/${ascii_file}" - - # Fallback to no ascii mode if distro ascii isn't found. - [[ ! -f "$image_source" ]] && \ - { to_off "Ascii: Failed to find distro ascii, falling back to no ascii mode."; return; } fi # Set locale to get correct padding. @@ -3480,7 +3467,7 @@ get_ascii() { line="${line//\\\\/\\}" ((${#line} > ascii_length)) && ascii_length="${#line}" ((++lines)) - done < "$image_source" + done <<< "$ascii_data" # Colors. print="${print//'${c1}'/$c1}" @@ -4159,745 +4146,1457 @@ get_distro_colors() { case "$ascii_distro" in "AIX"*) set_colors 2 7 - ascii_file="aix" + read -rd '' ascii_data <<'EOF' +${c1} `:+ssssossossss+-` + .oys///oyhddddhyo///sy+. + /yo:+hNNNNNNNNNNNNNNNNh+:oy/ + :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: + `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh + h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy +/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: +h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y +N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m +N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m +h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y +:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- + yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy + sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo + :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- + :ys:/yNNNNNNNNNNNNNNNmy/:sy: + .+ys///osyhhhhys+///sy+. + -/osssossossso/- +EOF ;; "alpine_small") set_colors 4 7 - ascii_file="alpine_small" + read -rd '' ascii_data <<'EOF' +${c1} /\\ /\\ + /${c2}/ ${c1}\\ \\ + /${c2}/ ${c1}\\ \\ +/${c2}// ${c1}\\ \\ +${c2}// ${c1}\\ \\ + \\ +EOF ;; "Alpine"*) set_colors 4 5 7 6 - ascii_file="alpine" + read -rd '' ascii_data <<'EOF' +${c1} .hddddddddddddddddddddddh. + :dddddddddddddddddddddddddd: + /dddddddddddddddddddddddddddd/ + +dddddddddddddddddddddddddddddd+ + `sdddddddddddddddddddddddddddddddds` + `ydddddddddddd++hdddddddddddddddddddy` +.hddddddddddd+` `+ddddh:-sdddddddddddh. +hdddddddddd+` `+y: .sddddddddddh +ddddddddh+` `//` `.` -sddddddddd +ddddddh+` `/hddh/` `:s- -sddddddd +ddddh+` `/+/dddddh/` `+s- -sddddd +ddd+` `/o` :dddddddh/` `oy- .yddd +hdddyo+ohddyosdddddddddho+oydddy++ohdddh +.hddddddddddddddddddddddddddddddddddddh. + `yddddddddddddddddddddddddddddddddddy` + `sdddddddddddddddddddddddddddddddds` + +dddddddddddddddddddddddddddddd+ + /dddddddddddddddddddddddddddd/ + :dddddddddddddddddddddddddd: + .hddddddddddddddddddddddh. +EOF ;; "Amazon"*) set_colors 3 7 - ascii_file="amazon" + read -rd '' ascii_data <<'EOF' +${c1} `-/oydNNdyo:.` + `.:+shmMMMMMMMMMMMMMMmhs+:.` + -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- +.`` -/+shmNNMMMMMMNNmhs+/- ``. +dNmhs+:. `.:/oo/:.` .:+shmNd +dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd +dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. + `.:+shNMMMMMh yMMMMMNhs+:`` + `-+shy shs+:` +EOF ;; "Anarchy"*) set_colors 7 4 - ascii_file="anarchy" + read -rd '' ascii_data <<'EOF' + ${c2}..${c1} + ${c2}..${c1} + ${c2}:..${c1} + ${c2}:+++.${c1} + .:::++${c2}++++${c1}+::. + .:+######${c2}++++${c1}######+:. + .+#########${c2}+++++${c1}##########:. + .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. + +###########${c2}+++++++++${c1}############: + +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ + +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ + :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: + ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ +.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. +.##########${c2}+++++++++++++++++++${c1}###########. + #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ + :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: + +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ + +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ + :##${c2}++++++${c1}############${c2}++++++++++${c1}##: + .${c2}++++++${c1}#############${c2}++++++++++${c1}+. + :${c2}++++${c1}###############${c2}+++++++${c1}:: + .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. + ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. + ${c2}.${c1} ${c2}.:+++${c1}. + ${c2}.:${c1}: + ${c2}..${c1} + ${c2}..${c1} +EOF ;; "Android"*) set_colors 2 7 - ascii_file="android" ascii_length_force=19 + read -rd '' ascii_data <<'EOF' +${c1} ╲ ▁▂▂▂▁ ╱ + ▄███████▄ + ▄██${c2} ${c1}███${c2} ${c1}██▄ + ▄███████████▄ +▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄ █▄ +██ █████████████ ██ +██ █████████████ ██ +██ █████████████ ██ +██ █████████████ ██ + █████████████ + ███████████ + ██ ██ + ██ ██ +EOF ;; "Antergos"*) set_colors 4 6 - ascii_file="antergos" + read -rd '' ascii_data <<'EOF' +${c2} `.-/::/-`` + .-/osssssssso/. + :osyysssssssyyys+- + `.+yyyysssssssssyyyyy+. + `/syyyyyssssssssssyyyyys-` + `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` + .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. + .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. + -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: + -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- + .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` +`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo +.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. +ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy +dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh +-dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- +.smmmmddddddddhhhhhhhhhdddddddddmmmms. + `+ydmmmdddddddddddddddddddmmmmdy/. + `.:+ooyyddddddddddddyyso+:.` +EOF ;; "antiX"*) set_colors 1 7 3 - ascii_file="antix" + read -rd '' ascii_data <<'EOF' +${c1} + \ + , - ~ ^ ~ - \ / + , ' \ ' , / + , \ '/ + , \ / , + ,___, \/ , + / | _ _ _|_ o /\ , +|, | / |/ | | | / \ , + \,_/\_/ | |_/|_/|_/_/ \, + , / ,\ + , / , ' \ + ' - , _ _ _ , ' +EOF ;; "AOSC"*) set_colors 4 7 1 - ascii_file="aosc" + read -rd '' ascii_data <<'EOF' +${c2} .:+syhhhhys+:. + .ohNMMMMMMMMMMMMMMNho. + `+mMMMMMMMMMMmdmNMMMMMMMMm+` + +NMMMMMMMMMMMM/ `./smMMMMMN+ + .mMMMMMMMMMMMMMMo -yMMMMMm. + :NMMMMMMMMMMMMMMMs .hMMMMN: + .NMMMMhmMMMMMMMMMMm+/- oMMMMN. + dMMMMs ./ymMMMMMMMMMMNy. sMMMMd +-MMMMN` oMMMMMMMMMMMN: `NMMMM- +/MMMMh NMMMMMMMMMMMMm hMMMM/ +/MMMMh NMMMMMMMMMMMMm hMMMM/ +-MMMMN` :MMMMMMMMMMMMy. `NMMMM- + dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd + .NMMMMo -/+sMMMMMMMMMMMmMMMMN. + :NMMMMh. .MMMMMMMMMMMMMMMN: + .mMMMMMy- NMMMMMMMMMMMMMm. + +NMMMMMms/.` mMMMMMMMMMMMN+ + `+mMMMMMMMMNmddMMMMMMMMMMm+` + .ohNMMMMMMMMMMMMMMNho. + .:+syhhhhys+:. +EOF ;; "Apricity"*) set_colors 4 7 1 - ascii_file="apricity" + read -rd '' ascii_data <<'EOF' +${c2} ./o- + ``...`` `:. -/: + `-+ymNMMMMMNmho-` :sdNNm/ + `+dMMMMMMMMMMMMMMMmo` sh:.:::- + /mMMMMMMMMMMMMMMMMMMMm/`sNd/ + oMMMMMMMMMMMMMMMMMMMMMMMs -` +:MMMMMMMMMMMMMMMMMMMMMMMMM/ +NMMMMMMMMMMMMMMMMMMMMMMMMMd +MMMMMMMmdmMMMMMMMMMMMMMMMMd +MMMMMMy` .mMMMMMMMMMMMmho:` +MMMMMMNo/sMMMMMMMNdy+-.`-/ +MMMMMMMMMMMMNdy+:.`.:ohmm: +MMMMMMMmhs+-.`.:+ymNMMMy. +MMMMMM/`.-/ohmNMMMMMMy- +MMMMMMNmNNMMMMMMMMmo. +MMMMMMMMMMMMMMMms:` +MMMMMMMMMMNds/. +dhhyys+/-` +EOF ;; "arch_small") set_colors 6 7 1 - ascii_file="arch_small" + read -rd '' ascii_data <<'EOF' +${c1} /\ + /^^\ + /\ \ + /${c2} __ \ + / ( ) \ + / __| |__\\\ +/// \\\\\ +EOF ;; "arch_old") set_colors 6 7 1 - ascii_file="arch_old" + read -rd '' ascii_data <<'EOF' +${c1} __ + _=(SDGJT=_ + _GTDJHGGFCVS) + ,GTDJGGDTDFBGX0 +${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ +${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL +${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, +${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], +${c1} SDDFDFH' !YEWD,${c2} )HDROD +${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' +${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' +${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' +${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) +${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF +'EHTI !H + `0F' '! +EOF ;; "ArchBox"*) set_colors 2 7 1 - ascii_file="archbox" + read -rd '' ascii_data <<'EOF' +${c1} ...:+oh/:::.. + ..-/oshhhhhh` `::::-. + .:/ohhhhhhhhhhhh` `-::::. + .+shhhhhhhhhhhhhhhhh` `.::-. + /`-:+shhhhhhhhhhhhhh` .-/+shh + / .:/ohhhhhhhhh` .:/ohhhhhhhh + / `-:+shhh` ..:+shhhhhhhhhhhh + / .:ohhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / .+o+ `hhhhhhhhhhhhhhhhhhhh + / -hhhhh `hhhhhhhhhhhhhhhhhhhh + / ohhhhho `hhhhhhhhhhhhhhhhhhhh + /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` + `--/:` /: `hhhhhhhhhhhho/- + -/:. `hhhhhhs+:-` + ::::/ho/-` +EOF ;; "ARCHlabs"*) set_colors 6 6 7 1 - ascii_file="archlabs" + read -rd '' ascii_data <<'EOF' +${c1} 'c' + 'kKk, + .dKKKx. + .oKXKXKd. + .l0XXXXKKo. + c0KXXXXKX0l. + :0XKKOxxOKX0l. + :OXKOc. .c0XX0l. + :OK0o. ${c4}...${c1}'dKKX0l. + :OX0c ${c4};xOx'${c1}'dKXX0l. + :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. + c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. + .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. + .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. + .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. + .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. + .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' + 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' + 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, + ,xko:'. ${c4}.. ${c1} .':okx; + .,'. .',. +EOF ;; *"XFerience"*) set_colors 6 6 7 1 - ascii_file="arch_xferience" + read -rd '' ascii_data <<'EOF' +${c1} ``--:::::::-.` + .-/+++ooooooooo+++:-` + `-/+oooooooooooooooooo++:. + -/+oooooo/+ooooooooo+/ooo++:` + `/+oo++oo. .+oooooo+.-: +:-o+- + `/+o/. -o. :oooooo+ ```:.+oo+- +`:+oo- -/` :oooooo+ .`-`+oooo/. +.+ooo+. .` `://///+-+..oooooo+:` +-+ooo:` ``.-+oooooo+/` +-+oo/` :+oooo/. +.+oo: ..-/. . -+oo+/` +`/++- -:::++::/. -+oo+- + ./o: `:///+- `./ooo+:` + .++- `` /-` -:/+oooo+:` + .:+/:`` `-:ooooooo++- + ./+o+//:...../+oooooooo++:` + `:/++ooooooooooooo++/-` + `.-//++++++//:-.` + `````` +EOF ;; "ArchMerge"*) set_colors 6 6 7 1 - ascii_file="archmerge" + read -rd '' ascii_data <<'EOF' +${c1} y: + sMN- + +MMMm` + /MMMMMd` + :NMMMMMMy + -NMMMMMMMMs + .NMMMMMMMMMM+ + .mMMMMMMMMMMMM+ + oNMMMMMMMMMMMMM+ + `+:-+NMMMMMMMMMMMM+ + .sNMNhNMMMMMMMMMMMM/ + `hho/sNMMMMMMMMMMMMMMM/ + `.`omMMmMMMMMMMMMMMMMMMM+ + .mMNdshMMMMd+::oNMMMMMMMMMo + .mMMMMMMMMM+ `yMMMMMMMMMs + .NMMMMMMMMM/ yMMMMMMMMMy + -NMMMMMMMMMh `mNMMMMMMMMd` + /NMMMNds+:.` `-/oymMMMm. + +Mmy/. `:smN: +/+. -o. +EOF ;; "Arch"*) set_colors 6 6 7 1 - ascii_file="arch" + read -rd '' ascii_data <<'EOF' +${c1} -` + .o+` + `ooo/ + `+oooo: + `+oooooo: + -+oooooo+: + `/:-:++oooo+: + `/++++/+++++++: + `/++++++++++++++: + `/+++o${c2}oooooooo${c1}oooo/` +${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` +${c2} .oossssso-````/ossssss+` + -osssssso. :ssssssso. + :osssssss/ osssso+++. + /ossssssss/ +ssssooo/- + `/ossssso+/:- -:/+osssso+- + `+sso+:-` `.-/+oso: + `++:. `-/+/ + .` `/ +EOF ;; "Artix"*) set_colors 6 4 2 7 - ascii_file="artix" + read -rd '' ascii_data <<'EOF' +${c1} d${c2}c. +${c1} x${c2}dc. +${c1} '.${c4}.${c1} d${c2}dlc. +${c1} c${c2}0d:${c1}o${c2}xllc; +${c1} :${c2}0ddlolc,lc, +${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. +${c1} ;${c1}K${c2}kxoOddollc' cllc. +${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: +${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: +${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, +${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. +${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; +${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, +${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. +${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. +${c1} 0${c2}Okd''dc. .cll; +${c1} k${c2}Okd' .llc, +${c1} d${c2}Od, 'lc. +${c1} :,${c4}. ${c2}... +EOF ;; "Arya"*) set_colors 2 1 - ascii_file="arya" + read -rd '' ascii_data <<'EOF' +${c1} `oyyy/${c2}-yyyyyy+ +${c1} -syyyy/${c2}-yyyyyy+ +${c1} .syyyyy/${c2}-yyyyyy+ +${c1} :yyyyyy/${c2}-yyyyyy+ +${c1} `/ :yyyyyy/${c2}-yyyyyy+ +${c1} .+s :yyyyyy/${c2}-yyyyyy+ +${c1} .oys :yyyyyy/${c2}-yyyyyy+ +${c1} -oyys :yyyyyy/${c2}-yyyyyy+ +${c1} :syyys :yyyyyy/${c2}-yyyyyy+ +${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ +${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ +${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- +${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy +${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy +${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy +EOF ;; "Bitrig"*) set_colors 2 7 - ascii_file="bitrig" + read -rd '' ascii_data <<'EOF' +${c1} `hMMMMN+ + -MMo-dMd` + oMN- oMN` + yMd /NM: + .mMmyyhMMs + :NMMMhsmMh + +MNhNNoyMm- + hMd.-hMNMN: + mMmsssmMMMo + .MMdyyhNMMMd + oMN.`/dMddMN` + yMm/hNm+./MM/ +.dMMMmo.``.NMo +:NMMMNmmmmmMMh +/MN/-------oNN: +hMd. .dMh +sm/ /ms +EOF ;; "BLAG"*) set_colors 5 7 - ascii_file="blag" + read -rd '' ascii_data <<'EOF' +${c1} d + ,MK: + xMMMX: + .NMMMMMX; + lMMMMMMMM0clodkO0KXWW: + KMMMMMMMMMMMMMMMMMMX' + .;d0NMMMMMMMMMMMMMMMMMMK. + .;dONMMMMMMMMMMMMMMMMMMMMMMx +'dKMMMMMMMMMMMMMMMMMMMMMMMMl + .:xKWMMMMMMMMMMMMMMMMMMM0. + .:xNMMMMMMMMMMMMMMMMMK. + lMMMMMMMMMMMMMMMMMMK. + ,MMMMMMMMWkOXWMMMMMM0 + .NMMMMMNd. `':ldko + OMMMK: + oWk, + ;: +EOF ;; "BlankOn"*) set_colors 1 7 3 - ascii_file="blankon" + read -rd '' ascii_data <<'EOF' +${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` +${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ +${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys +${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys +${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys +${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys +${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys +${c2}NMMMMMN: .NMMMMMN${c1}yyyyys +${c2}MMMMMMm. NMMMMMN${c1}yyyyys +${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys +${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys +${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys +${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys +${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys +${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys +${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo +${c2} `.:/++++/:.` ${c1}:oys+. +EOF ;; "BSD") set_colors 1 7 4 3 6 - ascii_file="bsd" + read -rd '' ascii_data <<'EOF' +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) +EOF ;; "BunsenLabs"*) set_colors fg 7 - ascii_file="bunsenlabs" + read -rd '' ascii_data <<'EOF' +${c1} `++ + -yMMs + `yMMMMN` + -NMMMMMMm. + :MMMMMMMMMN- + .NMMMMMMMMMMM/ + yMMMMMMMMMMMMM/ +`MMMMMMNMMMMMMMN. +-MMMMN+ /mMMMMMMy +-MMMm` `dMMMMMM +`MMN. .NMMMMM. + hMy yMMMMM` + -Mo +MMMMN + /o +MMMMs + +MMMN` + hMMM: + `NMM/ + +MN: + mh. + -/ +EOF ;; "Calculate"*) set_colors 7 3 - ascii_file="calculate" + read -rd '' ascii_data <<'EOF' +${c1} ...... + ,,+++++++,. + .,,,....,,,${c2}+**+,,.${c1} + ............,${c2}++++,,,${c1} + ............... + ......,,,........ + .....+*#####+,,,*+. + .....,*###############,..,,,,,,.. + ......,*#################*..,,,,,..,,,.. + .,,....*####################+***+,,,,...,++, + .,,..,..*#####################*, + ,+,.+*..*#######################. + ,+,,+*+..,########################* +.,++++++. ..+##**###################+ +..... ..+##***#################*. + .,.*#*****##############*. + ..,,*********#####****+. + ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} + ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} + ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} +EOF ;; "CentOS"*) set_colors 3 2 4 5 7 - ascii_file="centos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Chakra"*) set_colors 4 5 7 6 - ascii_file="chakra" + read -rd '' ascii_data <<'EOF' + +EOF ;; "ChaletOS"*) set_colors 4 7 1 - ascii_file="chaletos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Chapeau"*) set_colors 2 7 - ascii_file="chapeau" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Chrom"*) set_colors 2 1 3 4 7 - ascii_file="chrome" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Clover"*) set_colors 2 6 - ascii_file="cloveros" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Container Linux by CoreOS"*) set_colors 4 7 1 - ascii_file="coreos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "crux_small") set_colors 4 5 7 6 - ascii_file="crux_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "CRUX"*) set_colors 4 5 7 6 - ascii_file="crux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "debian_small") set_colors 1 7 3 - ascii_file="debian_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Debian"*) set_colors 1 7 3 - ascii_file="debian" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Deepin"*) set_colors 2 7 - ascii_file="deepin" + read -rd '' ascii_data <<'EOF' + +EOF ;; "DesaOS") set_colors 2 7 - ascii_file="desaos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Devuan"*) set_colors 5 7 - ascii_file="devuan" + read -rd '' ascii_data <<'EOF' + +EOF ;; "DracOS"*) set_colors 1 7 3 - ascii_file="dracos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "dragonfly_old"*) set_colors 1 7 3 - ascii_file="dragonflybsd_old" + read -rd '' ascii_data <<'EOF' + +EOF ;; "dragonfly_small"*) set_colors 1 7 3 - ascii_file="dragonflybsd_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "DragonFly"*) set_colors 1 7 3 - ascii_file="dragonflybsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Elementary"*) set_colors 4 7 1 - ascii_file="elementary" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Endless"*) set_colors 1 7 - ascii_file="endless" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Exherbo"*) set_colors 4 7 1 - ascii_file="exherbo" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Fedora"* | "RFRemix"*) set_colors 4 7 1 - ascii_file="fedora" + read -rd '' ascii_data <<'EOF' + +EOF ;; "freebsd_small") set_colors 1 7 3 - ascii_file="freebsd_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "FreeBSD"*) set_colors 1 7 3 - ascii_file="freebsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "FreeMiNT"*) # Don't explicitly set colors since # TosWin2 doesn't reset well. - ascii_file="gem" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Frugalware"*) set_colors 4 7 1 - ascii_file="frugalware" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Funtoo"*) set_colors 5 7 - ascii_file="funtoo" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GalliumOS"*) set_colors 4 7 1 - ascii_file="galliumos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "gentoo_small") set_colors 5 7 - ascii_file="gentoo_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Gentoo"*) set_colors 5 7 - ascii_file="gentoo" + read -rd '' ascii_data <<'EOF' + +EOF ;; "gNewSense"*) set_colors 4 5 7 6 - ascii_file="gnewsense" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GNU") set_colors fg 7 - ascii_file="gnu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GoboLinux"*) set_colors 5 4 6 2 - ascii_file="gobolinux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Grombyang"*) set_colors 4 2 1 - ascii_file="grombyang" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GuixSD"*) set_colors 3 7 6 1 8 - ascii_file="guixsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Haiku"*) set_colors 2 8 - ascii_file="haiku" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Hyperbola"*) set_colors 8 - ascii_file="hyperbola" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Kali"*) set_colors 4 8 - ascii_file="kali" + read -rd '' ascii_data <<'EOF' + +EOF ;; "KaOS"*) set_colors 4 7 1 - ascii_file="kaos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "KDE"*) set_colors 2 7 - ascii_file="kde" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Kogaion"*) set_colors 4 7 1 - ascii_file="kogaion" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Korora"*) set_colors 4 7 1 - ascii_file="korora" + read -rd '' ascii_data <<'EOF' + +EOF ;; "KSLinux"*) set_colors 4 7 1 - ascii_file="kslinux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Kubuntu"*) set_colors 4 7 1 - ascii_file="kubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "LEDE"*) set_colors 4 7 1 - ascii_file="lede" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Linux") set_colors fg 8 3 - ascii_file="linux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "LMDE"*) set_colors 2 7 - ascii_file="lmde" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Lubuntu"*) set_colors 4 7 1 - ascii_file="lubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Lunar"*) set_colors 4 7 3 - ascii_file="lunar" + read -rd '' ascii_data <<'EOF' + +EOF ;; "mac"*"_small") set_colors 2 3 1 5 4 - ascii_file="mac_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "mac" | "Darwin") set_colors 2 3 1 1 5 4 - ascii_file="mac" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Mageia"*) set_colors 6 7 - ascii_file="mageia" + read -rd '' ascii_data <<'EOF' + +EOF ;; "MagpieOS"*) set_colors 2 1 3 5 - ascii_file="magpieos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Manjaro"*) set_colors 2 7 - ascii_file="manjaro" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Maui"*) set_colors 6 7 - ascii_file="maui" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Mer"*) set_colors 4 7 1 - ascii_file="mer" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Minix"*) set_colors 1 7 3 - ascii_file="minix" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Linux Mint"* | "LinuxMint"*) set_colors 2 7 - ascii_file="mint" + read -rd '' ascii_data <<'EOF' + +EOF ;; "MX"*) set_colors 4 6 7 - ascii_file="mx" + read -rd '' ascii_data <<'EOF' + +EOF ;; "NetBSD"*) set_colors 5 7 - ascii_file="netbsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Netrunner"*) set_colors 4 7 1 - ascii_file="netrunner" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Nitrux"*) set_colors 4 - ascii_file="nitrux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "nixos_small") set_colors 4 6 - ascii_file="nixos_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "NixOS"*) set_colors 4 6 - ascii_file="nixos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Nurunner"*) set_colors 4 - ascii_file="nurunner" + read -rd '' ascii_data <<'EOF' + +EOF ;; "NuTyX"*) set_colors 4 1 - ascii_file="nutyx" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OBRevenge"*) set_colors 1 7 3 - ascii_file="obrevenge" + read -rd '' ascii_data <<'EOF' + +EOF ;; "openbsd_small") set_colors 3 7 6 1 8 - ascii_file="openbsd_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenBSD"*) set_colors 3 7 6 1 8 - ascii_file="openbsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenIndiana"*) set_colors 4 7 1 - ascii_file="openindiana" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenMandriva"*) set_colors 4 3 - ascii_file="openmandriva" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenWrt"*) set_colors 4 7 1 - ascii_file="openwrt" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Open Source Media Center"* | "osmc") set_colors 4 7 1 - ascii_file="osmc" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Oracle"*) set_colors 1 7 3 - ascii_file="oracle" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PacBSD"*) set_colors 1 7 3 - ascii_file="pacbsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Parabola"*) set_colors 5 7 - ascii_file="parabola" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Pardus"*) set_colors 3 7 6 1 8 - ascii_file="pardus" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Parrot"*) set_colors 6 7 - ascii_file="parrot" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Parsix"*) set_colors 3 1 7 8 - ascii_file="parsix" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PCBSD"* | "TrueOS"*) set_colors 1 7 3 - ascii_file="trueos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PCLinuxOS"*) set_colors 4 7 1 - ascii_file="pclinuxos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Peppermint"*) set_colors 1 7 3 - ascii_file="peppermint" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Pop!_OS"*) set_colors 6 7 - ascii_file="pop_os" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Porteus"*) set_colors 6 7 - ascii_file="porteus" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PostMarketOS"*) set_colors 2 7 - ascii_file="postmarketos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) set_colors 4 7 - ascii_file="puppy" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Qubes"*) set_colors 4 5 7 6 - ascii_file="qubes" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Raspbian"*) set_colors 2 1 - ascii_file="raspbian" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Red Star"* | "Redstar"*) set_colors 1 7 3 - ascii_file="redstar" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Redhat"* | "Red Hat"* | "rhel"*) set_colors 1 7 3 - ascii_file="redhat" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Refracted Devuan"*) set_colors 8 7 - ascii_file="refracta" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Rosa"*) set_colors 4 7 1 - ascii_file="rosa" + read -rd '' ascii_data <<'EOF' + +EOF ;; "sabotage"*) set_colors 4 7 1 - ascii_file="sabotage" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Sabayon"*) set_colors 4 7 1 - ascii_file="sabayon" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SailfishOS"*) set_colors 4 5 7 6 - ascii_file="sailfishos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SalentOS"*) set_colors 2 1 3 7 - ascii_file="salentos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Scientific"*) set_colors 4 7 1 - ascii_file="scientific" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Siduction"*) set_colors 4 4 - ascii_file="siduction" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Slackware"*) set_colors 4 7 1 - ascii_file="slackware" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SliTaz"*) set_colors 3 3 - ascii_file="slitaz" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SmartOS"*) set_colors 6 7 - ascii_file="smartos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Solus"*) set_colors 4 7 1 - ascii_file="solus" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Source Mage"*) set_colors 4 7 1 - ascii_file="source_mage" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Sparky"*) set_colors 1 7 - ascii_file="sparky" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SteamOS"*) set_colors 5 7 - ascii_file="steamos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SunOS" | "Solaris") set_colors 3 7 - ascii_file="solaris" + read -rd '' ascii_data <<'EOF' + +EOF ;; "openSUSE Tumbleweed"*) set_colors 2 7 - ascii_file="tumbleweed" + read -rd '' ascii_data <<'EOF' + +EOF ;; "openSUSE"* | "open SUSE"* | "SUSE"*) set_colors 2 7 - ascii_file="suse" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SwagArch"*) set_colors 4 7 1 - ascii_file="swagarch" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Tails"*) set_colors 5 7 - ascii_file="tails" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Trisquel"*) set_colors 4 6 - ascii_file="trisquel" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-Budgie"*) set_colors 4 7 1 - ascii_file="ubuntu-budgie" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-GNOME"*) set_colors 4 5 7 6 - ascii_file="ubuntu-gnome" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-MATE"*) set_colors 2 7 - ascii_file="ubuntu-mate" + read -rd '' ascii_data <<'EOF' + +EOF ;; "ubuntu_old") set_colors 1 7 3 - ascii_file="ubuntu_old" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-Studio") set_colors 6 7 - ascii_file="ubuntu-studio" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu"*) set_colors 1 7 3 - ascii_file="ubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "void_small") set_colors 2 8 - ascii_file="void_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Void"*) set_colors 2 8 - ascii_file="void" + read -rd '' ascii_data <<'EOF' + +EOF ;; *"[Windows 10]"* | *"on Windows 10"* | "Windows 8"* |\ "Windows 10"* | "windows10" | "windows8" ) set_colors 6 7 - ascii_file="windows10" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Windows"*) set_colors 1 2 4 3 - ascii_file="windows" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Xubuntu"*) set_colors 4 7 1 - ascii_file="xubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Zorin"*) set_colors 4 6 - ascii_file="zorin" + read -rd '' ascii_data <<'EOF' + +EOF ;; *) From 4e0f7ac2918c8fed4e174ceed8a3130d0359c43b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:39:24 +1000 Subject: [PATCH 0248/1133] general: Start inlining ascii. --- neofetch | 463 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 435 insertions(+), 28 deletions(-) diff --git a/neofetch b/neofetch index 07b053bdf..6e721c7db 100755 --- a/neofetch +++ b/neofetch @@ -4739,14 +4739,49 @@ EOF "CentOS"*) set_colors 3 2 4 5 7 read -rd '' ascii_data <<'EOF' - +${c1} .. + .PLTJ. + <><><><> + ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK + ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK + ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V + ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. +${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. +${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. +${c4} +${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV +${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' + ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' + ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 + ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK + ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK +${c2} <><><><> + 'MKKM' + '' EOF ;; "Chakra"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} _ _ _ "kkkkkkkk. + ,kkkkkkkk., 'kkkkkkkkk, + ,kkkkkkkkkkkk., 'kkkkkkkkk. + ,kkkkkkkkkkkkkkkk,'kkkkkkkk, + ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. + "''"''',;::,,"''kkk''kkkkk; __ + ,kkkkkkkkkk, "k''kkkkk' ,kkkk + ,kkkkkkk' ., ' .: 'kkkk',kkkkkk + ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk + ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk +.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' +;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' +'kkkkkkk; 'kkkkkkkk.,""''"''"" + ''kkkk; 'kkkkkkkkkk., + ';' 'kkkkkkkkkkkk., + ';kkkkkkkkkk' + ';kkkkkk' + "''" EOF ;; @@ -4767,140 +4802,425 @@ EOF "Chrom"*) set_colors 2 1 3 4 7 read -rd '' ascii_data <<'EOF' - +${c1} `.//+osso+/:`` + `/sdNNmhyssssydmNNdo:` + :hNmy+-` .-+hNNs- + /mMh/` `+:` `+dMd: + .hMd- -sNNMNo. /yyy /mMs` + -NM+ `/dMd/--omNh::dMM `yMd` + .NN+ .sNNs:/dMNy:/hNmo/s yMd` + hMs `/hNd+-smMMMMMMd+:omNy- `dMo +:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` +/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: +/Md` MMMMMMMMMMMMMMMMMMMN .MN: +:NN. MMMMMMm....--NMMMMMN -Mm. +`dMo MMMMMMd mMMMMMN hMs + -MN: MMMMMMd mMMMMMN oMm` + :NM: MMMMMMd mMMMMMN +Mm- + -mMy. mmmmmmh dmmmmmh -hMh. + oNNs- :yMm/ + .+mMdo:` `:smMd/` + -ohNNmhsoo++osshmNNh+. + `./+syyhhyys+:`` EOF ;; "Clover"*) set_colors 2 6 read -rd '' ascii_data <<'EOF' - +${c1} `omo``omo` + `oNMMMNNMMMNo` + `oNMMMMMMMMMMMMNo` + oNMMMMMMMMMMMMMMMMNo + `sNMMMMMMMMMMMMMMNs` + `omo` `sNMMMMMMMMMMNs` `omo` + `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` + `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` +oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo +`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` +`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` +oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo + `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` + `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` + `oNs` `sNMMMMMMMMMMNs` `oNs` + `sNMMMMMMMMMMMMMMNs` + +NMMMMMMMMMMMMMMMMNo + `oNMMMMMMMMMMMMNo` + `oNMMMNNMMMNs` + `omo``oNs` EOF ;; "Container Linux by CoreOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ..... + .';:cccccccc:;'. + ':ccccclc${c3}lllllllll${c1}cc:. + .;cccccccc${c3}lllllllllllllll${c1}c, + ;clllccccc${c3}llllllllllllllllll${c1}c, + .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: + ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: + :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, +.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c +.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. +.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. +.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc + :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; + .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc + .cllllllllllclcccclccclccllllcllc + :cllllllllccclcllllllllllllcc; + .cccccccccccccclcccccccccc:. + .;cccclccccccllllllccc,. + .';ccccclllccc:;.. + ..... EOF ;; "crux_small") set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} ___ + (${c3}.· ${c1}| + (${c2}<> ${c1}| + / ${c3}__ ${c1}\\ + ( ${c3}/ \\ ${c1}/| +${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) +${c2}\/${c1}-____${c2}\/ EOF ;; "CRUX"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} odddd + oddxkkkxxdoo + ddcoddxxxdoool + xdclodod olol + xoc xdd olol + xdc ${c2}k00${c1}Okdlol + xxd${c2}kOKKKOkd${c1}ldd + xdco${c2}xOkdlo${c1}dldd + ddc:cl${c2}lll${c1}oooodo + odxxdd${c3}xkO000kx${c1}ooxdo + oxdd${c3}x0NMMMMMMWW0od${c1}kkxo + oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx +docldkXW${c3}MMMMMMMWWN${c1}Odolco +xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c +${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l +${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd +${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo +${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; "debian_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - + ${c1}_____ + / __ \\ +| / | +| \\___- +-_ + --_ EOF ;; "Debian"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c2} _,met$$$$$gg. + ,g$$$$$$$$$$$$$$$P. + ,g$$P" """Y$$.". + ,$$P' `$$$. +',$$P ,ggs. `$$b: +`d$$' ,$P"' ${c1}.${c2} $$$ + $$P d$' ${c1},${c2} $$P + $$: $$. ${c1}-${c2} ,d$$' + $$; Y$b._ _,d$P' + Y$$. ${c1}`.${c2}`"Y$$$$P"' +${c2} `$$b ${c1}"-.__ +${c2} `Y$$ + `Y$$. + `$$b. + `Y$$b. + `"Y$b._ + `""" EOF ;; "Deepin"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} ............ + .';;;;;. .,;,. + .,;;;;;;;. ';;;;;;;. + .;::::::::' .,::;;,''''',. + ,'.:::::::: .;;'. '; + ;' 'cccccc, ,' :: '.. .: + ,, :ccccc. ;: .c, '' :. ,; +.l. cllll' ., .lc :; .l' l. +.c :lllc ;cl: .l' .ll. :' +.l 'looc. . ,o: 'oo' c, +.o. .:ool::coc' .ooo' o. + :: ..... .;dddo ;c + l:... .';lddddo. ,o + lxxxxxdoolllodxxxxxxxxxc :l + ,dxxxxxxxxxxxxxxxxxxl. 'o, + ,dkkkkkkkkkkkkko;. .;o; + .;okkkkkdl;. .,cl:. + .,:cccccccc:,. EOF ;; "DesaOS") set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1}███████████████████████ +███████████████████████ +███████████████████████ +███████████████████████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +██████████████████████████████ +██████████████████████████████ +████████████████████████ +████████████████████████ +████████████████████████ EOF ;; "Devuan"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} ..,,;;;::;,.. + `':ddd;:,. + `'dPPd:,. + `:b$$b`. + 'P$$$d` + .$$$$$` + ;$$$$$P + .:P$$$$$$` + .,:b$$$$$$$;' + .,:dP$$$$$$$$b:' + .,:;db$$$$$$$$$$Pd'` + ,db$$$$$$$$$$$$$$b:'` +:$$$$$$$$$$$$b:'` + `$$$$$bd:''` + `'''` EOF ;; "DracOS"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} `-:/- + -os: + -os/` + :sy+-` + `/yyyy+. + `+yyyyo- + `/yyyys: +`:osssoooo++- +yyyyyy/` + ./yyyyyyo yo`:syyyy+. + -oyyy+ +- :yyyyyo- + `:sy: `. `/yyyyys: + ./o/.` .oyyso+oo:` + :+oo+//::::///:-.` `.` EOF ;; "dragonfly_old"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - + ${c1} | + .-. + ${c3} ()${c1}I${c3}() + ${c1} "==.__:-:__.==" + "==.__/~|~\__.==" + "==._( Y )_.==" + ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. +( ..=${c1}\\=${c1}/${c2}=.. ) + `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` + `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` + .-~` /${c1}|=|${c2}\ `~-. + .~` / ${c1}|=|${c2} \ `~. + .-~` .' ${c1}|=|${c2} `. `~-. + (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) + `~"~"` ${c1} |=|${c2} `"~"~` + ${c1} /=\\ + \\=/ + ^ EOF ;; "dragonfly_small"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c2}(\${c3}"${c2}/) +${c2}(/${c1}|${c2}\) +${c1} | + | EOF ;; "DragonFly"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c2},--, ${c1}| ${c2},--, +${c2}| `-, ${c1},^, ${c2},-' | +${c2} `, `-, ${c3}(/ \) ${c2},-' ,' +${c2} `-, `-,${c1}/ \${c2},-' ,-' +${c2} `------${c1}( )${c2}------' +${c2} ,----------${c1}( )${c2}----------, +${c2} | _,-${c1}( )${c2}-,_ | +${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' +${c1} | | + | | + | | + | | + | | + | | + `|' EOF ;; "Elementary"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee eeeeeeeeeeee eeeee + eeee eeeee eee eeee + eeee eeee eee eeee +eee eee eee eee +eee eee eee eee +ee eee eeee eeee +ee eee eeeee eeeeee +ee eee eeeee eeeee ee +eee eeee eeeeee eeeee eee +eee eeeeeeeeee eeeeee eee + eeeeeeeeeeeeeeeeeeeeeeee eeeee + eeeeeeee eeeeeeeeeeee eeee + eeeee eeeee + eeeeeee eeeeeee + eeeeeeeeeeeeeeeee EOF ;; "Endless"*) set_colors 1 7 read -rd '' ascii_data <<'EOF' - +${c1} `:+yhmNMMMMNmhy+:` + -odMMNhso//////oshNMMdo- + /dMMh+. .+hMMd/ + /mMNo` `oNMm: + `yMMo` `oMMy` + `dMN- -NMd` + hMN. .NMh +/MM/ -os` /MM/ +dMm `smNmmhs/- `:sNMd+ `` mMd +MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM +MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM +dMm `/++/-``/yNNh+/sdNMNddMm- mMd +/MM/ `dNy: `-::- /MM/ + hMN. .NMh + `dMN- -NMd` + `yMMo` `oMMy` + /mMNo` `oNMm/ + /dMMh+. .+hMMd/ + -odMMNhso//////oshNMMdo- + `:+yhmNMMMMNmhy+:` EOF ;; "Exherbo"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} , +OXo. +NXdX0: .cok0KXNNXXK0ko:. +KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... +'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. + cNMk NK .oXM. OMMMMO. 0MMNo kW. + lMc o: ., .oKNk; ;NMMWlxW' + ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO + XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk +.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl +,M: ,XMMWx::,''oOK0x; NM. +'Ml ,kNKOxxxxxkkO0XXKOd:. oMk + NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW + ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW + ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO + 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' + xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd + 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO + :XMNxl,';:lodxkOO000Oxc. .oWMMo + 'dXMMXkl;,. .,o0MMNo' + ':d0XWMMMMWNNNNMMMNOl' + ':okKXWNKkl' EOF ;; "Fedora"* | "RFRemix"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} /:-------------:\\ + :-------------------:: + :-----------${c2}/shhOHbmp${c1}---:\\ + /-----------${c2}omMMMNNNMMD ${c1}---: + :-----------${c2}sMMMMNMNMP${c1}. ---: + :-----------${c2}:MMMdP${c1}------- ---\\ +,------------${c2}:MMMd${c1}-------- ---: +:------------${c2}:MMMd${c1}------- .---: +:---- ${c2}oNMMMMMMMMMNho${c1} .----: +:-- .${c2}+shhhMMMmhhy++${c1} .------/ +:- -------${c2}:MMMd${c1}--------------: +:- --------${c2}/MMMd${c1}-------------; +:- ------${c2}/hMMMy${c1}------------: +:--${c2} :dMNdhhdNMMNo${c1}------------; +:---${c2}:sdNMMMMNds:${c1}------------: +:------${c2}:://:${c1}-------------:: +:---------------------:// EOF ;; "freebsd_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} /\\ _____ /\\ + \\_) (_/ + / \ +| | +| | + \ / + --_____-- EOF ;; "FreeBSD"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - + ${c2}``` ${c1}` + ${c2}` `.....---...${c1}....--.``` -/ + ${c2}+o .--` ${c1}/y:` +. + ${c2} yo`:. ${c1}:o `+- + ${c2}y/ ${c1}-/` -o/ + ${c2}.- ${c1}::/sy+:. + ${c2}/ ${c1}`-- / + ${c2}`: ${c1}:` + ${c2}`: ${c1}:` + ${c2}/ ${c1}/ + ${c2}.- ${c1}-. + ${c2}-- ${c1}-. + ${c2}`:` ${c1}`:` + .-- `--. + .---.....----. EOF ;; @@ -4908,42 +5228,129 @@ EOF # Don't explicitly set colors since # TosWin2 doesn't reset well. read -rd '' ascii_data <<'EOF' - +${c1} ## + ## ######### + #### ## + #### #### ## +#### #### ## ## + #### #### ## ## + #### #### ## ## ## + #### ###### + ###### ## ## #### + #### ################ + #### ## #### + ## #### ###### + ## ## #### #### + ## ## ## ## ## #### + #### ## ## ## EOF ;; "Frugalware"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `++/::-.` + /o+++++++++/::-.` + `o+++++++++++++++o++/::-.` + /+++++++++++++++++++++++oo++/:-.`` + .o+ooooooooooooooooooosssssssso++oo++/:-` + ++osoooooooooooosssssssssssssyyo+++++++o: + -o+ssoooooooooooosssssssssssssyyo+++++++s` + o++ssoooooo++++++++++++++sssyyyyo++++++o: + :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo + `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: + /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss + .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- + ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso + -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. + sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ + :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` + yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ +-ysooooooydhhhhhhhhhhhddddddddddddddddssy + .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: + ``.-/+oosysssssssssssssssssssssss + ``.:/+osyysssssssssssssh. + `-:/+osyyssssyo + .-:+++` EOF ;; "Funtoo"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c2} _______ ____ + /MMMMMMM/ /MMMM| _____ _____ + __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ +|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ +|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| +|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| + |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ + |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ EOF ;; "GalliumOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1}sooooooooooooooooooooooooooooooooooooo+: +yyooooooooooooooooooooooooooooooooo+/::: +yyysoooooooooooooooooooooooooooo+/:::::: +yyyyyoooooooooooooooooooooooo+/::::::::: +yyyyyysoooooooooooooooooo++/:::::::::::: +yyyyyyysoooooooooooooo++/::::::::::::::: +yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: +yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: +yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: +yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: +yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: +yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: +yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: +yyyyyyyyyyyyyyys+:--...........-///::::: +yyyyyyyyyyyys+:--................://:::: +yyyyyyyyyo+:-.....................-//::: +yyyyyyo+:-..........................://: +yyyo+:-..............................-// +o/:-...................................: EOF ;; "gentoo_small") set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} _-----_ +( \\ +\ 0 \\ +${c2} \ ) + / _/ +( _- +\____- EOF ;; "Gentoo"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} -/oyddmdhs+:. + -o${c2}dNMMMMMMMMNNmhy+${c1}-` + -y${c2}NMMMMMMMMMMMNNNmmdhy${c1}+- + `o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/` + om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o` +.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+` + oy${c2}hdmNMMMMMMMN${c1}dyooy${c2}dmddddhhhhyhN${c1}d. + :o${c2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${c1}Mh + .:${c2}+sydNMMMMMNNNmmmdddhhhhhhmM${c1}my + /m${c2}MMMMMMNNNmmmdddhhhhhmMNh${c1}s: + `o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+` + `s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. + /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:` ++M${c2}MMMMMMNNNNNmmmmdmNMNdso${c1}/- +yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` +/h${c2}MMNNNNNNNNMNdhs++/${c1}-` +`/${c2}ohdmmddhys+++/:${c1}.` + `-//////:--. EOF ;; From 15fb8cdc5941cf3973603d4ffff9a893611c8cf9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:43:28 +1000 Subject: [PATCH 0249/1133] general: Start inlining ascii. --- neofetch | 458 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 432 insertions(+), 26 deletions(-) diff --git a/neofetch b/neofetch index 6e721c7db..cfc29ca4d 100755 --- a/neofetch +++ b/neofetch @@ -5357,189 +5357,595 @@ EOF "gNewSense"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} ..,,,,.. + .oocchhhhhhhhhhccoo. + .ochhlllllllc hhhhhh ollllllhhco. + ochlllllllllll hhhllllllhhh lllllllllllhco + .cllllllllllllll hlllllo +hllh llllllllllllllc. +ollllllllllhco'' hlllllo +hllh ``ochllllllllllo +hllllllllc' hllllllllllllh `cllllllllh +ollllllh +llllllllllll+ hllllllo + `cllllh. ohllllllho .hllllc' + ochllc. ++++ .cllhco + `+occooo+. .+ooocco+' + `+oo++++ ++++oo+' EOF ;; "GNU") set_colors fg 7 read -rd '' ascii_data <<'EOF' - +${c1} _-`````-, ,- '- . + .' .- - | | - -. `. + /.' / `. \ +:/ : _... ..._ `` : +:: : /._ .`:'_.._\. || : +:: `._ ./ ,` : \ . _.'' . +`:. / | -. \-. \\_ / + \:._ _/ .' .@) \@) ` `\ ,.' + _/,--' .- .\,-.`--`. + ,'/'' (( \ ` ) + /'/' \ `-' ( + '/'' `._,-----' + ''/' .,---' + ''/' ;: + ''/'' ''/ + ''/''/'' + '/'/' + `; EOF ;; "GoboLinux"*) set_colors 5 4 6 2 read -rd '' ascii_data <<'EOF' - +${c1}_____ _ +/ ____| | | +| | __ ___ | |__ ___ +| | |_ |/ _ \| '_ \ / _ \ +| |__| | (_) | |_) | (_) | + \_____|\___/|_.__/ \___/ EOF ;; "Grombyang"*) set_colors 4 2 1 read -rd '' ascii_data <<'EOF' - +${c1} eeeeeeeeeeee + eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee ${c2}.o+ ${c1}eeee + eeee ${c2}`ooo/ ${c1}eeee + eeee ${c2}`+oooo: ${c1}eeee +eee ${c2}`+oooooo: ${c1}eee +eee ${c2}-+oooooo+: ${c1}eee +ee ${c2}`/:oooooooo+: ${c1}ee +ee ${c2}`/+ +++ +: ${c1}ee +ee ${c2}+o+\ ${c1}ee +eee ${c2}+o+\ ${c1}eee +eee ${c2}// \\ooo/ \\\ ${c1}eee + eee ${c2}//++++oooo++++\\\ ${c1}eee + eeee ${c2}::::++oooo+::::: ${c1}eeee + eeeee ${c3}Grombyang OS ${c1} eeee + eeeeeeeeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeee EOF ;; "GuixSD"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - +${c1} .. `. + `--..```..` `..```..--` + .-:///-:::. `-:::///:-. + ````.:::` `:::.```` + -//:` -::- + ://: -::- + `///- .:::` + -+++-:::. + :+/:::- + `-....` EOF ;; "Haiku"*) set_colors 2 8 read -rd '' ascii_data <<'EOF' - +${c2} :dc' + 'l:;'${c1},${c2}'ck. .;dc:. + co ${c1}..${c2}k. .;; ':o. + co ${c1}..${c2}k. ol ${c1}.${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. +.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. + ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; + ..${c1}oOolllllccccccc:::::${c2}od; + cx:ooc${c1}:::::::;${c2}cooolcX. + cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. + cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. + .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. + '::c'${c1}...${c2}do${c1}..... .${c2}K, + cd,.${c1}....:${c2}O,${c1} + ':clod:'${c1} + ${c1} EOF ;; "Hyperbola"*) set_colors 8 read -rd '' ascii_data <<'EOF' - +${c1} WW + KX W + WO0W NX0O + NOO0NW WNXK0OOKW + W0OOOOOOOOOOOOKN + N0OOOOOOO0KXW + WNXXXNW + NXK00000KN + WNK0OOOOOOOOOO0W + NK0OOOOOOOOOOOOOO0W + X0OOOOOOO00KK00OOOOOK + X0OOOO0KNWW WX0OO0W + X0OO0XNW KOOW + N00KNW KOW + NKXN W0W +WW W EOF ;; "Kali"*) set_colors 4 8 read -rd '' ascii_data <<'EOF' - +${c1}.............. + ..,;:ccc,. + ......''';lxO. +.....''''..........,:ld; + .';;;:::;,,.x, + ..'''. 0Xxoc:,. ... + .... ,ONkc;,;cokOdc',. + . OMo ':${c2}dd${c1}o. + dMc :OO; + 0M. .:o. + ;Wd + ;XO, + ,d0Odlc;,.. + ..',;:cdOOd::,. + .:d;.':;. + 'd, .' + ;l .. + .o + c + .' + . EOF ;; "KaOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} .. + ..... ..OSSAAAAAAA.. + .KKKKSS. .SSAAAAAAAAAAA. +.KKKKKSO. .SAAAAAAAAAA... +KKKKKKS. .OAAAAAAAA. +KKKKKKS. .OAAAAAA. +KKKKKKS. .SSAA.. +.KKKKKS..OAAAAAAAAAAAA........ + DKKKKO.=AA=========A===AASSSO.. + AKKKS.==========AASSSSAAAAAASS. + .=KKO..========ASS.....SSSSASSSS. + .KK. .ASS..O.. =SSSSAOSS: + .OK. .ASSSSSSSO...=A.SSA. + .K ..SSSASSSS.. ..SSA. + .SSS.AAKAKSSKA. + .SSS....S.. EOF ;; "KDE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} `..---+/---..` + `---.`` `` `.---.` + .--.` `` `-:-. + `:/: `.----//----.` :/- + .:. `---` `--.` .:` + .:` `--` .:- `:. + `/ `:. `.-::-.` -:` `/` + /. /. `:++++++++:` .: .: +`/ .: `+++++++++++/ /` `+` +/+` -- .++++++++++++` :. .+: +`/ .: `+++++++++++/ /` `+` + /` /. `:++++++++:` .: .: + ./ `:. `.:::-.` -:` `/` + .:` `--` .:- `:. + .:. `---` `--.` .:` + `:/: `.----//----.` :/- + .-:.` `` `-:-. + `---.`` `` `.---.` + `..---+/---..` EOF ;; "Kogaion"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ;; ,; + ;;; ,;; + ,;;;; ;;;; + ,;;;;;;;; ;;;; + ;;;;;;;;;;; ;;;;; + ,;;;;;;;;;;;; ';;;;;, + ;;;;;;;;;;;;;;, ';;;;;;; + ;;;;;;;;;;;;;;;;;, ';;;;; +; ';;;;;;;;;;;;;;;;;;, ;;; +;;;, ';;;;;;;;;;;;;;;;;;;,;; +;;;;;, ';;;;;;;;;;;;;;;;;;, +;;;;;;;;, ';;;;;;;;;;;;;;;;, +;;;;;;;;;;;;, ';;;;;;;;;;;;;; +';;;;;;;;;;;;; ';;;;;;;;;;;;; + ';;;;;;;;;;;;;, ';;;;;;;;;;; + ';;;;;;;;;;;;; ;;;;;;;;;; + ';;;;;;;;;;;; ;;;;;;;; + ';;;;;;;; ;;;;;; + ';;;;; ;;;; + ';;; ;; EOF ;; "Korora"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} ____________ + _add55555555554${c1}: + _w?'${c1}``````````'${c2})k${c1}: + _Z'${c1}`${c2} ]k${c1}: + m(${c1}`${c2} )k${c1}: + _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: + .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` + jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` + jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` +.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` +:#${c1}:${c2} ${c1}`${c2})e${c1}``` +:m${c1}:${c2} ,#'${c1}` +:#${c1}:${c2} .s2'${c1}` +:m,________.aa7^${c1}` +:#baaaaaaas!J'${c1}` + ``````````` EOF ;; "KSLinux"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' +${c1} K K U U RRRR ooo + K K U U R R o o + KKK U U RRRR o o + K K U U R R o o + K K UUU R R ooo +${c2} SSS AAA W W AAA + S A A W W A A + SSS AAAAA W W W AAAAA + S A A WW WW A A + SSS A A W W A A EOF ;; "Kubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `.:/ossyyyysso/:. + .:oyyyyyyyyyyyyyyyyyyo:` + -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- + -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- + oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo + `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` + oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- +oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy +oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- + oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo + `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo + oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo + -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- + -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- + ./oyyyyyyyyyyyyyyyyyyo/. + `.:/oosyyyysso/:.` EOF ;; "LEDE"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - + ${c1} _________ + / /\ + / LE / \ + / DE / \ + /________/ LE \ + \ \ DE / + \ LE \ / + \ DE \ / + \________\/ EOF ;; "Linux") set_colors fg 8 3 read -rd '' ascii_data <<'EOF' - +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### EOF ;; "LMDE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - + ${c2}`.-::---.. +${c1} .:++++ooooosssoo:. + .+o++::. `.:oos+. +${c1} :oo:.` -+oo${c2}: +${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` +${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` +${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: +${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` +${c1}`s: `oo s m Myy+-o:` +`oo :+sdoohyoydyso/. + :o. .:////////++: +${c1} `/++ ${c2}-:::::- +${c1} ${c2}`${c1}++- +${c1} ${c2}`${c1}/+- +${c1} ${c2}.${c1}+/. +${c1} ${c2}.${c1}:+-. + `--.`` EOF ;; "Lubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `-/+oyyhhhhyyo+/-` + ./shhhhhhhhhhhhhhhhhhs/. + `:shhhhhhhhhhhhhhhhhhhhhhhhs:` + :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: + `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` + `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` + shhhhhhhhy+. .ohhhhhhhhhhhhhs +:hhhhhhy/. /hhhhhhhhhhhhh: +shhhy/. :hhhhhhhhhhhhs +hy+. ` `+yhs/` +hhhhhhhhhhhh +-.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh +shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs +:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: + shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs + `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` + +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` + :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: + :shhhhhhhhhhhhhhhhhhhhhy`+s:` + .+shhhhhhhhhhhhhhhhhhs:` + `-/+oyyhhhhyys+/-` EOF ;; "Lunar"*) set_colors 4 7 3 read -rd '' ascii_data <<'EOF' - +${c1}`-. `-. + -ohys/-` `:+shy/` + -omNNdyo/` :+shmNNy/` + ${c3} - + /mMmo + hMMMN` + .NMMs + ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` + /:.` ${c3}/${c1} `.:/` +${c3} __ + | | _ _ ___ ___ ___ + | |__| | | | .'| _| + |_____|___|_|_|__,|_| EOF ;; "mac"*"_small") set_colors 2 3 1 5 4 read -rd '' ascii_data <<'EOF' - +${c1} .:' + _ :'_ +${c2} .'`_`-'_``. +:________.-' +${c3}:_______: +:_______: +${c4} :_______`-; +${c5} `._.-._.' EOF ;; "mac" | "Darwin") set_colors 2 3 1 1 5 4 read -rd '' ascii_data <<'EOF' - +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. EOF ;; "Mageia"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} .°°. + °° .°°. + .°°°. °° + . . + °°° .°°°. + .°°°. '___' +${c2} .${c1}'___' ${c2} . + :dkxc;'. ..,cxkd; + .dkk. kkkkkkkkkk .kkd. +.dkk. ';cloolc;. .kkd +ckk. .kk; +xO: cOd +xO: lOd +lOO. .OO: +.k00. .00x + .k00; ;00O. + .lO0Kc;,,,,,,;c0KOc. + ;d00KKKKKK00d; + .,KKKK,. EOF ;; "MagpieOS"*) set_colors 2 1 3 5 read -rd '' ascii_data <<'EOF' - +${c1} ;00000 :000Ol + .x00kk00: O0kk00k; + l00: :00. o0k :O0k. + .k0k. x${c2}d$dddd${c1}k' .d00; + k0k. ${c2}.dddddl ${c1}o00, + o00. ${c2}':cc:. ${c1}d0O +.00l ,00. +l00. d0x +k0O .:k0o +O0k ;dO0000d. +k0O .O0O${c2}xxxxk${c1}00: +o00. k0O${c2}dddddd${c1}occ +'00l x0O${c2}dddddo${c3};..${c1} + x00. .x00${c2}kxxd${c3}:..${c1} + .O0x .:oxxx${c4}Okl.${c1} + .x0d ${c4},xx,${c1} + .:o. ${c4}.xd ckd${c1} + .. ${c4}dxl .xx; + :xxolldxd' + ;oxdl. EOF ;; "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1}██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ EOF ;; "Maui"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} `.-://////:--` + .:/oooooooooooooooo+:. + `:+ooooooooooooooooooooooo:` + `:oooooooooooooooooooooooooooo/` + ..```-oooooo/-`` `:oooooo+:.` `-- + :. +oo+-` /ooo/` -/ + -o. `o+- +o/` -o: +`oo` ::` :o/ `+. .+o` /oo. +/o+ . -+oo- ` /oo/ `ooo/ ++o- /ooo+` .+ooo. :ooo+ +++ .+oooo: -oooo+ `oooo+ +:. .oooooo` :ooooo- :oooo: +` .oooooo: :ooooo+ `ooo+-` + .+oooooo` -oooooo: `o/- + +oooooo: .ooooooo. + /ooooooo` /ooooooo/ .. + `:oooooooo/:::/ooooooooo+:--:/:` + `:+oooooooooooooooooooooo+:` + .:+oooooooooooooooo+:. + `.-://////:-.` EOF ;; "Mer"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} dMs + .-` + `y`-o+` + ``NMMy + .--`:++. + .hNNNNs + /MMMMMN + `ommmd/ +/ + ```` +/ + `:+sssso/-` + .-::. `-::-` `smNMNmdmNMNd/ .://-` +.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo +dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- +MMm yMM- :MMs NMN` `:::::--sMMh dMM` +MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` +NNd sNN- -NNs -mMNs-.--..:dMMh` dNN +--- .--` `--. .smMMmdddmMNdo` .-- + ./ohddds+:` + +h- `.:-. + ./`.dMMMN+ + +MMMMMd + `+dmmy- + ``` .+` + .dMNo-y. + `hmm/ + .:` + dMs EOF ;; "Minix"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c2} -sdhyo+:-` -/syymm: + sdyooymmNNy. `` .smNmmdysNd + odyoso+syNNmysoyhhdhsoomNmm+/osdm/ + :hhy+-/syNNmddhddddddmNMNo:sdNd: + `smNNdNmmNmddddddddddmmmmmmmy` + `ohhhhdddddmmNNdmddNmNNmdddddmdh- + odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: + `+mNho:` smmd/ sNNh :dmms` -+ymmo. +-od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: ++sms -.` :so: .NN+ :os/ .-`mNh: +.-hyh+:////- -sNNd:` .--://ohNs- + `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ + -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: + //oydNMMMMydMMNysNMMmsMMMMMNyo/` + ../-yNMMy--/::/-.sMMmos+.` + -+oyhNsooo+omy/``` + `::ohdmds-` EOF ;; From 3dd7b0a7d631ead79773851ecd55b430e1ee1fda Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:48:02 +1000 Subject: [PATCH 0250/1133] general: Start inlining ascii. --- neofetch | 631 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 599 insertions(+), 32 deletions(-) diff --git a/neofetch b/neofetch index cfc29ca4d..909bd098d 100755 --- a/neofetch +++ b/neofetch @@ -5952,231 +5952,798 @@ EOF "Linux Mint"* | "LinuxMint"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. +MMm----::-://////////////oymNMd+` +MMd ${c2}/++ ${c1}-sNMd: +MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: +ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm + NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM + NMm ${c2}dMM` ..` ... ydm. ${c1}dMM + hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM + -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM + -dMNs-${c2}``-::::-------.`` ${c1}dMM + `/dMNmy+/:-------------:/yMMM + ./ydNMMMMMMMMMMMMMMMMMMMMM + .MMMMMMMMMMMMMMMMMMM EOF ;; "MX"*) set_colors 4 6 7 read -rd '' ascii_data <<'EOF' - +${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM +MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM +MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM +MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM +MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM +MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM +MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM +MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM +MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM +MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM +MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM +MMMMMMMNo` :mMMN+` `-hMMMMMMMM +MMMMMMh. `oNMMd: `/mMMMMMM +MMMMm/ -hMd- `sNMMMM +MMNs` - :dMMM +Mm: `oMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM EOF ;; "NetBSD"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} `-/oshdmNMNdhyo+:-` +${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` +${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` + ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` + ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` + ${c2}-N/${c1}hMMMMMMMMMmho:` + ${c2}-N/${c1}-:/++/:.` +${c2} :M+ + :Mo + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms EOF ;; "Netrunner"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} .:oydmMMMMMMmdyo:` + -smMMMMMMMMMMMMMMMMMMds- + +mMMMMMMMMMMMMMMMMMMMMMMMMd+ + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ + `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` + .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` + dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh ++MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ +mMMMMMMMMd+:.` `mMMMMMMMMMMMMd +MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM +mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd ++MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ + dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh + `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` + `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: + +dMMMMMMMMMMMMMMMMMMMMMMMMd/ + -odMMMMMMMMMMMMMMMMMMdo- + `:+ydmNMMMMNmhy+-` EOF ;; "Nitrux"*) set_colors 4 read -rd '' ascii_data <<'EOF' - +${c1}`:/. +`/yo +`/yo +`/yo .+:. +`/yo .sys+:.` +`/yo `-/sys+:.` +`/yo ./sss+:.` +`/yo .:oss+:-` +`/yo ./o///:-` +`/yo `.-:///////:` +`/yo `.://///++//-`` +`/yo `.-:////++++/-` +`/yo `-://///++o+/-` +`/yo `-/+o+++ooo+/-` +`/s+:+oooossso/.` +`//+sssssso:. +`+syyyy+:` +:+s+- EOF ;; "nixos_small") set_colors 4 6 read -rd '' ascii_data <<'EOF' - + ${c1}\\\\ \\\\ // + ==\\\\__\\\\/ // + // \\\\// +==// //== + //\\\\___// +// /\\\\ \\\\== + // \\\\ \\\\ EOF ;; "NixOS"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' - +${c1} ::::. ${c2}'::::: ::::' +${c1} '::::: ${c2}':::::. ::::' +${c1} ::::: ${c2}'::::.::::: +${c1} .......:::::..... ${c2}:::::::: +${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. + ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' +${c2} ..... ::::' ${c1}:::::' +${c2} ::::: '::' ${c1}:::::' +${c2} ........::::: ' ${c1}:::::::::::. +${c2}::::::::::::: ${c1}::::::::::::: +${c2} ::::::::::: ${c1}.. ${c1}::::: +${c2} .::::: ${c1}.::: ${c1}::::: +${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... + ::::: ${c1}':::::. ${c2}......:::::::::::::' + ::: ${c1}::::::. ${c2}':::::::::::::::::' +${c1} .:::::::: ${c2}':::::::::: +${c1} .::::''::::. ${c2}'::::. +${c1} .::::' ::::. ${c2}'::::. +${c1} .:::: :::: ${c2}'::::. EOF ;; "Nurunner"*) set_colors 4 read -rd '' ascii_data <<'EOF' - +${c1} ,xc + ;00cxXl + ;K0, .xNo. + :KO' .lXx. + cXk. ;xl cXk. + cXk. ;k:.,xo. cXk. + .lXx. :x::0MNl,dd. :KO, + .xNx. cx;:KMMMMMNo'dx. ;KK; + .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: +;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO + 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: + .kNo .xo'xWMMMMMM0;:O: ;KK; + .dXd. .do,oNMMO;ck: ;00, + oNd. .dx,;'cO; ;K0, + oNx. okk; ;K0, + lXx. :KO' + cKk' cXk. + ;00:lXx. + ,kd. EOF ;; "NuTyX"*) set_colors 4 1 read -rd '' ascii_data <<'EOF' - +${c1} . + . + ... + ... + .... .........--. + ..-++-----....--++++++---. + .-++++++-. .-++++++++++++-----.. + .--... .++..-+++--.....-++++++++++--.. + . .-+-. .**- .... ..-+----.. + .+++. .*+. + -++-----. + .+++++- ++. .*+. .....-+++-----. + -+++-++. .+. .-+***++***++--++++. . + -+-. -- -. -*- ...... ..--. +.-. .+- . -+. +. .+- +. + -- -- + -+----. .- + -++-.+. . + .++. -- + +. ----. + . .+. .. + - . + . EOF ;; "OBRevenge"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} __ __ + _@@@@ @@@g_ + _@@@@@@ @@@@@@ + _@@@@@@M W@@@@@@_ + j@@@@P ^W@@@@ + @@@@L____ _____Q@@@@ +Q@@@@@@@@@@j@@@@@@@@@@ +@@@@@ T@j@ T@@@@@ +@@@@@ ___Q@J@ _@@@@@ +@@@@@fMMM@@j@jggg@@@@@@ +@@@@@ j@j@^MW@P @@@@ +Q@@@@@ggg@@f@ @@@@@@L +^@@@@WWMMP ^ Q@@@@ + @@@@@_ _@@@@l + W@@@@@g_____g@@@@@P + @@@@@@@@@@@@@@@@l + ^W@@@@@@@@@@@P + ^TMMMMTll EOF ;; "openbsd_small") set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - +${c1} _____ + \\- -/ + \\_/ \\ + | ${c2}O O${c1} | + |_ < ) 3 ) + / \\ / + /-_____-\\ EOF ;; "OpenBSD"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - + ${c3} _ + (_) +${c1} | . +${c1} . |L /| . ${c3} _ +${c1} _ . |\ _| \--+._/| . ${c3}(_) +${c1} / ||\| Y J ) / |/| ./ + J |)'( | ` F`.'/ ${c3} _ +${c1} -<| F __ .-< ${c3}(_) +${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ + J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ +${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) +${c1} '-F -<_. \\ .-' `-' L__ +__J _ _. >-' ${c1})${c4}._. ${c1}|-' +${c1} `-|.' /_. ${c4}\_| ${c1} F + /.- . _.< + /' /.' .' `\\ + /L /' |/ _.-'-\\ + /'J ___.---'\| + |\ .--' V | `. ` + |/`. `-. `._) + / .-.\\ + \\ ( `\\ + `.\ EOF ;; "OpenIndiana"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' +${c2} .sy/ + .yh+ + ${c1}-+syyyo+- ${c2} /+. + ${c1}+ddo/---/sdh/ ${c2} ym- + ${c1}`hm+ `sms${c2} ym-```````.-. + ${c1}sm+ sm/ ${c2} ym- +s + ${c1}hm. /mo ${c2} ym- /h + ${c1}omo ym: ${c2} ym- `os` + ${c1}smo` .ym+ ${c2} ym- .os- + `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. + ..` ${c1}`:+oo+/-` ${c2} -//oyo- + -:` .:oys/. ++- `./oyys/. +h+` `.-:+oyyyo/-` +`/ossssysso+/-.` EOF ;; "OpenMandriva"*) set_colors 4 3 read -rd '' ascii_data <<'EOF' - +${c2} `` + `-. +${c1} ` ${c2}.--- +${c1} -/ ${c2}-::--` +${c1} `++ ${c2}`----...```-:::::. +${c1} `os. ${c2}.::::::::::::::-``` ` ` +${c1} +s+ ${c2}.::::::::::::::::---...--` +${c1}-ss: ${c2}`-::::::::::::::::-.``.`` +${c1}/ss- ${c2}.::::::::::::-.`` ` +${c1}+ss: ${c2}.::::::::::::- +${c1}/sso ${c2}.::::::-::::::- +${c1}.sss/ ${c2}-:::-.` .::::: +${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: +${c1} -ossso+/:://+/-` ${c2}.:` +${c1} -/+ooo+/-. ${c2}` EOF ;; "OpenWrt"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} _______ +| |.-----.-----.-----. +| - || _ | -__| | +|_______|| __|_____|__|__| + |__| + ________ __ +| | | |.----.| |_ +| | | || _|| _| +|________||__| |____| EOF ;; "Open Source Media Center"* | "osmc") set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} -+shdmNNNNmdhs+- + .+hMNho/:..``..:/ohNMh+. + :hMdo. .odMh: + -dMy- -yMd- + sMd- -dMs + hMy +. .+ yMh + yMy dMs. .sMd yMy +:Mm dMNMs` `sMNMd `mM: +yM+ dM//mNs``sNm//Md +My +mM- dM: +NNNN+ :Md -Mm +mM- dM: `oNN+ :Md -Mm +yM+ dM/+NNo` :Md +My +:Mm` dMMNs` :Md `mM: + yMy dMs` -ms yMy + hMy +. yMh + sMd- -dMs + -dMy- -yMd- + :hMdo. .odMh: + .+hMNho/:..``..:/ohNMh+. + -+shdmNNNNmdhs+- EOF ;; "Oracle"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} + `-/+++++++++++++++++/-.` + `/syyyyyyyyyyyyyyyyyyyyyyys/. + :yyyyo/-...............-/oyyyy/ + /yyys- .oyyy+ +.yyyy` `syyy- +:yyyo /yyy/ +.yyyy` `syyy- + /yyys. .oyyyo + /yyyyo:-...............-:oyyyy/` + `/syyyyyyyyyyyyyyyyyyyyyyys+. + `.:/+ooooooooooooooo+/:.` EOF ;; "PacBSD"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} :+sMs. + `:ddNMd- -o--` + -sMMMMh: `+N+`` + yMMMMMs` .....-/-... `mNh/ + yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm + yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm + :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd + +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- + :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. + .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- + /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` +.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- +:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` +/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. +:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` +:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` + sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. + :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// + /dMMMMMMMMMMMMMs- ````````..`` + .oMMMMMMMMMMMMNs` ./y:` + +dNMMNMMMMMMMmy` ``./ys. + `/hMMMMMMMMMMMNo-`` `.+yy+-` + `-/hmNMNMMMMMMmmddddhhy/-` + `-+oooyMMMdsoo+/:. EOF ;; "Parabola"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} `.-. `. + `.` `:++. `-+o+. + `` `:+/. `:+/. `-+oooo+ + ``-::-.:+/. `:+/. `-+oooooo+ + `.-:///- ..` .-. `-+oooooooo- + `..-..` `+ooooooooo: +`` :oooooooo/ + `ooooooo: + `oooooo: + -oooo+. + +ooo/` + -ooo- + `+o/. + /+- + //` + -. EOF ;; "Pardus"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - +${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. +/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ +mN. oMdyy- -y `-dMo .Nm +.mN+` sMy hN+ -: yMs `+Nm. + `yMMddMs.dy `+` sMddMMy` + +MMMo .` . oMMM+ + `NM/ `````.` `.````` +MN` + yM+ `.-:yhomy ymohy:-.` +My + yM: yo oy :My + +Ms .N` `N. +h sM+ + `MN - -::::::- : :o:+`NM` + yM/ sh -dMMMMd- ho +y+My + .dNhsohMh-//: /mm/ ://-yMyoshNd` + `-ommNMm+:/. oo ./:+mMNmmo:` + `/o+.-somNh- :yy: -hNmos-.+o/` + ./` .s/`s+sMdd+``+ddMs+s`/s. `/. + : -y. -hNmddmNy. .y- : + -+ `..` +- EOF ;; "Parrot"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} `:oho/-` +`mMMMMMMMMMMMNmmdhy- + dMMMMMMMMMMMMMMMMMMs` + +MMsohNMMMMMMMMMMMMMm/ + .My .+dMMMMMMMMMMMMMh. + + :NMMMMMMMMMMMMNo + `yMMMMMMMMMMMMMm: + /NMMMMMMMMMMMMMy` + .hMMMMMMMMMMMMMN+ + ``-NMMMMMMMMMd- + /MMMMMMMMMMMs` + mMMMMMMMsyNMN/ + +MMMMMMMo :sNh. + `NMMMMMMm -o/ + oMMMMMMM. + `NMMMMMM+ + +MMd/NMh + mMm -mN` + /MM `h: + dM` . + :M- + d: + -+ + - EOF ;; "Parsix"*) set_colors 3 1 7 8 read -rd '' ascii_data <<'EOF' - + ${c2}-/+/:. + ${c2}.syssssys. + ${c1}.--. ${c2}ssssssssso${c1} ..--. + :++++++: ${c2}+ssssssss+${c1} ./++/+++: + /+++++++++.${c2}.yssooooy`${c1}-+///////o- + /++++++++++.${c2}+soooos:${c1}:+////////+- + :+++++////o-${c2}oooooo-${c1}+/////////- + `-/++//++-${c4}.-----.-${c1}:+/////:- + ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. +${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- +${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ +${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- + `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` + ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. + ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: + ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ + ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: + ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- + ${c1}`--` ${c2}+sssssssso ${c1}`--` + ${c2}+sssssy+` + ${c2}`.::-` EOF ;; "PCBSD"* | "TrueOS"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} .. + s. + +y + yN + -MN `. + :NMs `m + .yMMm` `No + `-/+++sdMMMNs+-`+Ms + `:oo+-` .yMMMMy` `-+oNMh + -oo- +NMMMM/ oMMh- + .s+` ` oMMMMM/ - oMMMhy. + +s`- :: :MMMMMd -o `mMMMy`s+ + y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y + s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s +-h .NM` `hMMMMMMMMMMMMMMNMMNy: h- +y- hMN` hMMmMMMMMMMMMNsdMNs. -y +m` mMMy` oMMNoNMMMMMMo` sMMMo `m +m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m +h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h +:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: + y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y + `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` + so -NMMMN /mmd+ `dMMMMMMMm- os + :y: `yMMM` `+NMMMMMMNo`:y: + /s+`.omy /NMMMMMNh/.+s: + .+oo:-. /mdhs+::oo+. + -/o+++++++++++/- EOF ;; "PCLinuxOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - + ${c1}mhhhyyyyhhhdN + dyssyhhhhhhhhhhhssyhN + Nysyhhyo/:-.....-/oyhhhssd + Nsshhy+. `/shhysm + dohhy/ -shhsy + dohhs` /hhys +N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy +ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ ++hho ${c2}ymm- /mmy+mms ${c1}:hhod +/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh ++hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m +yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ + ohhy` ${c2}://` -/+++/- ${c1}ohhom + N+hhy- `shhoh + sshho. `+hhyom + dsyhhs/. `:ohhhoy + dysyhhhso///://+syhhhssh + dhyssyhhhhhhyssyyhN + mddhdhdmN EOF ;; "Peppermint"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} 8ZZZZZZ${c2}MMMMM +${c1} .ZZZZZZZZZ${c2}MMMMMMM. +${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ +${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM +${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. +${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI +${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM +${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM +${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM +${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM +${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM +${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M +${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 +${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 +${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 +${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z +${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM +${c1} NZZZZZZZZZZZ${c2}MMMMM +${c1} ZZZZZZZZZ${c2}MM) EOF ;; "Pop!_OS"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} ///////////// + ///////////////////// + ///////${c2}*767${c1}//////////////// + //////${c2}7676767676*${c1}////////////// + /////${c2}76767${c1}//${c2}7676767${c1}////////////// + /////${c2}767676${c1}///${c2}*76767${c1}/////////////// + ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// +/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// +//////////${c2}76767676767${c1}////${c2}76767${c1}///////// +///////////${c2}76767676${c1}//////${c2}7676${c1}////////// +////////////,${c2}7676${c1},///////${c2}767${c1}/////////// +/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// +///////////////${c2}7676${c1}//////////////////// + ///////////////${c2}7676${c1}///${c2}767${c1}//////////// + //////////////////////${c2}'${c1}//////////// + //////${c2}.7676767676767676767,${c1}////// + /////${c2}767676767676767676767${c1}///// + /////////////////////////// + ///////////////////// + ///////////// EOF ;; "Porteus"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} `.-:::-.` + -+ydmNNNNNNNmdy+- + .+dNmdhs+//////+shdmdo. + .smmy+-` ./sdy: + `omdo. `.-/+osssso+/-` `+dy. + `yms. `:shmNmdhsoo++osyyo-``oh. + hm/ .odNmds/.` ``.....:::-+s +/m: `+dNmy:` `./oyhhhhyyooo++so +ys `yNmy- .+hmmho:-.` ``` +s: yNm+` .smNd+. +`` /Nm: +dNd+` + yN+ `smNy. + dm oNNy` + hy -mNm. + +y oNNo + `y` sNN: + `: +NN: + ` .mNo + /mm` + /my` + .sy` + .+: + ` EOF ;; "PostMarketOS"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} ss + `hMMh` + .dMMMMd. + -NMMMMMMN- + /MMMMMMMMMN/ + hMMMMMMMMMMMo + y+`mMMmdNMMMMMMy + `dMM-.-:- .mMMMMMMh` + .mMMMMMMd` `dMMMMMMm. + :NMMMMMMy yMMMMMMN: + /MMMMMMMo oMMMmdmN/ + oMMMMMMM/ /MN.-/:-. + `yMMMMMMN- -:.NMMMMy` + `dMMMMMMM- -/////////////dMMMMMMd` + -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- + :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: ++MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ EOF ;; "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' - +${c1} `-/osyyyysosyhhhhhyys+- + -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ + yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy +.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ +-NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ +.Nm+shddyooo+/smNNNNmmmmNh. :mmd. + NNNNy:` ./hmmmmmmmNNNN: hNMh + NMN- -++- +NNNNNNNNNNm+..-sMMMM- +.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ +.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ + mMM+ .. `sNN+. hMMMMhhMMM- + +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy + yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` + sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` + :mMMMMMMMMMMMmddNMMMMMMMMmh/ + /dMMMMMMMMMMMMMMMMMMNdy/` + .+hNMMMMMMMMMNmdhs/. + .:/+ooo+/:-. EOF ;; "Qubes"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} `..--..` + `.----------.` + `..----------------..` + `.------------------------.`` + `..-------------....-------------..` +.::----------..`` ``..----------:+: +:////:----..` `..---:/ossso +:///////:` `/osssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:////////-` .:sssssssso +:///////////-.` `-/osssssssssso +`//////////////:-```.:+ssssssssssssso- + .-://////////////sssssssssssssso/-` + `.:///////////sssssssssssssso:. + .-:///////ssssssssssssssssss/` + `.:////ssss+/+ssssssssssss. + `--//- `-/osssso/. EOF ;; "Raspbian"*) set_colors 2 1 read -rd '' ascii_data <<'EOF' - +${c1} `.::///+:/-. --///+//-:`` + `+oooooooooooo: `+oooooooooooo: + /oooo++//ooooo: ooooo+//+ooooo. + `+ooooooo:-:oo- +o+::/ooooooo: + `:oooooooo+`` `.oooooooo+- + `:++ooo/. :+ooo+/.` + ${c2}...` `.----.` ``.. + .::::-``:::::::::.`-:::-` + -:::-` .:::::::-` `-:::- + `::. `.--.` `` `.---.``.::` + .::::::::` -::::::::` ` + .::` .:::::::::- `::::::::::``::. +-:::` ::::::::::. ::::::::::.`:::- +:::: -::::::::. `-:::::::: :::: +-::- .-:::-.``....``.-::-. -::- + .. `` .::::::::. `..`.. + -:::-` -::::::::::` .:::::` + :::::::` -::::::::::` :::::::. + .::::::: -::::::::. :::::::: + `-:::::` ..--.` ::::::. + `...` `...--..` `...` + .:::::::::: + `.-::::-` EOF ;; "Red Star"* | "Redstar"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} .. + .oK0l + :0KKKKd. + .xKO0KKKKd + ,Od' .d0000l + .c;. .'''... ..'. +.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: +;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. + .okkkkd,.lko .......',;:cllc:;,,'''''. + .cdo. :xd' cd:. ..';'',,,'',,;;;,'. + . .ddl.;doooc'..;oc;'..';::;,'. + coo;.oooolllllllcccc:'. . + .ool''lllllccccccc:::::;. + ;lll. .':cccc:::::::;;;;' + :lcc:'',..';::::;;;;;;;,,. + :cccc::::;...';;;;;,,,,,,. + ,::::::;;;,'. ..',,,,'''. + ........ ...... EOF ;; "Redhat"* | "Red Hat"* | "rhel"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} `.-..........` + `////////::.`-/. + -: ....-////////. + //:-::///////////` + `--::: `-://////////////: + //////- ``.-:///////// .` + `://////:-.` :///////::///:` + .-/////////:---/////////////: + .-://////////////////////. +${c2} yMN+`.-${c1}::///////////////-` +${c2} .-`:NMMNMs` `..-------..` + MN+/mMMMMMhoooyysshsss +MMM MMMMMMMMMMMMMMyyddMMM+ + MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM + MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM + MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM EOF ;; From 21f76463ab291671faf2e4deb5a0a7eabf1a5689 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:52:59 +1000 Subject: [PATCH 0251/1133] general: Start inlining ascii. --- neofetch | 609 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 579 insertions(+), 30 deletions(-) diff --git a/neofetch b/neofetch index 909bd098d..0c0a6aaaf 100755 --- a/neofetch +++ b/neofetch @@ -6750,203 +6750,684 @@ EOF "Refracted Devuan"*) set_colors 8 7 read -rd '' ascii_data <<'EOF' - +${c2} A + VW + VVW\\ + .yWWW\\ + ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ + *WWWWWWWWWWWWWWWW/ $VWWWWw , + ^*%WWWWWWVWWX $WWWW** ,yy + , "**WWW/' **' ,yy/WWW*` + &WWWWwy `*` <,ywWW%VWWW* + yWWWWWWWWWW* ., "**WW%W + ,&WWWWWM*"` ,y/ &WWWww ^* + XWWX*^ ,yWWWW09 .WWWWWWWWwy, + *` &WWWWWM WWWWWWWWWWWWWww, + (WWWWW` /#####WWW*********** + ^WWWW + VWW + Wh. + V/ EOF ;; "Rosa"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ROSAROSAROSAROSAR + ROSA AROS + ROS SAROSAROSAROSAR AROS + RO ROSAROSAROSAROSAROSAR RO + ARO AROSAROSAROSARO AROS ROS + ARO ROSAROS OSAR ROSA ROS + RO AROSA ROSAROSAROSA ROSAR RO +RO ROSAR ROSAROSAROSAR R ROSARO RO +RO ROSA AROSAROSAROSA AR ROSARO AR +RO AROS ROSAROSAROSA ROS AROSARO AR +RO AROS ROSAROSARO ROSARO ROSARO AR +RO ROS AROSAROS ROSAROSA AROSAR AR +RO ROSA ROS ROSAROSAR ROSARO RO + RO ROS AROSAROSAROSA ROSARO AR + ARO ROSA ROSAROSAROS AROSAR ARO + ARO OROSA R ROSAROS ROS + RO AROSAROS AROSAROSAR RO + AROS AROSAROSAROSARO AROS + ROSA SARO + ROSAROSAROSAROSAR EOF ;; "sabotage"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' +${c2} .|'''.| | '||''|. ..|''|| + ||.. ' ||| || || .|' || + ''|||. | || ||'''|. || || +. '|| .''''|. || || '|. || +|'....|' .|. .||. .||...|' ''|...|' +|''||''| | ..|'''.| '||''''| + || ||| .|' ' || . + || | || || .... ||''| + || .''''|. '|. || || + .||. .|. .||. ''|...'| .||.....| EOF ;; "Sabayon"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ........... + .. .. + .. .. + .. ${c2}o ${c1}.. + .. ${c2}:W' ${c1}.. + .. ${c2}.d. ${c1}.. +:. ${c2}.KNO ${c1}.: +:. ${c2}cNNN. ${c1}.: +: ${c2}dXXX, ${c1}: +: ${c2}. dXXX, .cd, ${c1}: +: ${c2}'kc .. dKKK. ,ll;:' ${c1}: +: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: +:. ${c2}.,cdddddddddddddo:. ${c1}.: + .. ${c2}:lllllll: ${c1}.. + .. ${c2}',,,,, ${c1}.. + .. .. + .. .. + ............... EOF ;; "SailfishOS"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} .+eWWW + .+ee+++eee e. + .ee++eeeeeeee +e. + .e++ee++eeeeeee+eee+e+ + ee.e+.ee+eee++eeeeee+ + W.+e.e+.e++ee+eee + W.+e.W.ee.W++ee' + +e.W W.e+.W.W+ + W.e.+e.W W W. + e e e +e.W.W + .W W W. + W.+e.W. + W++e.ee+. + ++ +ee++eeeee++. + ' '+++e 'ee. + ee + ee + e EOF ;; "SalentOS"*) set_colors 2 1 3 7 read -rd '' ascii_data <<'EOF' - +${c1} ``..`` + .-:+oshdNMMMMMMNdhyo+:-.` + -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ +${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` +${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- +${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` +${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` +${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd +${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy +${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo +${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ +${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- +${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` +${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm +${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy +${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: +${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. +${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: +${c2} `:smMM${c4}yy${c3}MMNy/` + ${c2}.- ${c4}`${c3}:. EOF ;; "Scientific"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} =/;;/- + +: // + /; /; + -X H. +.//;;;:;;-, X= :+ .-;:=;:;#;. +M- ,=;;;#:, ,:#;;:=, ,@ +:# :#.=/++++/=.$= #= + ,#; #/:+/;,,/++:+/ ;+. + ,+/. ,;@+, ,#H;, ,/+, + ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; + ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. + ,;: :@#= =$H: .+#- + ,#= #;-///==///-// =#, +;+ :#-;;;:;;;;-X- +: +@- .-;;;;M- =M/;;;-. -X + :;;::;;-. #- :+ ,-;;-;:== + ,X H. + ;/ #= + // +; + '////' EOF ;; "Siduction"*) set_colors 4 4 read -rd '' ascii_data <<'EOF' - +${c1} _aass, + jQh: =$w + QWmwawQW + )$QQQQ@( .. + _a_a. ~??^ syDY?Sa, + _mW>-<$c jWmi imm. + ]QQwayQE 4QQmgwmQQ` + ?WWQWP' -9QQQQQ@'._aas, + _a%is. .adYYs,. -"?!` aQB*~^3$c +_Qh;.nm .QWc. {QL ]QQp;..vmQ/ +"QQmmQ@ -QQQggmQP ]QQWmggmQQ( + -???" "$WQQQY` __, ?QQQQQQW! + _yZ!?q, - .yWY!!Sw, "???^ + .QQa_=qQ mQm>..vmm + $QQWQQP $QQQgmQQ@ + "???" _aa, -9WWQQWY` + _mB>~)$a -~~ + mQms_vmQ. + ]WQQQQQP + -?T??" EOF ;; "Slackware"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ::::::: + ::::::::::::::::::: + ::::::::::::::::::::::::: + ::::::::${c2}cllcccccllllllll${c1}:::::: + :::::::::${c2}lc dc${c1}::::::: + ::::::::${c2}cl clllccllll oc${c1}::::::::: + :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: + ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: + :::::::::::${c2}lc cclccclc${c1}::::::::::::: +::::::::::::::${c2}lcclcc lc${c1}:::::::::::: +::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: +::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: + :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: + :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: + ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: + :::${c2}oclcccccccccccccllllllllllllll${c1}::::: + ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: + :::::::::::::::::::::::::::::::: + :::::::::::::::::::::::::::: + :::::::::::::::::::::: + :::::::::::: EOF ;; "SliTaz"*) set_colors 3 3 read -rd '' ascii_data <<'EOF' - +${c1} @ @( @ + @@ @@ @ @/ + @@ @@ @@ @@ + @@ %@@ @@ @@ + @@ %@@@ @@@@@. @@@@ @@ + @@@ @@@@ @@@@@@@ &@@@ @@@ + @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ + ,@@@@@@@@@@@@@@@@@@@@@@@@@ + .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ +@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ +@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ +@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. +@@ ,@@ @@@@@@@@@@@@@ @@@ @@ +@ @@. @@@@@@@@@@@@@ @@@ *@ +@ @@ @@@@@@@@@@@@ @@ @ + @ @@@@@@@@@. #@ + @ ,@@@@@ @ EOF ;; "SmartOS"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyys oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyy syyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy yyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy EOF ;; "Solus"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} -``````````` + `-+/------------.` + .---:mNo---------------. + .-----yMMMy:---------------. + `------oMMMMMm/----------------` + .------/MMMMMMMN+----------------. + .------/NMMMMMMMMm-+/--------------. +`------/NMMMMMMMMMN-:mh/-------------` +.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. +-----/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- +----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. +.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` +`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. +`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ + .------------:://+-/++++++${c1}oshddys: + -hhhhyyyyyyyyyyyhhhhddddhysssso- + `:ossssssyysssssssssssssssso:` + `:+ssssssssssssssssssss+- + `-/+ssssssssssso+/-` + `.-----..` EOF ;; "Source Mage"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} :ymNMNho. +.+sdmNMMMMMMMMMMy` +.-::/yMMMMMMMMMMMm- + sMMMMMMMMMMMm/ + /NMMMMMMMMMMMMMm: + .MMMMMMMMMMMMMMMMM: + `MMMMMMMMMMMMMMMMMN. + NMMMMMMMMMMMMMMMMMd + mMMMMMMMMMMMMMMMMMMo + hhMMMMMMMMMMMMMMMMMM. + .`/MMMMMMMMMMMMMMMMMs + :mMMMMMMMMMMMMMMMN` + `sMMMMMMMMMMMMMMM+ + /NMMMMMMMMMMMMMN` + oMMMMMMMMMMMMM+ + ./sd.-hMMMMMMMMmmN` + ./+oyyyh- `MMMMMMMMMmNh + sMMMMMMMMMmmo + `NMMMMMMMMMd: + -dMMMMMMMMMo + -shmNMMms. EOF ;; "Sparky"*) set_colors 1 7 read -rd '' ascii_data <<'EOF' - +${c1} + . `-:-` + .o` .-///-` + `oo` .:/++:. + os+` -/+++:` ``.........``` + /ys+`./+++/-.-::::::----......`` + `syyo`++o+--::::-::/+++/-`` + -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` +::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` +`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` + -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- + .sdddy::syo--/:. `.:dy+-ohhho ./: + :yddds/:+oo+//:-`- /+ +hy+.shhy: `` + `:ydmmdysooooooo-.ss`/yss--oyyo + `./ossyyyyo+:-/oo:.osso- .oys + ``..-------::////.-oooo/ :so + `...----::::::::--.`/oooo: .o: + ``````` ++o+:` `:` + ./+/-` ` + `-:-. + `` EOF ;; "SteamOS"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} .,,,,. + .,'onNMMMMMNNnn',. + .'oNMANKMMMMMMMMMMMNNn'. + .'ANMMMMMMMXKNNWWWPFFWNNMNn. + ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, + ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, +,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, +'${c2}+#############, +. ,+' ${c1}+NMMM +${c2} '*#########*' '*,,*' ${c1}.+NMMMM. +${c2} `'*###*' ,.,;###${c1}+WNM, +${c2} .,;;, .;##########${c1}+W +${c2},',. '; ,+##############' + '###+. :,. .,; ,###############' + '####.. `'' .,###############' + '#####+++################' + '*##################*' + ''*##########*'' + '''''' EOF ;; "SunOS" | "Solaris") set_colors 3 7 read -rd '' ascii_data <<'EOF' - +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. EOF ;; "openSUSE Tumbleweed"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c2} ...... + .,cdxxxoc,. .:kKMMMNWMMMNk:. + cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. + ;WMK;. .lKMMNM, :NMK, .OMW; + cMW; 'WMMMN ,XMK, oMM' +.MMc ..;l. xMN: KM0 +'MM. 'NMO oMM +.MM, .kMMl xMN + KM0 .kMM0. .dl:,.. .WMd + .XM0. ,OMMK, OMMMK. .XMK + oWMO:. .;xNMMk, NNNMKl. .xWMx + :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, + ..... .:dOOXXKOxl, EOF ;; "openSUSE"* | "open SUSE"* | "SUSE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c2} .;ldkO0000Okdl;. + .;d00xl:^''''''^:ok00d;. + .d00l' 'o00d. + .d0Kd'${c1} Okxol:;,. ${c2}:O0d. + .OK${c1}KKK0kOKKKKKKKKKKOxo:, ${c2}lKO. + ,0K${c1}KKKKKKKKKKKKKKK0P^${c2},,,${c1}^dx:${c2} ;00, +.OK${c1}KKKKKKKKKKKKKKKk'${c2}.oOPPb.${c1}'0k.${c2} cKO. +:KK${c1}KKKKKKKKKKKKKKK: ${c2}kKx..dd ${c1}lKd${c2} 'OK: +dKK${c1}KKKKKKKKKOx0KKKd ${c2}^0KKKO' ${c1}kKKc${c2} dKd +dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd +:KK${c1}KKKKKKKKKK0o;...^cdxxOK0O/^^' ${c2}.0K: + kKK${c1}KKKKKKKKKKKKK0x;,,......,;od ${c2}lKk + '0K${c1}KKKKKKKKKKKKKKKKKKKK00KKOo^ ${c2}c00' + 'kK${c1}KKOxddxkOO00000Okxoc;'' ${c2}.dKk' + l0Ko. .c00l' + 'l0Kk:. .;xK0l' + 'lkK0xl:;,,,,;:ldO0kl' + '^:ldxkkkkxdl:^' EOF ;; "SwagArch"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} .;ldkOKXXNNNNXXK0Oxoc,. + ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; + 'K0xo ..,;:c:. `'lKMMMMM0 + .lONMMMMMM' `lNMk' +${c2} ;WMMMMMMMMMO. ${c1}....::... +${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, +${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. +${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. +${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: +${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. +${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: +${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. +${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. + :ccc:' `cccccccc:, + '' EOF ;; "Tails"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} `` + ./yhNh +syy/Nshh `:o/ +N:dsNshh █ `ohNMMd +N-/+Nshh `yMMMMd +N-yhMshh yMMMMd +N-s:hshh █ yMMMMd so//. +N-oyNsyh yMMMMd d Mms. +N:hohhhd:. yMMMMd syMMM+ +Nsyh+-..+y+- yMMMMd :mMM+ ++hy- -ss/`yMMMM `+d+ + :sy/. ./yNMMMMm `` + .+ys- `:+hNMMMMMMy/` + `hNmmMMMMMMMMMMMMdo. + dMMMMMMMMMMMMMMMMMNh: + +hMMMMMMMMMMMMMMMMMmy. + -oNMMMMMMMMMMmy+.` + `:yNMMMds/.` + .//` EOF ;; "Trisquel"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' - +${c1} ▄▄▄▄▄▄ + ▄█████████▄ + ▄▄▄▄▄▄ ████▀ ▀████ + ▄██████████▄ ████▀ ▄▄ ▀███ + ▄███▀▀ ▀▀████ ███▄ ▄█ ███ +▄███ ▄▄▄ ████▄ ▀██████ ▄███ +███ █▀▀██▄ █████▄ ▀▀ ▄████ +▀███ ███ ███████▄▄ ▄▄██████ +${c1} ▀███▄ ▄███ █████████████${c2}████▀ +${c1} ▀█████████ ███████${c2}███▀▀▀ + ▀▀███▀▀ ██████▀▀ + ██████▀ ▄▄▄▄ + █████▀ ████████ + █████ ███▀ ▀███ + ████▄ ██▄▄▄ ███ + █████▄ ▀▀ ▄██ + ██████▄▄▄████ + ▀▀█████▀▀ EOF ;; "Ubuntu-Budgie"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} ./oydmMMMMMMmdyo/. + :smMMMMMMMMMMMhs+:++yhs: + `omMMMMMMMMMMMN+` `odo` + /NMMMMMMMMMMMMN- `sN/ + `hMMMMmhhmMMMMMMh sMh` + .mMmo- /yMMMMm` `MMm. + mN/ yMMMMMMMd- MMMm +oN- oMMMMMMMMMms+//+o+: :MMMMo +m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm +M` .NMMMMMMMMMMMMMMMNodMMMMMMM +M- sMMMMMMMMMMMMMMMMMMMMMMMMM +mm` mMMMMMMMMMNdhhdNMMMMMMMMMm +oMm/ .dMMMMMMMMh: :dMMMMMMMo + mMMNyo/:/sdMMMMMMMMM+ sMMMMMm + .mMMMMMMMMMMMMMMMMMs `NMMMm. + `hMMMMMMMMMMM.oo+. `MMMh` + /NMMMMMMMMMo sMN/ + `omMMMMMMMMy. :dmo` + :smMMMMMMMh+-` `.:ohs: + ./oydmMMMMMMdhyo/. EOF ;; "Ubuntu-GNOME"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c3} ./o. + .oooooooo + .oooo```soooo + .oooo` `soooo + .ooo` ${c4}.o.${c3} `\/ooo. + :ooo ${c4}:oooo.${c3} `\/ooo. + sooo ${c4}`ooooo${c3} \/oooo + \/ooo ${c4}`soooo${c3} `ooooo + `soooo ${c4}`\/ooo${c3} `soooo +${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo +${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` +${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` +${c4} `ooooo ${c3}`` ${c4}.oooo +${c4} `soooo. .oooo` + `\/oooooooooo` + ``\/oo`` EOF ;; "Ubuntu-MATE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} `:+shmNNMMNNmhs+:` + .odMMMMMMMMMMMMMMMMMMdo. + /dMMMMMMMMMMMMMMMmMMMMMMMMd/ + :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: + `yMMMMMMMMMms:..-::oM: -omMMMMMy` + `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` + hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh +/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ +hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh +/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ + hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh + `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` + yMMMMMMMMMms/..-::oM: .+dMMMMMy + :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: + /dMMMMMMMMMMMMMMMdNMMMMMMMd/ + .odMMMMMMMMMMMMMMMMMMdo. + `:+shmNNMMNNmhs+:` EOF ;; "ubuntu_old") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} ./+o+- +${c2} yyyyy- ${c1}-yyyyyy+ +${c2} ${c2}://+//////${c1}-yyyyyyo +${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` +${c3} .:++o: ${c2}/++++++++/:--:/- +${c3} o:+o+:++.${c2}`..```.-/oo+++++/ +${c3} .:+o:+o/.${c2} `+sssoo+/ +${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. +${c2}/+++//+:${c3}`oo+o${c2} /::--:. +${c2}+/+o+++${c3}`o++o${c1} ++////. +${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. +${c3} .+.o+oo:.${c1} `oddhhhh+ +${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ +${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: +${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` +${c1} /osyyyyyyo${c3}++ooo+++/ +${c1} ````` ${c3}+oo+++o: +${c3} `oo++. EOF ;; "Ubuntu-Studio") set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} ..-::::::-.` + `.:+++++++++++${c2}ooo${c1}++:.` + ./+++++++++++++${c2}sMMMNdyo${c1}+/. + .++++++++++++++++${c2}oyhmMMMMms${c1}++. + `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` + `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` + +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` + :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: + ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. + ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ + :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: + +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ + `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` + `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ + ./+++++++++++++++${c2}oyhdNMMMms${c1}++. + ./+++++++++++++${c2}hMMMNdyo${c1}+/. + `.:+++++++++++${c2}sso${c1}++:. + ..-::::::-.. EOF ;; "Ubuntu"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} .-/+oossssoo+/-. + `:+ssssssssssssssssss+:` + -+ssssssssssssssssssyyssss+- + .ossssssssssssssssss${c2}dMMMNy${c1}sssso. + /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ + +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ +.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. ++ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ +oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso +oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso ++ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ +.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ + +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ + /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ + .ossssssssssssssssss${c2}dMMMNy${c1}sssso. + -+sssssssssssssssss${c2}yyy${c1}ssss+- + `:+ssssssssssssssssss+:` + .-/+oossssoo+/-. EOF ;; "void_small") set_colors 2 8 read -rd '' ascii_data <<'EOF' - +${c1} _______ + _ \______ - +| \ ___ \ | +| | / \ | | +| | \___/ | | +| \______ \_| + -_______\ EOF ;; "Void"*) set_colors 2 8 read -rd '' ascii_data <<'EOF' - +${c1} __.;=====;.__ + _.=+==++=++=+=+===;. + -=+++=+===+=+=+++++=_ + . -=:`` `--==+=++==. + _vi, ` --+=++++: + .uvnvi. _._ -==+==+. + .vvnvnI` .;==|==;. :|=||=|. +${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL +${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE +${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' +${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! +${c1} -1vvnvv. `~+++` ++|+++ + +vnvnnv, `-|=== + +vnvnvns. . :=- + -Invnvvnsi..___..=sv=. ` + +Invnvnvnnnnnnnnvvnn;. + ~|Invnvnvvnvvvnnv}+` + -~|{*l}*|~ EOF ;; @@ -6954,28 +7435,96 @@ EOF "Windows 10"* | "windows10" | "windows8" ) set_colors 6 7 read -rd '' ascii_data <<'EOF' +${c1} .., + ....,,:;+ccllll + ...,,+:; cllllllllllllllllll +,cclllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +`'ccllllllllll lllllllllllllllllll + `' \\*:: :ccllllllllllllllll + ````''*::cll + `` EOF ;; "Windows"*) set_colors 1 2 4 3 read -rd '' ascii_data <<'EOF' - +${c1} ,.=:!!t3Z3z., + :tt:::tt333EE3 +${c1} Et:::ztt33EEEL${c2} @Ee., .., +${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# +${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL +${c1} it::::tt333EEF${c2} @EEEEEEttttt33F +${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. +${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF +${c3} ;::::::::zt33)${c2} "4EEEtttji3P* +${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. +${c3} i::::::::zt33F${c4} AEEEtttt::::ztF +${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 +${c3} E::::::::zt33L${c4} @EEEtttt::::z3F +${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` +${c3} `${c4} :EEEEtttt::::z7 + "VEzjt:;;z>*` EOF ;; "Xubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `-/osyhddddhyso/-` + .+yddddddddddddddddddy+. + :yddddddddddddddddddddddddy: + -yddddddddddddddddddddhdddddddy- + odddddddddddyshdddddddh`dddd+ydddo + `yddddddhshdd- ydddddd+`ddh.:dddddy` + sddddddy /d. :dddddd-:dy`-ddddddds +:ddddddds /+ .dddddd`yy`:ddddddddd: +sdddddddd` . .-:/+ssdyodddddddddds +ddddddddy `:ohddddddddd +dddddddd. +dddddddd +sddddddy ydddddds +:dddddd+ .oddddddd: + sdddddo ./ydddddddds + `yddddd. `:ohddddddddddy` + oddddh/` `.:+shdddddddddddddo + -ydddddhyssyhdddddddddddddddddy- + :yddddddddddddddddddddddddy: + .+yddddddddddddddddddy+. + `-/osyhddddhyso/-` EOF ;; "Zorin"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' +${c1} `osssssssssssssssssssso` + .osssssssssssssssssssssso. + .+oooooooooooooooooooooooo+. + + + `::::::::::::::::::::::. .:` + `+ssssssssssssssssss+:.` `.:+ssso` +.ossssssssssssssso/. `-+ossssssso. +ssssssssssssso/-` `-/osssssssssssss +.ossssssso/-` .-/ossssssssssssssso. + `+sss+:. `.:+ssssssssssssssssss+` + `:. .::::::::::::::::::::::` + + .+oooooooooooooooooooooooo+. + -osssssssssssssssssssssso- + `osssssssssssssssssssso` EOF ;; From 8b41e513ce0b58e8e6c632ff23e67596302c3f0d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:55:34 +1000 Subject: [PATCH 0252/1133] general: Start inlining ascii. --- neofetch | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 105 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 0c0a6aaaf..77db76a0e 100755 --- a/neofetch +++ b/neofetch @@ -7532,32 +7532,131 @@ EOF case "$kernel_name" in *"BSD") set_colors 1 7 4 3 6 - ascii_file="bsd" + read -rd '' ascii_data <<'EOF' +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) +EOF ;; "Darwin") set_colors 2 3 1 1 5 4 - ascii_file="mac" + read -rd '' ascii_data <<'EOF' +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. +EOF ;; "GNU"*) set_colors fg 7 - ascii_file="gnu" + read -rd '' ascii_data <<'EOF' +${c1} _-`````-, ,- '- . + .' .- - | | - -. `. + /.' / `. \ +:/ : _... ..._ `` : +:: : /._ .`:'_.._\. || : +:: `._ ./ ,` : \ . _.'' . +`:. / | -. \-. \\_ / + \:._ _/ .' .@) \@) ` `\ ,.' + _/,--' .- .\,-.`--`. + ,'/'' (( \ ` ) + /'/' \ `-' ( + '/'' `._,-----' + ''/' .,---' + ''/' ;: + ''/'' ''/ + ''/''/'' + '/'/' + `; +EOF ;; "Linux") set_colors fg 8 3 - ascii_file="linux" + read -rd '' ascii_data <<'EOF' +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### +EOF ;; "SunOS") set_colors 3 7 - ascii_file="solaris" + read -rd '' ascii_data <<'EOF' +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. +EOF ;; "IRIX"*) set_colors 4 7 - ascii_file="irix" + read -rd '' ascii_data <<'EOF' +${c1} ./ohmNd/ +dNmho/- + `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. + `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` + -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. + `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` ++mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ +dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd +oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ +.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. + hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh + /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: + `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd + `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` + `yNMMNho-yMMMM` NMMMm.+hNMMNh` + -MMMMd: oMMMM. NMMMh :hMMMM- + -yNMMMmooMMMM- NMMMyomMMMNy- + .omMMMMMMMM-`NMMMMMMMmo. + `:hMMMMMM. NMMMMMh/` + .odNm+ /dNms. +EOF ;; esac ;; From 6a7fb8121332b5a93b0c279c07ec58d824f6c72a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:59:37 +1000 Subject: [PATCH 0253/1133] general: Start inlining ascii. --- neofetch | 62 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 14 deletions(-) diff --git a/neofetch b/neofetch index 77db76a0e..128e23bc6 100755 --- a/neofetch +++ b/neofetch @@ -4788,20 +4788,6 @@ EOF "ChaletOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - -EOF - ;; - - "Chapeau"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' - -EOF - ;; - - "Chrom"*) - set_colors 2 1 3 4 7 - read -rd '' ascii_data <<'EOF' ${c1} `.//+osso+/:`` `/sdNNmhyssssydmNNdo:` :hNmy+-` .-+hNNs- @@ -4825,6 +4811,54 @@ ${c1} `.//+osso+/:`` EOF ;; + "Chapeau"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} .-/-. + ////////. + ////////${c2}y+${c1}//. + ////////${c2}mMN${c1}/////. + ////////${c2}mMN+${c1}////////. + ////////////////////////. + /////////+${c2}shhddhyo${c1}+////////. + ////////${c2}ymMNmdhhdmNNdo${c1}///////. +///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. +///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// +//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// +//////${c2}+MMmssssssssssssss+${c1}/////// +`//////${c2}yMMy${c1}//////////////////// + `//////${c2}smMNhso++oydNm${c1}//////// + `///////${c2}ohmNMMMNNdy+${c1}/////// + `//////////${c2}++${c1}////////// + `////////////////. + -////////- +EOF + ;; + + "Chrom"*) + set_colors 2 1 3 4 7 + read -rd '' ascii_data <<'EOF' +${c2} .,:loool:,. + .,coooooooooooooc,. + .,lllllllllllllllllllll,. + ;ccccccccccccccccccccccccc; +${c1} '${c2}ccccccccccccccccccccccccccccc. +${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: +${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. +${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d +${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 +${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 +${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d +${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. +${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; +${c1} .:ccccccccllllllllo${c3}O0000000OOO, +${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. +${c1} '::ccccccccc${c3}dOOOOOOOkx:. +${c1} ..,::cccc${c3}xOOOkkko;. +${c1} ..,:${c3}dOkxl:. +EOF + ;; + "Clover"*) set_colors 2 6 read -rd '' ascii_data <<'EOF' From 0415cd405e93d20da700d2dfa9c68ad894afafca Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:04:15 +1000 Subject: [PATCH 0254/1133] general: Remove old files --- ascii/distro/aix | 20 ------------ ascii/distro/alpine | 20 ------------ ascii/distro/alpine_small | 6 ---- ascii/distro/amazon | 19 ----------- ascii/distro/anarchy | 28 ---------------- ascii/distro/android | 13 -------- ascii/distro/antergos | 19 ----------- ascii/distro/antix | 13 -------- ascii/distro/aosc | 20 ------------ ascii/distro/apricity | 18 ----------- ascii/distro/arch | 19 ----------- ascii/distro/arch_old | 16 --------- ascii/distro/arch_small | 7 ---- ascii/distro/arch_xferience | 19 ----------- ascii/distro/archbox | 19 ----------- ascii/distro/archlabs | 21 ------------ ascii/distro/archmerge | 20 ------------ ascii/distro/artix | 19 ----------- ascii/distro/arya | 15 --------- ascii/distro/bitrig | 18 ----------- ascii/distro/blag | 17 ---------- ascii/distro/blankon | 17 ---------- ascii/distro/bsd | 19 ----------- ascii/distro/bunsenlabs | 20 ------------ ascii/distro/calculate | 20 ------------ ascii/distro/centos | 19 ----------- ascii/distro/chakra | 18 ----------- ascii/distro/chaletos | 20 ------------ ascii/distro/chapeau | 18 ----------- ascii/distro/chrome | 18 ----------- ascii/distro/cloveros | 20 ------------ ascii/distro/coreos | 20 ------------ ascii/distro/crux | 18 ----------- ascii/distro/crux_small | 7 ---- ascii/distro/debian | 17 ---------- ascii/distro/debian_small | 6 ---- ascii/distro/deepin | 18 ----------- ascii/distro/desaos | 16 --------- ascii/distro/devuan | 15 --------- ascii/distro/dracos | 13 -------- ascii/distro/dragonflybsd | 15 --------- ascii/distro/dragonflybsd_old | 18 ----------- ascii/distro/dragonflybsd_small | 4 --- ascii/distro/elementary | 17 ---------- ascii/distro/endless | 21 ------------ ascii/distro/exherbo | 22 ------------- ascii/distro/fedora | 17 ---------- ascii/distro/freebsd | 15 --------- ascii/distro/freebsd_small | 7 ---- ascii/distro/frugalware | 23 ------------- ascii/distro/funtoo | 11 ------- ascii/distro/galliumos | 19 ----------- ascii/distro/gem | 15 --------- ascii/distro/gentoo | 18 ----------- ascii/distro/gentoo_small | 7 ---- ascii/distro/gnewsense | 12 ------- ascii/distro/gnu | 18 ----------- ascii/distro/gobolinux | 6 ---- ascii/distro/grombyang | 18 ----------- ascii/distro/guixsd | 10 ------ ascii/distro/haiku | 17 ---------- ascii/distro/hyperbola | 16 --------- ascii/distro/irix | 19 ----------- ascii/distro/kali | 21 ------------ ascii/distro/kaos | 16 --------- ascii/distro/kde | 19 ----------- ascii/distro/kogaion | 20 ------------ ascii/distro/korora | 16 --------- ascii/distro/kslinux | 11 ------- ascii/distro/kubuntu | 20 ------------ ascii/distro/lede | 9 ------ ascii/distro/linux | 12 ------- ascii/distro/lmde | 17 ---------- ascii/distro/lubuntu | 20 ------------ ascii/distro/lunar | 13 -------- ascii/distro/mac | 18 ----------- ascii/distro/mac_small | 8 ----- ascii/distro/mageia | 19 ----------- ascii/distro/magpieos | 20 ------------ ascii/distro/manjaro | 14 -------- ascii/distro/maui | 20 ------------ ascii/distro/mer | 27 ---------------- ascii/distro/minix | 17 ---------- ascii/distro/mint | 16 --------- ascii/distro/mx | 17 ---------- ascii/distro/netbsd | 17 ---------- ascii/distro/netrunner | 20 ------------ ascii/distro/nitrux | 18 ----------- ascii/distro/nixos | 19 ----------- ascii/distro/nixos_small | 7 ---- ascii/distro/nurunner | 19 ----------- ascii/distro/nutyx | 23 ------------- ascii/distro/obrevenge | 18 ----------- ascii/distro/openbsd | 23 ------------- ascii/distro/openbsd_small | 7 ---- ascii/distro/openindiana | 16 --------- ascii/distro/openmandriva | 15 --------- ascii/distro/openwrt | 9 ------ ascii/distro/oracle | 12 ------- ascii/distro/osmc | 20 ------------ ascii/distro/pacbsd | 24 -------------- ascii/distro/parabola | 16 --------- ascii/distro/pardus | 18 ----------- ascii/distro/parrot | 24 -------------- ascii/distro/parsix | 21 ------------ ascii/distro/pclinuxos | 19 ----------- ascii/distro/peppermint | 19 ----------- ascii/distro/pop_os | 21 ------------ ascii/distro/porteus | 23 ------------- ascii/distro/postmarketos | 17 ---------- ascii/distro/puppy | 18 ----------- ascii/distro/qubes | 21 ------------ ascii/distro/raspbian | 23 ------------- ascii/distro/redhat | 16 --------- ascii/distro/redstar | 18 ----------- ascii/distro/refracta | 19 ----------- ascii/distro/rosa | 20 ------------ ascii/distro/sabayon | 18 ----------- ascii/distro/sabotage | 12 ------- ascii/distro/sailfishos | 18 ----------- ascii/distro/salentos | 20 ------------ ascii/distro/scientific | 20 ------------ ascii/distro/siduction | 21 ------------ ascii/distro/slackware | 21 ------------ ascii/distro/slitaz | 17 ---------- ascii/distro/smartos | 17 ---------- ascii/distro/solaris | 8 ----- ascii/distro/solus | 20 ------------ ascii/distro/source_mage | 21 ------------ ascii/distro/sparky | 21 ------------ ascii/distro/steamos | 18 ----------- ascii/distro/suse | 18 ----------- ascii/distro/swagarch | 15 --------- ascii/distro/tails | 19 ----------- ascii/distro/trisquel | 18 ----------- ascii/distro/trueos | 27 ---------------- ascii/distro/tumbleweed | 13 -------- ascii/distro/ubuntu | 20 ------------ ascii/distro/ubuntu-budgie | 20 ------------ ascii/distro/ubuntu-gnome | 16 --------- ascii/distro/ubuntu-mate | 20 ------------ ascii/distro/ubuntu-studio | 20 ------------ ascii/distro/ubuntu_old | 19 ----------- ascii/distro/void | 18 ----------- ascii/distro/void_small | 7 ---- ascii/distro/windows | 16 --------- ascii/distro/windows10 | 19 ----------- ascii/distro/xubuntu | 20 ------------ ascii/distro/zorin | 17 ---------- config/travis.conf | 55 ------------------------------- neofetch | 57 +++++++++++++++++++++++++++++++++ 151 files changed, 57 insertions(+), 2609 deletions(-) delete mode 100644 ascii/distro/aix delete mode 100644 ascii/distro/alpine delete mode 100644 ascii/distro/alpine_small delete mode 100644 ascii/distro/amazon delete mode 100644 ascii/distro/anarchy delete mode 100644 ascii/distro/android delete mode 100644 ascii/distro/antergos delete mode 100644 ascii/distro/antix delete mode 100644 ascii/distro/aosc delete mode 100644 ascii/distro/apricity delete mode 100644 ascii/distro/arch delete mode 100644 ascii/distro/arch_old delete mode 100644 ascii/distro/arch_small delete mode 100644 ascii/distro/arch_xferience delete mode 100644 ascii/distro/archbox delete mode 100644 ascii/distro/archlabs delete mode 100644 ascii/distro/archmerge delete mode 100644 ascii/distro/artix delete mode 100644 ascii/distro/arya delete mode 100644 ascii/distro/bitrig delete mode 100644 ascii/distro/blag delete mode 100644 ascii/distro/blankon delete mode 100644 ascii/distro/bsd delete mode 100644 ascii/distro/bunsenlabs delete mode 100644 ascii/distro/calculate delete mode 100644 ascii/distro/centos delete mode 100644 ascii/distro/chakra delete mode 100644 ascii/distro/chaletos delete mode 100644 ascii/distro/chapeau delete mode 100644 ascii/distro/chrome delete mode 100644 ascii/distro/cloveros delete mode 100644 ascii/distro/coreos delete mode 100644 ascii/distro/crux delete mode 100644 ascii/distro/crux_small delete mode 100644 ascii/distro/debian delete mode 100644 ascii/distro/debian_small delete mode 100644 ascii/distro/deepin delete mode 100644 ascii/distro/desaos delete mode 100644 ascii/distro/devuan delete mode 100644 ascii/distro/dracos delete mode 100644 ascii/distro/dragonflybsd delete mode 100644 ascii/distro/dragonflybsd_old delete mode 100644 ascii/distro/dragonflybsd_small delete mode 100644 ascii/distro/elementary delete mode 100644 ascii/distro/endless delete mode 100644 ascii/distro/exherbo delete mode 100644 ascii/distro/fedora delete mode 100644 ascii/distro/freebsd delete mode 100644 ascii/distro/freebsd_small delete mode 100644 ascii/distro/frugalware delete mode 100644 ascii/distro/funtoo delete mode 100644 ascii/distro/galliumos delete mode 100644 ascii/distro/gem delete mode 100644 ascii/distro/gentoo delete mode 100644 ascii/distro/gentoo_small delete mode 100644 ascii/distro/gnewsense delete mode 100644 ascii/distro/gnu delete mode 100644 ascii/distro/gobolinux delete mode 100644 ascii/distro/grombyang delete mode 100644 ascii/distro/guixsd delete mode 100644 ascii/distro/haiku delete mode 100644 ascii/distro/hyperbola delete mode 100644 ascii/distro/irix delete mode 100644 ascii/distro/kali delete mode 100644 ascii/distro/kaos delete mode 100644 ascii/distro/kde delete mode 100644 ascii/distro/kogaion delete mode 100644 ascii/distro/korora delete mode 100644 ascii/distro/kslinux delete mode 100644 ascii/distro/kubuntu delete mode 100644 ascii/distro/lede delete mode 100644 ascii/distro/linux delete mode 100644 ascii/distro/lmde delete mode 100644 ascii/distro/lubuntu delete mode 100644 ascii/distro/lunar delete mode 100644 ascii/distro/mac delete mode 100644 ascii/distro/mac_small delete mode 100644 ascii/distro/mageia delete mode 100644 ascii/distro/magpieos delete mode 100644 ascii/distro/manjaro delete mode 100644 ascii/distro/maui delete mode 100644 ascii/distro/mer delete mode 100644 ascii/distro/minix delete mode 100644 ascii/distro/mint delete mode 100644 ascii/distro/mx delete mode 100644 ascii/distro/netbsd delete mode 100644 ascii/distro/netrunner delete mode 100644 ascii/distro/nitrux delete mode 100644 ascii/distro/nixos delete mode 100644 ascii/distro/nixos_small delete mode 100644 ascii/distro/nurunner delete mode 100644 ascii/distro/nutyx delete mode 100644 ascii/distro/obrevenge delete mode 100644 ascii/distro/openbsd delete mode 100644 ascii/distro/openbsd_small delete mode 100644 ascii/distro/openindiana delete mode 100644 ascii/distro/openmandriva delete mode 100644 ascii/distro/openwrt delete mode 100644 ascii/distro/oracle delete mode 100644 ascii/distro/osmc delete mode 100644 ascii/distro/pacbsd delete mode 100644 ascii/distro/parabola delete mode 100644 ascii/distro/pardus delete mode 100644 ascii/distro/parrot delete mode 100644 ascii/distro/parsix delete mode 100644 ascii/distro/pclinuxos delete mode 100644 ascii/distro/peppermint delete mode 100644 ascii/distro/pop_os delete mode 100644 ascii/distro/porteus delete mode 100644 ascii/distro/postmarketos delete mode 100644 ascii/distro/puppy delete mode 100644 ascii/distro/qubes delete mode 100644 ascii/distro/raspbian delete mode 100644 ascii/distro/redhat delete mode 100644 ascii/distro/redstar delete mode 100644 ascii/distro/refracta delete mode 100644 ascii/distro/rosa delete mode 100644 ascii/distro/sabayon delete mode 100644 ascii/distro/sabotage delete mode 100644 ascii/distro/sailfishos delete mode 100644 ascii/distro/salentos delete mode 100644 ascii/distro/scientific delete mode 100644 ascii/distro/siduction delete mode 100644 ascii/distro/slackware delete mode 100644 ascii/distro/slitaz delete mode 100644 ascii/distro/smartos delete mode 100644 ascii/distro/solaris delete mode 100644 ascii/distro/solus delete mode 100644 ascii/distro/source_mage delete mode 100644 ascii/distro/sparky delete mode 100644 ascii/distro/steamos delete mode 100644 ascii/distro/suse delete mode 100644 ascii/distro/swagarch delete mode 100644 ascii/distro/tails delete mode 100644 ascii/distro/trisquel delete mode 100644 ascii/distro/trueos delete mode 100644 ascii/distro/tumbleweed delete mode 100644 ascii/distro/ubuntu delete mode 100644 ascii/distro/ubuntu-budgie delete mode 100644 ascii/distro/ubuntu-gnome delete mode 100644 ascii/distro/ubuntu-mate delete mode 100644 ascii/distro/ubuntu-studio delete mode 100644 ascii/distro/ubuntu_old delete mode 100644 ascii/distro/void delete mode 100644 ascii/distro/void_small delete mode 100644 ascii/distro/windows delete mode 100644 ascii/distro/windows10 delete mode 100644 ascii/distro/xubuntu delete mode 100644 ascii/distro/zorin delete mode 100644 config/travis.conf diff --git a/ascii/distro/aix b/ascii/distro/aix deleted file mode 100644 index 8526b7c6a..000000000 --- a/ascii/distro/aix +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `:+ssssossossss+-` - .oys///oyhddddhyo///sy+. - /yo:+hNNNNNNNNNNNNNNNNh+:oy/ - :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: - `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh - h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy -/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: -h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y -N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m -N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m -h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y -:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- - yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy - sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo - :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- - :ys:/yNNNNNNNNNNNNNNNmy/:sy: - .+ys///osyhhhhys+///sy+. - -/osssossossso/- diff --git a/ascii/distro/alpine b/ascii/distro/alpine deleted file mode 100644 index 8f9b8771d..000000000 --- a/ascii/distro/alpine +++ /dev/null @@ -1,20 +0,0 @@ -${c1} .hddddddddddddddddddddddh. - :dddddddddddddddddddddddddd: - /dddddddddddddddddddddddddddd/ - +dddddddddddddddddddddddddddddd+ - `sdddddddddddddddddddddddddddddddds` - `ydddddddddddd++hdddddddddddddddddddy` -.hddddddddddd+` `+ddddh:-sdddddddddddh. -hdddddddddd+` `+y: .sddddddddddh -ddddddddh+` `//` `.` -sddddddddd -ddddddh+` `/hddh/` `:s- -sddddddd -ddddh+` `/+/dddddh/` `+s- -sddddd -ddd+` `/o` :dddddddh/` `oy- .yddd -hdddyo+ohddyosdddddddddho+oydddy++ohdddh -.hddddddddddddddddddddddddddddddddddddh. - `yddddddddddddddddddddddddddddddddddy` - `sdddddddddddddddddddddddddddddddds` - +dddddddddddddddddddddddddddddd+ - /dddddddddddddddddddddddddddd/ - :dddddddddddddddddddddddddd: - .hddddddddddddddddddddddh. diff --git a/ascii/distro/alpine_small b/ascii/distro/alpine_small deleted file mode 100644 index 9949011c4..000000000 --- a/ascii/distro/alpine_small +++ /dev/null @@ -1,6 +0,0 @@ -${c1} /\\ /\\ - /${c2}/ ${c1}\\ \\ - /${c2}/ ${c1}\\ \\ -/${c2}// ${c1}\\ \\ -${c2}// ${c1}\\ \\ - \\ diff --git a/ascii/distro/amazon b/ascii/distro/amazon deleted file mode 100644 index 050c5b3aa..000000000 --- a/ascii/distro/amazon +++ /dev/null @@ -1,19 +0,0 @@ -${c1} `-/oydNNdyo:.` - `.:+shmMMMMMMMMMMMMMMmhs+:.` - -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- -.`` -/+shmNNMMMMMMNNmhs+/- ``. -dNmhs+:. `.:/oo/:.` .:+shmNd -dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd -dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. - `.:+shNMMMMMh yMMMMMNhs+:`` - `-+shy shs+:` diff --git a/ascii/distro/anarchy b/ascii/distro/anarchy deleted file mode 100644 index d0f5a1402..000000000 --- a/ascii/distro/anarchy +++ /dev/null @@ -1,28 +0,0 @@ - ${c2}..${c1} - ${c2}..${c1} - ${c2}:..${c1} - ${c2}:+++.${c1} - .:::++${c2}++++${c1}+::. - .:+######${c2}++++${c1}######+:. - .+#########${c2}+++++${c1}##########:. - .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. - +###########${c2}+++++++++${c1}############: - +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ - +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ - :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: - ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ -.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. -.##########${c2}+++++++++++++++++++${c1}###########. - #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ - :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: - +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ - +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ - :##${c2}++++++${c1}############${c2}++++++++++${c1}##: - .${c2}++++++${c1}#############${c2}++++++++++${c1}+. - :${c2}++++${c1}###############${c2}+++++++${c1}:: - .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. - ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. - ${c2}.${c1} ${c2}.:+++${c1}. - ${c2}.:${c1}: - ${c2}..${c1} - ${c2}..${c1} \ No newline at end of file diff --git a/ascii/distro/android b/ascii/distro/android deleted file mode 100644 index 17e7ff306..000000000 --- a/ascii/distro/android +++ /dev/null @@ -1,13 +0,0 @@ -${c1} ╲ ▁▂▂▂▁ ╱ - ▄███████▄ - ▄██${c2} ${c1}███${c2} ${c1}██▄ - ▄███████████▄ -▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄ █▄ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ - █████████████ - ███████████ - ██ ██ - ██ ██ diff --git a/ascii/distro/antergos b/ascii/distro/antergos deleted file mode 100644 index 023af9bd8..000000000 --- a/ascii/distro/antergos +++ /dev/null @@ -1,19 +0,0 @@ -${c2} `.-/::/-`` - .-/osssssssso/. - :osyysssssssyyys+- - `.+yyyysssssssssyyyyy+. - `/syyyyyssssssssssyyyyys-` - `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` - .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. - .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. - -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: - -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- - .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` -`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo -.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. -ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy -dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh --dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- -.smmmmddddddddhhhhhhhhhdddddddddmmmms. - `+ydmmmdddddddddddddddddddmmmmdy/. - `.:+ooyyddddddddddddyyso+:.` diff --git a/ascii/distro/antix b/ascii/distro/antix deleted file mode 100644 index c383774ee..000000000 --- a/ascii/distro/antix +++ /dev/null @@ -1,13 +0,0 @@ -${c1} - \ - , - ~ ^ ~ - \ / - , ' \ ' , / - , \ '/ - , \ / , - ,___, \/ , - / | _ _ _|_ o /\ , -|, | / |/ | | | / \ , - \,_/\_/ | |_/|_/|_/_/ \, - , / ,\ - , / , ' \ - ' - , _ _ _ , ' diff --git a/ascii/distro/aosc b/ascii/distro/aosc deleted file mode 100644 index 785ba7d93..000000000 --- a/ascii/distro/aosc +++ /dev/null @@ -1,20 +0,0 @@ -${c2} .:+syhhhhys+:. - .ohNMMMMMMMMMMMMMMNho. - `+mMMMMMMMMMMmdmNMMMMMMMMm+` - +NMMMMMMMMMMMM/ `./smMMMMMN+ - .mMMMMMMMMMMMMMMo -yMMMMMm. - :NMMMMMMMMMMMMMMMs .hMMMMN: - .NMMMMhmMMMMMMMMMMm+/- oMMMMN. - dMMMMs ./ymMMMMMMMMMMNy. sMMMMd --MMMMN` oMMMMMMMMMMMN: `NMMMM- -/MMMMh NMMMMMMMMMMMMm hMMMM/ -/MMMMh NMMMMMMMMMMMMm hMMMM/ --MMMMN` :MMMMMMMMMMMMy. `NMMMM- - dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd - .NMMMMo -/+sMMMMMMMMMMMmMMMMN. - :NMMMMh. .MMMMMMMMMMMMMMMN: - .mMMMMMy- NMMMMMMMMMMMMMm. - +NMMMMMms/.` mMMMMMMMMMMMN+ - `+mMMMMMMMMNmddMMMMMMMMMMm+` - .ohNMMMMMMMMMMMMMMNho. - .:+syhhhhys+:. diff --git a/ascii/distro/apricity b/ascii/distro/apricity deleted file mode 100644 index eada9d6df..000000000 --- a/ascii/distro/apricity +++ /dev/null @@ -1,18 +0,0 @@ -${c2} ./o- - ``...`` `:. -/: - `-+ymNMMMMMNmho-` :sdNNm/ - `+dMMMMMMMMMMMMMMMmo` sh:.:::- - /mMMMMMMMMMMMMMMMMMMMm/`sNd/ - oMMMMMMMMMMMMMMMMMMMMMMMs -` -:MMMMMMMMMMMMMMMMMMMMMMMMM/ -NMMMMMMMMMMMMMMMMMMMMMMMMMd -MMMMMMMmdmMMMMMMMMMMMMMMMMd -MMMMMMy` .mMMMMMMMMMMMmho:` -MMMMMMNo/sMMMMMMMNdy+-.`-/ -MMMMMMMMMMMMNdy+:.`.:ohmm: -MMMMMMMmhs+-.`.:+ymNMMMy. -MMMMMM/`.-/ohmNMMMMMMy- -MMMMMMNmNNMMMMMMMMmo. -MMMMMMMMMMMMMMMms:` -MMMMMMMMMMNds/. -dhhyys+/-` diff --git a/ascii/distro/arch b/ascii/distro/arch deleted file mode 100644 index 3de103bb0..000000000 --- a/ascii/distro/arch +++ /dev/null @@ -1,19 +0,0 @@ -${c1} -` - .o+` - `ooo/ - `+oooo: - `+oooooo: - -+oooooo+: - `/:-:++oooo+: - `/++++/+++++++: - `/++++++++++++++: - `/+++o${c2}oooooooo${c1}oooo/` -${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` -${c2} .oossssso-````/ossssss+` - -osssssso. :ssssssso. - :osssssss/ osssso+++. - /ossssssss/ +ssssooo/- - `/ossssso+/:- -:/+osssso+- - `+sso+:-` `.-/+oso: - `++:. `-/+/ - .` `/ diff --git a/ascii/distro/arch_old b/ascii/distro/arch_old deleted file mode 100644 index dbd6cefae..000000000 --- a/ascii/distro/arch_old +++ /dev/null @@ -1,16 +0,0 @@ -${c1} __ - _=(SDGJT=_ - _GTDJHGGFCVS) - ,GTDJGGDTDFBGX0 -${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ -${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL -${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, -${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], -${c1} SDDFDFH' !YEWD,${c2} )HDROD -${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' -${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' -${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' -${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) -${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF -'EHTI !H - `0F' '! diff --git a/ascii/distro/arch_small b/ascii/distro/arch_small deleted file mode 100644 index 267576179..000000000 --- a/ascii/distro/arch_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} /\ - /^^\ - /\ \ - /${c2} __ \ - / ( ) \ - / __| |__\\\ -/// \\\\\ diff --git a/ascii/distro/arch_xferience b/ascii/distro/arch_xferience deleted file mode 100644 index f1757f924..000000000 --- a/ascii/distro/arch_xferience +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ``--:::::::-.` - .-/+++ooooooooo+++:-` - `-/+oooooooooooooooooo++:. - -/+oooooo/+ooooooooo+/ooo++:` - `/+oo++oo. .+oooooo+.-: +:-o+- - `/+o/. -o. :oooooo+ ```:.+oo+- -`:+oo- -/` :oooooo+ .`-`+oooo/. -.+ooo+. .` `://///+-+..oooooo+:` --+ooo:` ``.-+oooooo+/` --+oo/` :+oooo/. -.+oo: ..-/. . -+oo+/` -`/++- -:::++::/. -+oo+- - ./o: `:///+- `./ooo+:` - .++- `` /-` -:/+oooo+:` - .:+/:`` `-:ooooooo++- - ./+o+//:...../+oooooooo++:` - `:/++ooooooooooooo++/-` - `.-//++++++//:-.` - `````` diff --git a/ascii/distro/archbox b/ascii/distro/archbox deleted file mode 100644 index a35a15c65..000000000 --- a/ascii/distro/archbox +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ...:+oh/:::.. - ..-/oshhhhhh` `::::-. - .:/ohhhhhhhhhhhh` `-::::. - .+shhhhhhhhhhhhhhhhh` `.::-. - /`-:+shhhhhhhhhhhhhh` .-/+shh - / .:/ohhhhhhhhh` .:/ohhhhhhhh - / `-:+shhh` ..:+shhhhhhhhhhhh - / .:ohhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / .+o+ `hhhhhhhhhhhhhhhhhhhh - / -hhhhh `hhhhhhhhhhhhhhhhhhhh - / ohhhhho `hhhhhhhhhhhhhhhhhhhh - /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` - `--/:` /: `hhhhhhhhhhhho/- - -/:. `hhhhhhs+:-` - ::::/ho/-` diff --git a/ascii/distro/archlabs b/ascii/distro/archlabs deleted file mode 100644 index 74f8a026c..000000000 --- a/ascii/distro/archlabs +++ /dev/null @@ -1,21 +0,0 @@ -${c1} 'c' - 'kKk, - .dKKKx. - .oKXKXKd. - .l0XXXXKKo. - c0KXXXXKX0l. - :0XKKOxxOKX0l. - :OXKOc. .c0XX0l. - :OK0o. ${c4}...${c1}'dKKX0l. - :OX0c ${c4};xOx'${c1}'dKXX0l. - :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. - c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. - .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. - .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. - .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. - .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. - .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' - 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' - 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, - ,xko:'. ${c4}.. ${c1} .':okx; - .,'. .',. diff --git a/ascii/distro/archmerge b/ascii/distro/archmerge deleted file mode 100644 index c849851ec..000000000 --- a/ascii/distro/archmerge +++ /dev/null @@ -1,20 +0,0 @@ -${c1} y: - sMN- - +MMMm` - /MMMMMd` - :NMMMMMMy - -NMMMMMMMMs - .NMMMMMMMMMM+ - .mMMMMMMMMMMMM+ - oNMMMMMMMMMMMMM+ - `+:-+NMMMMMMMMMMMM+ - .sNMNhNMMMMMMMMMMMM/ - `hho/sNMMMMMMMMMMMMMMM/ - `.`omMMmMMMMMMMMMMMMMMMM+ - .mMNdshMMMMd+::oNMMMMMMMMMo - .mMMMMMMMMM+ `yMMMMMMMMMs - .NMMMMMMMMM/ yMMMMMMMMMy - -NMMMMMMMMMh `mNMMMMMMMMd` - /NMMMNds+:.` `-/oymMMMm. - +Mmy/. `:smN: -/+. -o. diff --git a/ascii/distro/artix b/ascii/distro/artix deleted file mode 100644 index 3ac30d3d6..000000000 --- a/ascii/distro/artix +++ /dev/null @@ -1,19 +0,0 @@ -${c1} d${c2}c. -${c1} x${c2}dc. -${c1} '.${c4}.${c1} d${c2}dlc. -${c1} c${c2}0d:${c1}o${c2}xllc; -${c1} :${c2}0ddlolc,lc, -${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. -${c1} ;${c1}K${c2}kxoOddollc' cllc. -${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: -${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: -${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, -${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. -${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; -${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, -${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. -${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. -${c1} 0${c2}Okd''dc. .cll; -${c1} k${c2}Okd' .llc, -${c1} d${c2}Od, 'lc. -${c1} :,${c4}. ${c2}... diff --git a/ascii/distro/arya b/ascii/distro/arya deleted file mode 100644 index 7d603e20d..000000000 --- a/ascii/distro/arya +++ /dev/null @@ -1,15 +0,0 @@ -${c1} `oyyy/${c2}-yyyyyy+ -${c1} -syyyy/${c2}-yyyyyy+ -${c1} .syyyyy/${c2}-yyyyyy+ -${c1} :yyyyyy/${c2}-yyyyyy+ -${c1} `/ :yyyyyy/${c2}-yyyyyy+ -${c1} .+s :yyyyyy/${c2}-yyyyyy+ -${c1} .oys :yyyyyy/${c2}-yyyyyy+ -${c1} -oyys :yyyyyy/${c2}-yyyyyy+ -${c1} :syyys :yyyyyy/${c2}-yyyyyy+ -${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ -${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ -${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- -${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy -${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy -${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy diff --git a/ascii/distro/bitrig b/ascii/distro/bitrig deleted file mode 100644 index 8daebf5f3..000000000 --- a/ascii/distro/bitrig +++ /dev/null @@ -1,18 +0,0 @@ -${c1} `hMMMMN+ - -MMo-dMd` - oMN- oMN` - yMd /NM: - .mMmyyhMMs - :NMMMhsmMh - +MNhNNoyMm- - hMd.-hMNMN: - mMmsssmMMMo - .MMdyyhNMMMd - oMN.`/dMddMN` - yMm/hNm+./MM/ -.dMMMmo.``.NMo -:NMMMNmmmmmMMh -/MN/-------oNN: -hMd. .dMh -sm/ /ms - diff --git a/ascii/distro/blag b/ascii/distro/blag deleted file mode 100644 index 047444cce..000000000 --- a/ascii/distro/blag +++ /dev/null @@ -1,17 +0,0 @@ -${c1} d - ,MK: - xMMMX: - .NMMMMMX; - lMMMMMMMM0clodkO0KXWW: - KMMMMMMMMMMMMMMMMMMX' - .;d0NMMMMMMMMMMMMMMMMMMK. - .;dONMMMMMMMMMMMMMMMMMMMMMMx -'dKMMMMMMMMMMMMMMMMMMMMMMMMl - .:xKWMMMMMMMMMMMMMMMMMMM0. - .:xNMMMMMMMMMMMMMMMMMK. - lMMMMMMMMMMMMMMMMMMK. - ,MMMMMMMMWkOXWMMMMMM0 - .NMMMMMNd. `':ldko - OMMMK: - oWk, - ;: diff --git a/ascii/distro/blankon b/ascii/distro/blankon deleted file mode 100644 index 43bbd7865..000000000 --- a/ascii/distro/blankon +++ /dev/null @@ -1,17 +0,0 @@ -${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` -${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ -${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys -${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys -${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys -${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys -${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys -${c2}NMMMMMN: .NMMMMMN${c1}yyyyys -${c2}MMMMMMm. NMMMMMN${c1}yyyyys -${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys -${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys -${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys -${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys -${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys -${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys -${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo -${c2} `.:/++++/:.` ${c1}:oys+. diff --git a/ascii/distro/bsd b/ascii/distro/bsd deleted file mode 100644 index 91c9a7ae2..000000000 --- a/ascii/distro/bsd +++ /dev/null @@ -1,19 +0,0 @@ -${c1} , , - /( )` - \ \___ / | - /- _ `-/ ' - (${c2}/\/ \ ${c1}\ /\ - ${c2}/ / | ` ${c1}\ - ${c3}O O ${c2}) ${c1}/ | - ${c2}`-^--'${c1}`< ' - (_.) _ ) / - `.___/` / - `-----' / -${c4}<----. __ / __ \ -${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| -<----' ${c1}`--' `.__,' \ - | | - \ / /\ - ${c5}______${c1}( (_ / \______/ - ${c5},' ,-----' | - `--{__________) diff --git a/ascii/distro/bunsenlabs b/ascii/distro/bunsenlabs deleted file mode 100644 index 937968233..000000000 --- a/ascii/distro/bunsenlabs +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `++ - -yMMs - `yMMMMN` - -NMMMMMMm. - :MMMMMMMMMN- - .NMMMMMMMMMMM/ - yMMMMMMMMMMMMM/ -`MMMMMMNMMMMMMMN. --MMMMN+ /mMMMMMMy --MMMm` `dMMMMMM -`MMN. .NMMMMM. - hMy yMMMMM` - -Mo +MMMMN - /o +MMMMs - +MMMN` - hMMM: - `NMM/ - +MN: - mh. - -/ diff --git a/ascii/distro/calculate b/ascii/distro/calculate deleted file mode 100644 index a6b256c4b..000000000 --- a/ascii/distro/calculate +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ...... - ,,+++++++,. - .,,,....,,,${c2}+**+,,.${c1} - ............,${c2}++++,,,${c1} - ............... - ......,,,........ - .....+*#####+,,,*+. - .....,*###############,..,,,,,,.. - ......,*#################*..,,,,,..,,,.. - .,,....*####################+***+,,,,...,++, - .,,..,..*#####################*, - ,+,.+*..*#######################. - ,+,,+*+..,########################* -.,++++++. ..+##**###################+ -..... ..+##***#################*. - .,.*#*****##############*. - ..,,*********#####****+. - ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} - ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} - ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} \ No newline at end of file diff --git a/ascii/distro/centos b/ascii/distro/centos deleted file mode 100644 index e56aa5dd1..000000000 --- a/ascii/distro/centos +++ /dev/null @@ -1,19 +0,0 @@ -${c1} .. - .PLTJ. - <><><><> - ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK - ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK - ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V - ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. -${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. -${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. -${c4} -${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV -${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' - ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' - ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 - ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK - ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK -${c2} <><><><> - 'MKKM' - '' diff --git a/ascii/distro/chakra b/ascii/distro/chakra deleted file mode 100644 index 28227b920..000000000 --- a/ascii/distro/chakra +++ /dev/null @@ -1,18 +0,0 @@ -${c1} _ _ _ "kkkkkkkk. - ,kkkkkkkk., 'kkkkkkkkk, - ,kkkkkkkkkkkk., 'kkkkkkkkk. - ,kkkkkkkkkkkkkkkk,'kkkkkkkk, - ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. - "''"''',;::,,"''kkk''kkkkk; __ - ,kkkkkkkkkk, "k''kkkkk' ,kkkk - ,kkkkkkk' ., ' .: 'kkkk',kkkkkk - ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk - ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk -.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' -;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' -'kkkkkkk; 'kkkkkkkk.,""''"''"" - ''kkkk; 'kkkkkkkkkk., - ';' 'kkkkkkkkkkkk., - ';kkkkkkkkkk' - ';kkkkkk' - "''" diff --git a/ascii/distro/chaletos b/ascii/distro/chaletos deleted file mode 100644 index 6473a5ccd..000000000 --- a/ascii/distro/chaletos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `.//+osso+/:`` - `/sdNNmhyssssydmNNdo:` - :hNmy+-` .-+hNNs- - /mMh/` `+:` `+dMd: - .hMd- -sNNMNo. /yyy /mMs` - -NM+ `/dMd/--omNh::dMM `yMd` - .NN+ .sNNs:/dMNy:/hNmo/s yMd` - hMs `/hNd+-smMMMMMMd+:omNy- `dMo -:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` -/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: -/Md` MMMMMMMMMMMMMMMMMMMN .MN: -:NN. MMMMMMm....--NMMMMMN -Mm. -`dMo MMMMMMd mMMMMMN hMs - -MN: MMMMMMd mMMMMMN oMm` - :NM: MMMMMMd mMMMMMN +Mm- - -mMy. mmmmmmh dmmmmmh -hMh. - oNNs- :yMm/ - .+mMdo:` `:smMd/` - -ohNNmhsoo++osshmNNh+. - `./+syyhhyys+:`` diff --git a/ascii/distro/chapeau b/ascii/distro/chapeau deleted file mode 100644 index 6107817c2..000000000 --- a/ascii/distro/chapeau +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .-/-. - ////////. - ////////${c2}y+${c1}//. - ////////${c2}mMN${c1}/////. - ////////${c2}mMN+${c1}////////. - ////////////////////////. - /////////+${c2}shhddhyo${c1}+////////. - ////////${c2}ymMNmdhhdmNNdo${c1}///////. -///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. -///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// -//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// -//////${c2}+MMmssssssssssssss+${c1}/////// -`//////${c2}yMMy${c1}//////////////////// - `//////${c2}smMNhso++oydNm${c1}//////// - `///////${c2}ohmNMMMNNdy+${c1}/////// - `//////////${c2}++${c1}////////// - `////////////////. - -////////- diff --git a/ascii/distro/chrome b/ascii/distro/chrome deleted file mode 100644 index 951bf1906..000000000 --- a/ascii/distro/chrome +++ /dev/null @@ -1,18 +0,0 @@ -${c2} .,:loool:,. - .,coooooooooooooc,. - .,lllllllllllllllllllll,. - ;ccccccccccccccccccccccccc; -${c1} '${c2}ccccccccccccccccccccccccccccc. -${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: -${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. -${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d -${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 -${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 -${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d -${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. -${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; -${c1} .:ccccccccllllllllo${c3}O0000000OOO, -${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. -${c1} '::ccccccccc${c3}dOOOOOOOkx:. -${c1} ..,::cccc${c3}xOOOkkko;. -${c1} ..,:${c3}dOkxl:. diff --git a/ascii/distro/cloveros b/ascii/distro/cloveros deleted file mode 100644 index 9996c77c9..000000000 --- a/ascii/distro/cloveros +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `omo``omo` - `oNMMMNNMMMNo` - `oNMMMMMMMMMMMMNo` - oNMMMMMMMMMMMMMMMMNo - `sNMMMMMMMMMMMMMMNs` - `omo` `sNMMMMMMMMMMNs` `omo` - `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` - `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` -oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo -`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` -`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` -oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo - `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` - `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` - `oNs` `sNMMMMMMMMMMNs` `oNs` - `sNMMMMMMMMMMMMMMNs` - +NMMMMMMMMMMMMMMMMNo - `oNMMMMMMMMMMMMNo` - `oNMMMNNMMMNs` - `omo``oNs` diff --git a/ascii/distro/coreos b/ascii/distro/coreos deleted file mode 100644 index 605d50506..000000000 --- a/ascii/distro/coreos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ..... - .';:cccccccc:;'. - ':ccccclc${c3}lllllllll${c1}cc:. - .;cccccccc${c3}lllllllllllllll${c1}c, - ;clllccccc${c3}llllllllllllllllll${c1}c, - .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: - ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: - :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, -.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c -.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. -.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. -.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc - :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; - .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc - .cllllllllllclcccclccclccllllcllc - :cllllllllccclcllllllllllllcc; - .cccccccccccccclcccccccccc:. - .;cccclccccccllllllccc,. - .';ccccclllccc:;.. - ..... diff --git a/ascii/distro/crux b/ascii/distro/crux deleted file mode 100644 index b5af7baab..000000000 --- a/ascii/distro/crux +++ /dev/null @@ -1,18 +0,0 @@ -${c1} odddd - oddxkkkxxdoo - ddcoddxxxdoool - xdclodod olol - xoc xdd olol - xdc ${c2}k00${c1}Okdlol - xxd${c2}kOKKKOkd${c1}ldd - xdco${c2}xOkdlo${c1}dldd - ddc:cl${c2}lll${c1}oooodo - odxxdd${c3}xkO000kx${c1}ooxdo - oxdd${c3}x0NMMMMMMWW0od${c1}kkxo - oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx -docldkXW${c3}MMMMMMMWWN${c1}Odolco -xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c -${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l -${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd -${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo -${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo diff --git a/ascii/distro/crux_small b/ascii/distro/crux_small deleted file mode 100644 index 4b64001dc..000000000 --- a/ascii/distro/crux_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} ___ - (${c3}.· ${c1}| - (${c2}<> ${c1}| - / ${c3}__ ${c1}\\ - ( ${c3}/ \\ ${c1}/| -${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) -${c2}\/${c1}-____${c2}\/ diff --git a/ascii/distro/debian b/ascii/distro/debian deleted file mode 100644 index df88d0792..000000000 --- a/ascii/distro/debian +++ /dev/null @@ -1,17 +0,0 @@ -${c2} _,met$$$$$gg. - ,g$$$$$$$$$$$$$$$P. - ,g$$P" """Y$$.". - ,$$P' `$$$. -',$$P ,ggs. `$$b: -`d$$' ,$P"' ${c1}.${c2} $$$ - $$P d$' ${c1},${c2} $$P - $$: $$. ${c1}-${c2} ,d$$' - $$; Y$b._ _,d$P' - Y$$. ${c1}`.${c2}`"Y$$$$P"' -${c2} `$$b ${c1}"-.__ -${c2} `Y$$ - `Y$$. - `$$b. - `Y$$b. - `"Y$b._ - `""" diff --git a/ascii/distro/debian_small b/ascii/distro/debian_small deleted file mode 100644 index 64cbb56c1..000000000 --- a/ascii/distro/debian_small +++ /dev/null @@ -1,6 +0,0 @@ - ${c1}_____ - / __ \\ -| / | -| \\___- --_ - --_ diff --git a/ascii/distro/deepin b/ascii/distro/deepin deleted file mode 100644 index a44f4dad9..000000000 --- a/ascii/distro/deepin +++ /dev/null @@ -1,18 +0,0 @@ -${c1} ............ - .';;;;;. .,;,. - .,;;;;;;;. ';;;;;;;. - .;::::::::' .,::;;,''''',. - ,'.:::::::: .;;'. '; - ;' 'cccccc, ,' :: '.. .: - ,, :ccccc. ;: .c, '' :. ,; -.l. cllll' ., .lc :; .l' l. -.c :lllc ;cl: .l' .ll. :' -.l 'looc. . ,o: 'oo' c, -.o. .:ool::coc' .ooo' o. - :: ..... .;dddo ;c - l:... .';lddddo. ,o - lxxxxxdoolllodxxxxxxxxxc :l - ,dxxxxxxxxxxxxxxxxxxl. 'o, - ,dkkkkkkkkkkkkko;. .;o; - .;okkkkkdl;. .,cl:. - .,:cccccccc:,. diff --git a/ascii/distro/desaos b/ascii/distro/desaos deleted file mode 100644 index 81d8b55e5..000000000 --- a/ascii/distro/desaos +++ /dev/null @@ -1,16 +0,0 @@ -${c1}███████████████████████ -███████████████████████ -███████████████████████ -███████████████████████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -██████████████████████████████ -██████████████████████████████ -████████████████████████ -████████████████████████ -████████████████████████ diff --git a/ascii/distro/devuan b/ascii/distro/devuan deleted file mode 100644 index 4173782f9..000000000 --- a/ascii/distro/devuan +++ /dev/null @@ -1,15 +0,0 @@ -${c1} ..,,;;;::;,.. - `':ddd;:,. - `'dPPd:,. - `:b$$b`. - 'P$$$d` - .$$$$$` - ;$$$$$P - .:P$$$$$$` - .,:b$$$$$$$;' - .,:dP$$$$$$$$b:' - .,:;db$$$$$$$$$$Pd'` - ,db$$$$$$$$$$$$$$b:'` -:$$$$$$$$$$$$b:'` - `$$$$$bd:''` - `'''` diff --git a/ascii/distro/dracos b/ascii/distro/dracos deleted file mode 100644 index 3eb2a70b5..000000000 --- a/ascii/distro/dracos +++ /dev/null @@ -1,13 +0,0 @@ -${c1} `-:/- - -os: - -os/` - :sy+-` - `/yyyy+. - `+yyyyo- - `/yyyys: -`:osssoooo++- +yyyyyy/` - ./yyyyyyo yo`:syyyy+. - -oyyy+ +- :yyyyyo- - `:sy: `. `/yyyyys: - ./o/.` .oyyso+oo:` - :+oo+//::::///:-.` `.` diff --git a/ascii/distro/dragonflybsd b/ascii/distro/dragonflybsd deleted file mode 100644 index 7ccc14bc3..000000000 --- a/ascii/distro/dragonflybsd +++ /dev/null @@ -1,15 +0,0 @@ -${c2},--, ${c1}| ${c2},--, -${c2}| `-, ${c1},^, ${c2},-' | -${c2} `, `-, ${c3}(/ \) ${c2},-' ,' -${c2} `-, `-,${c1}/ \${c2},-' ,-' -${c2} `------${c1}( )${c2}------' -${c2} ,----------${c1}( )${c2}----------, -${c2} | _,-${c1}( )${c2}-,_ | -${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' -${c1} | | - | | - | | - | | - | | - | | - `|' diff --git a/ascii/distro/dragonflybsd_old b/ascii/distro/dragonflybsd_old deleted file mode 100644 index 3276d4f05..000000000 --- a/ascii/distro/dragonflybsd_old +++ /dev/null @@ -1,18 +0,0 @@ - ${c1} | - .-. - ${c3} ()${c1}I${c3}() - ${c1} "==.__:-:__.==" - "==.__/~|~\__.==" - "==._( Y )_.==" - ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. -( ..=${c1}\\=${c1}/${c2}=.. ) - `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` - `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` - .-~` /${c1}|=|${c2}\ `~-. - .~` / ${c1}|=|${c2} \ `~. - .-~` .' ${c1}|=|${c2} `. `~-. - (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) - `~"~"` ${c1} |=|${c2} `"~"~` - ${c1} /=\\ - \\=/ - ^ diff --git a/ascii/distro/dragonflybsd_small b/ascii/distro/dragonflybsd_small deleted file mode 100644 index 3a48a9250..000000000 --- a/ascii/distro/dragonflybsd_small +++ /dev/null @@ -1,4 +0,0 @@ -${c2}(\${c3}"${c2}/) -${c2}(/${c1}|${c2}\) -${c1} | - | diff --git a/ascii/distro/elementary b/ascii/distro/elementary deleted file mode 100644 index 8614c746f..000000000 --- a/ascii/distro/elementary +++ /dev/null @@ -1,17 +0,0 @@ -${c2} eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee eeeeeeeeeeee eeeee - eeee eeeee eee eeee - eeee eeee eee eeee -eee eee eee eee -eee eee eee eee -ee eee eeee eeee -ee eee eeeee eeeeee -ee eee eeeee eeeee ee -eee eeee eeeeee eeeee eee -eee eeeeeeeeee eeeeee eee - eeeeeeeeeeeeeeeeeeeeeeee eeeee - eeeeeeee eeeeeeeeeeee eeee - eeeee eeeee - eeeeeee eeeeeee - eeeeeeeeeeeeeeeee diff --git a/ascii/distro/endless b/ascii/distro/endless deleted file mode 100644 index fbff54b95..000000000 --- a/ascii/distro/endless +++ /dev/null @@ -1,21 +0,0 @@ -${c1} `:+yhmNMMMMNmhy+:` - -odMMNhso//////oshNMMdo- - /dMMh+. .+hMMd/ - /mMNo` `oNMm: - `yMMo` `oMMy` - `dMN- -NMd` - hMN. .NMh -/MM/ -os` /MM/ -dMm `smNmmhs/- `:sNMd+ `` mMd -MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM -MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM -dMm `/++/-``/yNNh+/sdNMNddMm- mMd -/MM/ `dNy: `-::- /MM/ - hMN. .NMh - `dMN- -NMd` - `yMMo` `oMMy` - /mMNo` `oNMm/ - /dMMh+. .+hMMd/ - -odMMNhso//////oshNMMdo- - `:+yhmNMMMMNmhy+:` - diff --git a/ascii/distro/exherbo b/ascii/distro/exherbo deleted file mode 100644 index edacf81a9..000000000 --- a/ascii/distro/exherbo +++ /dev/null @@ -1,22 +0,0 @@ -${c2} , -OXo. -NXdX0: .cok0KXNNXXK0ko:. -KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... -'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. - cNMk NK .oXM. OMMMMO. 0MMNo kW. - lMc o: ., .oKNk; ;NMMWlxW' - ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO - XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk -.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl -,M: ,XMMWx::,''oOK0x; NM. -'Ml ,kNKOxxxxxkkO0XXKOd:. oMk - NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW - ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW - ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO - 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' - xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd - 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO - :XMNxl,';:lodxkOO000Oxc. .oWMMo - 'dXMMXkl;,. .,o0MMNo' - ':d0XWMMMMWNNNNMMMNOl' - ':okKXWNKkl' diff --git a/ascii/distro/fedora b/ascii/distro/fedora deleted file mode 100644 index f0ba391bb..000000000 --- a/ascii/distro/fedora +++ /dev/null @@ -1,17 +0,0 @@ -${c1} /:-------------:\\ - :-------------------:: - :-----------${c2}/shhOHbmp${c1}---:\\ - /-----------${c2}omMMMNNNMMD ${c1}---: - :-----------${c2}sMMMMNMNMP${c1}. ---: - :-----------${c2}:MMMdP${c1}------- ---\\ -,------------${c2}:MMMd${c1}-------- ---: -:------------${c2}:MMMd${c1}------- .---: -:---- ${c2}oNMMMMMMMMMNho${c1} .----: -:-- .${c2}+shhhMMMmhhy++${c1} .------/ -:- -------${c2}:MMMd${c1}--------------: -:- --------${c2}/MMMd${c1}-------------; -:- ------${c2}/hMMMy${c1}------------: -:--${c2} :dMNdhhdNMMNo${c1}------------; -:---${c2}:sdNMMMMNds:${c1}------------: -:------${c2}:://:${c1}-------------:: -:---------------------:// diff --git a/ascii/distro/freebsd b/ascii/distro/freebsd deleted file mode 100644 index 6ef677826..000000000 --- a/ascii/distro/freebsd +++ /dev/null @@ -1,15 +0,0 @@ - ${c2}``` ${c1}` - ${c2}` `.....---...${c1}....--.``` -/ - ${c2}+o .--` ${c1}/y:` +. - ${c2} yo`:. ${c1}:o `+- - ${c2}y/ ${c1}-/` -o/ - ${c2}.- ${c1}::/sy+:. - ${c2}/ ${c1}`-- / - ${c2}`: ${c1}:` - ${c2}`: ${c1}:` - ${c2}/ ${c1}/ - ${c2}.- ${c1}-. - ${c2}-- ${c1}-. - ${c2}`:` ${c1}`:` - .-- `--. - .---.....----. diff --git a/ascii/distro/freebsd_small b/ascii/distro/freebsd_small deleted file mode 100644 index 943c147ee..000000000 --- a/ascii/distro/freebsd_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} /\\ _____ /\\ - \\_) (_/ - / \ -| | -| | - \ / - --_____-- diff --git a/ascii/distro/frugalware b/ascii/distro/frugalware deleted file mode 100644 index b11961ba2..000000000 --- a/ascii/distro/frugalware +++ /dev/null @@ -1,23 +0,0 @@ -${c1} `++/::-.` - /o+++++++++/::-.` - `o+++++++++++++++o++/::-.` - /+++++++++++++++++++++++oo++/:-.`` - .o+ooooooooooooooooooosssssssso++oo++/:-` - ++osoooooooooooosssssssssssssyyo+++++++o: - -o+ssoooooooooooosssssssssssssyyo+++++++s` - o++ssoooooo++++++++++++++sssyyyyo++++++o: - :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo - `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: - /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss - .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- - ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso - -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. - sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ - :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` - yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ --ysooooooydhhhhhhhhhhhddddddddddddddddssy - .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: - ``.-/+oosysssssssssssssssssssssss - ``.:/+osyysssssssssssssh. - `-:/+osyyssssyo - .-:+++` diff --git a/ascii/distro/funtoo b/ascii/distro/funtoo deleted file mode 100644 index 13079091f..000000000 --- a/ascii/distro/funtoo +++ /dev/null @@ -1,11 +0,0 @@ -${c2} _______ ____ - /MMMMMMM/ /MMMM| _____ _____ - __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ -|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ -|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| -|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| - |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ - |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ diff --git a/ascii/distro/galliumos b/ascii/distro/galliumos deleted file mode 100644 index ae9681d5c..000000000 --- a/ascii/distro/galliumos +++ /dev/null @@ -1,19 +0,0 @@ -${c1}sooooooooooooooooooooooooooooooooooooo+: -yyooooooooooooooooooooooooooooooooo+/::: -yyysoooooooooooooooooooooooooooo+/:::::: -yyyyyoooooooooooooooooooooooo+/::::::::: -yyyyyysoooooooooooooooooo++/:::::::::::: -yyyyyyysoooooooooooooo++/::::::::::::::: -yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: -yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: -yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: -yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: -yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: -yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: -yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: -yyyyyyyyyyyyyyys+:--...........-///::::: -yyyyyyyyyyyys+:--................://:::: -yyyyyyyyyo+:-.....................-//::: -yyyyyyo+:-..........................://: -yyyo+:-..............................-// -o/:-...................................: diff --git a/ascii/distro/gem b/ascii/distro/gem deleted file mode 100644 index 49c8849d8..000000000 --- a/ascii/distro/gem +++ /dev/null @@ -1,15 +0,0 @@ -${c1} ## - ## ######### - #### ## - #### #### ## -#### #### ## ## - #### #### ## ## - #### #### ## ## ## - #### ###### - ###### ## ## #### - #### ################ - #### ## #### - ## #### ###### - ## ## #### #### - ## ## ## ## ## #### - #### ## ## ## diff --git a/ascii/distro/gentoo b/ascii/distro/gentoo deleted file mode 100644 index 3bec6daa6..000000000 --- a/ascii/distro/gentoo +++ /dev/null @@ -1,18 +0,0 @@ -${c1} -/oyddmdhs+:. - -o${c2}dNMMMMMMMMNNmhy+${c1}-` - -y${c2}NMMMMMMMMMMMNNNmmdhy${c1}+- - `o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/` - om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o` -.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+` - oy${c2}hdmNMMMMMMMN${c1}dyooy${c2}dmddddhhhhyhN${c1}d. - :o${c2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${c1}Mh - .:${c2}+sydNMMMMMNNNmmmdddhhhhhhmM${c1}my - /m${c2}MMMMMMNNNmmmdddhhhhhmMNh${c1}s: - `o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+` - `s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. - /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:` -+M${c2}MMMMMMNNNNNmmmmdmNMNdso${c1}/- -yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` -/h${c2}MMNNNNNNNNMNdhs++/${c1}-` -`/${c2}ohdmmddhys+++/:${c1}.` - `-//////:--. diff --git a/ascii/distro/gentoo_small b/ascii/distro/gentoo_small deleted file mode 100644 index a1e7a0ba1..000000000 --- a/ascii/distro/gentoo_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} _-----_ -( \\ -\ 0 \\ -${c2} \ ) - / _/ -( _- -\____- diff --git a/ascii/distro/gnewsense b/ascii/distro/gnewsense deleted file mode 100644 index b98b859b5..000000000 --- a/ascii/distro/gnewsense +++ /dev/null @@ -1,12 +0,0 @@ -${c1} ..,,,,.. - .oocchhhhhhhhhhccoo. - .ochhlllllllc hhhhhh ollllllhhco. - ochlllllllllll hhhllllllhhh lllllllllllhco - .cllllllllllllll hlllllo +hllh llllllllllllllc. -ollllllllllhco'' hlllllo +hllh ``ochllllllllllo -hllllllllc' hllllllllllllh `cllllllllh -ollllllh +llllllllllll+ hllllllo - `cllllh. ohllllllho .hllllc' - ochllc. ++++ .cllhco - `+occooo+. .+ooocco+' - `+oo++++ ++++oo+' diff --git a/ascii/distro/gnu b/ascii/distro/gnu deleted file mode 100644 index e4b4c017e..000000000 --- a/ascii/distro/gnu +++ /dev/null @@ -1,18 +0,0 @@ -${c1} _-`````-, ,- '- . - .' .- - | | - -. `. - /.' / `. \ -:/ : _... ..._ `` : -:: : /._ .`:'_.._\. || : -:: `._ ./ ,` : \ . _.'' . -`:. / | -. \-. \\_ / - \:._ _/ .' .@) \@) ` `\ ,.' - _/,--' .- .\,-.`--`. - ,'/'' (( \ ` ) - /'/' \ `-' ( - '/'' `._,-----' - ''/' .,---' - ''/' ;: - ''/'' ''/ - ''/''/'' - '/'/' - `; diff --git a/ascii/distro/gobolinux b/ascii/distro/gobolinux deleted file mode 100644 index 443cfbca8..000000000 --- a/ascii/distro/gobolinux +++ /dev/null @@ -1,6 +0,0 @@ -${c1}_____ _ -/ ____| | | -| | __ ___ | |__ ___ -| | |_ |/ _ \| '_ \ / _ \ -| |__| | (_) | |_) | (_) | - \_____|\___/|_.__/ \___/ diff --git a/ascii/distro/grombyang b/ascii/distro/grombyang deleted file mode 100644 index 6dfbea9b6..000000000 --- a/ascii/distro/grombyang +++ /dev/null @@ -1,18 +0,0 @@ -${c1} eeeeeeeeeeee - eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee ${c2}.o+ ${c1}eeee - eeee ${c2}`ooo/ ${c1}eeee - eeee ${c2}`+oooo: ${c1}eeee -eee ${c2}`+oooooo: ${c1}eee -eee ${c2}-+oooooo+: ${c1}eee -ee ${c2}`/:oooooooo+: ${c1}ee -ee ${c2}`/+ +++ +: ${c1}ee -ee ${c2}+o+\ ${c1}ee -eee ${c2}+o+\ ${c1}eee -eee ${c2}// \\ooo/ \\\ ${c1}eee - eee ${c2}//++++oooo++++\\\ ${c1}eee - eeee ${c2}::::++oooo+::::: ${c1}eeee - eeeee ${c3}Grombyang OS ${c1} eeee - eeeeeeeeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeee diff --git a/ascii/distro/guixsd b/ascii/distro/guixsd deleted file mode 100644 index 6d6345ec1..000000000 --- a/ascii/distro/guixsd +++ /dev/null @@ -1,10 +0,0 @@ -${c1} .. `. - `--..```..` `..```..--` - .-:///-:::. `-:::///:-. - ````.:::` `:::.```` - -//:` -::- - ://: -::- - `///- .:::` - -+++-:::. - :+/:::- - `-....` diff --git a/ascii/distro/haiku b/ascii/distro/haiku deleted file mode 100644 index 56a7feb4b..000000000 --- a/ascii/distro/haiku +++ /dev/null @@ -1,17 +0,0 @@ -${c2} :dc' - 'l:;'${c1},${c2}'ck. .;dc:. - co ${c1}..${c2}k. .;; ':o. - co ${c1}..${c2}k. ol ${c1}.${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. -.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. - ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; - ..${c1}oOolllllccccccc:::::${c2}od; - cx:ooc${c1}:::::::;${c2}cooolcX. - cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. - cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. - .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. - '::c'${c1}...${c2}do${c1}..... .${c2}K, - cd,.${c1}....:${c2}O,${c1} - ':clod:'${c1} - ${c1} diff --git a/ascii/distro/hyperbola b/ascii/distro/hyperbola deleted file mode 100644 index 5e0133591..000000000 --- a/ascii/distro/hyperbola +++ /dev/null @@ -1,16 +0,0 @@ -${c1} WW - KX W - WO0W NX0O - NOO0NW WNXK0OOKW - W0OOOOOOOOOOOOKN - N0OOOOOOO0KXW - WNXXXNW - NXK00000KN - WNK0OOOOOOOOOO0W - NK0OOOOOOOOOOOOOO0W - X0OOOOOOO00KK00OOOOOK - X0OOOO0KNWW WX0OO0W - X0OO0XNW KOOW - N00KNW KOW - NKXN W0W -WW W diff --git a/ascii/distro/irix b/ascii/distro/irix deleted file mode 100644 index 57ce2121c..000000000 --- a/ascii/distro/irix +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ./ohmNd/ +dNmho/- - `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. - `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` - -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. - `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` -+mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ -dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd -oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ -.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. - hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh - /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: - `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd - `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` - `yNMMNho-yMMMM` NMMMm.+hNMMNh` - -MMMMd: oMMMM. NMMMh :hMMMM- - -yNMMMmooMMMM- NMMMyomMMMNy- - .omMMMMMMMM-`NMMMMMMMmo. - `:hMMMMMM. NMMMMMh/` - .odNm+ /dNms. diff --git a/ascii/distro/kali b/ascii/distro/kali deleted file mode 100644 index d1e01da67..000000000 --- a/ascii/distro/kali +++ /dev/null @@ -1,21 +0,0 @@ -${c1}.............. - ..,;:ccc,. - ......''';lxO. -.....''''..........,:ld; - .';;;:::;,,.x, - ..'''. 0Xxoc:,. ... - .... ,ONkc;,;cokOdc',. - . OMo ':${c2}dd${c1}o. - dMc :OO; - 0M. .:o. - ;Wd - ;XO, - ,d0Odlc;,.. - ..',;:cdOOd::,. - .:d;.':;. - 'd, .' - ;l .. - .o - c - .' - . diff --git a/ascii/distro/kaos b/ascii/distro/kaos deleted file mode 100644 index 830835e47..000000000 --- a/ascii/distro/kaos +++ /dev/null @@ -1,16 +0,0 @@ -${c1} .. - ..... ..OSSAAAAAAA.. - .KKKKSS. .SSAAAAAAAAAAA. -.KKKKKSO. .SAAAAAAAAAA... -KKKKKKS. .OAAAAAAAA. -KKKKKKS. .OAAAAAA. -KKKKKKS. .SSAA.. -.KKKKKS..OAAAAAAAAAAAA........ - DKKKKO.=AA=========A===AASSSO.. - AKKKS.==========AASSSSAAAAAASS. - .=KKO..========ASS.....SSSSASSSS. - .KK. .ASS..O.. =SSSSAOSS: - .OK. .ASSSSSSSO...=A.SSA. - .K ..SSSASSSS.. ..SSA. - .SSS.AAKAKSSKA. - .SSS....S.. diff --git a/ascii/distro/kde b/ascii/distro/kde deleted file mode 100644 index 168097004..000000000 --- a/ascii/distro/kde +++ /dev/null @@ -1,19 +0,0 @@ -${c1} `..---+/---..` - `---.`` `` `.---.` - .--.` `` `-:-. - `:/: `.----//----.` :/- - .:. `---` `--.` .:` - .:` `--` .:- `:. - `/ `:. `.-::-.` -:` `/` - /. /. `:++++++++:` .: .: -`/ .: `+++++++++++/ /` `+` -/+` -- .++++++++++++` :. .+: -`/ .: `+++++++++++/ /` `+` - /` /. `:++++++++:` .: .: - ./ `:. `.:::-.` -:` `/` - .:` `--` .:- `:. - .:. `---` `--.` .:` - `:/: `.----//----.` :/- - .-:.` `` `-:-. - `---.`` `` `.---.` - `..---+/---..` diff --git a/ascii/distro/kogaion b/ascii/distro/kogaion deleted file mode 100644 index 47ed962e4..000000000 --- a/ascii/distro/kogaion +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ;; ,; - ;;; ,;; - ,;;;; ;;;; - ,;;;;;;;; ;;;; - ;;;;;;;;;;; ;;;;; - ,;;;;;;;;;;;; ';;;;;, - ;;;;;;;;;;;;;;, ';;;;;;; - ;;;;;;;;;;;;;;;;;, ';;;;; -; ';;;;;;;;;;;;;;;;;;, ;;; -;;;, ';;;;;;;;;;;;;;;;;;;,;; -;;;;;, ';;;;;;;;;;;;;;;;;;, -;;;;;;;;, ';;;;;;;;;;;;;;;;, -;;;;;;;;;;;;, ';;;;;;;;;;;;;; -';;;;;;;;;;;;; ';;;;;;;;;;;;; - ';;;;;;;;;;;;;, ';;;;;;;;;;; - ';;;;;;;;;;;;; ;;;;;;;;;; - ';;;;;;;;;;;; ;;;;;;;; - ';;;;;;;; ;;;;;; - ';;;;; ;;;; - ';;; ;; diff --git a/ascii/distro/korora b/ascii/distro/korora deleted file mode 100644 index 709289afd..000000000 --- a/ascii/distro/korora +++ /dev/null @@ -1,16 +0,0 @@ -${c2} ____________ - _add55555555554${c1}: - _w?'${c1}``````````'${c2})k${c1}: - _Z'${c1}`${c2} ]k${c1}: - m(${c1}`${c2} )k${c1}: - _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: - .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` - jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` - jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` -.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` -:#${c1}:${c2} ${c1}`${c2})e${c1}``` -:m${c1}:${c2} ,#'${c1}` -:#${c1}:${c2} .s2'${c1}` -:m,________.aa7^${c1}` -:#baaaaaaas!J'${c1}` - ``````````` diff --git a/ascii/distro/kslinux b/ascii/distro/kslinux deleted file mode 100644 index 53385bd80..000000000 --- a/ascii/distro/kslinux +++ /dev/null @@ -1,11 +0,0 @@ -${c1} K K U U RRRR ooo - K K U U R R o o - KKK U U RRRR o o - K K U U R R o o - K K UUU R R ooo - -${c2} SSS AAA W W AAA - S A A W W A A - SSS AAAAA W W W AAAAA - S A A WW WW A A - SSS A A W W A A diff --git a/ascii/distro/kubuntu b/ascii/distro/kubuntu deleted file mode 100644 index 6302ff0f7..000000000 --- a/ascii/distro/kubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `.:/ossyyyysso/:. - .:oyyyyyyyyyyyyyyyyyyo:` - -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- - -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- - oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo - `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` - oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- -oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy -oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- - oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo - `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo - oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo - -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- - -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- - ./oyyyyyyyyyyyyyyyyyyo/. - `.:/oosyyyysso/:.` diff --git a/ascii/distro/lede b/ascii/distro/lede deleted file mode 100644 index b1af94951..000000000 --- a/ascii/distro/lede +++ /dev/null @@ -1,9 +0,0 @@ - ${c1} _________ - / /\ - / LE / \ - / DE / \ - /________/ LE \ - \ \ DE / - \ LE \ / - \ DE \ / - \________\/ diff --git a/ascii/distro/linux b/ascii/distro/linux deleted file mode 100644 index f31dd29ff..000000000 --- a/ascii/distro/linux +++ /dev/null @@ -1,12 +0,0 @@ -${c2} ##### -${c2} ####### -${c2} ##${c1}O${c2}#${c1}O${c2}## -${c2} #${c3}#####${c2}# -${c2} ##${c1}##${c3}###${c1}##${c2}## -${c2} #${c1}##########${c2}## -${c2} #${c1}############${c2}## -${c2} #${c1}############${c2}### -${c3} ##${c2}#${c1}###########${c2}##${c3}# -${c3}######${c2}#${c1}#######${c2}#${c3}###### -${c3}#######${c2}#${c1}#####${c2}#${c3}####### -${c3} #####${c2}#######${c3}##### diff --git a/ascii/distro/lmde b/ascii/distro/lmde deleted file mode 100644 index 5161881e9..000000000 --- a/ascii/distro/lmde +++ /dev/null @@ -1,17 +0,0 @@ - ${c2}`.-::---.. -${c1} .:++++ooooosssoo:. - .+o++::. `.:oos+. -${c1} :oo:.` -+oo${c2}: -${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` -${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` -${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: -${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` -${c1}`s: `oo s m Myy+-o:` -`oo :+sdoohyoydyso/. - :o. .:////////++: -${c1} `/++ ${c2}-:::::- -${c1} ${c2}`${c1}++- -${c1} ${c2}`${c1}/+- -${c1} ${c2}.${c1}+/. -${c1} ${c2}.${c1}:+-. - `--.`` diff --git a/ascii/distro/lubuntu b/ascii/distro/lubuntu deleted file mode 100644 index 9731cb3ef..000000000 --- a/ascii/distro/lubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `-/+oyyhhhhyyo+/-` - ./shhhhhhhhhhhhhhhhhhs/. - `:shhhhhhhhhhhhhhhhhhhhhhhhs:` - :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: - `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` - `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` - shhhhhhhhy+. .ohhhhhhhhhhhhhs -:hhhhhhy/. /hhhhhhhhhhhhh: -shhhy/. :hhhhhhhhhhhhs -hy+. ` `+yhs/` +hhhhhhhhhhhh --.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh -shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs -:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: - shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs - `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` - +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` - :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: - :shhhhhhhhhhhhhhhhhhhhhy`+s:` - .+shhhhhhhhhhhhhhhhhhs:` - `-/+oyyhhhhyys+/-` diff --git a/ascii/distro/lunar b/ascii/distro/lunar deleted file mode 100644 index 26bd295c3..000000000 --- a/ascii/distro/lunar +++ /dev/null @@ -1,13 +0,0 @@ -${c1}`-. `-. - -ohys/-` `:+shy/` - -omNNdyo/` :+shmNNy/` - ${c3} - - /mMmo - hMMMN` - .NMMs - ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` - /:.` ${c3}/${c1} `.:/` -${c3} __ - | | _ _ ___ ___ ___ - | |__| | | | .'| _| - |_____|___|_|_|__,|_| diff --git a/ascii/distro/mac b/ascii/distro/mac deleted file mode 100644 index 3ca5ea313..000000000 --- a/ascii/distro/mac +++ /dev/null @@ -1,18 +0,0 @@ -${c1} 'c. - ,xNMM. - .OMMMMo - OMMM0, - .;loddo:' loolloddol;. - cKMMMMMMMMMMNWMMMMMMMMMM0: -${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. - XMMMMMMMMMMMMMMMMMMMMMMMX. -${c3};MMMMMMMMMMMMMMMMMMMMMMMM: -:MMMMMMMMMMMMMMMMMMMMMMMM: -${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. - kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. - ${c6}kMMMMMMMMMMMMMMMMMMMMMMd - ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. - diff --git a/ascii/distro/mac_small b/ascii/distro/mac_small deleted file mode 100644 index 24852ff12..000000000 --- a/ascii/distro/mac_small +++ /dev/null @@ -1,8 +0,0 @@ -${c1} .:' - _ :'_ -${c2} .'`_`-'_``. -:________.-' -${c3}:_______: -:_______: -${c4} :_______`-; -${c5} `._.-._.' diff --git a/ascii/distro/mageia b/ascii/distro/mageia deleted file mode 100644 index af01caba2..000000000 --- a/ascii/distro/mageia +++ /dev/null @@ -1,19 +0,0 @@ -${c1} .°°. - °° .°°. - .°°°. °° - . . - °°° .°°°. - .°°°. '___' -${c2} .${c1}'___' ${c2} . - :dkxc;'. ..,cxkd; - .dkk. kkkkkkkkkk .kkd. -.dkk. ';cloolc;. .kkd -ckk. .kk; -xO: cOd -xO: lOd -lOO. .OO: -.k00. .00x - .k00; ;00O. - .lO0Kc;,,,,,,;c0KOc. - ;d00KKKKKK00d; - .,KKKK,. diff --git a/ascii/distro/magpieos b/ascii/distro/magpieos deleted file mode 100644 index 6859d96b2..000000000 --- a/ascii/distro/magpieos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ;00000 :000Ol - .x00kk00: O0kk00k; - l00: :00. o0k :O0k. - .k0k. x${c2}d$dddd${c1}k' .d00; - k0k. ${c2}.dddddl ${c1}o00, - o00. ${c2}':cc:. ${c1}d0O -.00l ,00. -l00. d0x -k0O .:k0o -O0k ;dO0000d. -k0O .O0O${c2}xxxxk${c1}00: -o00. k0O${c2}dddddd${c1}occ -'00l x0O${c2}dddddo${c3};..${c1} - x00. .x00${c2}kxxd${c3}:..${c1} - .O0x .:oxxx${c4}Okl.${c1} - .x0d ${c4},xx,${c1} - .:o. ${c4}.xd ckd${c1} - .. ${c4}dxl .xx; - :xxolldxd' - ;oxdl. diff --git a/ascii/distro/manjaro b/ascii/distro/manjaro deleted file mode 100644 index 89fa7a2f2..000000000 --- a/ascii/distro/manjaro +++ /dev/null @@ -1,14 +0,0 @@ -${c1}██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ diff --git a/ascii/distro/maui b/ascii/distro/maui deleted file mode 100644 index 1ab9c07d4..000000000 --- a/ascii/distro/maui +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `.-://////:--` - .:/oooooooooooooooo+:. - `:+ooooooooooooooooooooooo:` - `:oooooooooooooooooooooooooooo/` - ..```-oooooo/-`` `:oooooo+:.` `-- - :. +oo+-` /ooo/` -/ - -o. `o+- +o/` -o: -`oo` ::` :o/ `+. .+o` /oo. -/o+ . -+oo- ` /oo/ `ooo/ -+o- /ooo+` .+ooo. :ooo+ -++ .+oooo: -oooo+ `oooo+ -:. .oooooo` :ooooo- :oooo: -` .oooooo: :ooooo+ `ooo+-` - .+oooooo` -oooooo: `o/- - +oooooo: .ooooooo. - /ooooooo` /ooooooo/ .. - `:oooooooo/:::/ooooooooo+:--:/:` - `:+oooooooooooooooooooooo+:` - .:+oooooooooooooooo+:. - `.-://////:-.` diff --git a/ascii/distro/mer b/ascii/distro/mer deleted file mode 100644 index a98f3eb10..000000000 --- a/ascii/distro/mer +++ /dev/null @@ -1,27 +0,0 @@ -${c1} dMs - .-` - `y`-o+` - ``NMMy - .--`:++. - .hNNNNs - /MMMMMN - `ommmd/ +/ - ```` +/ - `:+sssso/-` - .-::. `-::-` `smNMNmdmNMNd/ .://-` -.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo -dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- -MMm yMM- :MMs NMN` `:::::--sMMh dMM` -MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` -NNd sNN- -NNs -mMNs-.--..:dMMh` dNN ---- .--` `--. .smMMmdddmMNdo` .-- - ./ohddds+:` - +h- `.:-. - ./`.dMMMN+ - +MMMMMd - `+dmmy- - ``` .+` - .dMNo-y. - `hmm/ - .:` - dMs diff --git a/ascii/distro/minix b/ascii/distro/minix deleted file mode 100644 index a0ff143ca..000000000 --- a/ascii/distro/minix +++ /dev/null @@ -1,17 +0,0 @@ -${c2} -sdhyo+:-` -/syymm: - sdyooymmNNy. `` .smNmmdysNd - odyoso+syNNmysoyhhdhsoomNmm+/osdm/ - :hhy+-/syNNmddhddddddmNMNo:sdNd: - `smNNdNmmNmddddddddddmmmmmmmy` - `ohhhhdddddmmNNdmddNmNNmdddddmdh- - odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: - `+mNho:` smmd/ sNNh :dmms` -+ymmo. --od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: -+sms -.` :so: .NN+ :os/ .-`mNh: -.-hyh+:////- -sNNd:` .--://ohNs- - `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ - -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: - //oydNMMMMydMMNysNMMmsMMMMMNyo/` - ../-yNMMy--/::/-.sMMmos+.` - -+oyhNsooo+omy/``` - `::ohdmds-` diff --git a/ascii/distro/mint b/ascii/distro/mint deleted file mode 100644 index c7e59d99a..000000000 --- a/ascii/distro/mint +++ /dev/null @@ -1,16 +0,0 @@ -${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. -MMm----::-://////////////oymNMd+` -MMd ${c2}/++ ${c1}-sNMd: -MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: -ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm - NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM - NMm ${c2}dMM` ..` ... ydm. ${c1}dMM - hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM - -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM - -dMNs-${c2}``-::::-------.`` ${c1}dMM - `/dMNmy+/:-------------:/yMMM - ./ydNMMMMMMMMMMMMMMMMMMMMM - .MMMMMMMMMMMMMMMMMMM diff --git a/ascii/distro/mx b/ascii/distro/mx deleted file mode 100644 index 9fc44075a..000000000 --- a/ascii/distro/mx +++ /dev/null @@ -1,17 +0,0 @@ -${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM -MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM -MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM -MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM -MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM -MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM -MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM -MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM -MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM -MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM -MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM -MMMMMMMNo` :mMMN+` `-hMMMMMMMM -MMMMMMh. `oNMMd: `/mMMMMMM -MMMMm/ -hMd- `sNMMMM -MMNs` - :dMMM -Mm: `oMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM diff --git a/ascii/distro/netbsd b/ascii/distro/netbsd deleted file mode 100644 index 6048ee3a3..000000000 --- a/ascii/distro/netbsd +++ /dev/null @@ -1,17 +0,0 @@ -${c1} `-/oshdmNMNdhyo+:-` -${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` -${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` - ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` - ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` - ${c2}-N/${c1}hMMMMMMMMMmho:` - ${c2}-N/${c1}-:/++/:.` -${c2} :M+ - :Mo - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms diff --git a/ascii/distro/netrunner b/ascii/distro/netrunner deleted file mode 100644 index 4230bc09c..000000000 --- a/ascii/distro/netrunner +++ /dev/null @@ -1,20 +0,0 @@ -${c1} .:oydmMMMMMMmdyo:` - -smMMMMMMMMMMMMMMMMMMds- - +mMMMMMMMMMMMMMMMMMMMMMMMMd+ - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ - `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` - .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` - dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh -+MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ -mMMMMMMMMd+:.` `mMMMMMMMMMMMMd -MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM -mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd -+MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ - dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh - `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` - `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: - +dMMMMMMMMMMMMMMMMMMMMMMMMd/ - -odMMMMMMMMMMMMMMMMMMdo- - `:+ydmNMMMMNmhy+-` diff --git a/ascii/distro/nitrux b/ascii/distro/nitrux deleted file mode 100644 index 2f49d638f..000000000 --- a/ascii/distro/nitrux +++ /dev/null @@ -1,18 +0,0 @@ -${c1}`:/. -`/yo -`/yo -`/yo .+:. -`/yo .sys+:.` -`/yo `-/sys+:.` -`/yo ./sss+:.` -`/yo .:oss+:-` -`/yo ./o///:-` -`/yo `.-:///////:` -`/yo `.://///++//-`` -`/yo `.-:////++++/-` -`/yo `-://///++o+/-` -`/yo `-/+o+++ooo+/-` -`/s+:+oooossso/.` -`//+sssssso:. -`+syyyy+:` -:+s+- diff --git a/ascii/distro/nixos b/ascii/distro/nixos deleted file mode 100644 index d1a35bd27..000000000 --- a/ascii/distro/nixos +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ::::. ${c2}'::::: ::::' -${c1} '::::: ${c2}':::::. ::::' -${c1} ::::: ${c2}'::::.::::: -${c1} .......:::::..... ${c2}:::::::: -${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. - ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' -${c2} ..... ::::' ${c1}:::::' -${c2} ::::: '::' ${c1}:::::' -${c2} ........::::: ' ${c1}:::::::::::. -${c2}::::::::::::: ${c1}::::::::::::: -${c2} ::::::::::: ${c1}.. ${c1}::::: -${c2} .::::: ${c1}.::: ${c1}::::: -${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... - ::::: ${c1}':::::. ${c2}......:::::::::::::' - ::: ${c1}::::::. ${c2}':::::::::::::::::' -${c1} .:::::::: ${c2}':::::::::: -${c1} .::::''::::. ${c2}'::::. -${c1} .::::' ::::. ${c2}'::::. -${c1} .:::: :::: ${c2}'::::. diff --git a/ascii/distro/nixos_small b/ascii/distro/nixos_small deleted file mode 100644 index 0917ff8ea..000000000 --- a/ascii/distro/nixos_small +++ /dev/null @@ -1,7 +0,0 @@ - ${c1}\\\\ \\\\ // - ==\\\\__\\\\/ // - // \\\\// -==// //== - //\\\\___// -// /\\\\ \\\\== - // \\\\ \\\\ diff --git a/ascii/distro/nurunner b/ascii/distro/nurunner deleted file mode 100644 index e5529673c..000000000 --- a/ascii/distro/nurunner +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ,xc - ;00cxXl - ;K0, .xNo. - :KO' .lXx. - cXk. ;xl cXk. - cXk. ;k:.,xo. cXk. - .lXx. :x::0MNl,dd. :KO, - .xNx. cx;:KMMMMMNo'dx. ;KK; - .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: -;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO - 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: - .kNo .xo'xWMMMMMM0;:O: ;KK; - .dXd. .do,oNMMO;ck: ;00, - oNd. .dx,;'cO; ;K0, - oNx. okk; ;K0, - lXx. :KO' - cKk' cXk. - ;00:lXx. - ,kd. diff --git a/ascii/distro/nutyx b/ascii/distro/nutyx deleted file mode 100644 index 84a6cc5a9..000000000 --- a/ascii/distro/nutyx +++ /dev/null @@ -1,23 +0,0 @@ -${c1} . - . - ... - ... - .... .........--. - ..-++-----....--++++++---. - .-++++++-. .-++++++++++++-----.. - .--... .++..-+++--.....-++++++++++--.. - . .-+-. .**- .... ..-+----.. - .+++. .*+. + -++-----. - .+++++- ++. .*+. .....-+++-----. - -+++-++. .+. .-+***++***++--++++. . - -+-. -- -. -*- ...... ..--. -.-. .+- . -+. -. .+- +. - -- -- - -+----. .- - -++-.+. . - .++. -- - +. ----. - . .+. .. - - . - . \ No newline at end of file diff --git a/ascii/distro/obrevenge b/ascii/distro/obrevenge deleted file mode 100644 index 87b50f40c..000000000 --- a/ascii/distro/obrevenge +++ /dev/null @@ -1,18 +0,0 @@ -${c1} __ __ - _@@@@ @@@g_ - _@@@@@@ @@@@@@ - _@@@@@@M W@@@@@@_ - j@@@@P ^W@@@@ - @@@@L____ _____Q@@@@ -Q@@@@@@@@@@j@@@@@@@@@@ -@@@@@ T@j@ T@@@@@ -@@@@@ ___Q@J@ _@@@@@ -@@@@@fMMM@@j@jggg@@@@@@ -@@@@@ j@j@^MW@P @@@@ -Q@@@@@ggg@@f@ @@@@@@L -^@@@@WWMMP ^ Q@@@@ - @@@@@_ _@@@@l - W@@@@@g_____g@@@@@P - @@@@@@@@@@@@@@@@l - ^W@@@@@@@@@@@P - ^TMMMMTll diff --git a/ascii/distro/openbsd b/ascii/distro/openbsd deleted file mode 100644 index d3812019a..000000000 --- a/ascii/distro/openbsd +++ /dev/null @@ -1,23 +0,0 @@ - ${c3} _ - (_) -${c1} | . -${c1} . |L /| . ${c3} _ -${c1} _ . |\ _| \--+._/| . ${c3}(_) -${c1} / ||\| Y J ) / |/| ./ - J |)'( | ` F`.'/ ${c3} _ -${c1} -<| F __ .-< ${c3}(_) -${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ - J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ -${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) -${c1} '-F -<_. \\ .-' `-' L__ -__J _ _. >-' ${c1})${c4}._. ${c1}|-' -${c1} `-|.' /_. ${c4}\_| ${c1} F - /.- . _.< - /' /.' .' `\\ - /L /' |/ _.-'-\\ - /'J ___.---'\| - |\ .--' V | `. ` - |/`. `-. `._) - / .-.\\ - \\ ( `\\ - `.\ diff --git a/ascii/distro/openbsd_small b/ascii/distro/openbsd_small deleted file mode 100644 index bb6e646ac..000000000 --- a/ascii/distro/openbsd_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} _____ - \\- -/ - \\_/ \\ - | ${c2}O O${c1} | - |_ < ) 3 ) - / \\ / - /-_____-\\ diff --git a/ascii/distro/openindiana b/ascii/distro/openindiana deleted file mode 100644 index c76d8f7ba..000000000 --- a/ascii/distro/openindiana +++ /dev/null @@ -1,16 +0,0 @@ -${c2} .sy/ - .yh+ - - ${c1}-+syyyo+- ${c2} /+. - ${c1}+ddo/---/sdh/ ${c2} ym- - ${c1}`hm+ `sms${c2} ym-```````.-. - ${c1}sm+ sm/ ${c2} ym- +s - ${c1}hm. /mo ${c2} ym- /h - ${c1}omo ym: ${c2} ym- `os` - ${c1}smo` .ym+ ${c2} ym- .os- - `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. - ..` ${c1}`:+oo+/-` ${c2} -//oyo- - -:` .:oys/. -+- `./oyys/. -h+` `.-:+oyyyo/-` -`/ossssysso+/-.` diff --git a/ascii/distro/openmandriva b/ascii/distro/openmandriva deleted file mode 100644 index ef3e84390..000000000 --- a/ascii/distro/openmandriva +++ /dev/null @@ -1,15 +0,0 @@ -${c2} `` - `-. -${c1} ` ${c2}.--- -${c1} -/ ${c2}-::--` -${c1} `++ ${c2}`----...```-:::::. -${c1} `os. ${c2}.::::::::::::::-``` ` ` -${c1} +s+ ${c2}.::::::::::::::::---...--` -${c1}-ss: ${c2}`-::::::::::::::::-.``.`` -${c1}/ss- ${c2}.::::::::::::-.`` ` -${c1}+ss: ${c2}.::::::::::::- -${c1}/sso ${c2}.::::::-::::::- -${c1}.sss/ ${c2}-:::-.` .::::: -${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: -${c1} -ossso+/:://+/-` ${c2}.:` -${c1} -/+ooo+/-. ${c2}` diff --git a/ascii/distro/openwrt b/ascii/distro/openwrt deleted file mode 100644 index 903068b00..000000000 --- a/ascii/distro/openwrt +++ /dev/null @@ -1,9 +0,0 @@ -${c1} _______ -| |.-----.-----.-----. -| - || _ | -__| | -|_______|| __|_____|__|__| - |__| - ________ __ -| | | |.----.| |_ -| | | || _|| _| -|________||__| |____| diff --git a/ascii/distro/oracle b/ascii/distro/oracle deleted file mode 100644 index cdd61c551..000000000 --- a/ascii/distro/oracle +++ /dev/null @@ -1,12 +0,0 @@ -${c1} - `-/+++++++++++++++++/-.` - `/syyyyyyyyyyyyyyyyyyyyyyys/. - :yyyyo/-...............-/oyyyy/ - /yyys- .oyyy+ -.yyyy` `syyy- -:yyyo /yyy/ -.yyyy` `syyy- - /yyys. .oyyyo - /yyyyo:-...............-:oyyyy/` - `/syyyyyyyyyyyyyyyyyyyyyyys+. - `.:/+ooooooooooooooo+/:.` diff --git a/ascii/distro/osmc b/ascii/distro/osmc deleted file mode 100644 index f18c2e990..000000000 --- a/ascii/distro/osmc +++ /dev/null @@ -1,20 +0,0 @@ -${c1} -+shdmNNNNmdhs+- - .+hMNho/:..``..:/ohNMh+. - :hMdo. .odMh: - -dMy- -yMd- - sMd- -dMs - hMy +. .+ yMh - yMy dMs. .sMd yMy -:Mm dMNMs` `sMNMd `mM: -yM+ dM//mNs``sNm//Md +My -mM- dM: +NNNN+ :Md -Mm -mM- dM: `oNN+ :Md -Mm -yM+ dM/+NNo` :Md +My -:Mm` dMMNs` :Md `mM: - yMy dMs` -ms yMy - hMy +. yMh - sMd- -dMs - -dMy- -yMd- - :hMdo. .odMh: - .+hMNho/:..``..:/ohNMh+. - -+shdmNNNNmdhs+- diff --git a/ascii/distro/pacbsd b/ascii/distro/pacbsd deleted file mode 100644 index 000e93a09..000000000 --- a/ascii/distro/pacbsd +++ /dev/null @@ -1,24 +0,0 @@ -${c1} :+sMs. - `:ddNMd- -o--` - -sMMMMh: `+N+`` - yMMMMMs` .....-/-... `mNh/ - yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm - yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm - :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd - +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- - :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. - .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- - /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` -.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- -:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` -/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. -:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` -:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` - sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. - :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// - /dMMMMMMMMMMMMMs- ````````..`` - .oMMMMMMMMMMMMNs` ./y:` - +dNMMNMMMMMMMmy` ``./ys. - `/hMMMMMMMMMMMNo-`` `.+yy+-` - `-/hmNMNMMMMMMmmddddhhy/-` - `-+oooyMMMdsoo+/:. diff --git a/ascii/distro/parabola b/ascii/distro/parabola deleted file mode 100644 index 33c38bd53..000000000 --- a/ascii/distro/parabola +++ /dev/null @@ -1,16 +0,0 @@ -${c1} `.-. `. - `.` `:++. `-+o+. - `` `:+/. `:+/. `-+oooo+ - ``-::-.:+/. `:+/. `-+oooooo+ - `.-:///- ..` .-. `-+oooooooo- - `..-..` `+ooooooooo: -`` :oooooooo/ - `ooooooo: - `oooooo: - -oooo+. - +ooo/` - -ooo- - `+o/. - /+- - //` - -. diff --git a/ascii/distro/pardus b/ascii/distro/pardus deleted file mode 100644 index ae817579f..000000000 --- a/ascii/distro/pardus +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. -/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ -mN. oMdyy- -y `-dMo .Nm -.mN+` sMy hN+ -: yMs `+Nm. - `yMMddMs.dy `+` sMddMMy` - +MMMo .` . oMMM+ - `NM/ `````.` `.````` +MN` - yM+ `.-:yhomy ymohy:-.` +My - yM: yo oy :My - +Ms .N` `N. +h sM+ - `MN - -::::::- : :o:+`NM` - yM/ sh -dMMMMd- ho +y+My - .dNhsohMh-//: /mm/ ://-yMyoshNd` - `-ommNMm+:/. oo ./:+mMNmmo:` - `/o+.-somNh- :yy: -hNmos-.+o/` - ./` .s/`s+sMdd+``+ddMs+s`/s. `/. - : -y. -hNmddmNy. .y- : - -+ `..` +- diff --git a/ascii/distro/parrot b/ascii/distro/parrot deleted file mode 100644 index af98994df..000000000 --- a/ascii/distro/parrot +++ /dev/null @@ -1,24 +0,0 @@ -${c1} `:oho/-` -`mMMMMMMMMMMMNmmdhy- - dMMMMMMMMMMMMMMMMMMs` - +MMsohNMMMMMMMMMMMMMm/ - .My .+dMMMMMMMMMMMMMh. - + :NMMMMMMMMMMMMNo - `yMMMMMMMMMMMMMm: - /NMMMMMMMMMMMMMy` - .hMMMMMMMMMMMMMN+ - ``-NMMMMMMMMMd- - /MMMMMMMMMMMs` - mMMMMMMMsyNMN/ - +MMMMMMMo :sNh. - `NMMMMMMm -o/ - oMMMMMMM. - `NMMMMMM+ - +MMd/NMh - mMm -mN` - /MM `h: - dM` . - :M- - d: - -+ - - diff --git a/ascii/distro/parsix b/ascii/distro/parsix deleted file mode 100644 index 2753a461a..000000000 --- a/ascii/distro/parsix +++ /dev/null @@ -1,21 +0,0 @@ - ${c2}-/+/:. - ${c2}.syssssys. - ${c1}.--. ${c2}ssssssssso${c1} ..--. - :++++++: ${c2}+ssssssss+${c1} ./++/+++: - /+++++++++.${c2}.yssooooy`${c1}-+///////o- - /++++++++++.${c2}+soooos:${c1}:+////////+- - :+++++////o-${c2}oooooo-${c1}+/////////- - `-/++//++-${c4}.-----.-${c1}:+/////:- - ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. -${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- -${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ -${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- - `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` - ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. - ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: - ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ - ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: - ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- - ${c1}`--` ${c2}+sssssssso ${c1}`--` - ${c2}+sssssy+` - ${c2}`.::-` diff --git a/ascii/distro/pclinuxos b/ascii/distro/pclinuxos deleted file mode 100644 index 963d39294..000000000 --- a/ascii/distro/pclinuxos +++ /dev/null @@ -1,19 +0,0 @@ - ${c1}mhhhyyyyhhhdN - dyssyhhhhhhhhhhhssyhN - Nysyhhyo/:-.....-/oyhhhssd - Nsshhy+. `/shhysm - dohhy/ -shhsy - dohhs` /hhys -N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy -ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ -+hho ${c2}ymm- /mmy+mms ${c1}:hhod -/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh -+hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m -yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ - ohhy` ${c2}://` -/+++/- ${c1}ohhom - N+hhy- `shhoh - sshho. `+hhyom - dsyhhs/. `:ohhhoy - dysyhhhso///://+syhhhssh - dhyssyhhhhhhyssyyhN - mddhdhdmN diff --git a/ascii/distro/peppermint b/ascii/distro/peppermint deleted file mode 100644 index be0a953b9..000000000 --- a/ascii/distro/peppermint +++ /dev/null @@ -1,19 +0,0 @@ -${c1} 8ZZZZZZ${c2}MMMMM -${c1} .ZZZZZZZZZ${c2}MMMMMMM. -${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ -${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM -${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. -${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI -${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM -${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM -${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM -${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM -${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM -${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M -${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 -${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 -${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 -${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z -${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM -${c1} NZZZZZZZZZZZ${c2}MMMMM -${c1} ZZZZZZZZZ${c2}MM) diff --git a/ascii/distro/pop_os b/ascii/distro/pop_os deleted file mode 100644 index a399f18f2..000000000 --- a/ascii/distro/pop_os +++ /dev/null @@ -1,21 +0,0 @@ -${c1} ///////////// - ///////////////////// - ///////${c2}*767${c1}//////////////// - //////${c2}7676767676*${c1}////////////// - /////${c2}76767${c1}//${c2}7676767${c1}////////////// - /////${c2}767676${c1}///${c2}*76767${c1}/////////////// - ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// -/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// -//////////${c2}76767676767${c1}////${c2}76767${c1}///////// -///////////${c2}76767676${c1}//////${c2}7676${c1}////////// -////////////,${c2}7676${c1},///////${c2}767${c1}/////////// -/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// -///////////////${c2}7676${c1}//////////////////// - ///////////////${c2}7676${c1}///${c2}767${c1}//////////// - //////////////////////${c2}'${c1}//////////// - //////${c2}.7676767676767676767,${c1}////// - /////${c2}767676767676767676767${c1}///// - /////////////////////////// - ///////////////////// - ///////////// - diff --git a/ascii/distro/porteus b/ascii/distro/porteus deleted file mode 100644 index 82cc7aa90..000000000 --- a/ascii/distro/porteus +++ /dev/null @@ -1,23 +0,0 @@ -${c1} `.-:::-.` - -+ydmNNNNNNNmdy+- - .+dNmdhs+//////+shdmdo. - .smmy+-` ./sdy: - `omdo. `.-/+osssso+/-` `+dy. - `yms. `:shmNmdhsoo++osyyo-``oh. - hm/ .odNmds/.` ``.....:::-+s -/m: `+dNmy:` `./oyhhhhyyooo++so -ys `yNmy- .+hmmho:-.` ``` -s: yNm+` .smNd+. -`` /Nm: +dNd+` - yN+ `smNy. - dm oNNy` - hy -mNm. - +y oNNo - `y` sNN: - `: +NN: - ` .mNo - /mm` - /my` - .sy` - .+: - ` diff --git a/ascii/distro/postmarketos b/ascii/distro/postmarketos deleted file mode 100644 index a2ebc838f..000000000 --- a/ascii/distro/postmarketos +++ /dev/null @@ -1,17 +0,0 @@ -${c1} ss - `hMMh` - .dMMMMd. - -NMMMMMMN- - /MMMMMMMMMN/ - hMMMMMMMMMMMo - y+`mMMmdNMMMMMMy - `dMM-.-:- .mMMMMMMh` - .mMMMMMMd` `dMMMMMMm. - :NMMMMMMy yMMMMMMN: - /MMMMMMMo oMMMmdmN/ - oMMMMMMM/ /MN.-/:-. - `yMMMMMMN- -:.NMMMMy` - `dMMMMMMM- -/////////////dMMMMMMd` - -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- - :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: -+MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ diff --git a/ascii/distro/puppy b/ascii/distro/puppy deleted file mode 100644 index 7cdc1c2d6..000000000 --- a/ascii/distro/puppy +++ /dev/null @@ -1,18 +0,0 @@ -${c1} `-/osyyyysosyhhhhhyys+- - -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ - yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy -.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ --NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ -.Nm+shddyooo+/smNNNNmmmmNh. :mmd. - NNNNy:` ./hmmmmmmmNNNN: hNMh - NMN- -++- +NNNNNNNNNNm+..-sMMMM- -.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ -.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ - mMM+ .. `sNN+. hMMMMhhMMM- - +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy - yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` - sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` - :mMMMMMMMMMMMmddNMMMMMMMMmh/ - /dMMMMMMMMMMMMMMMMMMNdy/` - .+hNMMMMMMMMMNmdhs/. - .:/+ooo+/:-. diff --git a/ascii/distro/qubes b/ascii/distro/qubes deleted file mode 100644 index 3867fa6fc..000000000 --- a/ascii/distro/qubes +++ /dev/null @@ -1,21 +0,0 @@ -${c1} `..--..` - `.----------.` - `..----------------..` - `.------------------------.`` - `..-------------....-------------..` -.::----------..`` ``..----------:+: -:////:----..` `..---:/ossso -:///////:` `/osssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:////////-` .:sssssssso -:///////////-.` `-/osssssssssso -`//////////////:-```.:+ssssssssssssso- - .-://////////////sssssssssssssso/-` - `.:///////////sssssssssssssso:. - .-:///////ssssssssssssssssss/` - `.:////ssss+/+ssssssssssss. - `--//- `-/osssso/. diff --git a/ascii/distro/raspbian b/ascii/distro/raspbian deleted file mode 100644 index 472b74eb0..000000000 --- a/ascii/distro/raspbian +++ /dev/null @@ -1,23 +0,0 @@ -${c1} `.::///+:/-. --///+//-:`` - `+oooooooooooo: `+oooooooooooo: - /oooo++//ooooo: ooooo+//+ooooo. - `+ooooooo:-:oo- +o+::/ooooooo: - `:oooooooo+`` `.oooooooo+- - `:++ooo/. :+ooo+/.` - ${c2}...` `.----.` ``.. - .::::-``:::::::::.`-:::-` - -:::-` .:::::::-` `-:::- - `::. `.--.` `` `.---.``.::` - .::::::::` -::::::::` ` - .::` .:::::::::- `::::::::::``::. --:::` ::::::::::. ::::::::::.`:::- -:::: -::::::::. `-:::::::: :::: --::- .-:::-.``....``.-::-. -::- - .. `` .::::::::. `..`.. - -:::-` -::::::::::` .:::::` - :::::::` -::::::::::` :::::::. - .::::::: -::::::::. :::::::: - `-:::::` ..--.` ::::::. - `...` `...--..` `...` - .:::::::::: - `.-::::-` diff --git a/ascii/distro/redhat b/ascii/distro/redhat deleted file mode 100644 index 868521f4f..000000000 --- a/ascii/distro/redhat +++ /dev/null @@ -1,16 +0,0 @@ -${c1} `.-..........` - `////////::.`-/. - -: ....-////////. - //:-::///////////` - `--::: `-://////////////: - //////- ``.-:///////// .` - `://////:-.` :///////::///:` - .-/////////:---/////////////: - .-://////////////////////. -${c2} yMN+`.-${c1}::///////////////-` -${c2} .-`:NMMNMs` `..-------..` - MN+/mMMMMMhoooyysshsss -MMM MMMMMMMMMMMMMMyyddMMM+ - MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM - MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM - MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM diff --git a/ascii/distro/redstar b/ascii/distro/redstar deleted file mode 100644 index 6c15233fd..000000000 --- a/ascii/distro/redstar +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .. - .oK0l - :0KKKKd. - .xKO0KKKKd - ,Od' .d0000l - .c;. .'''... ..'. -.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: -;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. - .okkkkd,.lko .......',;:cllc:;,,'''''. - .cdo. :xd' cd:. ..';'',,,'',,;;;,'. - . .ddl.;doooc'..;oc;'..';::;,'. - coo;.oooolllllllcccc:'. . - .ool''lllllccccccc:::::;. - ;lll. .':cccc:::::::;;;;' - :lcc:'',..';::::;;;;;;;,,. - :cccc::::;...';;;;;,,,,,,. - ,::::::;;;,'. ..',,,,'''. - ........ ...... diff --git a/ascii/distro/refracta b/ascii/distro/refracta deleted file mode 100644 index 396474b5d..000000000 --- a/ascii/distro/refracta +++ /dev/null @@ -1,19 +0,0 @@ -${c2} A - VW - VVW\\ - .yWWW\\ - ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ - *WWWWWWWWWWWWWWWW/ $VWWWWw , - ^*%WWWWWWVWWX $WWWW** ,yy - , "**WWW/' **' ,yy/WWW*` - &WWWWwy `*` <,ywWW%VWWW* - yWWWWWWWWWW* ., "**WW%W - ,&WWWWWM*"` ,y/ &WWWww ^* - XWWX*^ ,yWWWW09 .WWWWWWWWwy, - *` &WWWWWM WWWWWWWWWWWWWww, - (WWWWW` /#####WWW*********** - ^WWWW - VWW - Wh. - V/ - diff --git a/ascii/distro/rosa b/ascii/distro/rosa deleted file mode 100644 index fcbad876e..000000000 --- a/ascii/distro/rosa +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ROSAROSAROSAROSAR - ROSA AROS - ROS SAROSAROSAROSAR AROS - RO ROSAROSAROSAROSAROSAR RO - ARO AROSAROSAROSARO AROS ROS - ARO ROSAROS OSAR ROSA ROS - RO AROSA ROSAROSAROSA ROSAR RO -RO ROSAR ROSAROSAROSAR R ROSARO RO -RO ROSA AROSAROSAROSA AR ROSARO AR -RO AROS ROSAROSAROSA ROS AROSARO AR -RO AROS ROSAROSARO ROSARO ROSARO AR -RO ROS AROSAROS ROSAROSA AROSAR AR -RO ROSA ROS ROSAROSAR ROSARO RO - RO ROS AROSAROSAROSA ROSARO AR - ARO ROSA ROSAROSAROS AROSAR ARO - ARO OROSA R ROSAROS ROS - RO AROSAROS AROSAROSAR RO - AROS AROSAROSAROSARO AROS - ROSA SARO - ROSAROSAROSAROSAR diff --git a/ascii/distro/sabayon b/ascii/distro/sabayon deleted file mode 100644 index bfd51eeda..000000000 --- a/ascii/distro/sabayon +++ /dev/null @@ -1,18 +0,0 @@ -${c1} ........... - .. .. - .. .. - .. ${c2}o ${c1}.. - .. ${c2}:W' ${c1}.. - .. ${c2}.d. ${c1}.. -:. ${c2}.KNO ${c1}.: -:. ${c2}cNNN. ${c1}.: -: ${c2}dXXX, ${c1}: -: ${c2}. dXXX, .cd, ${c1}: -: ${c2}'kc .. dKKK. ,ll;:' ${c1}: -: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: -:. ${c2}.,cdddddddddddddo:. ${c1}.: - .. ${c2}:lllllll: ${c1}.. - .. ${c2}',,,,, ${c1}.. - .. .. - .. .. - ............... diff --git a/ascii/distro/sabotage b/ascii/distro/sabotage deleted file mode 100644 index d4490fc89..000000000 --- a/ascii/distro/sabotage +++ /dev/null @@ -1,12 +0,0 @@ - -${c2} .|'''.| | '||''|. ..|''|| - ||.. ' ||| || || .|' || - ''|||. | || ||'''|. || || -. '|| .''''|. || || '|. || -|'....|' .|. .||. .||...|' ''|...|' - -|''||''| | ..|'''.| '||''''| - || ||| .|' ' || . - || | || || .... ||''| - || .''''|. '|. || || - .||. .|. .||. ''|...'| .||.....| diff --git a/ascii/distro/sailfishos b/ascii/distro/sailfishos deleted file mode 100644 index a7dd91b43..000000000 --- a/ascii/distro/sailfishos +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .+eWWW - .+ee+++eee e. - .ee++eeeeeeee +e. - .e++ee++eeeeeee+eee+e+ - ee.e+.ee+eee++eeeeee+ - W.+e.e+.e++ee+eee - W.+e.W.ee.W++ee' - +e.W W.e+.W.W+ - W.e.+e.W W W. - e e e +e.W.W - .W W W. - W.+e.W. - W++e.ee+. - ++ +ee++eeeee++. - ' '+++e 'ee. - ee - ee - e diff --git a/ascii/distro/salentos b/ascii/distro/salentos deleted file mode 100644 index f41ee747b..000000000 --- a/ascii/distro/salentos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ``..`` - .-:+oshdNMMMMMMNdhyo+:-.` - -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ -${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` -${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- -${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` -${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` -${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd -${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy -${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo -${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ -${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- -${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` -${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm -${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy -${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: -${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. -${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: -${c2} `:smMM${c4}yy${c3}MMNy/` - ${c2}.- ${c4}`${c3}:. diff --git a/ascii/distro/scientific b/ascii/distro/scientific deleted file mode 100644 index 82e9553f0..000000000 --- a/ascii/distro/scientific +++ /dev/null @@ -1,20 +0,0 @@ -${c1} =/;;/- - +: // - /; /; - -X H. -.//;;;:;;-, X= :+ .-;:=;:;#;. -M- ,=;;;#:, ,:#;;:=, ,@ -:# :#.=/++++/=.$= #= - ,#; #/:+/;,,/++:+/ ;+. - ,+/. ,;@+, ,#H;, ,/+, - ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; - ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. - ,;: :@#= =$H: .+#- - ,#= #;-///==///-// =#, -;+ :#-;;;:;;;;-X- +: -@- .-;;;;M- =M/;;;-. -X - :;;::;;-. #- :+ ,-;;-;:== - ,X H. - ;/ #= - // +; - '////' diff --git a/ascii/distro/siduction b/ascii/distro/siduction deleted file mode 100644 index c9720a606..000000000 --- a/ascii/distro/siduction +++ /dev/null @@ -1,21 +0,0 @@ -${c1} _aass, - jQh: =$w - QWmwawQW - )$QQQQ@( .. - _a_a. ~??^ syDY?Sa, - _mW>-<$c jWmi imm. - ]QQwayQE 4QQmgwmQQ` - ?WWQWP' -9QQQQQ@'._aas, - _a%is. .adYYs,. -"?!` aQB*~^3$c -_Qh;.nm .QWc. {QL ]QQp;..vmQ/ -"QQmmQ@ -QQQggmQP ]QQWmggmQQ( - -???" "$WQQQY` __, ?QQQQQQW! - _yZ!?q, - .yWY!!Sw, "???^ - .QQa_=qQ mQm>..vmm - $QQWQQP $QQQgmQQ@ - "???" _aa, -9WWQQWY` - _mB>~)$a -~~ - mQms_vmQ. - ]WQQQQQP - -?T??" - diff --git a/ascii/distro/slackware b/ascii/distro/slackware deleted file mode 100644 index 9ffde3dcd..000000000 --- a/ascii/distro/slackware +++ /dev/null @@ -1,21 +0,0 @@ -${c1} ::::::: - ::::::::::::::::::: - ::::::::::::::::::::::::: - ::::::::${c2}cllcccccllllllll${c1}:::::: - :::::::::${c2}lc dc${c1}::::::: - ::::::::${c2}cl clllccllll oc${c1}::::::::: - :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: - ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: - :::::::::::${c2}lc cclccclc${c1}::::::::::::: -::::::::::::::${c2}lcclcc lc${c1}:::::::::::: -::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: -::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: - :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: - :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: - ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: - :::${c2}oclcccccccccccccllllllllllllll${c1}::::: - ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: - :::::::::::::::::::::::::::::::: - :::::::::::::::::::::::::::: - :::::::::::::::::::::: - :::::::::::: diff --git a/ascii/distro/slitaz b/ascii/distro/slitaz deleted file mode 100644 index 5ee527061..000000000 --- a/ascii/distro/slitaz +++ /dev/null @@ -1,17 +0,0 @@ -${c1} @ @( @ - @@ @@ @ @/ - @@ @@ @@ @@ - @@ %@@ @@ @@ - @@ %@@@ @@@@@. @@@@ @@ - @@@ @@@@ @@@@@@@ &@@@ @@@ - @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ - ,@@@@@@@@@@@@@@@@@@@@@@@@@ - .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ -@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ -@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ -@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. -@@ ,@@ @@@@@@@@@@@@@ @@@ @@ -@ @@. @@@@@@@@@@@@@ @@@ *@ -@ @@ @@@@@@@@@@@@ @@ @ - @ @@@@@@@@@. #@ - @ ,@@@@@ @ diff --git a/ascii/distro/smartos b/ascii/distro/smartos deleted file mode 100644 index 59cea6932..000000000 --- a/ascii/distro/smartos +++ /dev/null @@ -1,17 +0,0 @@ -${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyys oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyy syyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy yyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy diff --git a/ascii/distro/solaris b/ascii/distro/solaris deleted file mode 100644 index 95a7f1a1e..000000000 --- a/ascii/distro/solaris +++ /dev/null @@ -1,8 +0,0 @@ -${c1} `- ` - `-- `+- .: - .+: `++: -/+- . - `.::` -++/``:::`./+/ `.-/. - `++/-`.` ` /++:` - `` ./:` .: `..`.- -``./+/:- -+++:- - -/+` :. diff --git a/ascii/distro/solus b/ascii/distro/solus deleted file mode 100644 index 75637543b..000000000 --- a/ascii/distro/solus +++ /dev/null @@ -1,20 +0,0 @@ -${c2} -``````````` - `-+/------------.` - .---:mNo---------------. - .-----yMMMy:---------------. - `------oMMMMMm/----------------` - .------/MMMMMMMN+----------------. - .------/NMMMMMMMMm-+/--------------. -`------/NMMMMMMMMMN-:mh/-------------` -.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. ------/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- -----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. -.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` -`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. -`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ - .------------:://+-/++++++${c1}oshddys: - -hhhhyyyyyyyyyyyhhhhddddhysssso- - `:ossssssyysssssssssssssssso:` - `:+ssssssssssssssssssss+- - `-/+ssssssssssso+/-` - `.-----..` diff --git a/ascii/distro/source_mage b/ascii/distro/source_mage deleted file mode 100644 index 39a440e82..000000000 --- a/ascii/distro/source_mage +++ /dev/null @@ -1,21 +0,0 @@ -${c2} :ymNMNho. -.+sdmNMMMMMMMMMMy` -.-::/yMMMMMMMMMMMm- - sMMMMMMMMMMMm/ - /NMMMMMMMMMMMMMm: - .MMMMMMMMMMMMMMMMM: - `MMMMMMMMMMMMMMMMMN. - NMMMMMMMMMMMMMMMMMd - mMMMMMMMMMMMMMMMMMMo - hhMMMMMMMMMMMMMMMMMM. - .`/MMMMMMMMMMMMMMMMMs - :mMMMMMMMMMMMMMMMN` - `sMMMMMMMMMMMMMMM+ - /NMMMMMMMMMMMMMN` - oMMMMMMMMMMMMM+ - ./sd.-hMMMMMMMMmmN` - ./+oyyyh- `MMMMMMMMMmNh - sMMMMMMMMMmmo - `NMMMMMMMMMd: - -dMMMMMMMMMo - -shmNMMms. diff --git a/ascii/distro/sparky b/ascii/distro/sparky deleted file mode 100644 index 82acb5a0a..000000000 --- a/ascii/distro/sparky +++ /dev/null @@ -1,21 +0,0 @@ -${c1} - . `-:-` - .o` .-///-` - `oo` .:/++:. - os+` -/+++:` ``.........``` - /ys+`./+++/-.-::::::----......`` - `syyo`++o+--::::-::/+++/-`` - -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` -::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` -`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` - -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- - .sdddy::syo--/:. `.:dy+-ohhho ./: - :yddds/:+oo+//:-`- /+ +hy+.shhy: `` - `:ydmmdysooooooo-.ss`/yss--oyyo - `./ossyyyyo+:-/oo:.osso- .oys - ``..-------::////.-oooo/ :so - `...----::::::::--.`/oooo: .o: - ``````` ++o+:` `:` - ./+/-` ` - `-:-. - `` diff --git a/ascii/distro/steamos b/ascii/distro/steamos deleted file mode 100644 index c17b16b69..000000000 --- a/ascii/distro/steamos +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .,,,,. - .,'onNMMMMMNNnn',. - .'oNMANKMMMMMMMMMMMNNn'. - .'ANMMMMMMMXKNNWWWPFFWNNMNn. - ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, - ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, -,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, -'${c2}+#############, +. ,+' ${c1}+NMMM -${c2} '*#########*' '*,,*' ${c1}.+NMMMM. -${c2} `'*###*' ,.,;###${c1}+WNM, -${c2} .,;;, .;##########${c1}+W -${c2},',. '; ,+##############' - '###+. :,. .,; ,###############' - '####.. `'' .,###############' - '#####+++################' - '*##################*' - ''*##########*'' - '''''' diff --git a/ascii/distro/suse b/ascii/distro/suse deleted file mode 100644 index 6cc0433c0..000000000 --- a/ascii/distro/suse +++ /dev/null @@ -1,18 +0,0 @@ -${c2} .;ldkO0000Okdl;. - .;d00xl:^''''''^:ok00d;. - .d00l' 'o00d. - .d0Kd'${c1} Okxol:;,. ${c2}:O0d. - .OK${c1}KKK0kOKKKKKKKKKKOxo:, ${c2}lKO. - ,0K${c1}KKKKKKKKKKKKKKK0P^${c2},,,${c1}^dx:${c2} ;00, -.OK${c1}KKKKKKKKKKKKKKKk'${c2}.oOPPb.${c1}'0k.${c2} cKO. -:KK${c1}KKKKKKKKKKKKKKK: ${c2}kKx..dd ${c1}lKd${c2} 'OK: -dKK${c1}KKKKKKKKKOx0KKKd ${c2}^0KKKO' ${c1}kKKc${c2} dKd -dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd -:KK${c1}KKKKKKKKKK0o;...^cdxxOK0O/^^' ${c2}.0K: - kKK${c1}KKKKKKKKKKKKK0x;,,......,;od ${c2}lKk - '0K${c1}KKKKKKKKKKKKKKKKKKKK00KKOo^ ${c2}c00' - 'kK${c1}KKOxddxkOO00000Okxoc;'' ${c2}.dKk' - l0Ko. .c00l' - 'l0Kk:. .;xK0l' - 'lkK0xl:;,,,,;:ldO0kl' - '^:ldxkkkkxdl:^' diff --git a/ascii/distro/swagarch b/ascii/distro/swagarch deleted file mode 100644 index e3884f158..000000000 --- a/ascii/distro/swagarch +++ /dev/null @@ -1,15 +0,0 @@ -${c2} .;ldkOKXXNNNNXXK0Oxoc,. - ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; - 'K0xo ..,;:c:. `'lKMMMMM0 - .lONMMMMMM' `lNMk' -${c2} ;WMMMMMMMMMO. ${c1}....::... -${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, -${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. -${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. -${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: -${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. -${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: -${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. -${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. - :ccc:' `cccccccc:, - '' diff --git a/ascii/distro/tails b/ascii/distro/tails deleted file mode 100644 index a0512bc65..000000000 --- a/ascii/distro/tails +++ /dev/null @@ -1,19 +0,0 @@ -${c1} `` - ./yhNh -syy/Nshh `:o/ -N:dsNshh █ `ohNMMd -N-/+Nshh `yMMMMd -N-yhMshh yMMMMd -N-s:hshh █ yMMMMd so//. -N-oyNsyh yMMMMd d Mms. -N:hohhhd:. yMMMMd syMMM+ -Nsyh+-..+y+- yMMMMd :mMM+ -+hy- -ss/`yMMMM `+d+ - :sy/. ./yNMMMMm `` - .+ys- `:+hNMMMMMMy/` - `hNmmMMMMMMMMMMMMdo. - dMMMMMMMMMMMMMMMMMNh: - +hMMMMMMMMMMMMMMMMMmy. - -oNMMMMMMMMMMmy+.` - `:yNMMMds/.` - .//` diff --git a/ascii/distro/trisquel b/ascii/distro/trisquel deleted file mode 100644 index 07634b834..000000000 --- a/ascii/distro/trisquel +++ /dev/null @@ -1,18 +0,0 @@ -${c1} ▄▄▄▄▄▄ - ▄█████████▄ - ▄▄▄▄▄▄ ████▀ ▀████ - ▄██████████▄ ████▀ ▄▄ ▀███ - ▄███▀▀ ▀▀████ ███▄ ▄█ ███ -▄███ ▄▄▄ ████▄ ▀██████ ▄███ -███ █▀▀██▄ █████▄ ▀▀ ▄████ -▀███ ███ ███████▄▄ ▄▄██████ -${c1} ▀███▄ ▄███ █████████████${c2}████▀ -${c1} ▀█████████ ███████${c2}███▀▀▀ - ▀▀███▀▀ ██████▀▀ - ██████▀ ▄▄▄▄ - █████▀ ████████ - █████ ███▀ ▀███ - ████▄ ██▄▄▄ ███ - █████▄ ▀▀ ▄██ - ██████▄▄▄████ - ▀▀█████▀▀ diff --git a/ascii/distro/trueos b/ascii/distro/trueos deleted file mode 100644 index 84bc618a8..000000000 --- a/ascii/distro/trueos +++ /dev/null @@ -1,27 +0,0 @@ -${c1} .. - s. - +y - yN - -MN `. - :NMs `m - .yMMm` `No - `-/+++sdMMMNs+-`+Ms - `:oo+-` .yMMMMy` `-+oNMh - -oo- +NMMMM/ oMMh- - .s+` ` oMMMMM/ - oMMMhy. - +s`- :: :MMMMMd -o `mMMMy`s+ - y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y - s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s --h .NM` `hMMMMMMMMMMMMMMNMMNy: h- -y- hMN` hMMmMMMMMMMMMNsdMNs. -y -m` mMMy` oMMNoNMMMMMMo` sMMMo `m -m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m -h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h -:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: - y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y - `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` - so -NMMMN /mmd+ `dMMMMMMMm- os - :y: `yMMM` `+NMMMMMMNo`:y: - /s+`.omy /NMMMMMNh/.+s: - .+oo:-. /mdhs+::oo+. - -/o+++++++++++/- diff --git a/ascii/distro/tumbleweed b/ascii/distro/tumbleweed deleted file mode 100644 index 37ee33ad4..000000000 --- a/ascii/distro/tumbleweed +++ /dev/null @@ -1,13 +0,0 @@ -${c2} ...... - .,cdxxxoc,. .:kKMMMNWMMMNk:. - cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. - ;WMK;. .lKMMNM, :NMK, .OMW; - cMW; 'WMMMN ,XMK, oMM' -.MMc ..;l. xMN: KM0 -'MM. 'NMO oMM -.MM, .kMMl xMN - KM0 .kMM0. .dl:,.. .WMd - .XM0. ,OMMK, OMMMK. .XMK - oWMO:. .;xNMMk, NNNMKl. .xWMx - :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, - ..... .:dOOXXKOxl, diff --git a/ascii/distro/ubuntu b/ascii/distro/ubuntu deleted file mode 100644 index db5df090c..000000000 --- a/ascii/distro/ubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} .-/+oossssoo+/-. - `:+ssssssssssssssssss+:` - -+ssssssssssssssssssyyssss+- - .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ - +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ -.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. -+ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ -oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso -oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso -+ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ -.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ - +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ - /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ - .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - -+sssssssssssssssss${c2}yyy${c1}ssss+- - `:+ssssssssssssssssss+:` - .-/+oossssoo+/-. diff --git a/ascii/distro/ubuntu-budgie b/ascii/distro/ubuntu-budgie deleted file mode 100644 index 1faec715e..000000000 --- a/ascii/distro/ubuntu-budgie +++ /dev/null @@ -1,20 +0,0 @@ -${c2} ./oydmMMMMMMmdyo/. - :smMMMMMMMMMMMhs+:++yhs: - `omMMMMMMMMMMMN+` `odo` - /NMMMMMMMMMMMMN- `sN/ - `hMMMMmhhmMMMMMMh sMh` - .mMmo- /yMMMMm` `MMm. - mN/ yMMMMMMMd- MMMm -oN- oMMMMMMMMMms+//+o+: :MMMMo -m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm -M` .NMMMMMMMMMMMMMMMNodMMMMMMM -M- sMMMMMMMMMMMMMMMMMMMMMMMMM -mm` mMMMMMMMMMNdhhdNMMMMMMMMMm -oMm/ .dMMMMMMMMh: :dMMMMMMMo - mMMNyo/:/sdMMMMMMMMM+ sMMMMMm - .mMMMMMMMMMMMMMMMMMs `NMMMm. - `hMMMMMMMMMMM.oo+. `MMMh` - /NMMMMMMMMMo sMN/ - `omMMMMMMMMy. :dmo` - :smMMMMMMMh+-` `.:ohs: - ./oydmMMMMMMdhyo/. diff --git a/ascii/distro/ubuntu-gnome b/ascii/distro/ubuntu-gnome deleted file mode 100644 index 096dca3d0..000000000 --- a/ascii/distro/ubuntu-gnome +++ /dev/null @@ -1,16 +0,0 @@ -${c3} ./o. - .oooooooo - .oooo```soooo - .oooo` `soooo - .ooo` ${c4}.o.${c3} `\/ooo. - :ooo ${c4}:oooo.${c3} `\/ooo. - sooo ${c4}`ooooo${c3} \/oooo - \/ooo ${c4}`soooo${c3} `ooooo - `soooo ${c4}`\/ooo${c3} `soooo -${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo -${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` -${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` -${c4} `ooooo ${c3}`` ${c4}.oooo -${c4} `soooo. .oooo` - `\/oooooooooo` - ``\/oo`` diff --git a/ascii/distro/ubuntu-mate b/ascii/distro/ubuntu-mate deleted file mode 100644 index 893389fe3..000000000 --- a/ascii/distro/ubuntu-mate +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `:+shmNNMMNNmhs+:` - .odMMMMMMMMMMMMMMMMMMdo. - /dMMMMMMMMMMMMMMMmMMMMMMMMd/ - :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: - `yMMMMMMMMMms:..-::oM: -omMMMMMy` - `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` - hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh -/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ -hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh -/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ - hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh - `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` - yMMMMMMMMMms/..-::oM: .+dMMMMMy - :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: - /dMMMMMMMMMMMMMMMdNMMMMMMMd/ - .odMMMMMMMMMMMMMMMMMMdo. - `:+shmNNMMNNmhs+:` diff --git a/ascii/distro/ubuntu-studio b/ascii/distro/ubuntu-studio deleted file mode 100644 index 2deb270ec..000000000 --- a/ascii/distro/ubuntu-studio +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ..-::::::-.` - `.:+++++++++++${c2}ooo${c1}++:.` - ./+++++++++++++${c2}sMMMNdyo${c1}+/. - .++++++++++++++++${c2}oyhmMMMMms${c1}++. - `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` - `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` - +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` - :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: - ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. - ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ - :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: - +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ - `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` - `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ - ./+++++++++++++++${c2}oyhdNMMMms${c1}++. - ./+++++++++++++${c2}hMMMNdyo${c1}+/. - `.:+++++++++++${c2}sso${c1}++:. - ..-::::::-.. diff --git a/ascii/distro/ubuntu_old b/ascii/distro/ubuntu_old deleted file mode 100644 index 4e3664b6b..000000000 --- a/ascii/distro/ubuntu_old +++ /dev/null @@ -1,19 +0,0 @@ - -${c1} ./+o+- -${c2} yyyyy- ${c1}-yyyyyy+ -${c2} ${c2}://+//////${c1}-yyyyyyo -${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` -${c3} .:++o: ${c2}/++++++++/:--:/- -${c3} o:+o+:++.${c2}`..```.-/oo+++++/ -${c3} .:+o:+o/.${c2} `+sssoo+/ -${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. -${c2}/+++//+:${c3}`oo+o${c2} /::--:. -${c2}+/+o+++${c3}`o++o${c1} ++////. -${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. -${c3} .+.o+oo:.${c1} `oddhhhh+ -${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ -${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: -${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` -${c1} /osyyyyyyo${c3}++ooo+++/ -${c1} ````` ${c3}+oo+++o: -${c3} `oo++. diff --git a/ascii/distro/void b/ascii/distro/void deleted file mode 100644 index 2a089e633..000000000 --- a/ascii/distro/void +++ /dev/null @@ -1,18 +0,0 @@ -${c1} __.;=====;.__ - _.=+==++=++=+=+===;. - -=+++=+===+=+=+++++=_ - . -=:`` `--==+=++==. - _vi, ` --+=++++: - .uvnvi. _._ -==+==+. - .vvnvnI` .;==|==;. :|=||=|. -${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL -${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE -${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' -${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! -${c1} -1vvnvv. `~+++` ++|+++ - +vnvnnv, `-|=== - +vnvnvns. . :=- - -Invnvvnsi..___..=sv=. ` - +Invnvnvnnnnnnnnvvnn;. - ~|Invnvnvvnvvvnnv}+` - -~|{*l}*|~ diff --git a/ascii/distro/void_small b/ascii/distro/void_small deleted file mode 100644 index adfae49bd..000000000 --- a/ascii/distro/void_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} _______ - _ \______ - -| \ ___ \ | -| | / \ | | -| | \___/ | | -| \______ \_| - -_______\ diff --git a/ascii/distro/windows b/ascii/distro/windows deleted file mode 100644 index 31564309b..000000000 --- a/ascii/distro/windows +++ /dev/null @@ -1,16 +0,0 @@ -${c1} ,.=:!!t3Z3z., - :tt:::tt333EE3 -${c1} Et:::ztt33EEEL${c2} @Ee., .., -${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# -${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL -${c1} it::::tt333EEF${c2} @EEEEEEttttt33F -${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. -${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF -${c3} ;::::::::zt33)${c2} "4EEEtttji3P* -${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. -${c3} i::::::::zt33F${c4} AEEEtttt::::ztF -${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 -${c3} E::::::::zt33L${c4} @EEEtttt::::z3F -${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` -${c3} `${c4} :EEEEtttt::::z7 - "VEzjt:;;z>*` diff --git a/ascii/distro/windows10 b/ascii/distro/windows10 deleted file mode 100644 index 625961294..000000000 --- a/ascii/distro/windows10 +++ /dev/null @@ -1,19 +0,0 @@ -${c1} .., - ....,,:;+ccllll - ...,,+:; cllllllllllllllllll -,cclllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll - -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -`'ccllllllllll lllllllllllllllllll - `' \\*:: :ccllllllllllllllll - ````''*::cll - `` diff --git a/ascii/distro/xubuntu b/ascii/distro/xubuntu deleted file mode 100644 index b872562b0..000000000 --- a/ascii/distro/xubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `-/osyhddddhyso/-` - .+yddddddddddddddddddy+. - :yddddddddddddddddddddddddy: - -yddddddddddddddddddddhdddddddy- - odddddddddddyshdddddddh`dddd+ydddo - `yddddddhshdd- ydddddd+`ddh.:dddddy` - sddddddy /d. :dddddd-:dy`-ddddddds -:ddddddds /+ .dddddd`yy`:ddddddddd: -sdddddddd` . .-:/+ssdyodddddddddds -ddddddddy `:ohddddddddd -dddddddd. +dddddddd -sddddddy ydddddds -:dddddd+ .oddddddd: - sdddddo ./ydddddddds - `yddddd. `:ohddddddddddy` - oddddh/` `.:+shdddddddddddddo - -ydddddhyssyhdddddddddddddddddy- - :yddddddddddddddddddddddddy: - .+yddddddddddddddddddy+. - `-/osyhddddhyso/-` diff --git a/ascii/distro/zorin b/ascii/distro/zorin deleted file mode 100644 index bb0516695..000000000 --- a/ascii/distro/zorin +++ /dev/null @@ -1,17 +0,0 @@ -${c1} `osssssssssssssssssssso` - .osssssssssssssssssssssso. - .+oooooooooooooooooooooooo+. - - - `::::::::::::::::::::::. .:` - `+ssssssssssssssssss+:.` `.:+ssso` -.ossssssssssssssso/. `-+ossssssso. -ssssssssssssso/-` `-/osssssssssssss -.ossssssso/-` .-/ossssssssssssssso. - `+sss+:. `.:+ssssssssssssssssss+` - `:. .::::::::::::::::::::::` - - - .+oooooooooooooooooooooooo+. - -osssssssssssssssssssssso- - `osssssssssssssssssssso` diff --git a/config/travis.conf b/config/travis.conf deleted file mode 100644 index 0dada093f..000000000 --- a/config/travis.conf +++ /dev/null @@ -1,55 +0,0 @@ -# Neofetch config file for travis.ci -# https://github.com/dylanaraps/neofetch - -print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "GPU Driver" gpu_driver - info "Memory" memory - - info "CPU Usage" cpu_usage - info "Disk" disk - info "Battery" battery - info "Font" font - info "Song" song - info "Local IP" local_ip - info "Public IP" public_ip - info "Users" users - info "Install Date" install_date - - info line_break - info cols - info line_break - - # Testing. - prin "prin" - prin "prin" "prin" - - # Testing no subtitles. - info uptime - info disk -} - -refresh_rate="on" -shell_version="on" -cpu_display="infobar" -memory_display="infobar" -disk_display="infobar" -cpu_temp="C" diff --git a/neofetch b/neofetch index 128e23bc6..98e94d894 100755 --- a/neofetch +++ b/neofetch @@ -3450,6 +3450,8 @@ get_ascii() { # Fallback to distro ascii mode if source is an image. [[ "$image_source" =~ \.(png|jpg|jpe|jpeg|gif)$ ]] && \ err "Image: Source is image file but ascii backend was selected. Using distro ascii." + else + ascii_data="$(< "$image_source")" fi # Set locale to get correct padding. @@ -8551,6 +8553,61 @@ get_args() { -N ./neofetch -o neofetch.1 exit 1 ;; + + "--travis") + print_info() { + info title + info underline + + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "GPU Driver" gpu_driver + info "Memory" memory + + info "CPU Usage" cpu_usage + info "Disk" disk + info "Battery" battery + info "Font" font + info "Song" song + info "Local IP" local_ip + info "Public IP" public_ip + info "Users" users + info "Install Date" install_date + + info line_break + info cols + info line_break + + # Testing. + prin "prin" + prin "prin" "prin" + + # Testing no subtitles. + info uptime + info disk + } + + refresh_rate="on" + shell_version="on" + cpu_display="infobar" + memory_display="infobar" + disk_display="infobar" + cpu_temp="C" + ;; esac shift From d52ba624bfeea254a06ec3aabbf721d8061bd1c5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:05:42 +1000 Subject: [PATCH 0255/1133] general: Adjust makefile --- Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 99ec43b22..7870d4566 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ PREFIX ?= /usr -SYSCONFDIR ?= /etc MANDIR ?= $(PREFIX)/share/man all: @@ -8,22 +7,15 @@ all: install: @echo 'Making directories...' @mkdir -p $(DESTDIR)$(PREFIX)/bin - @mkdir -p $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro @mkdir -p $(DESTDIR)$(MANDIR)/man1 - @mkdir -p $(DESTDIR)$(SYSCONFDIR)/neofetch @echo 'Installing binaries...' - @sed "s|ASCIIDIR|$(PREFIX)/share/neofetch/ascii/distro|g;s|CONFDIR|$(SYSCONFDIR)/neofetch|g" < neofetch > $(DESTDIR)$(PREFIX)/bin/neofetch @chmod 755 $(DESTDIR)$(PREFIX)/bin/neofetch - @echo 'Installing ASCII files, man page and config file...' - @cp -p ascii/distro/* $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro + @echo 'Installing man page...' @cp -p neofetch.1 $(DESTDIR)$(MANDIR)/man1 - @cp -p config/config.conf $(DESTDIR)$(SYSCONFDIR)/neofetch/config.conf uninstall: @echo 'Removing files...' @rm -rf $(DESTDIR)$(PREFIX)/bin/neofetch @rm -rf $(DESTDIR)$(MANDIR)/man1/neofetch.1* - @rm -rf $(DESTDIR)$(PREFIX)/share/neofetch - @rm -rf $(DESTDIR)$(SYSCONFDIR)/neofetch From 3e9c76a830b449745e72550c6193607d0f10efc3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:12:42 +1000 Subject: [PATCH 0256/1133] theme: Fixes for bash3 --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 98e94d894..c23974f0d 100755 --- a/neofetch +++ b/neofetch @@ -32,7 +32,7 @@ shopt -s nocasematch reset="\e[0m" # Neofetch default config. -readarray -t config <<'EOM' +read -rd '' config <<'EOF' # See this wiki page for more info: # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info print_info() { @@ -801,7 +801,7 @@ stdout="off" # NOTE: Don't change this value, neofetch reads this to determine # how to handle backwards compatibility. config_version="3.4.1-git" -EOM +EOF # DETECT INFORMATION @@ -7836,7 +7836,7 @@ get_user_config() { config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" # The config file doesn't exist, create it. - printf "%s\n" "${config[@]}" > "$config_file" + printf "%s\n" "$config" > "$config_file" fi source "$config_file" @@ -8619,7 +8619,7 @@ main() { get_os # Load default config. - source /dev/stdin < <(printf "%s\\n" "${config[@]}") + source /dev/stdin < <(printf "%s\n" "$config") get_args "$@" [[ "$verbose" != "on" ]] && exec 2>/dev/null From a982b0b5099fae0580218a92b26dd026bec00d01 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:17:43 +1000 Subject: [PATCH 0257/1133] ascii: Update android ascii --- neofetch | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/neofetch b/neofetch index c23974f0d..2f421ae1a 100755 --- a/neofetch +++ b/neofetch @@ -4271,21 +4271,25 @@ EOF "Android"*) set_colors 2 7 - ascii_length_force=19 - read -rd '' ascii_data <<'EOF' -${c1} ╲ ▁▂▂▂▁ ╱ - ▄███████▄ - ▄██${c2} ${c1}███${c2} ${c1}██▄ - ▄███████████▄ -▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄ █▄ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ - █████████████ - ███████████ - ██ ██ - ██ ██ + read -rd '' ascii_data <<'EOF' +${c1} -o o- + +hydNNNNdyh+ + +mMMMMMMMMMMMMm+ + `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` + hMMMMMMMMMMMMMMMMMMh + .. yyyyyyyyyyyyyyyyyyyy .. +.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +-MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- + +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ + mMMMMMMMMMMMMMMMMMMm + `/++MMMMh++hMMMM++/` + MMMMo oMMMM + MMMMo oMMMM + oNMm- -mMNs EOF ;; From 7b0d8c2d090dfc94777f8ac49200f21502fea7e6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:21:33 +1000 Subject: [PATCH 0258/1133] travis: Added another exclude. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f96df785f..af3a372ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,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,SC1117; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1091,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 f5a50d52fc76dfe41ac4392ec6426bb1d5cb81a0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:22:25 +1000 Subject: [PATCH 0259/1133] travis: Remove line limit. Will still be enforced by hand. --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index af3a372ea..532ca462e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,3 @@ script: # 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,SC1091,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. - - if grep '.\{101\}' neofetch; then (exit 1); else (exit 0); fi From a796d41fa856cbb29ce30c15649f2d7a1bff76cd Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 16:09:04 +1000 Subject: [PATCH 0260/1133] General: Move ascii art to the bottom of the script. --- neofetch | 8044 +++++++++++++++++++++++++++--------------------------- 1 file changed, 4022 insertions(+), 4022 deletions(-) diff --git a/neofetch b/neofetch index 2f421ae1a..a2dd2d3d6 100755 --- a/neofetch +++ b/neofetch @@ -4140,3487 +4140,2189 @@ uppercase() { # COLORS -get_distro_colors() { - # This function sets the text colors according - # to your OS/Distro's logo colors. - # - # $ascii_distro is the same as $distro. - case "$ascii_distro" in - "AIX"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} `:+ssssossossss+-` - .oys///oyhddddhyo///sy+. - /yo:+hNNNNNNNNNNNNNNNNh+:oy/ - :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: - `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh - h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy -/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: -h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y -N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m -N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m -h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y -:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- - yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy - sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo - :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- - :ys:/yNNNNNNNNNNNNNNNmy/:sy: - .+ys///osyhhhhys+///sy+. - -/osssossossso/- -EOF - ;; +set_colors() { + c1="$(color "$1")${ascii_bold}" + c2="$(color "$2")${ascii_bold}" + c3="$(color "$3")${ascii_bold}" + c4="$(color "$4")${ascii_bold}" + c5="$(color "$5")${ascii_bold}" + c6="$(color "$6")${ascii_bold}" - "alpine_small") - set_colors 4 7 - read -rd '' ascii_data <<'EOF' -${c1} /\\ /\\ - /${c2}/ ${c1}\\ \\ - /${c2}/ ${c1}\\ \\ -/${c2}// ${c1}\\ \\ -${c2}// ${c1}\\ \\ - \\ -EOF - ;; + [[ "$color_text" != "off" ]] && set_text_colors "$@" +} - "Alpine"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} .hddddddddddddddddddddddh. - :dddddddddddddddddddddddddd: - /dddddddddddddddddddddddddddd/ - +dddddddddddddddddddddddddddddd+ - `sdddddddddddddddddddddddddddddddds` - `ydddddddddddd++hdddddddddddddddddddy` -.hddddddddddd+` `+ddddh:-sdddddddddddh. -hdddddddddd+` `+y: .sddddddddddh -ddddddddh+` `//` `.` -sddddddddd -ddddddh+` `/hddh/` `:s- -sddddddd -ddddh+` `/+/dddddh/` `+s- -sddddd -ddd+` `/o` :dddddddh/` `oy- .yddd -hdddyo+ohddyosdddddddddho+oydddy++ohdddh -.hddddddddddddddddddddddddddddddddddddh. - `yddddddddddddddddddddddddddddddddddy` - `sdddddddddddddddddddddddddddddddds` - +dddddddddddddddddddddddddddddd+ - /dddddddddddddddddddddddddddd/ - :dddddddddddddddddddddddddd: - .hddddddddddddddddddddddh. -EOF - ;; +set_text_colors() { + if [[ "${colors[0]}" == "distro" ]]; then + title_color="$(color "$1")" + at_color="$reset" + underline_color="$reset" + subtitle_color="$(color "$2")" + colon_color="$reset" + info_color="$reset" - "Amazon"*) - set_colors 3 7 - read -rd '' ascii_data <<'EOF' -${c1} `-/oydNNdyo:.` - `.:+shmMMMMMMMMMMMMMMmhs+:.` - -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- -.`` -/+shmNNMMMMMMNNmhs+/- ``. -dNmhs+:. `.:/oo/:.` .:+shmNd -dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd -dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. - `.:+shNMMMMMh yMMMMMNhs+:`` - `-+shy shs+:` -EOF - ;; + # If the ascii art uses 8 as a color, make the text the fg. + ((${1:-1} == 8)) && title_color="$reset" + ((${2:-7} == 8)) && subtitle_color="$reset" - "Anarchy"*) - set_colors 7 4 - read -rd '' ascii_data <<'EOF' - ${c2}..${c1} - ${c2}..${c1} - ${c2}:..${c1} - ${c2}:+++.${c1} - .:::++${c2}++++${c1}+::. - .:+######${c2}++++${c1}######+:. - .+#########${c2}+++++${c1}##########:. - .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. - +###########${c2}+++++++++${c1}############: - +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ - +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ - :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: - ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ -.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. -.##########${c2}+++++++++++++++++++${c1}###########. - #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ - :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: - +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ - +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ - :##${c2}++++++${c1}############${c2}++++++++++${c1}##: - .${c2}++++++${c1}#############${c2}++++++++++${c1}+. - :${c2}++++${c1}###############${c2}+++++++${c1}:: - .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. - ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. - ${c2}.${c1} ${c2}.:+++${c1}. - ${c2}.:${c1}: - ${c2}..${c1} - ${c2}..${c1} -EOF - ;; + # If the second color is white use the first for the subtitle. + ((${2:-7} == 7)) && subtitle_color="$(color "$1")" + ((${1:-1} == 7)) && title_color="$reset" + else + title_color="$(color "${colors[0]}")" + at_color="$(color "${colors[1]}")" + underline_color="$(color "${colors[2]}")" + subtitle_color="$(color "${colors[3]}")" + colon_color="$(color "${colors[4]}")" + info_color="$(color "${colors[5]}")" + fi - "Android"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} -o o- - +hydNNNNdyh+ - +mMMMMMMMMMMMMm+ - `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` - hMMMMMMMMMMMMMMMMMMh - .. yyyyyyyyyyyyyyyyyyyy .. -.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: --MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- - +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ - mMMMMMMMMMMMMMMMMMMm - `/++MMMMh++hMMMM++/` - MMMMo oMMMM - MMMMo oMMMM - oNMm- -mMNs -EOF - ;; + # Bar colors. + if [[ "$bar_color_elapsed" == "distro" ]]; then + bar_color_elapsed="$(color fg)" + else + bar_color_elapsed="$(color "$bar_color_elapsed")" + fi - "Antergos"*) - set_colors 4 6 - read -rd '' ascii_data <<'EOF' -${c2} `.-/::/-`` - .-/osssssssso/. - :osyysssssssyyys+- - `.+yyyysssssssssyyyyy+. - `/syyyyyssssssssssyyyyys-` - `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` - .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. - .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. - -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: - -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- - .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` -`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo -.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. -ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy -dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh --dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- -.smmmmddddddddhhhhhhhhhdddddddddmmmms. - `+ydmmmdddddddddddddddddddmmmmdy/. - `.:+ooyyddddddddddddyyso+:.` -EOF - ;; + case "$bar_color_total $1" in + "distro "[736]) bar_color_total="$(color "$1")" ;; + "distro "[0-9]) bar_color_total="$(color "$2")" ;; + *) bar_color_total="$(color "$bar_color_total")" ;; + esac +} - "antiX"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} - \ - , - ~ ^ ~ - \ / - , ' \ ' , / - , \ '/ - , \ / , - ,___, \/ , - / | _ _ _|_ o /\ , -|, | / |/ | | | / \ , - \,_/\_/ | |_/|_/|_/_/ \, - , / ,\ - , / , ' \ - ' - , _ _ _ , ' -EOF - ;; +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" ;; + esac +} - "AOSC"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} .:+syhhhhys+:. - .ohNMMMMMMMMMMMMMMNho. - `+mMMMMMMMMMMmdmNMMMMMMMMm+` - +NMMMMMMMMMMMM/ `./smMMMMMN+ - .mMMMMMMMMMMMMMMo -yMMMMMm. - :NMMMMMMMMMMMMMMMs .hMMMMN: - .NMMMMhmMMMMMMMMMMm+/- oMMMMN. - dMMMMs ./ymMMMMMMMMMMNy. sMMMMd --MMMMN` oMMMMMMMMMMMN: `NMMMM- -/MMMMh NMMMMMMMMMMMMm hMMMM/ -/MMMMh NMMMMMMMMMMMMm hMMMM/ --MMMMN` :MMMMMMMMMMMMy. `NMMMM- - dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd - .NMMMMo -/+sMMMMMMMMMMMmMMMMN. - :NMMMMh. .MMMMMMMMMMMMMMMN: - .mMMMMMy- NMMMMMMMMMMMMMm. - +NMMMMMms/.` mMMMMMMMMMMMN+ - `+mMMMMMMMMNmddMMMMMMMMMMm+` - .ohNMMMMMMMMMMMMMMNho. - .:+syhhhhys+:. -EOF - ;; +# OTHER - "Apricity"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} ./o- - ``...`` `:. -/: - `-+ymNMMMMMNmho-` :sdNNm/ - `+dMMMMMMMMMMMMMMMmo` sh:.:::- - /mMMMMMMMMMMMMMMMMMMMm/`sNd/ - oMMMMMMMMMMMMMMMMMMMMMMMs -` -:MMMMMMMMMMMMMMMMMMMMMMMMM/ -NMMMMMMMMMMMMMMMMMMMMMMMMMd -MMMMMMMmdmMMMMMMMMMMMMMMMMd -MMMMMMy` .mMMMMMMMMMMMmho:` -MMMMMMNo/sMMMMMMMNdy+-.`-/ -MMMMMMMMMMMMNdy+:.`.:ohmm: -MMMMMMMmhs+-.`.:+ymNMMMy. -MMMMMM/`.-/ohmNMMMMMMy- -MMMMMMNmNNMMMMMMMMmo. -MMMMMMMMMMMMMMMms:` -MMMMMMMMMMNds/. -dhhyys+/-` -EOF - ;; +stdout() { + image_backend="off" + unset subtitle_color + unset colon_color + unset info_color + unset underline_color + unset bold + unset title_color + unset at_color + unset text_padding + unset zws + unset reset + unset color_blocks + unset get_line_break +} - "arch_small") - set_colors 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} /\ - /^^\ - /\ \ - /${c2} __ \ - / ( ) \ - / __| |__\\\ -/// \\\\\ -EOF - ;; +err() { + err+="$(color 1)[!]\e[0m $1\n" +} - "arch_old") - set_colors 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} __ - _=(SDGJT=_ - _GTDJHGGFCVS) - ,GTDJGGDTDFBGX0 -${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ -${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL -${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, -${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], -${c1} SDDFDFH' !YEWD,${c2} )HDROD -${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' -${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' -${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' -${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) -${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF -'EHTI !H - `0F' '! -EOF - ;; +get_full_path() { + # This function finds the absolute path from a relative one. + # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" - "ArchBox"*) - set_colors 2 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ...:+oh/:::.. - ..-/oshhhhhh` `::::-. - .:/ohhhhhhhhhhhh` `-::::. - .+shhhhhhhhhhhhhhhhh` `.::-. - /`-:+shhhhhhhhhhhhhh` .-/+shh - / .:/ohhhhhhhhh` .:/ohhhhhhhh - / `-:+shhh` ..:+shhhhhhhhhhhh - / .:ohhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / .+o+ `hhhhhhhhhhhhhhhhhhhh - / -hhhhh `hhhhhhhhhhhhhhhhhhhh - / ohhhhho `hhhhhhhhhhhhhhhhhhhh - /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` - `--/:` /: `hhhhhhhhhhhho/- - -/:. `hhhhhhs+:-` - ::::/ho/-` -EOF - ;; + # If the file exists in the current directory, stop here. + [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - "ARCHlabs"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} 'c' - 'kKk, - .dKKKx. - .oKXKXKd. - .l0XXXXKKo. - c0KXXXXKX0l. - :0XKKOxxOKX0l. - :OXKOc. .c0XX0l. - :OK0o. ${c4}...${c1}'dKKX0l. - :OX0c ${c4};xOx'${c1}'dKXX0l. - :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. - c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. - .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. - .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. - .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. - .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. - .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' - 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' - 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, - ,xko:'. ${c4}.. ${c1} .':okx; - .,'. .',. -EOF - ;; + if ! cd "${1%/*}"; then + err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" + err " Check that the directory exists or try another directory." + exit 1 + fi - *"XFerience"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ``--:::::::-.` - .-/+++ooooooooo+++:-` - `-/+oooooooooooooooooo++:. - -/+oooooo/+ooooooooo+/ooo++:` - `/+oo++oo. .+oooooo+.-: +:-o+- - `/+o/. -o. :oooooo+ ```:.+oo+- -`:+oo- -/` :oooooo+ .`-`+oooo/. -.+ooo+. .` `://///+-+..oooooo+:` --+ooo:` ``.-+oooooo+/` --+oo/` :+oooo/. -.+oo: ..-/. . -+oo+/` -`/++- -:::++::/. -+oo+- - ./o: `:///+- `./ooo+:` - .++- `` /-` -:/+oooo+:` - .:+/:`` `-:ooooooo++- - ./+o+//:...../+oooooooo++:` - `:/++ooooooooooooo++/-` - `.-//++++++//:-.` - `````` -EOF - ;; + local full_dir="${1##*/}" - "ArchMerge"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} y: - sMN- - +MMMm` - /MMMMMd` - :NMMMMMMy - -NMMMMMMMMs - .NMMMMMMMMMM+ - .mMMMMMMMMMMMM+ - oNMMMMMMMMMMMMM+ - `+:-+NMMMMMMMMMMMM+ - .sNMNhNMMMMMMMMMMMM/ - `hho/sNMMMMMMMMMMMMMMM/ - `.`omMMmMMMMMMMMMMMMMMMM+ - .mMNdshMMMMd+::oNMMMMMMMMMo - .mMMMMMMMMM+ `yMMMMMMMMMs - .NMMMMMMMMM/ yMMMMMMMMMy - -NMMMMMMMMMh `mNMMMMMMMMd` - /NMMMNds+:.` `-/oymMMMm. - +Mmy/. `:smN: -/+. -o. -EOF - ;; + # Iterate down a (possible) chain of symlinks. + while [[ -L "$full_dir" ]]; do + full_dir="$(readlink "$full_dir")" + cd "${full_dir%/*}" || exit + full_dir="${full_dir##*/}" + done - "Arch"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} -` - .o+` - `ooo/ - `+oooo: - `+oooooo: - -+oooooo+: - `/:-:++oooo+: - `/++++/+++++++: - `/++++++++++++++: - `/+++o${c2}oooooooo${c1}oooo/` -${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` -${c2} .oossssso-````/ossssss+` - -osssssso. :ssssssso. - :osssssss/ osssso+++. - /ossssssss/ +ssssooo/- - `/ossssso+/:- -:/+osssso+- - `+sso+:-` `.-/+oso: - `++:. `-/+/ - .` `/ -EOF - ;; + # Final directory. + full_dir="$(pwd -P)/${1/*\/}" - "Artix"*) - set_colors 6 4 2 7 - read -rd '' ascii_data <<'EOF' -${c1} d${c2}c. -${c1} x${c2}dc. -${c1} '.${c4}.${c1} d${c2}dlc. -${c1} c${c2}0d:${c1}o${c2}xllc; -${c1} :${c2}0ddlolc,lc, -${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. -${c1} ;${c1}K${c2}kxoOddollc' cllc. -${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: -${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: -${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, -${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. -${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; -${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, -${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. -${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. -${c1} 0${c2}Okd''dc. .cll; -${c1} k${c2}Okd' .llc, -${c1} d${c2}Od, 'lc. -${c1} :,${c4}. ${c2}... -EOF - ;; + [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" +} - "Arya"*) - set_colors 2 1 - read -rd '' ascii_data <<'EOF' -${c1} `oyyy/${c2}-yyyyyy+ -${c1} -syyyy/${c2}-yyyyyy+ -${c1} .syyyyy/${c2}-yyyyyy+ -${c1} :yyyyyy/${c2}-yyyyyy+ -${c1} `/ :yyyyyy/${c2}-yyyyyy+ -${c1} .+s :yyyyyy/${c2}-yyyyyy+ -${c1} .oys :yyyyyy/${c2}-yyyyyy+ -${c1} -oyys :yyyyyy/${c2}-yyyyyy+ -${c1} :syyys :yyyyyy/${c2}-yyyyyy+ -${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ -${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ -${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- -${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy -${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy -${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy -EOF - ;; +get_user_config() { + # Check $config_file. + if [[ -f "$config_file" ]]; then + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options + return + fi + mkdir -p "${XDG_CONFIG_HOME}/neofetch/" - "Bitrig"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} `hMMMMN+ - -MMo-dMd` - oMN- oMN` - yMd /NM: - .mMmyyhMMs - :NMMMhsmMh - +MNhNNoyMm- - hMd.-hMNMN: - mMmsssmMMMo - .MMdyyhNMMMd - oMN.`/dMddMN` - yMm/hNm+./MM/ -.dMMMmo.``.NMo -:NMMMNmmmmmMMh -/MN/-------oNN: -hMd. .dMh -sm/ /ms -EOF - ;; + # Check ${XDG_CONFIG_HOME}/neofetch and create the + # dir/files if they don't exist. + if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config" - "BLAG"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} d - ,MK: - xMMMX: - .NMMMMMX; - lMMMMMMMM0clodkO0KXWW: - KMMMMMMMMMMMMMMMMMMX' - .;d0NMMMMMMMMMMMMMMMMMMK. - .;dONMMMMMMMMMMMMMMMMMMMMMMx -'dKMMMMMMMMMMMMMMMMMMMMMMMMl - .:xKWMMMMMMMMMMMMMMMMMMM0. - .:xNMMMMMMMMMMMMMMMMMK. - lMMMMMMMMMMMMMMMMMMK. - ,MMMMMMMMWkOXWMMMMMM0 - .NMMMMMNd. `':ldko - OMMMK: - oWk, - ;: -EOF - ;; + elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - "BlankOn"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` -${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ -${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys -${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys -${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys -${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys -${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys -${c2}NMMMMMN: .NMMMMMN${c1}yyyyys -${c2}MMMMMMm. NMMMMMN${c1}yyyyys -${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys -${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys -${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys -${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys -${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys -${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys -${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo -${c2} `.:/++++/:.` ${c1}:oys+. -EOF - ;; + else + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - "BSD") - set_colors 1 7 4 3 6 - read -rd '' ascii_data <<'EOF' -${c1} , , - /( )` - \ \___ / | - /- _ `-/ ' - (${c2}/\/ \ ${c1}\ /\ - ${c2}/ / | ` ${c1}\ - ${c3}O O ${c2}) ${c1}/ | - ${c2}`-^--'${c1}`< ' - (_.) _ ) / - `.___/` / - `-----' / -${c4}<----. __ / __ \ -${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| -<----' ${c1}`--' `.__,' \ - | | - \ / /\ - ${c5}______${c1}( (_ / \______/ - ${c5},' ,-----' | - `--{__________) -EOF - ;; + # The config file doesn't exist, create it. + printf "%s\n" "$config" > "$config_file" + fi - "BunsenLabs"*) - set_colors fg 7 - read -rd '' ascii_data <<'EOF' -${c1} `++ - -yMMs - `yMMMMN` - -NMMMMMMm. - :MMMMMMMMMN- - .NMMMMMMMMMMM/ - yMMMMMMMMMMMMM/ -`MMMMMMNMMMMMMMN. --MMMMN+ /mMMMMMMy --MMMm` `dMMMMMM -`MMN. .NMMMMM. - hMy yMMMMM` - -Mo +MMMMN - /o +MMMMs - +MMMN` - hMMM: - `NMM/ - +MN: - mh. - -/ -EOF - ;; + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options +} - "Calculate"*) - set_colors 7 3 - read -rd '' ascii_data <<'EOF' -${c1} ...... - ,,+++++++,. - .,,,....,,,${c2}+**+,,.${c1} - ............,${c2}++++,,,${c1} - ............... - ......,,,........ - .....+*#####+,,,*+. - .....,*###############,..,,,,,,.. - ......,*#################*..,,,,,..,,,.. - .,,....*####################+***+,,,,...,++, - .,,..,..*#####################*, - ,+,.+*..*#######################. - ,+,,+*+..,########################* -.,++++++. ..+##**###################+ -..... ..+##***#################*. - .,.*#*****##############*. - ..,,*********#####****+. - ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} - ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} - ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} -EOF - ;; +bar() { + # Get the values. + elapsed="$(($1 * bar_length / $2))" - "CentOS"*) - set_colors 3 2 4 5 7 - read -rd '' ascii_data <<'EOF' -${c1} .. - .PLTJ. - <><><><> - ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK - ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK - ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V - ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. -${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. -${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. -${c4} -${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV -${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' - ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' - ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 - ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK - ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK -${c2} <><><><> - 'MKKM' - '' -EOF - ;; + # Create the bar with spaces. + printf -v prog "%${elapsed}s" + printf -v total "%$((bar_length - elapsed))s" - "Chakra"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} _ _ _ "kkkkkkkk. - ,kkkkkkkk., 'kkkkkkkkk, - ,kkkkkkkkkkkk., 'kkkkkkkkk. - ,kkkkkkkkkkkkkkkk,'kkkkkkkk, - ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. - "''"''',;::,,"''kkk''kkkkk; __ - ,kkkkkkkkkk, "k''kkkkk' ,kkkk - ,kkkkkkk' ., ' .: 'kkkk',kkkkkk - ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk - ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk -.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' -;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' -'kkkkkkk; 'kkkkkkkk.,""''"''"" - ''kkkk; 'kkkkkkkkkk., - ';' 'kkkkkkkkkkkk., - ';kkkkkkkkkk' - ';kkkkkk' - "''" -EOF - ;; + # Set the colors and swap the spaces for $bar_char_. + bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" + bar+="${bar_color_total}${total// /${bar_char_total}}" - "ChaletOS"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `.//+osso+/:`` - `/sdNNmhyssssydmNNdo:` - :hNmy+-` .-+hNNs- - /mMh/` `+:` `+dMd: - .hMd- -sNNMNo. /yyy /mMs` - -NM+ `/dMd/--omNh::dMM `yMd` - .NN+ .sNNs:/dMNy:/hNmo/s yMd` - hMs `/hNd+-smMMMMMMd+:omNy- `dMo -:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` -/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: -/Md` MMMMMMMMMMMMMMMMMMMN .MN: -:NN. MMMMMMm....--NMMMMMN -Mm. -`dMo MMMMMMd mMMMMMN hMs - -MN: MMMMMMd mMMMMMN oMm` - :NM: MMMMMMd mMMMMMN +Mm- - -mMy. mmmmmmh dmmmmmh -hMh. - oNNs- :yMm/ - .+mMdo:` `:smMd/` - -ohNNmhsoo++osshmNNh+. - `./+syyhhyys+:`` -EOF - ;; + # Borders. + [[ "$bar_border" == "on" ]] && \ + bar="$(color fg)[${bar}$(color fg)]" - "Chapeau"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} .-/-. - ////////. - ////////${c2}y+${c1}//. - ////////${c2}mMN${c1}/////. - ////////${c2}mMN+${c1}////////. - ////////////////////////. - /////////+${c2}shhddhyo${c1}+////////. - ////////${c2}ymMNmdhhdmNNdo${c1}///////. -///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. -///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// -//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// -//////${c2}+MMmssssssssssssss+${c1}/////// -`//////${c2}yMMy${c1}//////////////////// - `//////${c2}smMNhso++oydNm${c1}//////// - `///////${c2}ohmNMMMNNdy+${c1}/////// - `//////////${c2}++${c1}////////// - `////////////////. - -////////- -EOF - ;; + printf "%b" "${bar}${info_color}" +} - "Chrom"*) - set_colors 2 1 3 4 7 - read -rd '' ascii_data <<'EOF' -${c2} .,:loool:,. - .,coooooooooooooc,. - .,lllllllllllllllllllll,. - ;ccccccccccccccccccccccccc; -${c1} '${c2}ccccccccccccccccccccccccccccc. -${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: -${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. -${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d -${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 -${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 -${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d -${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. -${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; -${c1} .:ccccccccllllllllo${c3}O0000000OOO, -${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. -${c1} '::ccccccccc${c3}dOOOOOOOkx:. -${c1} ..,::cccc${c3}xOOOkkko;. -${c1} ..,:${c3}dOkxl:. -EOF - ;; +cache() { + if [[ "$2" ]]; then + mkdir -p "${cache_dir}/neofetch" + printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" + fi +} - "Clover"*) - set_colors 2 6 - read -rd '' ascii_data <<'EOF' -${c1} `omo``omo` - `oNMMMNNMMMNo` - `oNMMMMMMMMMMMMNo` - oNMMMMMMMMMMMMMMMMNo - `sNMMMMMMMMMMMMMMNs` - `omo` `sNMMMMMMMMMMNs` `omo` - `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` - `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` -oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo -`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` -`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` -oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo - `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` - `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` - `oNs` `sNMMMMMMMMMMNs` `oNs` - `sNMMMMMMMMMMMMMMNs` - +NMMMMMMMMMMMMMMMMNo - `oNMMMMMMMMMMMMNo` - `oNMMMNNMMMNs` - `omo``oNs` -EOF - ;; +get_cache_dir() { + case "$os" in + "Mac OS X") cache_dir="/Library/Caches" ;; + *) cache_dir="/tmp" ;; + esac +} - "Container Linux by CoreOS"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ..... - .';:cccccccc:;'. - ':ccccclc${c3}lllllllll${c1}cc:. - .;cccccccc${c3}lllllllllllllll${c1}c, - ;clllccccc${c3}llllllllllllllllll${c1}c, - .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: - ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: - :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, -.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c -.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. -.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. -.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc - :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; - .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc - .cllllllllllclcccclccclccllllcllc - :cllllllllccclcllllllllllllcc; - .cccccccccccccclcccccccccc:. - .;cccclccccccllllllccc,. - .';ccccclllccc:;.. - ..... -EOF - ;; +kde_config_dir() { + # If the user is using KDE get the KDE + # configuration directory. + if [[ "$kde_config_dir" ]]; then + return - "crux_small") - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} ___ - (${c3}.· ${c1}| - (${c2}<> ${c1}| - / ${c3}__ ${c1}\\ - ( ${c3}/ \\ ${c1}/| -${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) -${c2}\/${c1}-____${c2}\/ -EOF - ;; + elif type -p kf5-config >/dev/null 2>&1; then + kde_config_dir="$(kf5-config --path config)" - "CRUX"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} odddd - oddxkkkxxdoo - ddcoddxxxdoool - xdclodod olol - xoc xdd olol - xdc ${c2}k00${c1}Okdlol - xxd${c2}kOKKKOkd${c1}ldd - xdco${c2}xOkdlo${c1}dldd - ddc:cl${c2}lll${c1}oooodo - odxxdd${c3}xkO000kx${c1}ooxdo - oxdd${c3}x0NMMMMMMWW0od${c1}kkxo - oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx -docldkXW${c3}MMMMMMMWWN${c1}Odolco -xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c -${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l -${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd -${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo -${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo -EOF - ;; + elif type -p kde4-config >/dev/null 2>&1; then + kde_config_dir="$(kde4-config --path config)" - "debian_small") - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' - ${c1}_____ - / __ \\ -| / | -| \\___- --_ - --_ -EOF - ;; + elif type -p kde-config >/dev/null 2>&1; then + kde_config_dir="$(kde-config --path config)" - "Debian"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2} _,met$$$$$gg. - ,g$$$$$$$$$$$$$$$P. - ,g$$P" """Y$$.". - ,$$P' `$$$. -',$$P ,ggs. `$$b: -`d$$' ,$P"' ${c1}.${c2} $$$ - $$P d$' ${c1},${c2} $$P - $$: $$. ${c1}-${c2} ,d$$' - $$; Y$b._ _,d$P' - Y$$. ${c1}`.${c2}`"Y$$$$P"' -${c2} `$$b ${c1}"-.__ -${c2} `Y$$ - `Y$$. - `$$b. - `Y$$b. - `"Y$b._ - `""" -EOF + elif [[ -d "${HOME}/.kde4" ]]; then + kde_config_dir="${HOME}/.kde4/share/config" + + elif [[ -d "${HOME}/.kde3" ]]; then + kde_config_dir="${HOME}/.kde3/share/config" + fi + + kde_config_dir="${kde_config_dir/$'/:'*}" +} + +get_term_padding() { + # Terminal info. + # + # Parse terminal config files to get + # info about padding. Due to how w3m-img + # works padding around the terminal throws + # off the cursor placement calculation in + # specific terminals. + # + # Note: This issue only seems to affect + # URxvt. + ((term_run != 1)) && get_term + + case "$term" in + "URxvt"*) + border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" ;; + esac +} - "Deepin"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} ............ - .';;;;;. .,;,. - .,;;;;;;;. ';;;;;;;. - .;::::::::' .,::;;,''''',. - ,'.:::::::: .;;'. '; - ;' 'cccccc, ,' :: '.. .: - ,, :ccccc. ;: .c, '' :. ,; -.l. cllll' ., .lc :; .l' l. -.c :lllc ;cl: .l' .ll. :' -.l 'looc. . ,o: 'oo' c, -.o. .:ool::coc' .ooo' o. - :: ..... .;dddo ;c - l:... .';lddddo. ,o - lxxxxxdoolllodxxxxxxxxxc :l - ,dxxxxxxxxxxxxxxxxxxl. 'o, - ,dkkkkkkkkkkkkko;. .;o; - .;okkkkkdl;. .,cl:. - .,:cccccccc:,. -EOF +dynamic_prompt() { + case "$image_backend" in + "ascii") printf "\n" ;; + "off") return ;; + *) + get_term_padding + lines="$(((border + height + yoffset) / font_height))" + image_prompt="on" ;; + esac - "DesaOS") - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1}███████████████████████ -███████████████████████ -███████████████████████ -███████████████████████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -██████████████████████████████ -██████████████████████████████ -████████████████████████ -████████████████████████ -████████████████████████ -EOF - ;; + # If the info is higher than the ascii/image place the prompt + # based on the info height instead of the ascii/image height. + if ((lines < info_height)); then + [[ "$image_prompt" ]] && printf "\n" + return + else + [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" + lines="$((lines - info_height + 1))" + fi - "Devuan"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} ..,,;;;::;,.. - `':ddd;:,. - `'dPPd:,. - `:b$$b`. - 'P$$$d` - .$$$$$` - ;$$$$$P - .:P$$$$$$` - .,:b$$$$$$$;' - .,:dP$$$$$$$$b:' - .,:;db$$$$$$$$$$Pd'` - ,db$$$$$$$$$$$$$$b:'` -:$$$$$$$$$$$$b:'` - `$$$$$bd:''` - `'''` -EOF - ;; + # Set the prompt location. + if ((lines > 1)); then + case "$kernel_name" in + "OpenBSD") tput cud "$lines" ;; + *) printf "%b" "\e[${lines}B" ;; + esac + fi +} - "DracOS"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} `-:/- - -os: - -os/` - :sy+-` - `/yyyy+. - `+yyyyo- - `/yyyys: -`:osssoooo++- +yyyyyy/` - ./yyyyyyo yo`:syyyy+. - -oyyy+ +- :yyyyyo- - `:sy: `. `/yyyyys: - ./o/.` .oyyso+oo:` - :+oo+//::::///:-.` `.` -EOF - ;; +old_functions() { + # Deprecated functions. + # Neofetch 2.0 changed the names of a few variables. + # This function adds backwards compatibility for the + # old variable names. + if type printinfo >/dev/null 2>&1; then + print_info() { printinfo ; } + get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } + get_termfont() { get_term_font; termfont="$term_font"; } + get_localip() { get_local_ip; localip="$local_ip"; } + get_publicip() { get_public_ip; publicip="$public_ip"; } + get_linebreak() { get_line_break; linebreak="$line_break"; } + fi - "dragonfly_old"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' - ${c1} | - .-. - ${c3} ()${c1}I${c3}() - ${c1} "==.__:-:__.==" - "==.__/~|~\__.==" - "==._( Y )_.==" - ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. -( ..=${c1}\\=${c1}/${c2}=.. ) - `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` - `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` - .-~` /${c1}|=|${c2}\ `~-. - .~` / ${c1}|=|${c2} \ `~. - .-~` .' ${c1}|=|${c2} `. `~-. - (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) - `~"~"` ${c1} |=|${c2} `"~"~` - ${c1} /=\\ - \\=/ - ^ -EOF - ;; + get_birthday() { get_install_date; birthday="$install_date"; } +} - "dragonfly_small"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2}(\${c3}"${c2}/) -${c2}(/${c1}|${c2}\) -${c1} | - | -EOF - ;; +old_options() { + [[ -n "$osx_buildversion" ]] && \ + err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." + [[ -n "$osx_codename" ]] && \ + err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." + [[ "$cpu_cores" == "on" ]] && \ + err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." + [[ -n "$image" ]] && \ + { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } - "DragonFly"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2},--, ${c1}| ${c2},--, -${c2}| `-, ${c1},^, ${c2},-' | -${c2} `, `-, ${c3}(/ \) ${c2},-' ,' -${c2} `-, `-,${c1}/ \${c2},-' ,-' -${c2} `------${c1}( )${c2}------' -${c2} ,----------${c1}( )${c2}----------, -${c2} | _,-${c1}( )${c2}-,_ | -${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' -${c1} | | - | | - | | - | | - | | - | | - `|' -EOF - ;; + # All progress_ variables were changed to bar_. + [[ -n "$progress_char" ]] && \ + err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." + [[ -n "$progress_border" ]] && \ + { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ + bar_border="$progress_border"; } + [[ -n "$progress_length" ]] && \ + { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ + bar_length="$progress_length"; } + [[ -n "$progress_color_elapsed" ]] && \ + { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ + bar_color_elapsed="$progress_color_elapsed"; } + [[ -n "$progress_color_total" ]] && \ + { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ + bar_color_total="$progress_color_total"; } - "Elementary"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee eeeeeeeeeeee eeeee - eeee eeeee eee eeee - eeee eeee eee eeee -eee eee eee eee -eee eee eee eee -ee eee eeee eeee -ee eee eeeee eeeeee -ee eee eeeee eeeee ee -eee eeee eeeeee eeeee eee -eee eeeeeeeeee eeeeee eee - eeeeeeeeeeeeeeeeeeeeeeee eeeee - eeeeeeee eeeeeeeeeeee eeee - eeeee eeeee - eeeeeee eeeeeee - eeeeeeeeeeeeeeeee -EOF - ;; + # All cpufreq values were changed in 3.0. + [[ "$speed_type" == "current" ]] && \ + err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." + [[ "$speed_type" == "min" ]] && \ + err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." + [[ "$speed_type" == "max" ]] && \ + err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." + [[ "$speed_type" == "bios" ]] && \ + err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." - "Endless"*) - set_colors 1 7 - read -rd '' ascii_data <<'EOF' -${c1} `:+yhmNMMMMNmhy+:` - -odMMNhso//////oshNMMdo- - /dMMh+. .+hMMd/ - /mMNo` `oNMm: - `yMMo` `oMMy` - `dMN- -NMd` - hMN. .NMh -/MM/ -os` /MM/ -dMm `smNmmhs/- `:sNMd+ `` mMd -MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM -MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM -dMm `/++/-``/yNNh+/sdNMNddMm- mMd -/MM/ `dNy: `-::- /MM/ - hMN. .NMh - `dMN- -NMd` - `yMMo` `oMMy` - /mMNo` `oNMm/ - /dMMh+. .+hMMd/ - -odMMNhso//////oshNMMdo- - `:+yhmNMMMMNmhy+:` -EOF - ;; + # Ascii_logo_size was removed in 3.0. + [[ "$ascii_logo_size" ]] && \ + err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." - "Exherbo"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} , -OXo. -NXdX0: .cok0KXNNXXK0ko:. -KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... -'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. - cNMk NK .oXM. OMMMMO. 0MMNo kW. - lMc o: ., .oKNk; ;NMMWlxW' - ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO - XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk -.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl -,M: ,XMMWx::,''oOK0x; NM. -'Ml ,kNKOxxxxxkkO0XXKOd:. oMk - NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW - ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW - ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO - 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' - xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd - 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO - :XMNxl,';:lodxkOO000Oxc. .oWMMo - 'dXMMXkl;,. .,o0MMNo' - ':d0XWMMMMWNNNNMMMNOl' - ':okKXWNKkl' -EOF - ;; + # $start and $end were replaced with ${block_range[@]} in 3.0. + [[ "$start" && "$end" ]] && \ + { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ + block_range=("$start" "$end"); } - "Fedora"* | "RFRemix"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} /:-------------:\\ - :-------------------:: - :-----------${c2}/shhOHbmp${c1}---:\\ - /-----------${c2}omMMMNNNMMD ${c1}---: - :-----------${c2}sMMMMNMNMP${c1}. ---: - :-----------${c2}:MMMdP${c1}------- ---\\ -,------------${c2}:MMMd${c1}-------- ---: -:------------${c2}:MMMd${c1}------- .---: -:---- ${c2}oNMMMMMMMMMNho${c1} .----: -:-- .${c2}+shhhMMMmhhy++${c1} .------/ -:- -------${c2}:MMMd${c1}--------------: -:- --------${c2}/MMMd${c1}-------------; -:- ------${c2}/hMMMy${c1}------------: -:--${c2} :dMNdhhdNMMNo${c1}------------; -:---${c2}:sdNMMMMNds:${c1}------------: -:------${c2}:://:${c1}-------------:: -:---------------------:// -EOF + # Fahrenheit support was added to CPU so the options were changed. + [[ "$cpu_temp" == "on" ]] && \ + { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; + cpu_temp="C"; } + + # Birthday was renamed to Install Date in 3.0 + [[ -n "$birthday_time" ]] && \ + { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ + install_time="$birthday_time"; } + + # Scrot dir was removed in 3.1.0. + [[ -n "$scrot_dir" ]] && scrot_dir= + + # cpu_shorthand was deprecated in 3.3.0 + [[ -n "$cpu_shorthand" ]] && \ + { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and + \$cpu_speed instead."; } +} + +cache_uname() { + # Cache the output of uname so we don't + # have to spawn it multiple times. + IFS=" " read -ra uname <<< "$(uname -sr)" + + kernel_name="${uname[0]}" + kernel_version="${uname[1]}" +} + +convert_time() { + # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. + year="$1" + day="${3#0}" + + # Split time into hours/minutes. + hour="${4/:*}" + min="${4/${hour}}" + + # Get month. (Month code is used for day of week) + # Due to different versions of 'ls', the month can be 1, 01 or Jan. + case "$2" in + 1 | 01 | "Jan") month="Jan"; month_code=0 ;; + 2 | 02 | "Feb") month="Feb"; month_code=3 ;; + 3 | 03 | "Mar") month="Mar"; month_code=3 ;; + 4 | 04 | "Apr") month="Apr"; month_code=6 ;; + 5 | 05 | "May") month="May"; month_code=1 ;; + 6 | 06 | "Jun") month="Jun"; month_code=4 ;; + 7 | 07 | "Jul") month="Jul"; month_code=6 ;; + 8 | 08 | "Aug") month="Aug"; month_code=2 ;; + 9 | 09 | "Sep") month="Sep"; month_code=5 ;; + 10 | "Oct") month="Oct"; month_code=0 ;; + 11 | "Nov") month="Nov"; month_code=3 ;; + 12 | "Dec") month="Dec"; month_code=5 ;; + esac + + # Get leap year. + # Source: http://stackoverflow.com/questions/725098/leap-year-calculation + [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ + [[ "$month" =~ (Jan|Feb) ]] && \ + leap_code=1 + + # Calculate day of week. + # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html + year_code="$((${year/??} + (${year/??} / 4) % 7))" + week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" + + case "$week_day" in + 0) week_day="Sun" ;; + 1) week_day="Mon" ;; + 2) week_day="Tue" ;; + 3) week_day="Wed" ;; + 4) week_day="Thu" ;; + 5) week_day="Fri" ;; + 6) week_day="Sat" ;; + esac + + # Convert 24 hour time to 12 hour time + AM/PM. + case "$install_time_format" in + "12h") + case "$hour" in + [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; + *) time="$((hour - 12))${min} PM" ;; + esac ;; + *) time="$4" ;; + esac - "freebsd_small") - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} /\\ _____ /\\ - \\_) (_/ - / \ -| | -| | - \ / - --_____-- -EOF + # Toggle showing the time. + [[ "$install_time" == "off" ]] && unset time + + # Print the install date. + printf "%s" "$week_day $day $month $year $time" +} + +get_ppid() { + # Get parent process ID of PID. + case "$os" in + "Windows") + ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" + ppid="${ppid/'PPID'}" ;; - "FreeBSD"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' - ${c2}``` ${c1}` - ${c2}` `.....---...${c1}....--.``` -/ - ${c2}+o .--` ${c1}/y:` +. - ${c2} yo`:. ${c1}:o `+- - ${c2}y/ ${c1}-/` -o/ - ${c2}.- ${c1}::/sy+:. - ${c2}/ ${c1}`-- / - ${c2}`: ${c1}:` - ${c2}`: ${c1}:` - ${c2}/ ${c1}/ - ${c2}.- ${c1}-. - ${c2}-- ${c1}-. - ${c2}`:` ${c1}`:` - .-- `--. - .---.....----. -EOF + "Linux") + ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" + ppid="$(trim "${ppid/PPid:}")" ;; - "FreeMiNT"*) - # Don't explicitly set colors since - # TosWin2 doesn't reset well. - read -rd '' ascii_data <<'EOF' -${c1} ## - ## ######### - #### ## - #### #### ## -#### #### ## ## - #### #### ## ## - #### #### ## ## ## - #### ###### - ###### ## ## #### - #### ################ - #### ## #### - ## #### ###### - ## ## #### #### - ## ## ## ## ## #### - #### ## ## ## -EOF + *) + ppid="$(ps -p "${1:-$PPID}" -o ppid=)" ;; + esac - "Frugalware"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `++/::-.` - /o+++++++++/::-.` - `o+++++++++++++++o++/::-.` - /+++++++++++++++++++++++oo++/:-.`` - .o+ooooooooooooooooooosssssssso++oo++/:-` - ++osoooooooooooosssssssssssssyyo+++++++o: - -o+ssoooooooooooosssssssssssssyyo+++++++s` - o++ssoooooo++++++++++++++sssyyyyo++++++o: - :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo - `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: - /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss - .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- - ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso - -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. - sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ - :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` - yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ --ysooooooydhhhhhhhhhhhddddddddddddddddssy - .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: - ``.-/+oosysssssssssssssssssssssss - ``.:/+osyysssssssssssssh. - `-:/+osyyssssyo - .-:+++` -EOF + printf "%s" "$ppid" +} + +get_process_name() { + # Get PID name. + case "$os" in + "Windows") + name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" + name="${name/'COMMAND'}" + name="${name/*\/}" ;; - "Funtoo"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c2} _______ ____ - /MMMMMMM/ /MMMM| _____ _____ - __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ -|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ -|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| -|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| - |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ - |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ -EOF + "Linux") + name="$(< "/proc/${1:-$PPID}/comm")" ;; - "GalliumOS"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1}sooooooooooooooooooooooooooooooooooooo+: -yyooooooooooooooooooooooooooooooooo+/::: -yyysoooooooooooooooooooooooooooo+/:::::: -yyyyyoooooooooooooooooooooooo+/::::::::: -yyyyyysoooooooooooooooooo++/:::::::::::: -yyyyyyysoooooooooooooo++/::::::::::::::: -yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: -yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: -yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: -yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: -yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: -yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: -yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: -yyyyyyyyyyyyyyys+:--...........-///::::: -yyyyyyyyyyyys+:--................://:::: -yyyyyyyyyo+:-.....................-//::: -yyyyyyo+:-..........................://: -yyyo+:-..............................-// -o/:-...................................: -EOF + *) + name="$(ps -p "${1:-$PPID}" -o comm=)" ;; + esac - "gentoo_small") - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} _-----_ -( \\ -\ 0 \\ -${c2} \ ) - / _/ -( _- -\____- -EOF - ;; + printf "%s" "$name" +} - "Gentoo"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} -/oyddmdhs+:. - -o${c2}dNMMMMMMMMNNmhy+${c1}-` - -y${c2}NMMMMMMMMMMMNNNmmdhy${c1}+- - `o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/` - om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o` -.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+` - oy${c2}hdmNMMMMMMMN${c1}dyooy${c2}dmddddhhhhyhN${c1}d. - :o${c2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${c1}Mh - .:${c2}+sydNMMMMMNNNmmmdddhhhhhhmM${c1}my - /m${c2}MMMMMMNNNmmmdddhhhhhmMNh${c1}s: - `o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+` - `s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. - /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:` -+M${c2}MMMMMMNNNNNmmmmdmNMNdso${c1}/- -yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` -/h${c2}MMNNNNNNNNMNdhs++/${c1}-` -`/${c2}ohdmmddhys+++/:${c1}.` - `-//////:--. -EOF - ;; +decode_url() { + decode="${1//+/ }" + printf "%b" "${decode//%/\\x}" +} - "gNewSense"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} ..,,,,.. - .oocchhhhhhhhhhccoo. - .ochhlllllllc hhhhhh ollllllhhco. - ochlllllllllll hhhllllllhhh lllllllllllhco - .cllllllllllllll hlllllo +hllh llllllllllllllc. -ollllllllllhco'' hlllllo +hllh ``ochllllllllllo -hllllllllc' hllllllllllllh `cllllllllh -ollllllh +llllllllllll+ hllllllo - `cllllh. ohllllllho .hllllc' - ochllc. ++++ .cllhco - `+occooo+. .+ooocco+' - `+oo++++ ++++oo+' -EOF - ;; +# FINISH UP - "GNU") - set_colors fg 7 - read -rd '' ascii_data <<'EOF' -${c1} _-`````-, ,- '- . - .' .- - | | - -. `. - /.' / `. \ -:/ : _... ..._ `` : -:: : /._ .`:'_.._\. || : -:: `._ ./ ,` : \ . _.'' . -`:. / | -. \-. \\_ / - \:._ _/ .' .@) \@) ` `\ ,.' - _/,--' .- .\,-.`--`. - ,'/'' (( \ ` ) - /'/' \ `-' ( - '/'' `._,-----' - ''/' .,---' - ''/' ;: - ''/'' ''/ - ''/''/'' - '/'/' - `; -EOF - ;; +usage() { printf "%s" "\ +Usage: neofetch --option \"value\" --option \"value\" - "GoboLinux"*) - set_colors 5 4 6 2 - read -rd '' ascii_data <<'EOF' -${c1}_____ _ -/ ____| | | -| | __ ___ | |__ ___ -| | |_ |/ _ \| '_ \ / _ \ -| |__| | (_) | |_) | (_) | - \_____|\___/|_.__/ \___/ -EOF - ;; +Neofetch is a CLI system information tool written in BASH. Neofetch +displays information about your system next to an image, your OS logo, +or any ASCII file of your choice. - "Grombyang"*) - set_colors 4 2 1 - read -rd '' ascii_data <<'EOF' -${c1} eeeeeeeeeeee - eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee ${c2}.o+ ${c1}eeee - eeee ${c2}`ooo/ ${c1}eeee - eeee ${c2}`+oooo: ${c1}eeee -eee ${c2}`+oooooo: ${c1}eee -eee ${c2}-+oooooo+: ${c1}eee -ee ${c2}`/:oooooooo+: ${c1}ee -ee ${c2}`/+ +++ +: ${c1}ee -ee ${c2}+o+\ ${c1}ee -eee ${c2}+o+\ ${c1}eee -eee ${c2}// \\ooo/ \\\ ${c1}eee - eee ${c2}//++++oooo++++\\\ ${c1}eee - eeee ${c2}::::++oooo+::::: ${c1}eeee - eeeee ${c3}Grombyang OS ${c1} eeee - eeeeeeeeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeee -EOF - ;; +NOTE: Every launch flag has a config option. - "GuixSD"*) - set_colors 3 7 6 1 8 - read -rd '' ascii_data <<'EOF' -${c1} .. `. - `--..```..` `..```..--` - .-:///-:::. `-:::///:-. - ````.:::` `:::.```` - -//:` -::- - ://: -::- - `///- .:::` - -+++-:::. - :+/:::- - `-....` -EOF - ;; +Options: - "Haiku"*) - set_colors 2 8 - read -rd '' ascii_data <<'EOF' -${c2} :dc' - 'l:;'${c1},${c2}'ck. .;dc:. - co ${c1}..${c2}k. .;; ':o. - co ${c1}..${c2}k. ol ${c1}.${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. -.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. - ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; - ..${c1}oOolllllccccccc:::::${c2}od; - cx:ooc${c1}:::::::;${c2}cooolcX. - cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. - cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. - .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. - '::c'${c1}...${c2}do${c1}..... .${c2}K, - cd,.${c1}....:${c2}O,${c1} - ':clod:'${c1} - ${c1} -EOF - ;; +INFO: + --disable infoname Allows you to disable an info line from appearing + in the output. - "Hyperbola"*) - set_colors 8 - read -rd '' ascii_data <<'EOF' -${c1} WW - KX W - WO0W NX0O - NOO0NW WNXK0OOKW - W0OOOOOOOOOOOOKN - N0OOOOOOO0KXW - WNXXXNW - NXK00000KN - WNK0OOOOOOOOOO0W - NK0OOOOOOOOOOOOOO0W - X0OOOOOOO00KK00OOOOOK - X0OOOO0KNWW WX0OO0W - X0OO0XNW KOOW - N00KNW KOW - NKXN W0W -WW W -EOF - ;; + NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - "Kali"*) - set_colors 4 8 - read -rd '' ascii_data <<'EOF' -${c1}.............. - ..,;:ccc,. - ......''';lxO. -.....''''..........,:ld; - .';;;:::;,,.x, - ..'''. 0Xxoc:,. ... - .... ,ONkc;,;cokOdc',. - . OMo ':${c2}dd${c1}o. - dMc :OO; - 0M. .:o. - ;Wd - ;XO, - ,d0Odlc;,.. - ..',;:cdOOd::,. - .:d;.':;. - 'd, .' - ;l .. - .o - c - .' - . -EOF - ;; + --os_arch on/off Hide/Show OS architecture. + --speed_type type Change the type of cpu speed to display. + Possible values: current, min, max, bios, + scaling_current, scaling_min, scaling_max - "KaOS"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} .. - ..... ..OSSAAAAAAA.. - .KKKKSS. .SSAAAAAAAAAAA. -.KKKKKSO. .SAAAAAAAAAA... -KKKKKKS. .OAAAAAAAA. -KKKKKKS. .OAAAAAA. -KKKKKKS. .SSAA.. -.KKKKKS..OAAAAAAAAAAAA........ - DKKKKO.=AA=========A===AASSSO.. - AKKKS.==========AASSSSAAAAAASS. - .=KKO..========ASS.....SSSSASSSS. - .KK. .ASS..O.. =SSSSAOSS: - .OK. .ASSSSSSSO...=A.SSA. - .K ..SSSASSSS.. ..SSA. - .SSS.AAKAKSSKA. - .SSS....S.. -EOF - ;; + NOTE: This only supports Linux with cpufreq. - "KDE"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} `..---+/---..` - `---.`` `` `.---.` - .--.` `` `-:-. - `:/: `.----//----.` :/- - .:. `---` `--.` .:` - .:` `--` .:- `:. - `/ `:. `.-::-.` -:` `/` - /. /. `:++++++++:` .: .: -`/ .: `+++++++++++/ /` `+` -/+` -- .++++++++++++` :. .+: -`/ .: `+++++++++++/ /` `+` - /` /. `:++++++++:` .: .: - ./ `:. `.:::-.` -:` `/` - .:` `--` .:- `:. - .:. `---` `--.` .:` - `:/: `.----//----.` :/- - .-:.` `` `-:-. - `---.`` `` `.---.` - `..---+/---..` -EOF - ;; + --speed_shorthand on/off Whether or not to show decimals in CPU speed. - "Kogaion"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ;; ,; - ;;; ,;; - ,;;;; ;;;; - ,;;;;;;;; ;;;; - ;;;;;;;;;;; ;;;;; - ,;;;;;;;;;;;; ';;;;;, - ;;;;;;;;;;;;;;, ';;;;;;; - ;;;;;;;;;;;;;;;;;, ';;;;; -; ';;;;;;;;;;;;;;;;;;, ;;; -;;;, ';;;;;;;;;;;;;;;;;;;,;; -;;;;;, ';;;;;;;;;;;;;;;;;;, -;;;;;;;;, ';;;;;;;;;;;;;;;;, -;;;;;;;;;;;;, ';;;;;;;;;;;;;; -';;;;;;;;;;;;; ';;;;;;;;;;;;; - ';;;;;;;;;;;;;, ';;;;;;;;;;; - ';;;;;;;;;;;;; ;;;;;;;;;; - ';;;;;;;;;;;; ;;;;;;;; - ';;;;;;;; ;;;;;; - ';;;;; ;;;; - ';;; ;; -EOF - ;; + NOTE: This flag is not supported in systems with CPU speed less than + 1 GHz. - "Korora"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} ____________ - _add55555555554${c1}: - _w?'${c1}``````````'${c2})k${c1}: - _Z'${c1}`${c2} ]k${c1}: - m(${c1}`${c2} )k${c1}: - _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: - .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` - jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` - jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` -.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` -:#${c1}:${c2} ${c1}`${c2})e${c1}``` -:m${c1}:${c2} ,#'${c1}` -:#${c1}:${c2} .s2'${c1}` -:m,________.aa7^${c1}` -:#baaaaaaas!J'${c1}` - ``````````` -EOF - ;; + --cpu_brand on/off Enable/Disable CPU brand in output. + --cpu_cores type Whether or not to display the number of CPU cores + Possible values: logical, physical, off - "KSLinux"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} K K U U RRRR ooo - K K U U R R o o - KKK U U RRRR o o - K K U U R R o o - K K UUU R R ooo + NOTE: 'physical' doesn't work on BSD. -${c2} SSS AAA W W AAA - S A A W W A A - SSS AAAAA W W W AAAAA - S A A WW WW A A - SSS A A W W A A -EOF - ;; + --cpu_speed on/off Hide/Show cpu speed. + --cpu_temp C/F/off Hide/Show cpu temperature. - "Kubuntu"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `.:/ossyyyysso/:. - .:oyyyyyyyyyyyyyyyyyyo:` - -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- - -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- - oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo - `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` - oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- -oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy -oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- - oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo - `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo - oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo - -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- - -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- - ./oyyyyyyyyyyyyyyyyyyo/. - `.:/oosyyyysso/:.` -EOF - ;; + NOTE: This only works on Linux and BSD. - "LEDE"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' - ${c1} _________ - / /\ - / LE / \ - / DE / \ - /________/ LE \ - \ \ DE / - \ LE \ / - \ DE \ / - \________\/ -EOF - ;; + NOTE: For FreeBSD and NetBSD-based systems, you need to enable + coretemp kernel module. This only supports newer Intel processors. - "Linux") - set_colors fg 8 3 - read -rd '' ascii_data <<'EOF' -${c2} ##### -${c2} ####### -${c2} ##${c1}O${c2}#${c1}O${c2}## -${c2} #${c3}#####${c2}# -${c2} ##${c1}##${c3}###${c1}##${c2}## -${c2} #${c1}##########${c2}## -${c2} #${c1}############${c2}## -${c2} #${c1}############${c2}### -${c3} ##${c2}#${c1}###########${c2}##${c3}# -${c3}######${c2}#${c1}#######${c2}#${c3}###### -${c3}#######${c2}#${c1}#####${c2}#${c3}####### -${c3} #####${c2}#######${c3}##### -EOF - ;; + --distro_shorthand on/off Shorten the output of distro (tiny, on, off) - "LMDE"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' - ${c2}`.-::---.. -${c1} .:++++ooooosssoo:. - .+o++::. `.:oos+. -${c1} :oo:.` -+oo${c2}: -${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` -${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` -${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: -${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` -${c1}`s: `oo s m Myy+-o:` -`oo :+sdoohyoydyso/. - :o. .:////////++: -${c1} `/++ ${c2}-:::::- -${c1} ${c2}`${c1}++- -${c1} ${c2}`${c1}/+- -${c1} ${c2}.${c1}+/. -${c1} ${c2}.${c1}:+-. - `--.`` -EOF - ;; + NOTE: This option won't work in Windows (Cygwin) - "Lubuntu"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `-/+oyyhhhhyyo+/-` - ./shhhhhhhhhhhhhhhhhhs/. - `:shhhhhhhhhhhhhhhhhhhhhhhhs:` - :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: - `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` - `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` - shhhhhhhhy+. .ohhhhhhhhhhhhhs -:hhhhhhy/. /hhhhhhhhhhhhh: -shhhy/. :hhhhhhhhhhhhs -hy+. ` `+yhs/` +hhhhhhhhhhhh --.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh -shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs -:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: - shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs - `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` - +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` - :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: - :shhhhhhhhhhhhhhhhhhhhhy`+s:` - .+shhhhhhhhhhhhhhhhhhs:` - `-/+oyyhhhhyys+/-` -EOF - ;; + --kernel_shorthand on/off Shorten the output of kernel - "Lunar"*) - set_colors 4 7 3 - read -rd '' ascii_data <<'EOF' -${c1}`-. `-. - -ohys/-` `:+shy/` - -omNNdyo/` :+shmNNy/` - ${c3} - - /mMmo - hMMMN` - .NMMs - ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` - /:.` ${c3}/${c1} `.:/` -${c3} __ - | | _ _ ___ ___ ___ - | |__| | | | .'| _| - |_____|___|_|_|__,|_| -EOF - ;; + NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) - "mac"*"_small") - set_colors 2 3 1 5 4 - read -rd '' ascii_data <<'EOF' -${c1} .:' - _ :'_ -${c2} .'`_`-'_``. -:________.-' -${c3}:_______: -:_______: -${c4} :_______`-; -${c5} `._.-._.' -EOF - ;; + --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) + --refresh_rate on/off Whether to display the refresh rate of each monitor + Unsupported on Windows + --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) + --gpu_type type Which GPU to display. (all, dedicated, integrated) - "mac" | "Darwin") - set_colors 2 3 1 1 5 4 - read -rd '' ascii_data <<'EOF' -${c1} 'c. - ,xNMM. - .OMMMMo - OMMM0, - .;loddo:' loolloddol;. - cKMMMMMMMMMMNWMMMMMMMMMM0: -${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. - XMMMMMMMMMMMMMMMMMMMMMMMX. -${c3};MMMMMMMMMMMMMMMMMMMMMMMM: -:MMMMMMMMMMMMMMMMMMMMMMMM: -${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. - kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. - ${c6}kMMMMMMMMMMMMMMMMMMMMMMd - ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. -EOF - ;; + NOTE: This only supports Linux. - "Mageia"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} .°°. - °° .°°. - .°°°. °° - . . - °°° .°°°. - .°°°. '___' -${c2} .${c1}'___' ${c2} . - :dkxc;'. ..,cxkd; - .dkk. kkkkkkkkkk .kkd. -.dkk. ';cloolc;. .kkd -ckk. .kk; -xO: cOd -xO: lOd -lOO. .OO: -.k00. .00x - .k00; ;00O. - .lO0Kc;,,,,,,;c0KOc. - ;d00KKKKKK00d; - .,KKKK,. -EOF - ;; + --gtk_shorthand on/off Shorten output of gtk theme/icons + --gtk2 on/off Enable/Disable gtk2 theme/font/icons output + --gtk3 on/off Enable/Disable gtk3 theme/font/icons output + --shell_path on/off Enable/Disable showing \$SHELL path + --shell_version on/off Enable/Disable showing \$SHELL version + --disk_show value Which disks to display. + Possible values: '/', '/dev/sdXX', '/path/to/mount point' - "MagpieOS"*) - set_colors 2 1 3 5 - read -rd '' ascii_data <<'EOF' -${c1} ;00000 :000Ol - .x00kk00: O0kk00k; - l00: :00. o0k :O0k. - .k0k. x${c2}d$dddd${c1}k' .d00; - k0k. ${c2}.dddddl ${c1}o00, - o00. ${c2}':cc:. ${c1}d0O -.00l ,00. -l00. d0x -k0O .:k0o -O0k ;dO0000d. -k0O .O0O${c2}xxxxk${c1}00: -o00. k0O${c2}dddddd${c1}occ -'00l x0O${c2}dddddo${c3};..${c1} - x00. .x00${c2}kxxd${c3}:..${c1} - .O0x .:oxxx${c4}Okl.${c1} - .x0d ${c4},xx,${c1} - .:o. ${c4}.xd ckd${c1} - .. ${c4}dxl .xx; - :xxolldxd' - ;oxdl. -EOF - ;; + NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') - "Manjaro"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1}██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -EOF - ;; + --disk_subtitle type What information to append to the Disk subtitle. + Takes: name, mount, dir - "Maui"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} `.-://////:--` - .:/oooooooooooooooo+:. - `:+ooooooooooooooooooooooo:` - `:oooooooooooooooooooooooooooo/` - ..```-oooooo/-`` `:oooooo+:.` `-- - :. +oo+-` /ooo/` -/ - -o. `o+- +o/` -o: -`oo` ::` :o/ `+. .+o` /oo. -/o+ . -+oo- ` /oo/ `ooo/ -+o- /ooo+` .+ooo. :ooo+ -++ .+oooo: -oooo+ `oooo+ -:. .oooooo` :ooooo- :oooo: -` .oooooo: :ooooo+ `ooo+-` - .+oooooo` -oooooo: `o/- - +oooooo: .ooooooo. - /ooooooo` /ooooooo/ .. - `:oooooooo/:::/ooooooooo+:--:/:` - `:+oooooooooooooooooooooo+:` - .:+oooooooooooooooo+:. - `.-://////:-.` -EOF - ;; + 'name' shows the disk's name (sda1, sda2, etc) - "Mer"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} dMs - .-` - `y`-o+` - ``NMMy - .--`:++. - .hNNNNs - /MMMMMN - `ommmd/ +/ - ```` +/ - `:+sssso/-` - .-::. `-::-` `smNMNmdmNMNd/ .://-` -.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo -dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- -MMm yMM- :MMs NMN` `:::::--sMMh dMM` -MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` -NNd sNN- -NNs -mMNs-.--..:dMMh` dNN ---- .--` `--. .smMMmdddmMNdo` .-- - ./ohddds+:` - +h- `.:-. - ./`.dMMMN+ - +MMMMMd - `+dmmy- - ``` .+` - .dMNo-y. - `hmm/ - .:` - dMs -EOF - ;; + 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) - "Minix"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2} -sdhyo+:-` -/syymm: - sdyooymmNNy. `` .smNmmdysNd - odyoso+syNNmysoyhhdhsoomNmm+/osdm/ - :hhy+-/syNNmddhddddddmNMNo:sdNd: - `smNNdNmmNmddddddddddmmmmmmmy` - `ohhhhdddddmmNNdmddNmNNmdddddmdh- - odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: - `+mNho:` smmd/ sNNh :dmms` -+ymmo. --od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: -+sms -.` :so: .NN+ :os/ .-`mNh: -.-hyh+:////- -sNNd:` .--://ohNs- - `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ - -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: - //oydNMMMMydMMNysNMMmsMMMMMNyo/` - ../-yNMMy--/::/-.sMMmos+.` - -+oyhNsooo+omy/``` - `::ohdmds-` -EOF - ;; + 'dir' shows the basename of the disks's path. (/, Local Disk, etc) + + --ip_host url URL to query for public IP + --song_shorthand on/off Print the Artist/Title on separate lines + --music_player player-name Manually specify a player to use. + Available values are listed in the config file + --install_time on/off Enable/Disable showing the time in Install Date output. + --install_time_format 12h/24h + Set time format in Install Date to be 12 hour or 24 hour. + +TEXT FORMATTING: + --colors x x x x x x Changes the text colors in this order: + title, @, underline, subtitle, colon, info + --underline on/off Enable/Disable the underline. + --underline_char char Character to use when underlining title + --bold on/off Enable/Disable bold text + +COLOR BLOCKS: + --color_blocks on/off Enable/Disable the color blocks + --block_width num Width of color blocks in spaces + --block_height num Height of color blocks in lines + --block_range num num Range of colors to print as blocks + +BARS: + --bar_char 'elapsed char' 'total char' + Characters to use when drawing bars. + --bar_border on/off Whether or not to surround the bar with '[]' + --bar_length num Length in spaces to make the bars. + --bar_colors num num Colors to make the bar. + Set in this order: elapsed, total + --cpu_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --memory_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --battery_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --disk_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + +IMAGE BACKEND: + --backend backend Which image backend to use. + Possible values: 'ascii', 'caca', 'catimg', '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/' + --ascii source Shortcut to use 'ascii' backend. + --caca source Shortcut to use 'caca' backend. + --catimg source Shortcut to use 'catimg' backend. + --iterm2 source Shortcut to use 'iterm2' backend. + --jp2a source Shortcut to use 'jp2a' backend. + --kitty source Shortcut to use 'kitty' backend. + --pixterm source Shortcut to use 'pixterm' backend. + --sixel source Shortcut to use 'sixel' backend. + --termpix source Shortcut to use 'termpix' backend. + --tycat source Shortcut to use 'tycat' backend. + --w3m source Shortcut to use 'w3m' backend. + --off Shortcut to use 'off' backend. + + NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', + '/path/to/ascii', '/path/to/dir/' + +ASCII: + --ascii_colors x x x x x x Colors to print the ascii art + --ascii_distro distro Which Distro's ascii art to print + + NOTE: Arch and Ubuntu have 'old' logo variants. + + NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. + + NOTE: Ubuntu has flavor variants. + + NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', + 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. + + NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, + OpenBSD, and Void have a smaller logo variant. + + NOTE: Use '{distro name}_small' to use the small variants. + + --ascii_bold on/off Whether or not to bold the ascii logo. + -L, --logo Hide the info text and only show the ascii logo. + + Possible values: bar, infobar, barinfo, off + +IMAGE: + --loop Redraw the image constantly until Ctrl+C is used. This fixes issues + in some terminals emulators when using image mode. + --size 00px | --size 00% How to size the image. + Possible values: auto, 00px, 00%, none + --crop_mode mode Which crop mode to use + Takes the values: normal, fit, fill + --crop_offset value Change the crop offset for normal mode. + Possible values: northwest, north, northeast, + west, center, east, southwest, south, southeast + + --xoffset px How close the image will be to the left edge of the + window. This only works with w3m. + --yoffset px How close the image will be to the top edge of the + window. This only works with w3m. + --bg_color color Background color to display behind transparent image. + This only works with w3m. + --gap num Gap between image and text. + + NOTE: --gap can take a negative value which will move the text + closer to the left side. + + --clean Delete cached files and thumbnails. + +SCREENSHOT: + -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- + shot function will use \$scrot_dir and \$scrot_name. + -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. + --image_host imgur/teknik Website to upload scrots to. + --scrot_cmd cmd Screenshot program to launch + +OTHER: + --config /path/to/config Specify a path to a custom config file + --config none Launch the script without a config file + --stdout Turn off all colors and disables any ASCII/image backend. + --help Print this text and exit + --version Show neofetch version + -v Display error messages. + -vv Display a verbose log for error reporting. + +DEVELOPER: + --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) + + +Report bugs to https://github.com/dylanaraps/neofetch/issues + +" +exit 1 +} + +get_args() { + # Check the commandline flags early for '--config'. + [[ "$*" != *--config* ]] && get_user_config + + while [[ "$1" ]]; do + case "$1" in + # Info + "--os_arch") os_arch="$2" ;; + "--cpu_cores") cpu_cores="$2" ;; + "--cpu_speed") cpu_speed="$2" ;; + "--speed_type") speed_type="$2" ;; + "--speed_shorthand") speed_shorthand="$2" ;; + "--distro_shorthand") distro_shorthand="$2" ;; + "--kernel_shorthand") kernel_shorthand="$2" ;; + "--uptime_shorthand") uptime_shorthand="$2" ;; + "--cpu_brand") cpu_brand="$2" ;; + "--gpu_brand") gpu_brand="$2" ;; + "--gpu_type") gpu_type="$2" ;; + "--refresh_rate") refresh_rate="$2" ;; + "--gtk_shorthand") gtk_shorthand="$2" ;; + "--gtk2") gtk2="$2" ;; + "--gtk3") gtk3="$2" ;; + "--shell_path") shell_path="$2" ;; + "--shell_version") shell_version="$2" ;; + "--ip_host") public_ip_host="$2" ;; + "--song_shorthand") song_shorthand="$2" ;; + "--music_player") music_player="$2" ;; + "--install_time") install_time="$2" ;; + "--install_time_format") install_time_format="$2" ;; + "--cpu_temp") + cpu_temp="$2" + [[ "$cpu_temp" == "on" ]] && cpu_temp="C" + ;; + + "--disk_subtitle") disk_subtitle="$2" ;; + "--disk_show") + unset disk_show + for arg in "$@"; do + case "$arg" in + "--disk_show") ;; + "-"*) break ;; + *) disk_show+=("$arg") ;; + esac + done + ;; + + "--disable") + for func in "$@"; do + case "$func" in + "--disable") continue ;; + "-"*) break ;; + *) + ((bash_version >= 4)) && func="${func,,}" + unset -f "get_$func" + ;; + esac + done + ;; + + # Text Colors + "--colors") + unset colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) colors+=("$arg") ;; + esac + done + colors+=(7 7 7 7 7 7) + ;; + + # Text Formatting + "--underline") underline_enabled="$2" ;; + "--underline_char") underline_char="$2" ;; + "--bold") bold="$2" ;; + + # Color Blocks + "--color_blocks") color_blocks="$2" ;; + "--block_range") block_range=("$2" "$3") ;; + "--block_width") block_width="$2" ;; + "--block_height") block_height="$2" ;; + + # Bars + "--bar_char") + bar_char_elapsed="$2" + bar_char_total="$3" + ;; - "Linux Mint"* | "LinuxMint"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. -MMm----::-://////////////oymNMd+` -MMd ${c2}/++ ${c1}-sNMd: -MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: -ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm - NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM - NMm ${c2}dMM` ..` ... ydm. ${c1}dMM - hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM - -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM - -dMNs-${c2}``-::::-------.`` ${c1}dMM - `/dMNmy+/:-------------:/yMMM - ./ydNMMMMMMMMMMMMMMMMMMMMM - .MMMMMMMMMMMMMMMMMMM -EOF - ;; + "--bar_border") bar_border="$2" ;; + "--bar_length") bar_length="$2" ;; + "--bar_colors") + bar_color_elapsed="$2" + bar_color_total="$3" + ;; - "MX"*) - set_colors 4 6 7 - read -rd '' ascii_data <<'EOF' -${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM -MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM -MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM -MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM -MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM -MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM -MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM -MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM -MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM -MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM -MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM -MMMMMMMNo` :mMMN+` `-hMMMMMMMM -MMMMMMh. `oNMMd: `/mMMMMMM -MMMMm/ -hMd- `sNMMMM -MMNs` - :dMMM -Mm: `oMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM -EOF - ;; + "--cpu_display") cpu_display="$2" ;; + "--memory_display") memory_display="$2" ;; + "--battery_display") battery_display="$2" ;; + "--disk_display") disk_display="$2" ;; - "NetBSD"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} `-/oshdmNMNdhyo+:-` -${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` -${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` - ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` - ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` - ${c2}-N/${c1}hMMMMMMMMMmho:` - ${c2}-N/${c1}-:/++/:.` -${c2} :M+ - :Mo - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms -EOF - ;; + # Image backend + "--backend") image_backend="$2" ;; + "--source") image_source="$2" ;; + "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + image_backend="${1/--}" + case "$2" in + "-"* | "") ;; + *) image_source="$2" ;; + esac + ;; - "Netrunner"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} .:oydmMMMMMMmdyo:` - -smMMMMMMMMMMMMMMMMMMds- - +mMMMMMMMMMMMMMMMMMMMMMMMMd+ - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ - `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` - .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` - dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh -+MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ -mMMMMMMMMd+:.` `mMMMMMMMMMMMMd -MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM -mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd -+MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ - dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh - `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` - `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: - +dMMMMMMMMMMMMMMMMMMMMMMMMd/ - -odMMMMMMMMMMMMMMMMMMdo- - `:+ydmNMMMMNmhy+-` -EOF - ;; + # Image options + "--loop") image_loop="on" ;; + "--image_size" | "--size") image_size="$2" ;; + "--crop_mode") crop_mode="$2" ;; + "--crop_offset") crop_offset="$2" ;; + "--xoffset") xoffset="$2" ;; + "--yoffset") yoffset="$2" ;; + "--background_color" | "--bg_color") background_color="$2" ;; + "--gap") gap="$2" ;; + "--clean") + [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" + rm -rf "/Library/Caches/neofetch/" + rm -rf "/tmp/neofetch/" + exit + ;; - "Nitrux"*) - set_colors 4 - read -rd '' ascii_data <<'EOF' -${c1}`:/. -`/yo -`/yo -`/yo .+:. -`/yo .sys+:.` -`/yo `-/sys+:.` -`/yo ./sss+:.` -`/yo .:oss+:-` -`/yo ./o///:-` -`/yo `.-:///////:` -`/yo `.://///++//-`` -`/yo `.-:////++++/-` -`/yo `-://///++o+/-` -`/yo `-/+o+++ooo+/-` -`/s+:+oooossso/.` -`//+sssssso:. -`+syyyy+:` -:+s+- -EOF - ;; + "--ascii_colors") + unset ascii_colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) ascii_colors+=("$arg") + esac + done + ascii_colors+=(7 7 7 7 7 7) + ;; - "nixos_small") - set_colors 4 6 - read -rd '' ascii_data <<'EOF' - ${c1}\\\\ \\\\ // - ==\\\\__\\\\/ // - // \\\\// -==// //== - //\\\\___// -// /\\\\ \\\\== - // \\\\ \\\\ -EOF - ;; + "--ascii_distro") + image_backend="ascii" + ascii_distro="$2" + case "$2" in "-"* | "") ascii_distro="$distro" ;; esac + ;; - "NixOS"*) - set_colors 4 6 - read -rd '' ascii_data <<'EOF' -${c1} ::::. ${c2}'::::: ::::' -${c1} '::::: ${c2}':::::. ::::' -${c1} ::::: ${c2}'::::.::::: -${c1} .......:::::..... ${c2}:::::::: -${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. - ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' -${c2} ..... ::::' ${c1}:::::' -${c2} ::::: '::' ${c1}:::::' -${c2} ........::::: ' ${c1}:::::::::::. -${c2}::::::::::::: ${c1}::::::::::::: -${c2} ::::::::::: ${c1}.. ${c1}::::: -${c2} .::::: ${c1}.::: ${c1}::::: -${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... - ::::: ${c1}':::::. ${c2}......:::::::::::::' - ::: ${c1}::::::. ${c2}':::::::::::::::::' -${c1} .:::::::: ${c2}':::::::::: -${c1} .::::''::::. ${c2}'::::. -${c1} .::::' ::::. ${c2}'::::. -${c1} .:::: :::: ${c2}'::::. -EOF - ;; + "--ascii_bold") ascii_bold="$2" ;; + "--logo" | "-L") + image_backend="ascii" + print_info() { info line_break; } + ;; - "Nurunner"*) - set_colors 4 - read -rd '' ascii_data <<'EOF' -${c1} ,xc - ;00cxXl - ;K0, .xNo. - :KO' .lXx. - cXk. ;xl cXk. - cXk. ;k:.,xo. cXk. - .lXx. :x::0MNl,dd. :KO, - .xNx. cx;:KMMMMMNo'dx. ;KK; - .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: -;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO - 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: - .kNo .xo'xWMMMMMM0;:O: ;KK; - .dXd. .do,oNMMO;ck: ;00, - oNd. .dx,;'cO; ;K0, - oNx. okk; ;K0, - lXx. :KO' - cKk' cXk. - ;00:lXx. - ,kd. -EOF - ;; + # Screenshot + "--scrot" | "-s") + scrot_args "$@" + ;; + "--upload" | "-su") + scrot_upload="on" + scrot_args "$@" + ;; + + "--image_host") image_host="$2" ;; + "--scrot_cmd") scrot_cmd="$2" ;; + + # Other + "--config") + case "$2" in + "none" | "off" | "") ;; + *) + config_file="$(get_full_path "$2")" + get_user_config + ;; + esac + ;; + "--stdout") stdout="on" ;; + "-v") verbose="on" ;; + "-vv") set -x; verbose="on" ;; + "--help") usage ;; + "--version") + printf "%s\\n" "Neofetch $version" + exit 1 + ;; + "--gen-man") + help2man -n "A fast, highly customizable system info script" \ + -N ./neofetch -o neofetch.1 + exit 1 + ;; - "NuTyX"*) - set_colors 4 1 - read -rd '' ascii_data <<'EOF' -${c1} . - . - ... - ... - .... .........--. - ..-++-----....--++++++---. - .-++++++-. .-++++++++++++-----.. - .--... .++..-+++--.....-++++++++++--.. - . .-+-. .**- .... ..-+----.. - .+++. .*+. + -++-----. - .+++++- ++. .*+. .....-+++-----. - -+++-++. .+. .-+***++***++--++++. . - -+-. -- -. -*- ...... ..--. -.-. .+- . -+. -. .+- +. - -- -- - -+----. .- - -++-.+. . - .++. -- - +. ----. - . .+. .. - - . - . -EOF - ;; + "--travis") + print_info() { + info title + info underline - "OBRevenge"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} __ __ - _@@@@ @@@g_ - _@@@@@@ @@@@@@ - _@@@@@@M W@@@@@@_ - j@@@@P ^W@@@@ - @@@@L____ _____Q@@@@ -Q@@@@@@@@@@j@@@@@@@@@@ -@@@@@ T@j@ T@@@@@ -@@@@@ ___Q@J@ _@@@@@ -@@@@@fMMM@@j@jggg@@@@@@ -@@@@@ j@j@^MW@P @@@@ -Q@@@@@ggg@@f@ @@@@@@L -^@@@@WWMMP ^ Q@@@@ - @@@@@_ _@@@@l - W@@@@@g_____g@@@@@P - @@@@@@@@@@@@@@@@l - ^W@@@@@@@@@@@P - ^TMMMMTll -EOF - ;; + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "GPU Driver" gpu_driver + info "Memory" memory - "openbsd_small") - set_colors 3 7 6 1 8 - read -rd '' ascii_data <<'EOF' -${c1} _____ - \\- -/ - \\_/ \\ - | ${c2}O O${c1} | - |_ < ) 3 ) - / \\ / - /-_____-\\ -EOF - ;; + info "CPU Usage" cpu_usage + info "Disk" disk + info "Battery" battery + info "Font" font + info "Song" song + info "Local IP" local_ip + info "Public IP" public_ip + info "Users" users + info "Install Date" install_date - "OpenBSD"*) - set_colors 3 7 6 1 8 - read -rd '' ascii_data <<'EOF' - ${c3} _ - (_) -${c1} | . -${c1} . |L /| . ${c3} _ -${c1} _ . |\ _| \--+._/| . ${c3}(_) -${c1} / ||\| Y J ) / |/| ./ - J |)'( | ` F`.'/ ${c3} _ -${c1} -<| F __ .-< ${c3}(_) -${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ - J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ -${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) -${c1} '-F -<_. \\ .-' `-' L__ -__J _ _. >-' ${c1})${c4}._. ${c1}|-' -${c1} `-|.' /_. ${c4}\_| ${c1} F - /.- . _.< - /' /.' .' `\\ - /L /' |/ _.-'-\\ - /'J ___.---'\| - |\ .--' V | `. ` - |/`. `-. `._) - / .-.\\ - \\ ( `\\ - `.\ -EOF - ;; + info line_break + info cols + info line_break - "OpenIndiana"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} .sy/ - .yh+ + # Testing. + prin "prin" + prin "prin" "prin" - ${c1}-+syyyo+- ${c2} /+. - ${c1}+ddo/---/sdh/ ${c2} ym- - ${c1}`hm+ `sms${c2} ym-```````.-. - ${c1}sm+ sm/ ${c2} ym- +s - ${c1}hm. /mo ${c2} ym- /h - ${c1}omo ym: ${c2} ym- `os` - ${c1}smo` .ym+ ${c2} ym- .os- - `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. - ..` ${c1}`:+oo+/-` ${c2} -//oyo- - -:` .:oys/. -+- `./oyys/. -h+` `.-:+oyyyo/-` -`/ossssysso+/-.` -EOF - ;; + # Testing no subtitles. + info uptime + info disk + } - "OpenMandriva"*) - set_colors 4 3 - read -rd '' ascii_data <<'EOF' -${c2} `` - `-. -${c1} ` ${c2}.--- -${c1} -/ ${c2}-::--` -${c1} `++ ${c2}`----...```-:::::. -${c1} `os. ${c2}.::::::::::::::-``` ` ` -${c1} +s+ ${c2}.::::::::::::::::---...--` -${c1}-ss: ${c2}`-::::::::::::::::-.``.`` -${c1}/ss- ${c2}.::::::::::::-.`` ` -${c1}+ss: ${c2}.::::::::::::- -${c1}/sso ${c2}.::::::-::::::- -${c1}.sss/ ${c2}-:::-.` .::::: -${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: -${c1} -ossso+/:://+/-` ${c2}.:` -${c1} -/+ooo+/-. ${c2}` -EOF - ;; + refresh_rate="on" + shell_version="on" + cpu_display="infobar" + memory_display="infobar" + disk_display="infobar" + cpu_temp="C" + ;; + esac - "OpenWrt"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} _______ -| |.-----.-----.-----. -| - || _ | -__| | -|_______|| __|_____|__|__| - |__| - ________ __ -| | | |.----.| |_ -| | | || _|| _| -|________||__| |____| -EOF - ;; + shift + done +} - "Open Source Media Center"* | "osmc") - set_colors 4 7 1 +get_distro_colors() { + # This function sets the text colors according + # to your OS/Distro's logo colors. + # + # $ascii_distro is the same as $distro. + case "$ascii_distro" in + "AIX"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} -+shdmNNNNmdhs+- - .+hMNho/:..``..:/ohNMh+. - :hMdo. .odMh: - -dMy- -yMd- - sMd- -dMs - hMy +. .+ yMh - yMy dMs. .sMd yMy -:Mm dMNMs` `sMNMd `mM: -yM+ dM//mNs``sNm//Md +My -mM- dM: +NNNN+ :Md -Mm -mM- dM: `oNN+ :Md -Mm -yM+ dM/+NNo` :Md +My -:Mm` dMMNs` :Md `mM: - yMy dMs` -ms yMy - hMy +. yMh - sMd- -dMs - -dMy- -yMd- - :hMdo. .odMh: - .+hMNho/:..``..:/ohNMh+. - -+shdmNNNNmdhs+- +${c1} `:+ssssossossss+-` + .oys///oyhddddhyo///sy+. + /yo:+hNNNNNNNNNNNNNNNNh+:oy/ + :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: + `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh + h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy +/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: +h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y +N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m +N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m +h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y +:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- + yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy + sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo + :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- + :ys:/yNNNNNNNNNNNNNNNmy/:sy: + .+ys///osyhhhhys+///sy+. + -/osssossossso/- EOF ;; - "Oracle"*) - set_colors 1 7 3 + "alpine_small") + set_colors 4 7 read -rd '' ascii_data <<'EOF' -${c1} - `-/+++++++++++++++++/-.` - `/syyyyyyyyyyyyyyyyyyyyyyys/. - :yyyyo/-...............-/oyyyy/ - /yyys- .oyyy+ -.yyyy` `syyy- -:yyyo /yyy/ -.yyyy` `syyy- - /yyys. .oyyyo - /yyyyo:-...............-:oyyyy/` - `/syyyyyyyyyyyyyyyyyyyyyyys+. - `.:/+ooooooooooooooo+/:.` +${c1} /\\ /\\ + /${c2}/ ${c1}\\ \\ + /${c2}/ ${c1}\\ \\ +/${c2}// ${c1}\\ \\ +${c2}// ${c1}\\ \\ + \\ EOF ;; - "PacBSD"*) - set_colors 1 7 3 + "Alpine"*) + set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c1} :+sMs. - `:ddNMd- -o--` - -sMMMMh: `+N+`` - yMMMMMs` .....-/-... `mNh/ - yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm - yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm - :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd - +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- - :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. - .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- - /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` -.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- -:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` -/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. -:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` -:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` - sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. - :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// - /dMMMMMMMMMMMMMs- ````````..`` - .oMMMMMMMMMMMMNs` ./y:` - +dNMMNMMMMMMMmy` ``./ys. - `/hMMMMMMMMMMMNo-`` `.+yy+-` - `-/hmNMNMMMMMMmmddddhhy/-` - `-+oooyMMMdsoo+/:. +${c1} .hddddddddddddddddddddddh. + :dddddddddddddddddddddddddd: + /dddddddddddddddddddddddddddd/ + +dddddddddddddddddddddddddddddd+ + `sdddddddddddddddddddddddddddddddds` + `ydddddddddddd++hdddddddddddddddddddy` +.hddddddddddd+` `+ddddh:-sdddddddddddh. +hdddddddddd+` `+y: .sddddddddddh +ddddddddh+` `//` `.` -sddddddddd +ddddddh+` `/hddh/` `:s- -sddddddd +ddddh+` `/+/dddddh/` `+s- -sddddd +ddd+` `/o` :dddddddh/` `oy- .yddd +hdddyo+ohddyosdddddddddho+oydddy++ohdddh +.hddddddddddddddddddddddddddddddddddddh. + `yddddddddddddddddddddddddddddddddddy` + `sdddddddddddddddddddddddddddddddds` + +dddddddddddddddddddddddddddddd+ + /dddddddddddddddddddddddddddd/ + :dddddddddddddddddddddddddd: + .hddddddddddddddddddddddh. EOF ;; - "Parabola"*) - set_colors 5 7 + "Amazon"*) + set_colors 3 7 read -rd '' ascii_data <<'EOF' -${c1} `.-. `. - `.` `:++. `-+o+. - `` `:+/. `:+/. `-+oooo+ - ``-::-.:+/. `:+/. `-+oooooo+ - `.-:///- ..` .-. `-+oooooooo- - `..-..` `+ooooooooo: -`` :oooooooo/ - `ooooooo: - `oooooo: - -oooo+. - +ooo/` - -ooo- - `+o/. - /+- - //` - -. +${c1} `-/oydNNdyo:.` + `.:+shmMMMMMMMMMMMMMMmhs+:.` + -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- +.`` -/+shmNNMMMMMMNNmhs+/- ``. +dNmhs+:. `.:/oo/:.` .:+shmNd +dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd +dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. + `.:+shNMMMMMh yMMMMMNhs+:`` + `-+shy shs+:` EOF ;; - "Pardus"*) - set_colors 3 7 6 1 8 + "Anarchy"*) + set_colors 7 4 read -rd '' ascii_data <<'EOF' -${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. -/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ -mN. oMdyy- -y `-dMo .Nm -.mN+` sMy hN+ -: yMs `+Nm. - `yMMddMs.dy `+` sMddMMy` - +MMMo .` . oMMM+ - `NM/ `````.` `.````` +MN` - yM+ `.-:yhomy ymohy:-.` +My - yM: yo oy :My - +Ms .N` `N. +h sM+ - `MN - -::::::- : :o:+`NM` - yM/ sh -dMMMMd- ho +y+My - .dNhsohMh-//: /mm/ ://-yMyoshNd` - `-ommNMm+:/. oo ./:+mMNmmo:` - `/o+.-somNh- :yy: -hNmos-.+o/` - ./` .s/`s+sMdd+``+ddMs+s`/s. `/. - : -y. -hNmddmNy. .y- : - -+ `..` +- + ${c2}..${c1} + ${c2}..${c1} + ${c2}:..${c1} + ${c2}:+++.${c1} + .:::++${c2}++++${c1}+::. + .:+######${c2}++++${c1}######+:. + .+#########${c2}+++++${c1}##########:. + .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. + +###########${c2}+++++++++${c1}############: + +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ + +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ + :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: + ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ +.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. +.##########${c2}+++++++++++++++++++${c1}###########. + #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ + :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: + +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ + +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ + :##${c2}++++++${c1}############${c2}++++++++++${c1}##: + .${c2}++++++${c1}#############${c2}++++++++++${c1}+. + :${c2}++++${c1}###############${c2}+++++++${c1}:: + .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. + ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. + ${c2}.${c1} ${c2}.:+++${c1}. + ${c2}.:${c1}: + ${c2}..${c1} + ${c2}..${c1} EOF ;; - "Parrot"*) - set_colors 6 7 + "Android"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} `:oho/-` -`mMMMMMMMMMMMNmmdhy- - dMMMMMMMMMMMMMMMMMMs` - +MMsohNMMMMMMMMMMMMMm/ - .My .+dMMMMMMMMMMMMMh. - + :NMMMMMMMMMMMMNo - `yMMMMMMMMMMMMMm: - /NMMMMMMMMMMMMMy` - .hMMMMMMMMMMMMMN+ - ``-NMMMMMMMMMd- - /MMMMMMMMMMMs` - mMMMMMMMsyNMN/ - +MMMMMMMo :sNh. - `NMMMMMMm -o/ - oMMMMMMM. - `NMMMMMM+ - +MMd/NMh - mMm -mN` - /MM `h: - dM` . - :M- - d: - -+ - - +${c1} -o o- + +hydNNNNdyh+ + +mMMMMMMMMMMMMm+ + `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` + hMMMMMMMMMMMMMMMMMMh + .. yyyyyyyyyyyyyyyyyyyy .. +.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +-MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- + +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ + mMMMMMMMMMMMMMMMMMMm + `/++MMMMh++hMMMM++/` + MMMMo oMMMM + MMMMo oMMMM + oNMm- -mMNs EOF ;; - "Parsix"*) - set_colors 3 1 7 8 + "Antergos"*) + set_colors 4 6 read -rd '' ascii_data <<'EOF' - ${c2}-/+/:. - ${c2}.syssssys. - ${c1}.--. ${c2}ssssssssso${c1} ..--. - :++++++: ${c2}+ssssssss+${c1} ./++/+++: - /+++++++++.${c2}.yssooooy`${c1}-+///////o- - /++++++++++.${c2}+soooos:${c1}:+////////+- - :+++++////o-${c2}oooooo-${c1}+/////////- - `-/++//++-${c4}.-----.-${c1}:+/////:- - ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. -${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- -${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ -${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- - `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` - ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. - ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: - ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ - ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: - ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- - ${c1}`--` ${c2}+sssssssso ${c1}`--` - ${c2}+sssssy+` - ${c2}`.::-` +${c2} `.-/::/-`` + .-/osssssssso/. + :osyysssssssyyys+- + `.+yyyysssssssssyyyyy+. + `/syyyyyssssssssssyyyyys-` + `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` + .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. + .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. + -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: + -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- + .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` +`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo +.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. +ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy +dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh +-dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- +.smmmmddddddddhhhhhhhhhdddddddddmmmms. + `+ydmmmdddddddddddddddddddmmmmdy/. + `.:+ooyyddddddddddddyyso+:.` +EOF + ;; + + "antiX"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} + \ + , - ~ ^ ~ - \ / + , ' \ ' , / + , \ '/ + , \ / , + ,___, \/ , + / | _ _ _|_ o /\ , +|, | / |/ | | | / \ , + \,_/\_/ | |_/|_/|_/_/ \, + , / ,\ + , / , ' \ + ' - , _ _ _ , ' EOF ;; - "PCBSD"* | "TrueOS"*) - set_colors 1 7 3 + "AOSC"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} .. - s. - +y - yN - -MN `. - :NMs `m - .yMMm` `No - `-/+++sdMMMNs+-`+Ms - `:oo+-` .yMMMMy` `-+oNMh - -oo- +NMMMM/ oMMh- - .s+` ` oMMMMM/ - oMMMhy. - +s`- :: :MMMMMd -o `mMMMy`s+ - y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y - s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s --h .NM` `hMMMMMMMMMMMMMMNMMNy: h- -y- hMN` hMMmMMMMMMMMMNsdMNs. -y -m` mMMy` oMMNoNMMMMMMo` sMMMo `m -m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m -h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h -:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: - y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y - `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` - so -NMMMN /mmd+ `dMMMMMMMm- os - :y: `yMMM` `+NMMMMMMNo`:y: - /s+`.omy /NMMMMMNh/.+s: - .+oo:-. /mdhs+::oo+. - -/o+++++++++++/- +${c2} .:+syhhhhys+:. + .ohNMMMMMMMMMMMMMMNho. + `+mMMMMMMMMMMmdmNMMMMMMMMm+` + +NMMMMMMMMMMMM/ `./smMMMMMN+ + .mMMMMMMMMMMMMMMo -yMMMMMm. + :NMMMMMMMMMMMMMMMs .hMMMMN: + .NMMMMhmMMMMMMMMMMm+/- oMMMMN. + dMMMMs ./ymMMMMMMMMMMNy. sMMMMd +-MMMMN` oMMMMMMMMMMMN: `NMMMM- +/MMMMh NMMMMMMMMMMMMm hMMMM/ +/MMMMh NMMMMMMMMMMMMm hMMMM/ +-MMMMN` :MMMMMMMMMMMMy. `NMMMM- + dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd + .NMMMMo -/+sMMMMMMMMMMMmMMMMN. + :NMMMMh. .MMMMMMMMMMMMMMMN: + .mMMMMMy- NMMMMMMMMMMMMMm. + +NMMMMMms/.` mMMMMMMMMMMMN+ + `+mMMMMMMMMNmddMMMMMMMMMMm+` + .ohNMMMMMMMMMMMMMMNho. + .:+syhhhhys+:. EOF ;; - "PCLinuxOS"*) + "Apricity"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - ${c1}mhhhyyyyhhhdN - dyssyhhhhhhhhhhhssyhN - Nysyhhyo/:-.....-/oyhhhssd - Nsshhy+. `/shhysm - dohhy/ -shhsy - dohhs` /hhys -N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy -ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ -+hho ${c2}ymm- /mmy+mms ${c1}:hhod -/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh -+hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m -yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ - ohhy` ${c2}://` -/+++/- ${c1}ohhom - N+hhy- `shhoh - sshho. `+hhyom - dsyhhs/. `:ohhhoy - dysyhhhso///://+syhhhssh - dhyssyhhhhhhyssyyhN - mddhdhdmN +${c2} ./o- + ``...`` `:. -/: + `-+ymNMMMMMNmho-` :sdNNm/ + `+dMMMMMMMMMMMMMMMmo` sh:.:::- + /mMMMMMMMMMMMMMMMMMMMm/`sNd/ + oMMMMMMMMMMMMMMMMMMMMMMMs -` +:MMMMMMMMMMMMMMMMMMMMMMMMM/ +NMMMMMMMMMMMMMMMMMMMMMMMMMd +MMMMMMMmdmMMMMMMMMMMMMMMMMd +MMMMMMy` .mMMMMMMMMMMMmho:` +MMMMMMNo/sMMMMMMMNdy+-.`-/ +MMMMMMMMMMMMNdy+:.`.:ohmm: +MMMMMMMmhs+-.`.:+ymNMMMy. +MMMMMM/`.-/ohmNMMMMMMy- +MMMMMMNmNNMMMMMMMMmo. +MMMMMMMMMMMMMMMms:` +MMMMMMMMMMNds/. +dhhyys+/-` EOF ;; - "Peppermint"*) - set_colors 1 7 3 + "arch_small") + set_colors 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} 8ZZZZZZ${c2}MMMMM -${c1} .ZZZZZZZZZ${c2}MMMMMMM. -${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ -${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM -${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. -${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI -${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM -${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM -${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM -${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM -${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM -${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M -${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 -${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 -${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 -${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z -${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM -${c1} NZZZZZZZZZZZ${c2}MMMMM -${c1} ZZZZZZZZZ${c2}MM) +${c1} /\ + /^^\ + /\ \ + /${c2} __ \ + / ( ) \ + / __| |__\\\ +/// \\\\\ EOF ;; - "Pop!_OS"*) - set_colors 6 7 + "arch_old") + set_colors 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} ///////////// - ///////////////////// - ///////${c2}*767${c1}//////////////// - //////${c2}7676767676*${c1}////////////// - /////${c2}76767${c1}//${c2}7676767${c1}////////////// - /////${c2}767676${c1}///${c2}*76767${c1}/////////////// - ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// -/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// -//////////${c2}76767676767${c1}////${c2}76767${c1}///////// -///////////${c2}76767676${c1}//////${c2}7676${c1}////////// -////////////,${c2}7676${c1},///////${c2}767${c1}/////////// -/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// -///////////////${c2}7676${c1}//////////////////// - ///////////////${c2}7676${c1}///${c2}767${c1}//////////// - //////////////////////${c2}'${c1}//////////// - //////${c2}.7676767676767676767,${c1}////// - /////${c2}767676767676767676767${c1}///// - /////////////////////////// - ///////////////////// - ///////////// +${c1} __ + _=(SDGJT=_ + _GTDJHGGFCVS) + ,GTDJGGDTDFBGX0 +${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ +${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL +${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, +${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], +${c1} SDDFDFH' !YEWD,${c2} )HDROD +${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' +${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' +${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' +${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) +${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF +'EHTI !H + `0F' '! EOF ;; - "Porteus"*) - set_colors 6 7 + "ArchBox"*) + set_colors 2 7 1 read -rd '' ascii_data <<'EOF' -${c1} `.-:::-.` - -+ydmNNNNNNNmdy+- - .+dNmdhs+//////+shdmdo. - .smmy+-` ./sdy: - `omdo. `.-/+osssso+/-` `+dy. - `yms. `:shmNmdhsoo++osyyo-``oh. - hm/ .odNmds/.` ``.....:::-+s -/m: `+dNmy:` `./oyhhhhyyooo++so -ys `yNmy- .+hmmho:-.` ``` -s: yNm+` .smNd+. -`` /Nm: +dNd+` - yN+ `smNy. - dm oNNy` - hy -mNm. - +y oNNo - `y` sNN: - `: +NN: - ` .mNo - /mm` - /my` - .sy` - .+: - ` +${c1} ...:+oh/:::.. + ..-/oshhhhhh` `::::-. + .:/ohhhhhhhhhhhh` `-::::. + .+shhhhhhhhhhhhhhhhh` `.::-. + /`-:+shhhhhhhhhhhhhh` .-/+shh + / .:/ohhhhhhhhh` .:/ohhhhhhhh + / `-:+shhh` ..:+shhhhhhhhhhhh + / .:ohhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / .+o+ `hhhhhhhhhhhhhhhhhhhh + / -hhhhh `hhhhhhhhhhhhhhhhhhhh + / ohhhhho `hhhhhhhhhhhhhhhhhhhh + /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` + `--/:` /: `hhhhhhhhhhhho/- + -/:. `hhhhhhs+:-` + ::::/ho/-` EOF ;; - "PostMarketOS"*) - set_colors 2 7 + "ARCHlabs"*) + set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} ss - `hMMh` - .dMMMMd. - -NMMMMMMN- - /MMMMMMMMMN/ - hMMMMMMMMMMMo - y+`mMMmdNMMMMMMy - `dMM-.-:- .mMMMMMMh` - .mMMMMMMd` `dMMMMMMm. - :NMMMMMMy yMMMMMMN: - /MMMMMMMo oMMMmdmN/ - oMMMMMMM/ /MN.-/:-. - `yMMMMMMN- -:.NMMMMy` - `dMMMMMMM- -/////////////dMMMMMMd` - -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- - :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: -+MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ +${c1} 'c' + 'kKk, + .dKKKx. + .oKXKXKd. + .l0XXXXKKo. + c0KXXXXKX0l. + :0XKKOxxOKX0l. + :OXKOc. .c0XX0l. + :OK0o. ${c4}...${c1}'dKKX0l. + :OX0c ${c4};xOx'${c1}'dKXX0l. + :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. + c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. + .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. + .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. + .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. + .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. + .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' + 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' + 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, + ,xko:'. ${c4}.. ${c1} .':okx; + .,'. .',. EOF ;; - "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) - set_colors 4 7 + *"XFerience"*) + set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} `-/osyyyysosyhhhhhyys+- - -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ - yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy -.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ --NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ -.Nm+shddyooo+/smNNNNmmmmNh. :mmd. - NNNNy:` ./hmmmmmmmNNNN: hNMh - NMN- -++- +NNNNNNNNNNm+..-sMMMM- -.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ -.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ - mMM+ .. `sNN+. hMMMMhhMMM- - +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy - yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` - sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` - :mMMMMMMMMMMMmddNMMMMMMMMmh/ - /dMMMMMMMMMMMMMMMMMMNdy/` - .+hNMMMMMMMMMNmdhs/. - .:/+ooo+/:-. +${c1} ``--:::::::-.` + .-/+++ooooooooo+++:-` + `-/+oooooooooooooooooo++:. + -/+oooooo/+ooooooooo+/ooo++:` + `/+oo++oo. .+oooooo+.-: +:-o+- + `/+o/. -o. :oooooo+ ```:.+oo+- +`:+oo- -/` :oooooo+ .`-`+oooo/. +.+ooo+. .` `://///+-+..oooooo+:` +-+ooo:` ``.-+oooooo+/` +-+oo/` :+oooo/. +.+oo: ..-/. . -+oo+/` +`/++- -:::++::/. -+oo+- + ./o: `:///+- `./ooo+:` + .++- `` /-` -:/+oooo+:` + .:+/:`` `-:ooooooo++- + ./+o+//:...../+oooooooo++:` + `:/++ooooooooooooo++/-` + `.-//++++++//:-.` + `````` EOF ;; - "Qubes"*) - set_colors 4 5 7 6 + "ArchMerge"*) + set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} `..--..` - `.----------.` - `..----------------..` - `.------------------------.`` - `..-------------....-------------..` -.::----------..`` ``..----------:+: -:////:----..` `..---:/ossso -:///////:` `/osssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:////////-` .:sssssssso -:///////////-.` `-/osssssssssso -`//////////////:-```.:+ssssssssssssso- - .-://////////////sssssssssssssso/-` - `.:///////////sssssssssssssso:. - .-:///////ssssssssssssssssss/` - `.:////ssss+/+ssssssssssss. - `--//- `-/osssso/. +${c1} y: + sMN- + +MMMm` + /MMMMMd` + :NMMMMMMy + -NMMMMMMMMs + .NMMMMMMMMMM+ + .mMMMMMMMMMMMM+ + oNMMMMMMMMMMMMM+ + `+:-+NMMMMMMMMMMMM+ + .sNMNhNMMMMMMMMMMMM/ + `hho/sNMMMMMMMMMMMMMMM/ + `.`omMMmMMMMMMMMMMMMMMMM+ + .mMNdshMMMMd+::oNMMMMMMMMMo + .mMMMMMMMMM+ `yMMMMMMMMMs + .NMMMMMMMMM/ yMMMMMMMMMy + -NMMMMMMMMMh `mNMMMMMMMMd` + /NMMMNds+:.` `-/oymMMMm. + +Mmy/. `:smN: +/+. -o. EOF ;; - "Raspbian"*) - set_colors 2 1 + "Arch"*) + set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} `.::///+:/-. --///+//-:`` - `+oooooooooooo: `+oooooooooooo: - /oooo++//ooooo: ooooo+//+ooooo. - `+ooooooo:-:oo- +o+::/ooooooo: - `:oooooooo+`` `.oooooooo+- - `:++ooo/. :+ooo+/.` - ${c2}...` `.----.` ``.. - .::::-``:::::::::.`-:::-` - -:::-` .:::::::-` `-:::- - `::. `.--.` `` `.---.``.::` - .::::::::` -::::::::` ` - .::` .:::::::::- `::::::::::``::. --:::` ::::::::::. ::::::::::.`:::- -:::: -::::::::. `-:::::::: :::: --::- .-:::-.``....``.-::-. -::- - .. `` .::::::::. `..`.. - -:::-` -::::::::::` .:::::` - :::::::` -::::::::::` :::::::. - .::::::: -::::::::. :::::::: - `-:::::` ..--.` ::::::. - `...` `...--..` `...` - .:::::::::: - `.-::::-` +${c1} -` + .o+` + `ooo/ + `+oooo: + `+oooooo: + -+oooooo+: + `/:-:++oooo+: + `/++++/+++++++: + `/++++++++++++++: + `/+++o${c2}oooooooo${c1}oooo/` +${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` +${c2} .oossssso-````/ossssss+` + -osssssso. :ssssssso. + :osssssss/ osssso+++. + /ossssssss/ +ssssooo/- + `/ossssso+/:- -:/+osssso+- + `+sso+:-` `.-/+oso: + `++:. `-/+/ + .` `/ EOF ;; - "Red Star"* | "Redstar"*) - set_colors 1 7 3 + "Artix"*) + set_colors 6 4 2 7 read -rd '' ascii_data <<'EOF' -${c1} .. - .oK0l - :0KKKKd. - .xKO0KKKKd - ,Od' .d0000l - .c;. .'''... ..'. -.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: -;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. - .okkkkd,.lko .......',;:cllc:;,,'''''. - .cdo. :xd' cd:. ..';'',,,'',,;;;,'. - . .ddl.;doooc'..;oc;'..';::;,'. - coo;.oooolllllllcccc:'. . - .ool''lllllccccccc:::::;. - ;lll. .':cccc:::::::;;;;' - :lcc:'',..';::::;;;;;;;,,. - :cccc::::;...';;;;;,,,,,,. - ,::::::;;;,'. ..',,,,'''. - ........ ...... +${c1} d${c2}c. +${c1} x${c2}dc. +${c1} '.${c4}.${c1} d${c2}dlc. +${c1} c${c2}0d:${c1}o${c2}xllc; +${c1} :${c2}0ddlolc,lc, +${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. +${c1} ;${c1}K${c2}kxoOddollc' cllc. +${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: +${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: +${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, +${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. +${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; +${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, +${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. +${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. +${c1} 0${c2}Okd''dc. .cll; +${c1} k${c2}Okd' .llc, +${c1} d${c2}Od, 'lc. +${c1} :,${c4}. ${c2}... EOF ;; - "Redhat"* | "Red Hat"* | "rhel"*) - set_colors 1 7 3 + "Arya"*) + set_colors 2 1 read -rd '' ascii_data <<'EOF' -${c1} `.-..........` - `////////::.`-/. - -: ....-////////. - //:-::///////////` - `--::: `-://////////////: - //////- ``.-:///////// .` - `://////:-.` :///////::///:` - .-/////////:---/////////////: - .-://////////////////////. -${c2} yMN+`.-${c1}::///////////////-` -${c2} .-`:NMMNMs` `..-------..` - MN+/mMMMMMhoooyysshsss -MMM MMMMMMMMMMMMMMyyddMMM+ - MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM - MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM - MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM +${c1} `oyyy/${c2}-yyyyyy+ +${c1} -syyyy/${c2}-yyyyyy+ +${c1} .syyyyy/${c2}-yyyyyy+ +${c1} :yyyyyy/${c2}-yyyyyy+ +${c1} `/ :yyyyyy/${c2}-yyyyyy+ +${c1} .+s :yyyyyy/${c2}-yyyyyy+ +${c1} .oys :yyyyyy/${c2}-yyyyyy+ +${c1} -oyys :yyyyyy/${c2}-yyyyyy+ +${c1} :syyys :yyyyyy/${c2}-yyyyyy+ +${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ +${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ +${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- +${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy +${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy +${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy EOF ;; - "Refracted Devuan"*) - set_colors 8 7 + "Bitrig"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c2} A - VW - VVW\\ - .yWWW\\ - ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ - *WWWWWWWWWWWWWWWW/ $VWWWWw , - ^*%WWWWWWVWWX $WWWW** ,yy - , "**WWW/' **' ,yy/WWW*` - &WWWWwy `*` <,ywWW%VWWW* - yWWWWWWWWWW* ., "**WW%W - ,&WWWWWM*"` ,y/ &WWWww ^* - XWWX*^ ,yWWWW09 .WWWWWWWWwy, - *` &WWWWWM WWWWWWWWWWWWWww, - (WWWWW` /#####WWW*********** - ^WWWW - VWW - Wh. - V/ +${c1} `hMMMMN+ + -MMo-dMd` + oMN- oMN` + yMd /NM: + .mMmyyhMMs + :NMMMhsmMh + +MNhNNoyMm- + hMd.-hMNMN: + mMmsssmMMMo + .MMdyyhNMMMd + oMN.`/dMddMN` + yMm/hNm+./MM/ +.dMMMmo.``.NMo +:NMMMNmmmmmMMh +/MN/-------oNN: +hMd. .dMh +sm/ /ms +EOF + ;; + + "BLAG"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} d + ,MK: + xMMMX: + .NMMMMMX; + lMMMMMMMM0clodkO0KXWW: + KMMMMMMMMMMMMMMMMMMX' + .;d0NMMMMMMMMMMMMMMMMMMK. + .;dONMMMMMMMMMMMMMMMMMMMMMMx +'dKMMMMMMMMMMMMMMMMMMMMMMMMl + .:xKWMMMMMMMMMMMMMMMMMMM0. + .:xNMMMMMMMMMMMMMMMMMK. + lMMMMMMMMMMMMMMMMMMK. + ,MMMMMMMMWkOXWMMMMMM0 + .NMMMMMNd. `':ldko + OMMMK: + oWk, + ;: EOF ;; - "Rosa"*) - set_colors 4 7 1 + "BlankOn"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} ROSAROSAROSAROSAR - ROSA AROS - ROS SAROSAROSAROSAR AROS - RO ROSAROSAROSAROSAROSAR RO - ARO AROSAROSAROSARO AROS ROS - ARO ROSAROS OSAR ROSA ROS - RO AROSA ROSAROSAROSA ROSAR RO -RO ROSAR ROSAROSAROSAR R ROSARO RO -RO ROSA AROSAROSAROSA AR ROSARO AR -RO AROS ROSAROSAROSA ROS AROSARO AR -RO AROS ROSAROSARO ROSARO ROSARO AR -RO ROS AROSAROS ROSAROSA AROSAR AR -RO ROSA ROS ROSAROSAR ROSARO RO - RO ROS AROSAROSAROSA ROSARO AR - ARO ROSA ROSAROSAROS AROSAR ARO - ARO OROSA R ROSAROS ROS - RO AROSAROS AROSAROSAR RO - AROS AROSAROSAROSARO AROS - ROSA SARO - ROSAROSAROSAROSAR +${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` +${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ +${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys +${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys +${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys +${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys +${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys +${c2}NMMMMMN: .NMMMMMN${c1}yyyyys +${c2}MMMMMMm. NMMMMMN${c1}yyyyys +${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys +${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys +${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys +${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys +${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys +${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys +${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo +${c2} `.:/++++/:.` ${c1}:oys+. EOF ;; - "sabotage"*) - set_colors 4 7 1 + "BSD") + set_colors 1 7 4 3 6 read -rd '' ascii_data <<'EOF' -${c2} .|'''.| | '||''|. ..|''|| - ||.. ' ||| || || .|' || - ''|||. | || ||'''|. || || -. '|| .''''|. || || '|. || -|'....|' .|. .||. .||...|' ''|...|' - -|''||''| | ..|'''.| '||''''| - || ||| .|' ' || . - || | || || .... ||''| - || .''''|. '|. || || - .||. .|. .||. ''|...'| .||.....| +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) EOF ;; - "Sabayon"*) - set_colors 4 7 1 + "BunsenLabs"*) + set_colors fg 7 read -rd '' ascii_data <<'EOF' -${c1} ........... - .. .. - .. .. - .. ${c2}o ${c1}.. - .. ${c2}:W' ${c1}.. - .. ${c2}.d. ${c1}.. -:. ${c2}.KNO ${c1}.: -:. ${c2}cNNN. ${c1}.: -: ${c2}dXXX, ${c1}: -: ${c2}. dXXX, .cd, ${c1}: -: ${c2}'kc .. dKKK. ,ll;:' ${c1}: -: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: -:. ${c2}.,cdddddddddddddo:. ${c1}.: - .. ${c2}:lllllll: ${c1}.. - .. ${c2}',,,,, ${c1}.. - .. .. - .. .. - ............... +${c1} `++ + -yMMs + `yMMMMN` + -NMMMMMMm. + :MMMMMMMMMN- + .NMMMMMMMMMMM/ + yMMMMMMMMMMMMM/ +`MMMMMMNMMMMMMMN. +-MMMMN+ /mMMMMMMy +-MMMm` `dMMMMMM +`MMN. .NMMMMM. + hMy yMMMMM` + -Mo +MMMMN + /o +MMMMs + +MMMN` + hMMM: + `NMM/ + +MN: + mh. + -/ EOF ;; - "SailfishOS"*) - set_colors 4 5 7 6 + "Calculate"*) + set_colors 7 3 read -rd '' ascii_data <<'EOF' -${c1} .+eWWW - .+ee+++eee e. - .ee++eeeeeeee +e. - .e++ee++eeeeeee+eee+e+ - ee.e+.ee+eee++eeeeee+ - W.+e.e+.e++ee+eee - W.+e.W.ee.W++ee' - +e.W W.e+.W.W+ - W.e.+e.W W W. - e e e +e.W.W - .W W W. - W.+e.W. - W++e.ee+. - ++ +ee++eeeee++. - ' '+++e 'ee. - ee - ee - e +${c1} ...... + ,,+++++++,. + .,,,....,,,${c2}+**+,,.${c1} + ............,${c2}++++,,,${c1} + ............... + ......,,,........ + .....+*#####+,,,*+. + .....,*###############,..,,,,,,.. + ......,*#################*..,,,,,..,,,.. + .,,....*####################+***+,,,,...,++, + .,,..,..*#####################*, + ,+,.+*..*#######################. + ,+,,+*+..,########################* +.,++++++. ..+##**###################+ +..... ..+##***#################*. + .,.*#*****##############*. + ..,,*********#####****+. + ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} + ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} + ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} EOF ;; - "SalentOS"*) - set_colors 2 1 3 7 + "CentOS"*) + set_colors 3 2 4 5 7 read -rd '' ascii_data <<'EOF' -${c1} ``..`` - .-:+oshdNMMMMMMNdhyo+:-.` - -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ -${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` -${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- -${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` -${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` -${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd -${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy -${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo -${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ -${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- -${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` -${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm -${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy -${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: -${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. -${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: -${c2} `:smMM${c4}yy${c3}MMNy/` - ${c2}.- ${c4}`${c3}:. +${c1} .. + .PLTJ. + <><><><> + ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK + ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK + ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V + ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. +${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. +${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. +${c4} +${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV +${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' + ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' + ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 + ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK + ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK +${c2} <><><><> + 'MKKM' + '' EOF ;; - "Scientific"*) - set_colors 4 7 1 + "Chakra"*) + set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c1} =/;;/- - +: // - /; /; - -X H. -.//;;;:;;-, X= :+ .-;:=;:;#;. -M- ,=;;;#:, ,:#;;:=, ,@ -:# :#.=/++++/=.$= #= - ,#; #/:+/;,,/++:+/ ;+. - ,+/. ,;@+, ,#H;, ,/+, - ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; - ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. - ,;: :@#= =$H: .+#- - ,#= #;-///==///-// =#, -;+ :#-;;;:;;;;-X- +: -@- .-;;;;M- =M/;;;-. -X - :;;::;;-. #- :+ ,-;;-;:== - ,X H. - ;/ #= - // +; - '////' +${c1} _ _ _ "kkkkkkkk. + ,kkkkkkkk., 'kkkkkkkkk, + ,kkkkkkkkkkkk., 'kkkkkkkkk. + ,kkkkkkkkkkkkkkkk,'kkkkkkkk, + ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. + "''"''',;::,,"''kkk''kkkkk; __ + ,kkkkkkkkkk, "k''kkkkk' ,kkkk + ,kkkkkkk' ., ' .: 'kkkk',kkkkkk + ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk + ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk +.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' +;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' +'kkkkkkk; 'kkkkkkkk.,""''"''"" + ''kkkk; 'kkkkkkkkkk., + ';' 'kkkkkkkkkkkk., + ';kkkkkkkkkk' + ';kkkkkk' + "''" EOF ;; - "Siduction"*) - set_colors 4 4 + "ChaletOS"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} _aass, - jQh: =$w - QWmwawQW - )$QQQQ@( .. - _a_a. ~??^ syDY?Sa, - _mW>-<$c jWmi imm. - ]QQwayQE 4QQmgwmQQ` - ?WWQWP' -9QQQQQ@'._aas, - _a%is. .adYYs,. -"?!` aQB*~^3$c -_Qh;.nm .QWc. {QL ]QQp;..vmQ/ -"QQmmQ@ -QQQggmQP ]QQWmggmQQ( - -???" "$WQQQY` __, ?QQQQQQW! - _yZ!?q, - .yWY!!Sw, "???^ - .QQa_=qQ mQm>..vmm - $QQWQQP $QQQgmQQ@ - "???" _aa, -9WWQQWY` - _mB>~)$a -~~ - mQms_vmQ. - ]WQQQQQP - -?T??" +${c1} `.//+osso+/:`` + `/sdNNmhyssssydmNNdo:` + :hNmy+-` .-+hNNs- + /mMh/` `+:` `+dMd: + .hMd- -sNNMNo. /yyy /mMs` + -NM+ `/dMd/--omNh::dMM `yMd` + .NN+ .sNNs:/dMNy:/hNmo/s yMd` + hMs `/hNd+-smMMMMMMd+:omNy- `dMo +:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` +/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: +/Md` MMMMMMMMMMMMMMMMMMMN .MN: +:NN. MMMMMMm....--NMMMMMN -Mm. +`dMo MMMMMMd mMMMMMN hMs + -MN: MMMMMMd mMMMMMN oMm` + :NM: MMMMMMd mMMMMMN +Mm- + -mMy. mmmmmmh dmmmmmh -hMh. + oNNs- :yMm/ + .+mMdo:` `:smMd/` + -ohNNmhsoo++osshmNNh+. + `./+syyhhyys+:`` EOF ;; - "Slackware"*) - set_colors 4 7 1 + "Chapeau"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} ::::::: - ::::::::::::::::::: - ::::::::::::::::::::::::: - ::::::::${c2}cllcccccllllllll${c1}:::::: - :::::::::${c2}lc dc${c1}::::::: - ::::::::${c2}cl clllccllll oc${c1}::::::::: - :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: - ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: - :::::::::::${c2}lc cclccclc${c1}::::::::::::: -::::::::::::::${c2}lcclcc lc${c1}:::::::::::: -::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: -::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: - :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: - :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: - ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: - :::${c2}oclcccccccccccccllllllllllllll${c1}::::: - ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: - :::::::::::::::::::::::::::::::: - :::::::::::::::::::::::::::: - :::::::::::::::::::::: - :::::::::::: +${c1} .-/-. + ////////. + ////////${c2}y+${c1}//. + ////////${c2}mMN${c1}/////. + ////////${c2}mMN+${c1}////////. + ////////////////////////. + /////////+${c2}shhddhyo${c1}+////////. + ////////${c2}ymMNmdhhdmNNdo${c1}///////. +///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. +///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// +//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// +//////${c2}+MMmssssssssssssss+${c1}/////// +`//////${c2}yMMy${c1}//////////////////// + `//////${c2}smMNhso++oydNm${c1}//////// + `///////${c2}ohmNMMMNNdy+${c1}/////// + `//////////${c2}++${c1}////////// + `////////////////. + -////////- EOF ;; - "SliTaz"*) - set_colors 3 3 + "Chrom"*) + set_colors 2 1 3 4 7 read -rd '' ascii_data <<'EOF' -${c1} @ @( @ - @@ @@ @ @/ - @@ @@ @@ @@ - @@ %@@ @@ @@ - @@ %@@@ @@@@@. @@@@ @@ - @@@ @@@@ @@@@@@@ &@@@ @@@ - @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ - ,@@@@@@@@@@@@@@@@@@@@@@@@@ - .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ -@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ -@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ -@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. -@@ ,@@ @@@@@@@@@@@@@ @@@ @@ -@ @@. @@@@@@@@@@@@@ @@@ *@ -@ @@ @@@@@@@@@@@@ @@ @ - @ @@@@@@@@@. #@ - @ ,@@@@@ @ +${c2} .,:loool:,. + .,coooooooooooooc,. + .,lllllllllllllllllllll,. + ;ccccccccccccccccccccccccc; +${c1} '${c2}ccccccccccccccccccccccccccccc. +${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: +${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. +${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d +${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 +${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 +${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d +${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. +${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; +${c1} .:ccccccccllllllllo${c3}O0000000OOO, +${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. +${c1} '::ccccccccc${c3}dOOOOOOOkx:. +${c1} ..,::cccc${c3}xOOOkkko;. +${c1} ..,:${c3}dOkxl:. EOF ;; - "SmartOS"*) - set_colors 6 7 + "Clover"*) + set_colors 2 6 read -rd '' ascii_data <<'EOF' -${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyys oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyy syyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy yyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +${c1} `omo``omo` + `oNMMMNNMMMNo` + `oNMMMMMMMMMMMMNo` + oNMMMMMMMMMMMMMMMMNo + `sNMMMMMMMMMMMMMMNs` + `omo` `sNMMMMMMMMMMNs` `omo` + `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` + `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` +oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo +`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` +`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` +oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo + `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` + `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` + `oNs` `sNMMMMMMMMMMNs` `oNs` + `sNMMMMMMMMMMMMMMNs` + +NMMMMMMMMMMMMMMMMNo + `oNMMMMMMMMMMMMNo` + `oNMMMNNMMMNs` + `omo``oNs` EOF ;; - "Solus"*) + "Container Linux by CoreOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c2} -``````````` - `-+/------------.` - .---:mNo---------------. - .-----yMMMy:---------------. - `------oMMMMMm/----------------` - .------/MMMMMMMN+----------------. - .------/NMMMMMMMMm-+/--------------. -`------/NMMMMMMMMMN-:mh/-------------` -.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. ------/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- -----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. -.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` -`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. -`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ - .------------:://+-/++++++${c1}oshddys: - -hhhhyyyyyyyyyyyhhhhddddhysssso- - `:ossssssyysssssssssssssssso:` - `:+ssssssssssssssssssss+- - `-/+ssssssssssso+/-` - `.-----..` +${c1} ..... + .';:cccccccc:;'. + ':ccccclc${c3}lllllllll${c1}cc:. + .;cccccccc${c3}lllllllllllllll${c1}c, + ;clllccccc${c3}llllllllllllllllll${c1}c, + .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: + ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: + :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, +.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c +.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. +.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. +.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc + :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; + .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc + .cllllllllllclcccclccclccllllcllc + :cllllllllccclcllllllllllllcc; + .cccccccccccccclcccccccccc:. + .;cccclccccccllllllccc,. + .';ccccclllccc:;.. + ..... EOF ;; - "Source Mage"*) - set_colors 4 7 1 + "crux_small") + set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c2} :ymNMNho. -.+sdmNMMMMMMMMMMy` -.-::/yMMMMMMMMMMMm- - sMMMMMMMMMMMm/ - /NMMMMMMMMMMMMMm: - .MMMMMMMMMMMMMMMMM: - `MMMMMMMMMMMMMMMMMN. - NMMMMMMMMMMMMMMMMMd - mMMMMMMMMMMMMMMMMMMo - hhMMMMMMMMMMMMMMMMMM. - .`/MMMMMMMMMMMMMMMMMs - :mMMMMMMMMMMMMMMMN` - `sMMMMMMMMMMMMMMM+ - /NMMMMMMMMMMMMMN` - oMMMMMMMMMMMMM+ - ./sd.-hMMMMMMMMmmN` - ./+oyyyh- `MMMMMMMMMmNh - sMMMMMMMMMmmo - `NMMMMMMMMMd: - -dMMMMMMMMMo - -shmNMMms. +${c1} ___ + (${c3}.· ${c1}| + (${c2}<> ${c1}| + / ${c3}__ ${c1}\\ + ( ${c3}/ \\ ${c1}/| +${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) +${c2}\/${c1}-____${c2}\/ +EOF + ;; + + "CRUX"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} odddd + oddxkkkxxdoo + ddcoddxxxdoool + xdclodod olol + xoc xdd olol + xdc ${c2}k00${c1}Okdlol + xxd${c2}kOKKKOkd${c1}ldd + xdco${c2}xOkdlo${c1}dldd + ddc:cl${c2}lll${c1}oooodo + odxxdd${c3}xkO000kx${c1}ooxdo + oxdd${c3}x0NMMMMMMWW0od${c1}kkxo + oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx +docldkXW${c3}MMMMMMMWWN${c1}Odolco +xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c +${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l +${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd +${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo +${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; - "Sparky"*) - set_colors 1 7 + "debian_small") + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} - . `-:-` - .o` .-///-` - `oo` .:/++:. - os+` -/+++:` ``.........``` - /ys+`./+++/-.-::::::----......`` - `syyo`++o+--::::-::/+++/-`` - -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` -::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` -`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` - -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- - .sdddy::syo--/:. `.:dy+-ohhho ./: - :yddds/:+oo+//:-`- /+ +hy+.shhy: `` - `:ydmmdysooooooo-.ss`/yss--oyyo - `./ossyyyyo+:-/oo:.osso- .oys - ``..-------::////.-oooo/ :so - `...----::::::::--.`/oooo: .o: - ``````` ++o+:` `:` - ./+/-` ` - `-:-. - `` + ${c1}_____ + / __ \\ +| / | +| \\___- +-_ + --_ EOF ;; - "SteamOS"*) - set_colors 5 7 + "Debian"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} .,,,,. - .,'onNMMMMMNNnn',. - .'oNMANKMMMMMMMMMMMNNn'. - .'ANMMMMMMMXKNNWWWPFFWNNMNn. - ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, - ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, -,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, -'${c2}+#############, +. ,+' ${c1}+NMMM -${c2} '*#########*' '*,,*' ${c1}.+NMMMM. -${c2} `'*###*' ,.,;###${c1}+WNM, -${c2} .,;;, .;##########${c1}+W -${c2},',. '; ,+##############' - '###+. :,. .,; ,###############' - '####.. `'' .,###############' - '#####+++################' - '*##################*' - ''*##########*'' - '''''' +${c2} _,met$$$$$gg. + ,g$$$$$$$$$$$$$$$P. + ,g$$P" """Y$$.". + ,$$P' `$$$. +',$$P ,ggs. `$$b: +`d$$' ,$P"' ${c1}.${c2} $$$ + $$P d$' ${c1},${c2} $$P + $$: $$. ${c1}-${c2} ,d$$' + $$; Y$b._ _,d$P' + Y$$. ${c1}`.${c2}`"Y$$$$P"' +${c2} `$$b ${c1}"-.__ +${c2} `Y$$ + `Y$$. + `$$b. + `Y$$b. + `"Y$b._ + `""" EOF ;; - "SunOS" | "Solaris") - set_colors 3 7 + "Deepin"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} `- ` - `-- `+- .: - .+: `++: -/+- . - `.::` -++/``:::`./+/ `.-/. - `++/-`.` ` /++:` - `` ./:` .: `..`.- -``./+/:- -+++:- - -/+` :. +${c1} ............ + .';;;;;. .,;,. + .,;;;;;;;. ';;;;;;;. + .;::::::::' .,::;;,''''',. + ,'.:::::::: .;;'. '; + ;' 'cccccc, ,' :: '.. .: + ,, :ccccc. ;: .c, '' :. ,; +.l. cllll' ., .lc :; .l' l. +.c :lllc ;cl: .l' .ll. :' +.l 'looc. . ,o: 'oo' c, +.o. .:ool::coc' .ooo' o. + :: ..... .;dddo ;c + l:... .';lddddo. ,o + lxxxxxdoolllodxxxxxxxxxc :l + ,dxxxxxxxxxxxxxxxxxxl. 'o, + ,dkkkkkkkkkkkkko;. .;o; + .;okkkkkdl;. .,cl:. + .,:cccccccc:,. EOF ;; - "openSUSE Tumbleweed"*) + "DesaOS") set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c2} ...... - .,cdxxxoc,. .:kKMMMNWMMMNk:. - cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. - ;WMK;. .lKMMNM, :NMK, .OMW; - cMW; 'WMMMN ,XMK, oMM' -.MMc ..;l. xMN: KM0 -'MM. 'NMO oMM -.MM, .kMMl xMN - KM0 .kMM0. .dl:,.. .WMd - .XM0. ,OMMK, OMMMK. .XMK - oWMO:. .;xNMMk, NNNMKl. .xWMx - :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, - ..... .:dOOXXKOxl, +${c1}███████████████████████ +███████████████████████ +███████████████████████ +███████████████████████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +██████████████████████████████ +██████████████████████████████ +████████████████████████ +████████████████████████ +████████████████████████ EOF ;; - "openSUSE"* | "open SUSE"* | "SUSE"*) - set_colors 2 7 + "Devuan"*) + set_colors 5 7 read -rd '' ascii_data <<'EOF' -${c2} .;ldkO0000Okdl;. - .;d00xl:^''''''^:ok00d;. - .d00l' 'o00d. - .d0Kd'${c1} Okxol:;,. ${c2}:O0d. - .OK${c1}KKK0kOKKKKKKKKKKOxo:, ${c2}lKO. - ,0K${c1}KKKKKKKKKKKKKKK0P^${c2},,,${c1}^dx:${c2} ;00, -.OK${c1}KKKKKKKKKKKKKKKk'${c2}.oOPPb.${c1}'0k.${c2} cKO. -:KK${c1}KKKKKKKKKKKKKKK: ${c2}kKx..dd ${c1}lKd${c2} 'OK: -dKK${c1}KKKKKKKKKOx0KKKd ${c2}^0KKKO' ${c1}kKKc${c2} dKd -dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd -:KK${c1}KKKKKKKKKK0o;...^cdxxOK0O/^^' ${c2}.0K: - kKK${c1}KKKKKKKKKKKKK0x;,,......,;od ${c2}lKk - '0K${c1}KKKKKKKKKKKKKKKKKKKK00KKOo^ ${c2}c00' - 'kK${c1}KKOxddxkOO00000Okxoc;'' ${c2}.dKk' - l0Ko. .c00l' - 'l0Kk:. .;xK0l' - 'lkK0xl:;,,,,;:ldO0kl' - '^:ldxkkkkxdl:^' +${c1} ..,,;;;::;,.. + `':ddd;:,. + `'dPPd:,. + `:b$$b`. + 'P$$$d` + .$$$$$` + ;$$$$$P + .:P$$$$$$` + .,:b$$$$$$$;' + .,:dP$$$$$$$$b:' + .,:;db$$$$$$$$$$Pd'` + ,db$$$$$$$$$$$$$$b:'` +:$$$$$$$$$$$$b:'` + `$$$$$bd:''` + `'''` EOF ;; - "SwagArch"*) - set_colors 4 7 1 + "DracOS"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c2} .;ldkOKXXNNNNXXK0Oxoc,. - ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; - 'K0xo ..,;:c:. `'lKMMMMM0 - .lONMMMMMM' `lNMk' -${c2} ;WMMMMMMMMMO. ${c1}....::... -${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, -${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. -${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. -${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: -${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. -${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: -${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. -${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. - :ccc:' `cccccccc:, - '' +${c1} `-:/- + -os: + -os/` + :sy+-` + `/yyyy+. + `+yyyyo- + `/yyyys: +`:osssoooo++- +yyyyyy/` + ./yyyyyyo yo`:syyyy+. + -oyyy+ +- :yyyyyo- + `:sy: `. `/yyyyys: + ./o/.` .oyyso+oo:` + :+oo+//::::///:-.` `.` EOF ;; - "Tails"*) - set_colors 5 7 + "dragonfly_old"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} `` - ./yhNh -syy/Nshh `:o/ -N:dsNshh █ `ohNMMd -N-/+Nshh `yMMMMd -N-yhMshh yMMMMd -N-s:hshh █ yMMMMd so//. -N-oyNsyh yMMMMd d Mms. -N:hohhhd:. yMMMMd syMMM+ -Nsyh+-..+y+- yMMMMd :mMM+ -+hy- -ss/`yMMMM `+d+ - :sy/. ./yNMMMMm `` - .+ys- `:+hNMMMMMMy/` - `hNmmMMMMMMMMMMMMdo. - dMMMMMMMMMMMMMMMMMNh: - +hMMMMMMMMMMMMMMMMMmy. - -oNMMMMMMMMMMmy+.` - `:yNMMMds/.` - .//` + ${c1} | + .-. + ${c3} ()${c1}I${c3}() + ${c1} "==.__:-:__.==" + "==.__/~|~\__.==" + "==._( Y )_.==" + ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. +( ..=${c1}\\=${c1}/${c2}=.. ) + `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` + `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` + .-~` /${c1}|=|${c2}\ `~-. + .~` / ${c1}|=|${c2} \ `~. + .-~` .' ${c1}|=|${c2} `. `~-. + (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) + `~"~"` ${c1} |=|${c2} `"~"~` + ${c1} /=\\ + \\=/ + ^ EOF ;; - "Trisquel"*) - set_colors 4 6 + "dragonfly_small"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} ▄▄▄▄▄▄ - ▄█████████▄ - ▄▄▄▄▄▄ ████▀ ▀████ - ▄██████████▄ ████▀ ▄▄ ▀███ - ▄███▀▀ ▀▀████ ███▄ ▄█ ███ -▄███ ▄▄▄ ████▄ ▀██████ ▄███ -███ █▀▀██▄ █████▄ ▀▀ ▄████ -▀███ ███ ███████▄▄ ▄▄██████ -${c1} ▀███▄ ▄███ █████████████${c2}████▀ -${c1} ▀█████████ ███████${c2}███▀▀▀ - ▀▀███▀▀ ██████▀▀ - ██████▀ ▄▄▄▄ - █████▀ ████████ - █████ ███▀ ▀███ - ████▄ ██▄▄▄ ███ - █████▄ ▀▀ ▄██ - ██████▄▄▄████ - ▀▀█████▀▀ +${c2}(\${c3}"${c2}/) +${c2}(/${c1}|${c2}\) +${c1} | + | EOF ;; - "Ubuntu-Budgie"*) - set_colors 4 7 1 + "DragonFly"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c2} ./oydmMMMMMMmdyo/. - :smMMMMMMMMMMMhs+:++yhs: - `omMMMMMMMMMMMN+` `odo` - /NMMMMMMMMMMMMN- `sN/ - `hMMMMmhhmMMMMMMh sMh` - .mMmo- /yMMMMm` `MMm. - mN/ yMMMMMMMd- MMMm -oN- oMMMMMMMMMms+//+o+: :MMMMo -m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm -M` .NMMMMMMMMMMMMMMMNodMMMMMMM -M- sMMMMMMMMMMMMMMMMMMMMMMMMM -mm` mMMMMMMMMMNdhhdNMMMMMMMMMm -oMm/ .dMMMMMMMMh: :dMMMMMMMo - mMMNyo/:/sdMMMMMMMMM+ sMMMMMm - .mMMMMMMMMMMMMMMMMMs `NMMMm. - `hMMMMMMMMMMM.oo+. `MMMh` - /NMMMMMMMMMo sMN/ - `omMMMMMMMMy. :dmo` - :smMMMMMMMh+-` `.:ohs: - ./oydmMMMMMMdhyo/. +${c2},--, ${c1}| ${c2},--, +${c2}| `-, ${c1},^, ${c2},-' | +${c2} `, `-, ${c3}(/ \) ${c2},-' ,' +${c2} `-, `-,${c1}/ \${c2},-' ,-' +${c2} `------${c1}( )${c2}------' +${c2} ,----------${c1}( )${c2}----------, +${c2} | _,-${c1}( )${c2}-,_ | +${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' +${c1} | | + | | + | | + | | + | | + | | + `|' EOF ;; - "Ubuntu-GNOME"*) - set_colors 4 5 7 6 + "Elementary"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c3} ./o. - .oooooooo - .oooo```soooo - .oooo` `soooo - .ooo` ${c4}.o.${c3} `\/ooo. - :ooo ${c4}:oooo.${c3} `\/ooo. - sooo ${c4}`ooooo${c3} \/oooo - \/ooo ${c4}`soooo${c3} `ooooo - `soooo ${c4}`\/ooo${c3} `soooo -${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo -${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` -${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` -${c4} `ooooo ${c3}`` ${c4}.oooo -${c4} `soooo. .oooo` - `\/oooooooooo` - ``\/oo`` +${c2} eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee eeeeeeeeeeee eeeee + eeee eeeee eee eeee + eeee eeee eee eeee +eee eee eee eee +eee eee eee eee +ee eee eeee eeee +ee eee eeeee eeeeee +ee eee eeeee eeeee ee +eee eeee eeeeee eeeee eee +eee eeeeeeeeee eeeeee eee + eeeeeeeeeeeeeeeeeeeeeeee eeeee + eeeeeeee eeeeeeeeeeee eeee + eeeee eeeee + eeeeeee eeeeeee + eeeeeeeeeeeeeeeee EOF ;; - "Ubuntu-MATE"*) - set_colors 2 7 + "Endless"*) + set_colors 1 7 read -rd '' ascii_data <<'EOF' -${c1} `:+shmNNMMNNmhs+:` - .odMMMMMMMMMMMMMMMMMMdo. - /dMMMMMMMMMMMMMMMmMMMMMMMMd/ - :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: - `yMMMMMMMMMms:..-::oM: -omMMMMMy` - `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` - hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh -/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ -hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh -/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ - hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh - `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` - yMMMMMMMMMms/..-::oM: .+dMMMMMy - :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: - /dMMMMMMMMMMMMMMMdNMMMMMMMd/ - .odMMMMMMMMMMMMMMMMMMdo. - `:+shmNNMMNNmhs+:` +${c1} `:+yhmNMMMMNmhy+:` + -odMMNhso//////oshNMMdo- + /dMMh+. .+hMMd/ + /mMNo` `oNMm: + `yMMo` `oMMy` + `dMN- -NMd` + hMN. .NMh +/MM/ -os` /MM/ +dMm `smNmmhs/- `:sNMd+ `` mMd +MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM +MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM +dMm `/++/-``/yNNh+/sdNMNddMm- mMd +/MM/ `dNy: `-::- /MM/ + hMN. .NMh + `dMN- -NMd` + `yMMo` `oMMy` + /mMNo` `oNMm/ + /dMMh+. .+hMMd/ + -odMMNhso//////oshNMMdo- + `:+yhmNMMMMNmhy+:` EOF ;; - "ubuntu_old") - set_colors 1 7 3 + "Exherbo"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} ./+o+- -${c2} yyyyy- ${c1}-yyyyyy+ -${c2} ${c2}://+//////${c1}-yyyyyyo -${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` -${c3} .:++o: ${c2}/++++++++/:--:/- -${c3} o:+o+:++.${c2}`..```.-/oo+++++/ -${c3} .:+o:+o/.${c2} `+sssoo+/ -${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. -${c2}/+++//+:${c3}`oo+o${c2} /::--:. -${c2}+/+o+++${c3}`o++o${c1} ++////. -${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. -${c3} .+.o+oo:.${c1} `oddhhhh+ -${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ -${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: -${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` -${c1} /osyyyyyyo${c3}++ooo+++/ -${c1} ````` ${c3}+oo+++o: -${c3} `oo++. +${c2} , +OXo. +NXdX0: .cok0KXNNXXK0ko:. +KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... +'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. + cNMk NK .oXM. OMMMMO. 0MMNo kW. + lMc o: ., .oKNk; ;NMMWlxW' + ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO + XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk +.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl +,M: ,XMMWx::,''oOK0x; NM. +'Ml ,kNKOxxxxxkkO0XXKOd:. oMk + NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW + ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW + ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO + 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' + xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd + 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO + :XMNxl,';:lodxkOO000Oxc. .oWMMo + 'dXMMXkl;,. .,o0MMNo' + ':d0XWMMMMWNNNNMMMNOl' + ':okKXWNKkl' EOF ;; - "Ubuntu-Studio") - set_colors 6 7 + "Fedora"* | "RFRemix"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} ..-::::::-.` - `.:+++++++++++${c2}ooo${c1}++:.` - ./+++++++++++++${c2}sMMMNdyo${c1}+/. - .++++++++++++++++${c2}oyhmMMMMms${c1}++. - `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` - `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` - +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` - :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: - ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. - ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ - :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: - +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ - `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` - `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ - ./+++++++++++++++${c2}oyhdNMMMms${c1}++. - ./+++++++++++++${c2}hMMMNdyo${c1}+/. - `.:+++++++++++${c2}sso${c1}++:. - ..-::::::-.. +${c1} /:-------------:\\ + :-------------------:: + :-----------${c2}/shhOHbmp${c1}---:\\ + /-----------${c2}omMMMNNNMMD ${c1}---: + :-----------${c2}sMMMMNMNMP${c1}. ---: + :-----------${c2}:MMMdP${c1}------- ---\\ +,------------${c2}:MMMd${c1}-------- ---: +:------------${c2}:MMMd${c1}------- .---: +:---- ${c2}oNMMMMMMMMMNho${c1} .----: +:-- .${c2}+shhhMMMmhhy++${c1} .------/ +:- -------${c2}:MMMd${c1}--------------: +:- --------${c2}/MMMd${c1}-------------; +:- ------${c2}/hMMMy${c1}------------: +:--${c2} :dMNdhhdNMMNo${c1}------------; +:---${c2}:sdNMMMMNds:${c1}------------: +:------${c2}:://:${c1}-------------:: +:---------------------:// EOF ;; - "Ubuntu"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} .-/+oossssoo+/-. - `:+ssssssssssssssssss+:` - -+ssssssssssssssssssyyssss+- - .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ - +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ -.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. -+ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ -oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso -oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso -+ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ -.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ - +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ - /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ - .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - -+sssssssssssssssss${c2}yyy${c1}ssss+- - `:+ssssssssssssssssss+:` - .-/+oossssoo+/-. + "freebsd_small") + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} /\\ _____ /\\ + \\_) (_/ + / \ +| | +| | + \ / + --_____-- EOF ;; - "void_small") - set_colors 2 8 + "FreeBSD"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} _______ - _ \______ - -| \ ___ \ | -| | / \ | | -| | \___/ | | -| \______ \_| - -_______\ + ${c2}``` ${c1}` + ${c2}` `.....---...${c1}....--.``` -/ + ${c2}+o .--` ${c1}/y:` +. + ${c2} yo`:. ${c1}:o `+- + ${c2}y/ ${c1}-/` -o/ + ${c2}.- ${c1}::/sy+:. + ${c2}/ ${c1}`-- / + ${c2}`: ${c1}:` + ${c2}`: ${c1}:` + ${c2}/ ${c1}/ + ${c2}.- ${c1}-. + ${c2}-- ${c1}-. + ${c2}`:` ${c1}`:` + .-- `--. + .---.....----. EOF ;; - "Void"*) - set_colors 2 8 + "FreeMiNT"*) + # Don't explicitly set colors since + # TosWin2 doesn't reset well. read -rd '' ascii_data <<'EOF' -${c1} __.;=====;.__ - _.=+==++=++=+=+===;. - -=+++=+===+=+=+++++=_ - . -=:`` `--==+=++==. - _vi, ` --+=++++: - .uvnvi. _._ -==+==+. - .vvnvnI` .;==|==;. :|=||=|. -${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL -${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE -${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' -${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! -${c1} -1vvnvv. `~+++` ++|+++ - +vnvnnv, `-|=== - +vnvnvns. . :=- - -Invnvvnsi..___..=sv=. ` - +Invnvnvnnnnnnnnvvnn;. - ~|Invnvnvvnvvvnnv}+` - -~|{*l}*|~ +${c1} ## + ## ######### + #### ## + #### #### ## +#### #### ## ## + #### #### ## ## + #### #### ## ## ## + #### ###### + ###### ## ## #### + #### ################ + #### ## #### + ## #### ###### + ## ## #### #### + ## ## ## ## ## #### + #### ## ## ## EOF ;; - *"[Windows 10]"* | *"on Windows 10"* | "Windows 8"* |\ - "Windows 10"* | "windows10" | "windows8" ) - set_colors 6 7 + "Frugalware"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} .., - ....,,:;+ccllll - ...,,+:; cllllllllllllllllll -,cclllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll - -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -`'ccllllllllll lllllllllllllllllll - `' \\*:: :ccllllllllllllllll - ````''*::cll - `` +${c1} `++/::-.` + /o+++++++++/::-.` + `o+++++++++++++++o++/::-.` + /+++++++++++++++++++++++oo++/:-.`` + .o+ooooooooooooooooooosssssssso++oo++/:-` + ++osoooooooooooosssssssssssssyyo+++++++o: + -o+ssoooooooooooosssssssssssssyyo+++++++s` + o++ssoooooo++++++++++++++sssyyyyo++++++o: + :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo + `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: + /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss + .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- + ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso + -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. + sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ + :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` + yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ +-ysooooooydhhhhhhhhhhhddddddddddddddddssy + .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: + ``.-/+oosysssssssssssssssssssssss + ``.:/+osyysssssssssssssh. + `-:/+osyyssssyo + .-:+++` EOF ;; - "Windows"*) - set_colors 1 2 4 3 + "Funtoo"*) + set_colors 5 7 read -rd '' ascii_data <<'EOF' -${c1} ,.=:!!t3Z3z., - :tt:::tt333EE3 -${c1} Et:::ztt33EEEL${c2} @Ee., .., -${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# -${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL -${c1} it::::tt333EEF${c2} @EEEEEEttttt33F -${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. -${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF -${c3} ;::::::::zt33)${c2} "4EEEtttji3P* -${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. -${c3} i::::::::zt33F${c4} AEEEtttt::::ztF -${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 -${c3} E::::::::zt33L${c4} @EEEtttt::::z3F -${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` -${c3} `${c4} :EEEEtttt::::z7 - "VEzjt:;;z>*` +${c2} _______ ____ + /MMMMMMM/ /MMMM| _____ _____ + __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ +|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ +|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| +|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| + |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ + |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ EOF ;; - "Xubuntu"*) + "GalliumOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} `-/osyhddddhyso/-` - .+yddddddddddddddddddy+. - :yddddddddddddddddddddddddy: - -yddddddddddddddddddddhdddddddy- - odddddddddddyshdddddddh`dddd+ydddo - `yddddddhshdd- ydddddd+`ddh.:dddddy` - sddddddy /d. :dddddd-:dy`-ddddddds -:ddddddds /+ .dddddd`yy`:ddddddddd: -sdddddddd` . .-:/+ssdyodddddddddds -ddddddddy `:ohddddddddd -dddddddd. +dddddddd -sddddddy ydddddds -:dddddd+ .oddddddd: - sdddddo ./ydddddddds - `yddddd. `:ohddddddddddy` - oddddh/` `.:+shdddddddddddddo - -ydddddhyssyhdddddddddddddddddy- - :yddddddddddddddddddddddddy: - .+yddddddddddddddddddy+. - `-/osyhddddhyso/-` +${c1}sooooooooooooooooooooooooooooooooooooo+: +yyooooooooooooooooooooooooooooooooo+/::: +yyysoooooooooooooooooooooooooooo+/:::::: +yyyyyoooooooooooooooooooooooo+/::::::::: +yyyyyysoooooooooooooooooo++/:::::::::::: +yyyyyyysoooooooooooooo++/::::::::::::::: +yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: +yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: +yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: +yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: +yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: +yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: +yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: +yyyyyyyyyyyyyyys+:--...........-///::::: +yyyyyyyyyyyys+:--................://:::: +yyyyyyyyyo+:-.....................-//::: +yyyyyyo+:-..........................://: +yyyo+:-..............................-// +o/:-...................................: EOF ;; - "Zorin"*) - set_colors 4 6 + "gentoo_small") + set_colors 5 7 read -rd '' ascii_data <<'EOF' -${c1} `osssssssssssssssssssso` - .osssssssssssssssssssssso. - .+oooooooooooooooooooooooo+. - - - `::::::::::::::::::::::. .:` - `+ssssssssssssssssss+:.` `.:+ssso` -.ossssssssssssssso/. `-+ossssssso. -ssssssssssssso/-` `-/osssssssssssss -.ossssssso/-` .-/ossssssssssssssso. - `+sss+:. `.:+ssssssssssssssssss+` - `:. .::::::::::::::::::::::` - - - .+oooooooooooooooooooooooo+. - -osssssssssssssssssssssso- - `osssssssssssssssssssso` +${c1} _-----_ +( \\ +\ 0 \\ +${c2} \ ) + / _/ +( _- +\____- EOF ;; - *) - case "$kernel_name" in - *"BSD") - set_colors 1 7 4 3 6 - read -rd '' ascii_data <<'EOF' -${c1} , , - /( )` - \ \___ / | - /- _ `-/ ' - (${c2}/\/ \ ${c1}\ /\ - ${c2}/ / | ` ${c1}\ - ${c3}O O ${c2}) ${c1}/ | - ${c2}`-^--'${c1}`< ' - (_.) _ ) / - `.___/` / - `-----' / -${c4}<----. __ / __ \ -${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| -<----' ${c1}`--' `.__,' \ - | | - \ / /\ - ${c5}______${c1}( (_ / \______/ - ${c5},' ,-----' | - `--{__________) + "Gentoo"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} -/oyddmdhs+:. + -o${c2}dNMMMMMMMMNNmhy+${c1}-` + -y${c2}NMMMMMMMMMMMNNNmmdhy${c1}+- + `o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/` + om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o` +.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+` + oy${c2}hdmNMMMMMMMN${c1}dyooy${c2}dmddddhhhhyhN${c1}d. + :o${c2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${c1}Mh + .:${c2}+sydNMMMMMNNNmmmdddhhhhhhmM${c1}my + /m${c2}MMMMMMNNNmmmdddhhhhhmMNh${c1}s: + `o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+` + `s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. + /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:` ++M${c2}MMMMMMNNNNNmmmmdmNMNdso${c1}/- +yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` +/h${c2}MMNNNNNNNNMNdhs++/${c1}-` +`/${c2}ohdmmddhys+++/:${c1}.` + `-//////:--. EOF - ;; + ;; - "Darwin") - set_colors 2 3 1 1 5 4 - read -rd '' ascii_data <<'EOF' -${c1} 'c. - ,xNMM. - .OMMMMo - OMMM0, - .;loddo:' loolloddol;. - cKMMMMMMMMMMNWMMMMMMMMMM0: -${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. - XMMMMMMMMMMMMMMMMMMMMMMMX. -${c3};MMMMMMMMMMMMMMMMMMMMMMMM: -:MMMMMMMMMMMMMMMMMMMMMMMM: -${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. - kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. - ${c6}kMMMMMMMMMMMMMMMMMMMMMMd - ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. + "gNewSense"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} ..,,,,.. + .oocchhhhhhhhhhccoo. + .ochhlllllllc hhhhhh ollllllhhco. + ochlllllllllll hhhllllllhhh lllllllllllhco + .cllllllllllllll hlllllo +hllh llllllllllllllc. +ollllllllllhco'' hlllllo +hllh ``ochllllllllllo +hllllllllc' hllllllllllllh `cllllllllh +ollllllh +llllllllllll+ hllllllo + `cllllh. ohllllllho .hllllc' + ochllc. ++++ .cllhco + `+occooo+. .+ooocco+' + `+oo++++ ++++oo+' EOF - ;; + ;; - "GNU"*) - set_colors fg 7 - read -rd '' ascii_data <<'EOF' + "GNU") + set_colors fg 7 + read -rd '' ascii_data <<'EOF' ${c1} _-`````-, ,- '- . .' .- - | | - -. `. /.' / `. \ @@ -7640,982 +6342,2280 @@ ${c1} _-`````-, ,- '- . '/'/' `; EOF - ;; - - "Linux") - set_colors fg 8 3 - read -rd '' ascii_data <<'EOF' -${c2} ##### -${c2} ####### -${c2} ##${c1}O${c2}#${c1}O${c2}## -${c2} #${c3}#####${c2}# -${c2} ##${c1}##${c3}###${c1}##${c2}## -${c2} #${c1}##########${c2}## -${c2} #${c1}############${c2}## -${c2} #${c1}############${c2}### -${c3} ##${c2}#${c1}###########${c2}##${c3}# -${c3}######${c2}#${c1}#######${c2}#${c3}###### -${c3}#######${c2}#${c1}#####${c2}#${c3}####### -${c3} #####${c2}#######${c3}##### -EOF - ;; - - "SunOS") - set_colors 3 7 - read -rd '' ascii_data <<'EOF' -${c1} `- ` - `-- `+- .: - .+: `++: -/+- . - `.::` -++/``:::`./+/ `.-/. - `++/-`.` ` /++:` - `` ./:` .: `..`.- -``./+/:- -+++:- - -/+` :. -EOF - ;; + ;; - "IRIX"*) - set_colors 4 7 - read -rd '' ascii_data <<'EOF' -${c1} ./ohmNd/ +dNmho/- - `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. - `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` - -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. - `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` -+mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ -dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd -oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ -.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. - hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh - /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: - `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd - `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` - `yNMMNho-yMMMM` NMMMm.+hNMMNh` - -MMMMd: oMMMM. NMMMh :hMMMM- - -yNMMMmooMMMM- NMMMyomMMMNy- - .omMMMMMMMM-`NMMMMMMMmo. - `:hMMMMMM. NMMMMMh/` - .odNm+ /dNms. + "GoboLinux"*) + set_colors 5 4 6 2 + read -rd '' ascii_data <<'EOF' +${c1}_____ _ +/ ____| | | +| | __ ___ | |__ ___ +| | |_ |/ _ \| '_ \ / _ \ +| |__| | (_) | |_) | (_) | + \_____|\___/|_.__/ \___/ EOF - ;; - esac ;; - esac - - # Overwrite distro colors if '$ascii_colors' doesn't - # equal 'distro'. - if [[ "${ascii_colors[0]}" != "distro" ]]; then - color_text="off" - set_colors "${ascii_colors[@]}" - fi -} - -set_colors() { - c1="$(color "$1")${ascii_bold}" - c2="$(color "$2")${ascii_bold}" - c3="$(color "$3")${ascii_bold}" - c4="$(color "$4")${ascii_bold}" - c5="$(color "$5")${ascii_bold}" - c6="$(color "$6")${ascii_bold}" - - [[ "$color_text" != "off" ]] && set_text_colors "$@" -} - -set_text_colors() { - if [[ "${colors[0]}" == "distro" ]]; then - title_color="$(color "$1")" - at_color="$reset" - underline_color="$reset" - subtitle_color="$(color "$2")" - colon_color="$reset" - info_color="$reset" - - # If the ascii art uses 8 as a color, make the text the fg. - ((${1:-1} == 8)) && title_color="$reset" - ((${2:-7} == 8)) && subtitle_color="$reset" - - # If the second color is white use the first for the subtitle. - ((${2:-7} == 7)) && subtitle_color="$(color "$1")" - ((${1:-1} == 7)) && title_color="$reset" - else - title_color="$(color "${colors[0]}")" - at_color="$(color "${colors[1]}")" - underline_color="$(color "${colors[2]}")" - subtitle_color="$(color "${colors[3]}")" - colon_color="$(color "${colors[4]}")" - info_color="$(color "${colors[5]}")" - fi - - # Bar colors. - if [[ "$bar_color_elapsed" == "distro" ]]; then - bar_color_elapsed="$(color fg)" - else - bar_color_elapsed="$(color "$bar_color_elapsed")" - fi - - case "$bar_color_total $1" in - "distro "[736]) bar_color_total="$(color "$1")" ;; - "distro "[0-9]) bar_color_total="$(color "$2")" ;; - *) bar_color_total="$(color "$bar_color_total")" ;; - esac -} - -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" ;; - esac -} - -# OTHER - -stdout() { - image_backend="off" - unset subtitle_color - unset colon_color - unset info_color - unset underline_color - unset bold - unset title_color - unset at_color - unset text_padding - unset zws - unset reset - unset color_blocks - unset get_line_break -} - -err() { - err+="$(color 1)[!]\e[0m $1\n" -} - -get_full_path() { - # This function finds the absolute path from a relative one. - # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" - - # If the file exists in the current directory, stop here. - [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - - if ! cd "${1%/*}"; then - err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" - err " Check that the directory exists or try another directory." - exit 1 - fi - - local full_dir="${1##*/}" - - # Iterate down a (possible) chain of symlinks. - while [[ -L "$full_dir" ]]; do - full_dir="$(readlink "$full_dir")" - cd "${full_dir%/*}" || exit - full_dir="${full_dir##*/}" - done - # Final directory. - full_dir="$(pwd -P)/${1/*\/}" + "Grombyang"*) + set_colors 4 2 1 + read -rd '' ascii_data <<'EOF' +${c1} eeeeeeeeeeee + eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee ${c2}.o+ ${c1}eeee + eeee ${c2}`ooo/ ${c1}eeee + eeee ${c2}`+oooo: ${c1}eeee +eee ${c2}`+oooooo: ${c1}eee +eee ${c2}-+oooooo+: ${c1}eee +ee ${c2}`/:oooooooo+: ${c1}ee +ee ${c2}`/+ +++ +: ${c1}ee +ee ${c2}+o+\ ${c1}ee +eee ${c2}+o+\ ${c1}eee +eee ${c2}// \\ooo/ \\\ ${c1}eee + eee ${c2}//++++oooo++++\\\ ${c1}eee + eeee ${c2}::::++oooo+::::: ${c1}eeee + eeeee ${c3}Grombyang OS ${c1} eeee + eeeeeeeeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeee +EOF + ;; - [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" -} + "GuixSD"*) + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1} .. `. + `--..```..` `..```..--` + .-:///-:::. `-:::///:-. + ````.:::` `:::.```` + -//:` -::- + ://: -::- + `///- .:::` + -+++-:::. + :+/:::- + `-....` +EOF + ;; -get_user_config() { - # Check $config_file. - if [[ -f "$config_file" ]]; then - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options - return - fi - mkdir -p "${XDG_CONFIG_HOME}/neofetch/" + "Haiku"*) + set_colors 2 8 + read -rd '' ascii_data <<'EOF' +${c2} :dc' + 'l:;'${c1},${c2}'ck. .;dc:. + co ${c1}..${c2}k. .;; ':o. + co ${c1}..${c2}k. ol ${c1}.${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. +.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. + ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; + ..${c1}oOolllllccccccc:::::${c2}od; + cx:ooc${c1}:::::::;${c2}cooolcX. + cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. + cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. + .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. + '::c'${c1}...${c2}do${c1}..... .${c2}K, + cd,.${c1}....:${c2}O,${c1} + ':clod:'${c1} + ${c1} +EOF + ;; - # Check ${XDG_CONFIG_HOME}/neofetch and create the - # dir/files if they don't exist. - if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config" + "Hyperbola"*) + set_colors 8 + read -rd '' ascii_data <<'EOF' +${c1} WW + KX W + WO0W NX0O + NOO0NW WNXK0OOKW + W0OOOOOOOOOOOOKN + N0OOOOOOO0KXW + WNXXXNW + NXK00000KN + WNK0OOOOOOOOOO0W + NK0OOOOOOOOOOOOOO0W + X0OOOOOOO00KK00OOOOOK + X0OOOO0KNWW WX0OO0W + X0OO0XNW KOOW + N00KNW KOW + NKXN W0W +WW W +EOF + ;; - elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + "Kali"*) + set_colors 4 8 + read -rd '' ascii_data <<'EOF' +${c1}.............. + ..,;:ccc,. + ......''';lxO. +.....''''..........,:ld; + .';;;:::;,,.x, + ..'''. 0Xxoc:,. ... + .... ,ONkc;,;cokOdc',. + . OMo ':${c2}dd${c1}o. + dMc :OO; + 0M. .:o. + ;Wd + ;XO, + ,d0Odlc;,.. + ..',;:cdOOd::,. + .:d;.':;. + 'd, .' + ;l .. + .o + c + .' + . +EOF + ;; - else - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + "KaOS"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} .. + ..... ..OSSAAAAAAA.. + .KKKKSS. .SSAAAAAAAAAAA. +.KKKKKSO. .SAAAAAAAAAA... +KKKKKKS. .OAAAAAAAA. +KKKKKKS. .OAAAAAA. +KKKKKKS. .SSAA.. +.KKKKKS..OAAAAAAAAAAAA........ + DKKKKO.=AA=========A===AASSSO.. + AKKKS.==========AASSSSAAAAAASS. + .=KKO..========ASS.....SSSSASSSS. + .KK. .ASS..O.. =SSSSAOSS: + .OK. .ASSSSSSSO...=A.SSA. + .K ..SSSASSSS.. ..SSA. + .SSS.AAKAKSSKA. + .SSS....S.. +EOF + ;; - # The config file doesn't exist, create it. - printf "%s\n" "$config" > "$config_file" - fi + "KDE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} `..---+/---..` + `---.`` `` `.---.` + .--.` `` `-:-. + `:/: `.----//----.` :/- + .:. `---` `--.` .:` + .:` `--` .:- `:. + `/ `:. `.-::-.` -:` `/` + /. /. `:++++++++:` .: .: +`/ .: `+++++++++++/ /` `+` +/+` -- .++++++++++++` :. .+: +`/ .: `+++++++++++/ /` `+` + /` /. `:++++++++:` .: .: + ./ `:. `.:::-.` -:` `/` + .:` `--` .:- `:. + .:. `---` `--.` .:` + `:/: `.----//----.` :/- + .-:.` `` `-:-. + `---.`` `` `.---.` + `..---+/---..` +EOF + ;; - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options -} + "Kogaion"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ;; ,; + ;;; ,;; + ,;;;; ;;;; + ,;;;;;;;; ;;;; + ;;;;;;;;;;; ;;;;; + ,;;;;;;;;;;;; ';;;;;, + ;;;;;;;;;;;;;;, ';;;;;;; + ;;;;;;;;;;;;;;;;;, ';;;;; +; ';;;;;;;;;;;;;;;;;;, ;;; +;;;, ';;;;;;;;;;;;;;;;;;;,;; +;;;;;, ';;;;;;;;;;;;;;;;;;, +;;;;;;;;, ';;;;;;;;;;;;;;;;, +;;;;;;;;;;;;, ';;;;;;;;;;;;;; +';;;;;;;;;;;;; ';;;;;;;;;;;;; + ';;;;;;;;;;;;;, ';;;;;;;;;;; + ';;;;;;;;;;;;; ;;;;;;;;;; + ';;;;;;;;;;;; ;;;;;;;; + ';;;;;;;; ;;;;;; + ';;;;; ;;;; + ';;; ;; +EOF + ;; -bar() { - # Get the values. - elapsed="$(($1 * bar_length / $2))" + "Korora"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} ____________ + _add55555555554${c1}: + _w?'${c1}``````````'${c2})k${c1}: + _Z'${c1}`${c2} ]k${c1}: + m(${c1}`${c2} )k${c1}: + _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: + .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` + jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` + jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` +.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` +:#${c1}:${c2} ${c1}`${c2})e${c1}``` +:m${c1}:${c2} ,#'${c1}` +:#${c1}:${c2} .s2'${c1}` +:m,________.aa7^${c1}` +:#baaaaaaas!J'${c1}` + ``````````` +EOF + ;; - # Create the bar with spaces. - printf -v prog "%${elapsed}s" - printf -v total "%$((bar_length - elapsed))s" + "KSLinux"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} K K U U RRRR ooo + K K U U R R o o + KKK U U RRRR o o + K K U U R R o o + K K UUU R R ooo - # Set the colors and swap the spaces for $bar_char_. - bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" - bar+="${bar_color_total}${total// /${bar_char_total}}" +${c2} SSS AAA W W AAA + S A A W W A A + SSS AAAAA W W W AAAAA + S A A WW WW A A + SSS A A W W A A +EOF + ;; - # Borders. - [[ "$bar_border" == "on" ]] && \ - bar="$(color fg)[${bar}$(color fg)]" + "Kubuntu"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `.:/ossyyyysso/:. + .:oyyyyyyyyyyyyyyyyyyo:` + -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- + -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- + oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo + `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` + oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- +oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy +oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- + oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo + `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo + oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo + -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- + -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- + ./oyyyyyyyyyyyyyyyyyyo/. + `.:/oosyyyysso/:.` +EOF + ;; - printf "%b" "${bar}${info_color}" -} + "LEDE"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' + ${c1} _________ + / /\ + / LE / \ + / DE / \ + /________/ LE \ + \ \ DE / + \ LE \ / + \ DE \ / + \________\/ +EOF + ;; -cache() { - if [[ "$2" ]]; then - mkdir -p "${cache_dir}/neofetch" - printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" - fi -} + "Linux") + set_colors fg 8 3 + read -rd '' ascii_data <<'EOF' +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### +EOF + ;; -get_cache_dir() { - case "$os" in - "Mac OS X") cache_dir="/Library/Caches" ;; - *) cache_dir="/tmp" ;; - esac -} + "LMDE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' + ${c2}`.-::---.. +${c1} .:++++ooooosssoo:. + .+o++::. `.:oos+. +${c1} :oo:.` -+oo${c2}: +${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` +${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` +${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: +${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` +${c1}`s: `oo s m Myy+-o:` +`oo :+sdoohyoydyso/. + :o. .:////////++: +${c1} `/++ ${c2}-:::::- +${c1} ${c2}`${c1}++- +${c1} ${c2}`${c1}/+- +${c1} ${c2}.${c1}+/. +${c1} ${c2}.${c1}:+-. + `--.`` +EOF + ;; -kde_config_dir() { - # If the user is using KDE get the KDE - # configuration directory. - if [[ "$kde_config_dir" ]]; then - return + "Lubuntu"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `-/+oyyhhhhyyo+/-` + ./shhhhhhhhhhhhhhhhhhs/. + `:shhhhhhhhhhhhhhhhhhhhhhhhs:` + :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: + `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` + `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` + shhhhhhhhy+. .ohhhhhhhhhhhhhs +:hhhhhhy/. /hhhhhhhhhhhhh: +shhhy/. :hhhhhhhhhhhhs +hy+. ` `+yhs/` +hhhhhhhhhhhh +-.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh +shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs +:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: + shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs + `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` + +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` + :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: + :shhhhhhhhhhhhhhhhhhhhhy`+s:` + .+shhhhhhhhhhhhhhhhhhs:` + `-/+oyyhhhhyys+/-` +EOF + ;; - elif type -p kf5-config >/dev/null 2>&1; then - kde_config_dir="$(kf5-config --path config)" + "Lunar"*) + set_colors 4 7 3 + read -rd '' ascii_data <<'EOF' +${c1}`-. `-. + -ohys/-` `:+shy/` + -omNNdyo/` :+shmNNy/` + ${c3} - + /mMmo + hMMMN` + .NMMs + ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` + /:.` ${c3}/${c1} `.:/` +${c3} __ + | | _ _ ___ ___ ___ + | |__| | | | .'| _| + |_____|___|_|_|__,|_| +EOF + ;; - elif type -p kde4-config >/dev/null 2>&1; then - kde_config_dir="$(kde4-config --path config)" + "mac"*"_small") + set_colors 2 3 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} .:' + _ :'_ +${c2} .'`_`-'_``. +:________.-' +${c3}:_______: +:_______: +${c4} :_______`-; +${c5} `._.-._.' +EOF + ;; - elif type -p kde-config >/dev/null 2>&1; then - kde_config_dir="$(kde-config --path config)" + "mac" | "Darwin") + set_colors 2 3 1 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. +EOF + ;; - elif [[ -d "${HOME}/.kde4" ]]; then - kde_config_dir="${HOME}/.kde4/share/config" + "Mageia"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} .°°. + °° .°°. + .°°°. °° + . . + °°° .°°°. + .°°°. '___' +${c2} .${c1}'___' ${c2} . + :dkxc;'. ..,cxkd; + .dkk. kkkkkkkkkk .kkd. +.dkk. ';cloolc;. .kkd +ckk. .kk; +xO: cOd +xO: lOd +lOO. .OO: +.k00. .00x + .k00; ;00O. + .lO0Kc;,,,,,,;c0KOc. + ;d00KKKKKK00d; + .,KKKK,. +EOF + ;; - elif [[ -d "${HOME}/.kde3" ]]; then - kde_config_dir="${HOME}/.kde3/share/config" - fi + "MagpieOS"*) + set_colors 2 1 3 5 + read -rd '' ascii_data <<'EOF' +${c1} ;00000 :000Ol + .x00kk00: O0kk00k; + l00: :00. o0k :O0k. + .k0k. x${c2}d$dddd${c1}k' .d00; + k0k. ${c2}.dddddl ${c1}o00, + o00. ${c2}':cc:. ${c1}d0O +.00l ,00. +l00. d0x +k0O .:k0o +O0k ;dO0000d. +k0O .O0O${c2}xxxxk${c1}00: +o00. k0O${c2}dddddd${c1}occ +'00l x0O${c2}dddddo${c3};..${c1} + x00. .x00${c2}kxxd${c3}:..${c1} + .O0x .:oxxx${c4}Okl.${c1} + .x0d ${c4},xx,${c1} + .:o. ${c4}.xd ckd${c1} + .. ${c4}dxl .xx; + :xxolldxd' + ;oxdl. +EOF + ;; - kde_config_dir="${kde_config_dir/$'/:'*}" -} + "Manjaro"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1}██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +EOF + ;; -get_term_padding() { - # Terminal info. - # - # Parse terminal config files to get - # info about padding. Due to how w3m-img - # works padding around the terminal throws - # off the cursor placement calculation in - # specific terminals. - # - # Note: This issue only seems to affect - # URxvt. - ((term_run != 1)) && get_term + "Maui"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} `.-://////:--` + .:/oooooooooooooooo+:. + `:+ooooooooooooooooooooooo:` + `:oooooooooooooooooooooooooooo/` + ..```-oooooo/-`` `:oooooo+:.` `-- + :. +oo+-` /ooo/` -/ + -o. `o+- +o/` -o: +`oo` ::` :o/ `+. .+o` /oo. +/o+ . -+oo- ` /oo/ `ooo/ ++o- /ooo+` .+ooo. :ooo+ +++ .+oooo: -oooo+ `oooo+ +:. .oooooo` :ooooo- :oooo: +` .oooooo: :ooooo+ `ooo+-` + .+oooooo` -oooooo: `o/- + +oooooo: .ooooooo. + /ooooooo` /ooooooo/ .. + `:oooooooo/:::/ooooooooo+:--:/:` + `:+oooooooooooooooooooooo+:` + .:+oooooooooooooooo+:. + `.-://////:-.` +EOF + ;; - case "$term" in - "URxvt"*) - border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" + "Mer"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} dMs + .-` + `y`-o+` + ``NMMy + .--`:++. + .hNNNNs + /MMMMMN + `ommmd/ +/ + ```` +/ + `:+sssso/-` + .-::. `-::-` `smNMNmdmNMNd/ .://-` +.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo +dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- +MMm yMM- :MMs NMN` `:::::--sMMh dMM` +MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` +NNd sNN- -NNs -mMNs-.--..:dMMh` dNN +--- .--` `--. .smMMmdddmMNdo` .-- + ./ohddds+:` + +h- `.:-. + ./`.dMMMN+ + +MMMMMd + `+dmmy- + ``` .+` + .dMNo-y. + `hmm/ + .:` + dMs +EOF ;; - esac -} -dynamic_prompt() { - case "$image_backend" in - "ascii") printf "\n" ;; - "off") return ;; - *) - get_term_padding - lines="$(((border + height + yoffset) / font_height))" - image_prompt="on" + "Minix"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c2} -sdhyo+:-` -/syymm: + sdyooymmNNy. `` .smNmmdysNd + odyoso+syNNmysoyhhdhsoomNmm+/osdm/ + :hhy+-/syNNmddhddddddmNMNo:sdNd: + `smNNdNmmNmddddddddddmmmmmmmy` + `ohhhhdddddmmNNdmddNmNNmdddddmdh- + odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: + `+mNho:` smmd/ sNNh :dmms` -+ymmo. +-od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: ++sms -.` :so: .NN+ :os/ .-`mNh: +.-hyh+:////- -sNNd:` .--://ohNs- + `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ + -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: + //oydNMMMMydMMNysNMMmsMMMMMNyo/` + ../-yNMMy--/::/-.sMMmos+.` + -+oyhNsooo+omy/``` + `::ohdmds-` +EOF ;; - esac - # If the info is higher than the ascii/image place the prompt - # based on the info height instead of the ascii/image height. - if ((lines < info_height)); then - [[ "$image_prompt" ]] && printf "\n" - return - else - [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" - lines="$((lines - info_height + 1))" - fi + "Linux Mint"* | "LinuxMint"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. +MMm----::-://////////////oymNMd+` +MMd ${c2}/++ ${c1}-sNMd: +MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: +ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm + NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM + NMm ${c2}dMM` ..` ... ydm. ${c1}dMM + hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM + -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM + -dMNs-${c2}``-::::-------.`` ${c1}dMM + `/dMNmy+/:-------------:/yMMM + ./ydNMMMMMMMMMMMMMMMMMMMMM + .MMMMMMMMMMMMMMMMMMM +EOF + ;; - # Set the prompt location. - if ((lines > 1)); then - case "$kernel_name" in - "OpenBSD") tput cud "$lines" ;; - *) printf "%b" "\e[${lines}B" ;; - esac - fi -} + "MX"*) + set_colors 4 6 7 + read -rd '' ascii_data <<'EOF' +${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM +MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM +MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM +MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM +MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM +MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM +MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM +MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM +MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM +MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM +MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM +MMMMMMMNo` :mMMN+` `-hMMMMMMMM +MMMMMMh. `oNMMd: `/mMMMMMM +MMMMm/ -hMd- `sNMMMM +MMNs` - :dMMM +Mm: `oMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM +EOF + ;; -old_functions() { - # Deprecated functions. - # Neofetch 2.0 changed the names of a few variables. - # This function adds backwards compatibility for the - # old variable names. - if type printinfo >/dev/null 2>&1; then - print_info() { printinfo ; } - get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } - get_termfont() { get_term_font; termfont="$term_font"; } - get_localip() { get_local_ip; localip="$local_ip"; } - get_publicip() { get_public_ip; publicip="$public_ip"; } - get_linebreak() { get_line_break; linebreak="$line_break"; } - fi + "NetBSD"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} `-/oshdmNMNdhyo+:-` +${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` +${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` + ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` + ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` + ${c2}-N/${c1}hMMMMMMMMMmho:` + ${c2}-N/${c1}-:/++/:.` +${c2} :M+ + :Mo + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms +EOF + ;; - get_birthday() { get_install_date; birthday="$install_date"; } -} + "Netrunner"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} .:oydmMMMMMMmdyo:` + -smMMMMMMMMMMMMMMMMMMds- + +mMMMMMMMMMMMMMMMMMMMMMMMMd+ + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ + `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` + .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` + dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh ++MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ +mMMMMMMMMd+:.` `mMMMMMMMMMMMMd +MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM +mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd ++MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ + dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh + `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` + `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: + +dMMMMMMMMMMMMMMMMMMMMMMMMd/ + -odMMMMMMMMMMMMMMMMMMdo- + `:+ydmNMMMMNmhy+-` +EOF + ;; -old_options() { - [[ -n "$osx_buildversion" ]] && \ - err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." - [[ -n "$osx_codename" ]] && \ - err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." - [[ "$cpu_cores" == "on" ]] && \ - err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." - [[ -n "$image" ]] && \ - { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } + "Nitrux"*) + set_colors 4 + read -rd '' ascii_data <<'EOF' +${c1}`:/. +`/yo +`/yo +`/yo .+:. +`/yo .sys+:.` +`/yo `-/sys+:.` +`/yo ./sss+:.` +`/yo .:oss+:-` +`/yo ./o///:-` +`/yo `.-:///////:` +`/yo `.://///++//-`` +`/yo `.-:////++++/-` +`/yo `-://///++o+/-` +`/yo `-/+o+++ooo+/-` +`/s+:+oooossso/.` +`//+sssssso:. +`+syyyy+:` +:+s+- +EOF + ;; - # All progress_ variables were changed to bar_. - [[ -n "$progress_char" ]] && \ - err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." - [[ -n "$progress_border" ]] && \ - { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ - bar_border="$progress_border"; } - [[ -n "$progress_length" ]] && \ - { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ - bar_length="$progress_length"; } - [[ -n "$progress_color_elapsed" ]] && \ - { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ - bar_color_elapsed="$progress_color_elapsed"; } - [[ -n "$progress_color_total" ]] && \ - { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ - bar_color_total="$progress_color_total"; } + "nixos_small") + set_colors 4 6 + read -rd '' ascii_data <<'EOF' + ${c1}\\\\ \\\\ // + ==\\\\__\\\\/ // + // \\\\// +==// //== + //\\\\___// +// /\\\\ \\\\== + // \\\\ \\\\ +EOF + ;; - # All cpufreq values were changed in 3.0. - [[ "$speed_type" == "current" ]] && \ - err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." - [[ "$speed_type" == "min" ]] && \ - err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." - [[ "$speed_type" == "max" ]] && \ - err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." - [[ "$speed_type" == "bios" ]] && \ - err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." + "NixOS"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' +${c1} ::::. ${c2}'::::: ::::' +${c1} '::::: ${c2}':::::. ::::' +${c1} ::::: ${c2}'::::.::::: +${c1} .......:::::..... ${c2}:::::::: +${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. + ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' +${c2} ..... ::::' ${c1}:::::' +${c2} ::::: '::' ${c1}:::::' +${c2} ........::::: ' ${c1}:::::::::::. +${c2}::::::::::::: ${c1}::::::::::::: +${c2} ::::::::::: ${c1}.. ${c1}::::: +${c2} .::::: ${c1}.::: ${c1}::::: +${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... + ::::: ${c1}':::::. ${c2}......:::::::::::::' + ::: ${c1}::::::. ${c2}':::::::::::::::::' +${c1} .:::::::: ${c2}':::::::::: +${c1} .::::''::::. ${c2}'::::. +${c1} .::::' ::::. ${c2}'::::. +${c1} .:::: :::: ${c2}'::::. +EOF + ;; - # Ascii_logo_size was removed in 3.0. - [[ "$ascii_logo_size" ]] && \ - err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." + "Nurunner"*) + set_colors 4 + read -rd '' ascii_data <<'EOF' +${c1} ,xc + ;00cxXl + ;K0, .xNo. + :KO' .lXx. + cXk. ;xl cXk. + cXk. ;k:.,xo. cXk. + .lXx. :x::0MNl,dd. :KO, + .xNx. cx;:KMMMMMNo'dx. ;KK; + .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: +;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO + 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: + .kNo .xo'xWMMMMMM0;:O: ;KK; + .dXd. .do,oNMMO;ck: ;00, + oNd. .dx,;'cO; ;K0, + oNx. okk; ;K0, + lXx. :KO' + cKk' cXk. + ;00:lXx. + ,kd. +EOF + ;; - # $start and $end were replaced with ${block_range[@]} in 3.0. - [[ "$start" && "$end" ]] && \ - { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ - block_range=("$start" "$end"); } + "NuTyX"*) + set_colors 4 1 + read -rd '' ascii_data <<'EOF' +${c1} . + . + ... + ... + .... .........--. + ..-++-----....--++++++---. + .-++++++-. .-++++++++++++-----.. + .--... .++..-+++--.....-++++++++++--.. + . .-+-. .**- .... ..-+----.. + .+++. .*+. + -++-----. + .+++++- ++. .*+. .....-+++-----. + -+++-++. .+. .-+***++***++--++++. . + -+-. -- -. -*- ...... ..--. +.-. .+- . -+. +. .+- +. + -- -- + -+----. .- + -++-.+. . + .++. -- + +. ----. + . .+. .. + - . + . +EOF + ;; - # Fahrenheit support was added to CPU so the options were changed. - [[ "$cpu_temp" == "on" ]] && \ - { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; - cpu_temp="C"; } + "OBRevenge"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} __ __ + _@@@@ @@@g_ + _@@@@@@ @@@@@@ + _@@@@@@M W@@@@@@_ + j@@@@P ^W@@@@ + @@@@L____ _____Q@@@@ +Q@@@@@@@@@@j@@@@@@@@@@ +@@@@@ T@j@ T@@@@@ +@@@@@ ___Q@J@ _@@@@@ +@@@@@fMMM@@j@jggg@@@@@@ +@@@@@ j@j@^MW@P @@@@ +Q@@@@@ggg@@f@ @@@@@@L +^@@@@WWMMP ^ Q@@@@ + @@@@@_ _@@@@l + W@@@@@g_____g@@@@@P + @@@@@@@@@@@@@@@@l + ^W@@@@@@@@@@@P + ^TMMMMTll +EOF + ;; - # Birthday was renamed to Install Date in 3.0 - [[ -n "$birthday_time" ]] && \ - { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ - install_time="$birthday_time"; } + "openbsd_small") + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1} _____ + \\- -/ + \\_/ \\ + | ${c2}O O${c1} | + |_ < ) 3 ) + / \\ / + /-_____-\\ +EOF + ;; - # Scrot dir was removed in 3.1.0. - [[ -n "$scrot_dir" ]] && scrot_dir= + "OpenBSD"*) + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' + ${c3} _ + (_) +${c1} | . +${c1} . |L /| . ${c3} _ +${c1} _ . |\ _| \--+._/| . ${c3}(_) +${c1} / ||\| Y J ) / |/| ./ + J |)'( | ` F`.'/ ${c3} _ +${c1} -<| F __ .-< ${c3}(_) +${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ + J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ +${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) +${c1} '-F -<_. \\ .-' `-' L__ +__J _ _. >-' ${c1})${c4}._. ${c1}|-' +${c1} `-|.' /_. ${c4}\_| ${c1} F + /.- . _.< + /' /.' .' `\\ + /L /' |/ _.-'-\\ + /'J ___.---'\| + |\ .--' V | `. ` + |/`. `-. `._) + / .-.\\ + \\ ( `\\ + `.\ +EOF + ;; - # cpu_shorthand was deprecated in 3.3.0 - [[ -n "$cpu_shorthand" ]] && \ - { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and - \$cpu_speed instead."; } -} + "OpenIndiana"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} .sy/ + .yh+ -cache_uname() { - # Cache the output of uname so we don't - # have to spawn it multiple times. - IFS=" " read -ra uname <<< "$(uname -sr)" + ${c1}-+syyyo+- ${c2} /+. + ${c1}+ddo/---/sdh/ ${c2} ym- + ${c1}`hm+ `sms${c2} ym-```````.-. + ${c1}sm+ sm/ ${c2} ym- +s + ${c1}hm. /mo ${c2} ym- /h + ${c1}omo ym: ${c2} ym- `os` + ${c1}smo` .ym+ ${c2} ym- .os- + `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. + ..` ${c1}`:+oo+/-` ${c2} -//oyo- + -:` .:oys/. ++- `./oyys/. +h+` `.-:+oyyyo/-` +`/ossssysso+/-.` +EOF + ;; - kernel_name="${uname[0]}" - kernel_version="${uname[1]}" -} + "OpenMandriva"*) + set_colors 4 3 + read -rd '' ascii_data <<'EOF' +${c2} `` + `-. +${c1} ` ${c2}.--- +${c1} -/ ${c2}-::--` +${c1} `++ ${c2}`----...```-:::::. +${c1} `os. ${c2}.::::::::::::::-``` ` ` +${c1} +s+ ${c2}.::::::::::::::::---...--` +${c1}-ss: ${c2}`-::::::::::::::::-.``.`` +${c1}/ss- ${c2}.::::::::::::-.`` ` +${c1}+ss: ${c2}.::::::::::::- +${c1}/sso ${c2}.::::::-::::::- +${c1}.sss/ ${c2}-:::-.` .::::: +${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: +${c1} -ossso+/:://+/-` ${c2}.:` +${c1} -/+ooo+/-. ${c2}` +EOF + ;; -convert_time() { - # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. - year="$1" - day="${3#0}" + "OpenWrt"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} _______ +| |.-----.-----.-----. +| - || _ | -__| | +|_______|| __|_____|__|__| + |__| + ________ __ +| | | |.----.| |_ +| | | || _|| _| +|________||__| |____| +EOF + ;; - # Split time into hours/minutes. - hour="${4/:*}" - min="${4/${hour}}" + "Open Source Media Center"* | "osmc") + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} -+shdmNNNNmdhs+- + .+hMNho/:..``..:/ohNMh+. + :hMdo. .odMh: + -dMy- -yMd- + sMd- -dMs + hMy +. .+ yMh + yMy dMs. .sMd yMy +:Mm dMNMs` `sMNMd `mM: +yM+ dM//mNs``sNm//Md +My +mM- dM: +NNNN+ :Md -Mm +mM- dM: `oNN+ :Md -Mm +yM+ dM/+NNo` :Md +My +:Mm` dMMNs` :Md `mM: + yMy dMs` -ms yMy + hMy +. yMh + sMd- -dMs + -dMy- -yMd- + :hMdo. .odMh: + .+hMNho/:..``..:/ohNMh+. + -+shdmNNNNmdhs+- +EOF + ;; - # Get month. (Month code is used for day of week) - # Due to different versions of 'ls', the month can be 1, 01 or Jan. - case "$2" in - 1 | 01 | "Jan") month="Jan"; month_code=0 ;; - 2 | 02 | "Feb") month="Feb"; month_code=3 ;; - 3 | 03 | "Mar") month="Mar"; month_code=3 ;; - 4 | 04 | "Apr") month="Apr"; month_code=6 ;; - 5 | 05 | "May") month="May"; month_code=1 ;; - 6 | 06 | "Jun") month="Jun"; month_code=4 ;; - 7 | 07 | "Jul") month="Jul"; month_code=6 ;; - 8 | 08 | "Aug") month="Aug"; month_code=2 ;; - 9 | 09 | "Sep") month="Sep"; month_code=5 ;; - 10 | "Oct") month="Oct"; month_code=0 ;; - 11 | "Nov") month="Nov"; month_code=3 ;; - 12 | "Dec") month="Dec"; month_code=5 ;; - esac + "Oracle"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} + `-/+++++++++++++++++/-.` + `/syyyyyyyyyyyyyyyyyyyyyyys/. + :yyyyo/-...............-/oyyyy/ + /yyys- .oyyy+ +.yyyy` `syyy- +:yyyo /yyy/ +.yyyy` `syyy- + /yyys. .oyyyo + /yyyyo:-...............-:oyyyy/` + `/syyyyyyyyyyyyyyyyyyyyyyys+. + `.:/+ooooooooooooooo+/:.` +EOF + ;; - # Get leap year. - # Source: http://stackoverflow.com/questions/725098/leap-year-calculation - [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ - [[ "$month" =~ (Jan|Feb) ]] && \ - leap_code=1 + "PacBSD"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} :+sMs. + `:ddNMd- -o--` + -sMMMMh: `+N+`` + yMMMMMs` .....-/-... `mNh/ + yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm + yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm + :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd + +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- + :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. + .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- + /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` +.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- +:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` +/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. +:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` +:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` + sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. + :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// + /dMMMMMMMMMMMMMs- ````````..`` + .oMMMMMMMMMMMMNs` ./y:` + +dNMMNMMMMMMMmy` ``./ys. + `/hMMMMMMMMMMMNo-`` `.+yy+-` + `-/hmNMNMMMMMMmmddddhhy/-` + `-+oooyMMMdsoo+/:. +EOF + ;; - # Calculate day of week. - # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html - year_code="$((${year/??} + (${year/??} / 4) % 7))" - week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" + "Parabola"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} `.-. `. + `.` `:++. `-+o+. + `` `:+/. `:+/. `-+oooo+ + ``-::-.:+/. `:+/. `-+oooooo+ + `.-:///- ..` .-. `-+oooooooo- + `..-..` `+ooooooooo: +`` :oooooooo/ + `ooooooo: + `oooooo: + -oooo+. + +ooo/` + -ooo- + `+o/. + /+- + //` + -. +EOF + ;; - case "$week_day" in - 0) week_day="Sun" ;; - 1) week_day="Mon" ;; - 2) week_day="Tue" ;; - 3) week_day="Wed" ;; - 4) week_day="Thu" ;; - 5) week_day="Fri" ;; - 6) week_day="Sat" ;; - esac + "Pardus"*) + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. +/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ +mN. oMdyy- -y `-dMo .Nm +.mN+` sMy hN+ -: yMs `+Nm. + `yMMddMs.dy `+` sMddMMy` + +MMMo .` . oMMM+ + `NM/ `````.` `.````` +MN` + yM+ `.-:yhomy ymohy:-.` +My + yM: yo oy :My + +Ms .N` `N. +h sM+ + `MN - -::::::- : :o:+`NM` + yM/ sh -dMMMMd- ho +y+My + .dNhsohMh-//: /mm/ ://-yMyoshNd` + `-ommNMm+:/. oo ./:+mMNmmo:` + `/o+.-somNh- :yy: -hNmos-.+o/` + ./` .s/`s+sMdd+``+ddMs+s`/s. `/. + : -y. -hNmddmNy. .y- : + -+ `..` +- +EOF + ;; - # Convert 24 hour time to 12 hour time + AM/PM. - case "$install_time_format" in - "12h") - case "$hour" in - [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; - *) time="$((hour - 12))${min} PM" ;; - esac + "Parrot"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} `:oho/-` +`mMMMMMMMMMMMNmmdhy- + dMMMMMMMMMMMMMMMMMMs` + +MMsohNMMMMMMMMMMMMMm/ + .My .+dMMMMMMMMMMMMMh. + + :NMMMMMMMMMMMMNo + `yMMMMMMMMMMMMMm: + /NMMMMMMMMMMMMMy` + .hMMMMMMMMMMMMMN+ + ``-NMMMMMMMMMd- + /MMMMMMMMMMMs` + mMMMMMMMsyNMN/ + +MMMMMMMo :sNh. + `NMMMMMMm -o/ + oMMMMMMM. + `NMMMMMM+ + +MMd/NMh + mMm -mN` + /MM `h: + dM` . + :M- + d: + -+ + - +EOF ;; - *) time="$4" ;; - esac - # Toggle showing the time. - [[ "$install_time" == "off" ]] && unset time + "Parsix"*) + set_colors 3 1 7 8 + read -rd '' ascii_data <<'EOF' + ${c2}-/+/:. + ${c2}.syssssys. + ${c1}.--. ${c2}ssssssssso${c1} ..--. + :++++++: ${c2}+ssssssss+${c1} ./++/+++: + /+++++++++.${c2}.yssooooy`${c1}-+///////o- + /++++++++++.${c2}+soooos:${c1}:+////////+- + :+++++////o-${c2}oooooo-${c1}+/////////- + `-/++//++-${c4}.-----.-${c1}:+/////:- + ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. +${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- +${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ +${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- + `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` + ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. + ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: + ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ + ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: + ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- + ${c1}`--` ${c2}+sssssssso ${c1}`--` + ${c2}+sssssy+` + ${c2}`.::-` +EOF + ;; - # Print the install date. - printf "%s" "$week_day $day $month $year $time" -} + "PCBSD"* | "TrueOS"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} .. + s. + +y + yN + -MN `. + :NMs `m + .yMMm` `No + `-/+++sdMMMNs+-`+Ms + `:oo+-` .yMMMMy` `-+oNMh + -oo- +NMMMM/ oMMh- + .s+` ` oMMMMM/ - oMMMhy. + +s`- :: :MMMMMd -o `mMMMy`s+ + y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y + s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s +-h .NM` `hMMMMMMMMMMMMMMNMMNy: h- +y- hMN` hMMmMMMMMMMMMNsdMNs. -y +m` mMMy` oMMNoNMMMMMMo` sMMMo `m +m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m +h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h +:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: + y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y + `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` + so -NMMMN /mmd+ `dMMMMMMMm- os + :y: `yMMM` `+NMMMMMMNo`:y: + /s+`.omy /NMMMMMNh/.+s: + .+oo:-. /mdhs+::oo+. + -/o+++++++++++/- +EOF + ;; -get_ppid() { - # Get parent process ID of PID. - case "$os" in - "Windows") - ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" - ppid="${ppid/'PPID'}" + "PCLinuxOS"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' + ${c1}mhhhyyyyhhhdN + dyssyhhhhhhhhhhhssyhN + Nysyhhyo/:-.....-/oyhhhssd + Nsshhy+. `/shhysm + dohhy/ -shhsy + dohhs` /hhys +N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy +ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ ++hho ${c2}ymm- /mmy+mms ${c1}:hhod +/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh ++hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m +yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ + ohhy` ${c2}://` -/+++/- ${c1}ohhom + N+hhy- `shhoh + sshho. `+hhyom + dsyhhs/. `:ohhhoy + dysyhhhso///://+syhhhssh + dhyssyhhhhhhyssyyhN + mddhdhdmN +EOF ;; - "Linux") - ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" - ppid="$(trim "${ppid/PPid:}")" + "Peppermint"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} 8ZZZZZZ${c2}MMMMM +${c1} .ZZZZZZZZZ${c2}MMMMMMM. +${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ +${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM +${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. +${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI +${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM +${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM +${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM +${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM +${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM +${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M +${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 +${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 +${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 +${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z +${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM +${c1} NZZZZZZZZZZZ${c2}MMMMM +${c1} ZZZZZZZZZ${c2}MM) +EOF ;; - *) - ppid="$(ps -p "${1:-$PPID}" -o ppid=)" + "Pop!_OS"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} ///////////// + ///////////////////// + ///////${c2}*767${c1}//////////////// + //////${c2}7676767676*${c1}////////////// + /////${c2}76767${c1}//${c2}7676767${c1}////////////// + /////${c2}767676${c1}///${c2}*76767${c1}/////////////// + ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// +/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// +//////////${c2}76767676767${c1}////${c2}76767${c1}///////// +///////////${c2}76767676${c1}//////${c2}7676${c1}////////// +////////////,${c2}7676${c1},///////${c2}767${c1}/////////// +/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// +///////////////${c2}7676${c1}//////////////////// + ///////////////${c2}7676${c1}///${c2}767${c1}//////////// + //////////////////////${c2}'${c1}//////////// + //////${c2}.7676767676767676767,${c1}////// + /////${c2}767676767676767676767${c1}///// + /////////////////////////// + ///////////////////// + ///////////// +EOF ;; - esac - - printf "%s" "$ppid" -} -get_process_name() { - # Get PID name. - case "$os" in - "Windows") - name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" - name="${name/'COMMAND'}" - name="${name/*\/}" + "Porteus"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} `.-:::-.` + -+ydmNNNNNNNmdy+- + .+dNmdhs+//////+shdmdo. + .smmy+-` ./sdy: + `omdo. `.-/+osssso+/-` `+dy. + `yms. `:shmNmdhsoo++osyyo-``oh. + hm/ .odNmds/.` ``.....:::-+s +/m: `+dNmy:` `./oyhhhhyyooo++so +ys `yNmy- .+hmmho:-.` ``` +s: yNm+` .smNd+. +`` /Nm: +dNd+` + yN+ `smNy. + dm oNNy` + hy -mNm. + +y oNNo + `y` sNN: + `: +NN: + ` .mNo + /mm` + /my` + .sy` + .+: + ` +EOF ;; - "Linux") - name="$(< "/proc/${1:-$PPID}/comm")" + "PostMarketOS"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} ss + `hMMh` + .dMMMMd. + -NMMMMMMN- + /MMMMMMMMMN/ + hMMMMMMMMMMMo + y+`mMMmdNMMMMMMy + `dMM-.-:- .mMMMMMMh` + .mMMMMMMd` `dMMMMMMm. + :NMMMMMMy yMMMMMMN: + /MMMMMMMo oMMMmdmN/ + oMMMMMMM/ /MN.-/:-. + `yMMMMMMN- -:.NMMMMy` + `dMMMMMMM- -/////////////dMMMMMMd` + -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- + :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: ++MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ +EOF ;; - *) - name="$(ps -p "${1:-$PPID}" -o comm=)" + "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} `-/osyyyysosyhhhhhyys+- + -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ + yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy +.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ +-NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ +.Nm+shddyooo+/smNNNNmmmmNh. :mmd. + NNNNy:` ./hmmmmmmmNNNN: hNMh + NMN- -++- +NNNNNNNNNNm+..-sMMMM- +.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ +.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ + mMM+ .. `sNN+. hMMMMhhMMM- + +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy + yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` + sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` + :mMMMMMMMMMMMmddNMMMMMMMMmh/ + /dMMMMMMMMMMMMMMMMMMNdy/` + .+hNMMMMMMMMMNmdhs/. + .:/+ooo+/:-. +EOF ;; - esac - - printf "%s" "$name" -} - -decode_url() { - decode="${1//+/ }" - printf "%b" "${decode//%/\\x}" -} - -# FINISH UP - -usage() { printf "%s" "\ -Usage: neofetch --option \"value\" --option \"value\" - -Neofetch is a CLI system information tool written in BASH. Neofetch -displays information about your system next to an image, your OS logo, -or any ASCII file of your choice. - -NOTE: Every launch flag has a config option. - -Options: - -INFO: - --disable infoname Allows you to disable an info line from appearing - in the output. - - NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - - --os_arch on/off Hide/Show OS architecture. - --speed_type type Change the type of cpu speed to display. - Possible values: current, min, max, bios, - scaling_current, scaling_min, scaling_max - - NOTE: This only supports Linux with cpufreq. - - --speed_shorthand on/off Whether or not to show decimals in CPU speed. - - NOTE: This flag is not supported in systems with CPU speed less than - 1 GHz. - - --cpu_brand on/off Enable/Disable CPU brand in output. - --cpu_cores type Whether or not to display the number of CPU cores - Possible values: logical, physical, off - - NOTE: 'physical' doesn't work on BSD. - - --cpu_speed on/off Hide/Show cpu speed. - --cpu_temp C/F/off Hide/Show cpu temperature. - - NOTE: This only works on Linux and BSD. - - NOTE: For FreeBSD and NetBSD-based systems, you need to enable - coretemp kernel module. This only supports newer Intel processors. - - --distro_shorthand on/off Shorten the output of distro (tiny, on, off) - - NOTE: This option won't work in Windows (Cygwin) - - --kernel_shorthand on/off Shorten the output of kernel - - NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) - - --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) - --refresh_rate on/off Whether to display the refresh rate of each monitor - Unsupported on Windows - --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) - --gpu_type type Which GPU to display. (all, dedicated, integrated) - - NOTE: This only supports Linux. - - --gtk_shorthand on/off Shorten output of gtk theme/icons - --gtk2 on/off Enable/Disable gtk2 theme/font/icons output - --gtk3 on/off Enable/Disable gtk3 theme/font/icons output - --shell_path on/off Enable/Disable showing \$SHELL path - --shell_version on/off Enable/Disable showing \$SHELL version - --disk_show value Which disks to display. - Possible values: '/', '/dev/sdXX', '/path/to/mount point' - - NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') - - --disk_subtitle type What information to append to the Disk subtitle. - Takes: name, mount, dir - - 'name' shows the disk's name (sda1, sda2, etc) - - 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) - - 'dir' shows the basename of the disks's path. (/, Local Disk, etc) - - --ip_host url URL to query for public IP - --song_shorthand on/off Print the Artist/Title on separate lines - --music_player player-name Manually specify a player to use. - Available values are listed in the config file - --install_time on/off Enable/Disable showing the time in Install Date output. - --install_time_format 12h/24h - Set time format in Install Date to be 12 hour or 24 hour. - -TEXT FORMATTING: - --colors x x x x x x Changes the text colors in this order: - title, @, underline, subtitle, colon, info - --underline on/off Enable/Disable the underline. - --underline_char char Character to use when underlining title - --bold on/off Enable/Disable bold text -COLOR BLOCKS: - --color_blocks on/off Enable/Disable the color blocks - --block_width num Width of color blocks in spaces - --block_height num Height of color blocks in lines - --block_range num num Range of colors to print as blocks + "Qubes"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} `..--..` + `.----------.` + `..----------------..` + `.------------------------.`` + `..-------------....-------------..` +.::----------..`` ``..----------:+: +:////:----..` `..---:/ossso +:///////:` `/osssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:////////-` .:sssssssso +:///////////-.` `-/osssssssssso +`//////////////:-```.:+ssssssssssssso- + .-://////////////sssssssssssssso/-` + `.:///////////sssssssssssssso:. + .-:///////ssssssssssssssssss/` + `.:////ssss+/+ssssssssssss. + `--//- `-/osssso/. +EOF + ;; -BARS: - --bar_char 'elapsed char' 'total char' - Characters to use when drawing bars. - --bar_border on/off Whether or not to surround the bar with '[]' - --bar_length num Length in spaces to make the bars. - --bar_colors num num Colors to make the bar. - Set in this order: elapsed, total - --cpu_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --memory_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --battery_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --disk_display mode Bar mode. - Possible values: bar, infobar, barinfo, off + "Raspbian"*) + set_colors 2 1 + read -rd '' ascii_data <<'EOF' +${c1} `.::///+:/-. --///+//-:`` + `+oooooooooooo: `+oooooooooooo: + /oooo++//ooooo: ooooo+//+ooooo. + `+ooooooo:-:oo- +o+::/ooooooo: + `:oooooooo+`` `.oooooooo+- + `:++ooo/. :+ooo+/.` + ${c2}...` `.----.` ``.. + .::::-``:::::::::.`-:::-` + -:::-` .:::::::-` `-:::- + `::. `.--.` `` `.---.``.::` + .::::::::` -::::::::` ` + .::` .:::::::::- `::::::::::``::. +-:::` ::::::::::. ::::::::::.`:::- +:::: -::::::::. `-:::::::: :::: +-::- .-:::-.``....``.-::-. -::- + .. `` .::::::::. `..`.. + -:::-` -::::::::::` .:::::` + :::::::` -::::::::::` :::::::. + .::::::: -::::::::. :::::::: + `-:::::` ..--.` ::::::. + `...` `...--..` `...` + .:::::::::: + `.-::::-` +EOF + ;; -IMAGE BACKEND: - --backend backend Which image backend to use. - Possible values: 'ascii', 'caca', 'catimg', '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/' - --ascii source Shortcut to use 'ascii' backend. - --caca source Shortcut to use 'caca' backend. - --catimg source Shortcut to use 'catimg' backend. - --iterm2 source Shortcut to use 'iterm2' backend. - --jp2a source Shortcut to use 'jp2a' backend. - --kitty source Shortcut to use 'kitty' backend. - --pixterm source Shortcut to use 'pixterm' backend. - --sixel source Shortcut to use 'sixel' backend. - --termpix source Shortcut to use 'termpix' backend. - --tycat source Shortcut to use 'tycat' backend. - --w3m source Shortcut to use 'w3m' backend. - --off Shortcut to use 'off' backend. + "Red Star"* | "Redstar"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} .. + .oK0l + :0KKKKd. + .xKO0KKKKd + ,Od' .d0000l + .c;. .'''... ..'. +.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: +;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. + .okkkkd,.lko .......',;:cllc:;,,'''''. + .cdo. :xd' cd:. ..';'',,,'',,;;;,'. + . .ddl.;doooc'..;oc;'..';::;,'. + coo;.oooolllllllcccc:'. . + .ool''lllllccccccc:::::;. + ;lll. .':cccc:::::::;;;;' + :lcc:'',..';::::;;;;;;;,,. + :cccc::::;...';;;;;,,,,,,. + ,::::::;;;,'. ..',,,,'''. + ........ ...... +EOF + ;; - NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' + "Redhat"* | "Red Hat"* | "rhel"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} `.-..........` + `////////::.`-/. + -: ....-////////. + //:-::///////////` + `--::: `-://////////////: + //////- ``.-:///////// .` + `://////:-.` :///////::///:` + .-/////////:---/////////////: + .-://////////////////////. +${c2} yMN+`.-${c1}::///////////////-` +${c2} .-`:NMMNMs` `..-------..` + MN+/mMMMMMhoooyysshsss +MMM MMMMMMMMMMMMMMyyddMMM+ + MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM + MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM + MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM +EOF + ;; -ASCII: - --ascii_colors x x x x x x Colors to print the ascii art - --ascii_distro distro Which Distro's ascii art to print + "Refracted Devuan"*) + set_colors 8 7 + read -rd '' ascii_data <<'EOF' +${c2} A + VW + VVW\\ + .yWWW\\ + ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ + *WWWWWWWWWWWWWWWW/ $VWWWWw , + ^*%WWWWWWVWWX $WWWW** ,yy + , "**WWW/' **' ,yy/WWW*` + &WWWWwy `*` <,ywWW%VWWW* + yWWWWWWWWWW* ., "**WW%W + ,&WWWWWM*"` ,y/ &WWWww ^* + XWWX*^ ,yWWWW09 .WWWWWWWWwy, + *` &WWWWWM WWWWWWWWWWWWWww, + (WWWWW` /#####WWW*********** + ^WWWW + VWW + Wh. + V/ +EOF + ;; - NOTE: Arch and Ubuntu have 'old' logo variants. + "Rosa"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ROSAROSAROSAROSAR + ROSA AROS + ROS SAROSAROSAROSAR AROS + RO ROSAROSAROSAROSAROSAR RO + ARO AROSAROSAROSARO AROS ROS + ARO ROSAROS OSAR ROSA ROS + RO AROSA ROSAROSAROSA ROSAR RO +RO ROSAR ROSAROSAROSAR R ROSARO RO +RO ROSA AROSAROSAROSA AR ROSARO AR +RO AROS ROSAROSAROSA ROS AROSARO AR +RO AROS ROSAROSARO ROSARO ROSARO AR +RO ROS AROSAROS ROSAROSA AROSAR AR +RO ROSA ROS ROSAROSAR ROSARO RO + RO ROS AROSAROSAROSA ROSARO AR + ARO ROSA ROSAROSAROS AROSAR ARO + ARO OROSA R ROSAROS ROS + RO AROSAROS AROSAROSAR RO + AROS AROSAROSAROSARO AROS + ROSA SARO + ROSAROSAROSAROSAR +EOF + ;; - NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. + "sabotage"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} .|'''.| | '||''|. ..|''|| + ||.. ' ||| || || .|' || + ''|||. | || ||'''|. || || +. '|| .''''|. || || '|. || +|'....|' .|. .||. .||...|' ''|...|' - NOTE: Ubuntu has flavor variants. +|''||''| | ..|'''.| '||''''| + || ||| .|' ' || . + || | || || .... ||''| + || .''''|. '|. || || + .||. .|. .||. ''|...'| .||.....| +EOF + ;; - NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. + "Sabayon"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ........... + .. .. + .. .. + .. ${c2}o ${c1}.. + .. ${c2}:W' ${c1}.. + .. ${c2}.d. ${c1}.. +:. ${c2}.KNO ${c1}.: +:. ${c2}cNNN. ${c1}.: +: ${c2}dXXX, ${c1}: +: ${c2}. dXXX, .cd, ${c1}: +: ${c2}'kc .. dKKK. ,ll;:' ${c1}: +: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: +:. ${c2}.,cdddddddddddddo:. ${c1}.: + .. ${c2}:lllllll: ${c1}.. + .. ${c2}',,,,, ${c1}.. + .. .. + .. .. + ............... +EOF + ;; - NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, - OpenBSD, and Void have a smaller logo variant. + "SailfishOS"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} .+eWWW + .+ee+++eee e. + .ee++eeeeeeee +e. + .e++ee++eeeeeee+eee+e+ + ee.e+.ee+eee++eeeeee+ + W.+e.e+.e++ee+eee + W.+e.W.ee.W++ee' + +e.W W.e+.W.W+ + W.e.+e.W W W. + e e e +e.W.W + .W W W. + W.+e.W. + W++e.ee+. + ++ +ee++eeeee++. + ' '+++e 'ee. + ee + ee + e +EOF + ;; - NOTE: Use '{distro name}_small' to use the small variants. + "SalentOS"*) + set_colors 2 1 3 7 + read -rd '' ascii_data <<'EOF' +${c1} ``..`` + .-:+oshdNMMMMMMNdhyo+:-.` + -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ +${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` +${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- +${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` +${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` +${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd +${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy +${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo +${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ +${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- +${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` +${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm +${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy +${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: +${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. +${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: +${c2} `:smMM${c4}yy${c3}MMNy/` + ${c2}.- ${c4}`${c3}:. +EOF + ;; - --ascii_bold on/off Whether or not to bold the ascii logo. - -L, --logo Hide the info text and only show the ascii logo. + "Scientific"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} =/;;/- + +: // + /; /; + -X H. +.//;;;:;;-, X= :+ .-;:=;:;#;. +M- ,=;;;#:, ,:#;;:=, ,@ +:# :#.=/++++/=.$= #= + ,#; #/:+/;,,/++:+/ ;+. + ,+/. ,;@+, ,#H;, ,/+, + ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; + ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. + ,;: :@#= =$H: .+#- + ,#= #;-///==///-// =#, +;+ :#-;;;:;;;;-X- +: +@- .-;;;;M- =M/;;;-. -X + :;;::;;-. #- :+ ,-;;-;:== + ,X H. + ;/ #= + // +; + '////' +EOF + ;; - Possible values: bar, infobar, barinfo, off + "Siduction"*) + set_colors 4 4 + read -rd '' ascii_data <<'EOF' +${c1} _aass, + jQh: =$w + QWmwawQW + )$QQQQ@( .. + _a_a. ~??^ syDY?Sa, + _mW>-<$c jWmi imm. + ]QQwayQE 4QQmgwmQQ` + ?WWQWP' -9QQQQQ@'._aas, + _a%is. .adYYs,. -"?!` aQB*~^3$c +_Qh;.nm .QWc. {QL ]QQp;..vmQ/ +"QQmmQ@ -QQQggmQP ]QQWmggmQQ( + -???" "$WQQQY` __, ?QQQQQQW! + _yZ!?q, - .yWY!!Sw, "???^ + .QQa_=qQ mQm>..vmm + $QQWQQP $QQQgmQQ@ + "???" _aa, -9WWQQWY` + _mB>~)$a -~~ + mQms_vmQ. + ]WQQQQQP + -?T??" +EOF + ;; -IMAGE: - --loop Redraw the image constantly until Ctrl+C is used. This fixes issues - in some terminals emulators when using image mode. - --size 00px | --size 00% How to size the image. - Possible values: auto, 00px, 00%, none - --crop_mode mode Which crop mode to use - Takes the values: normal, fit, fill - --crop_offset value Change the crop offset for normal mode. - Possible values: northwest, north, northeast, - west, center, east, southwest, south, southeast + "Slackware"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ::::::: + ::::::::::::::::::: + ::::::::::::::::::::::::: + ::::::::${c2}cllcccccllllllll${c1}:::::: + :::::::::${c2}lc dc${c1}::::::: + ::::::::${c2}cl clllccllll oc${c1}::::::::: + :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: + ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: + :::::::::::${c2}lc cclccclc${c1}::::::::::::: +::::::::::::::${c2}lcclcc lc${c1}:::::::::::: +::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: +::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: + :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: + :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: + ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: + :::${c2}oclcccccccccccccllllllllllllll${c1}::::: + ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: + :::::::::::::::::::::::::::::::: + :::::::::::::::::::::::::::: + :::::::::::::::::::::: + :::::::::::: +EOF + ;; - --xoffset px How close the image will be to the left edge of the - window. This only works with w3m. - --yoffset px How close the image will be to the top edge of the - window. This only works with w3m. - --bg_color color Background color to display behind transparent image. - This only works with w3m. - --gap num Gap between image and text. + "SliTaz"*) + set_colors 3 3 + read -rd '' ascii_data <<'EOF' +${c1} @ @( @ + @@ @@ @ @/ + @@ @@ @@ @@ + @@ %@@ @@ @@ + @@ %@@@ @@@@@. @@@@ @@ + @@@ @@@@ @@@@@@@ &@@@ @@@ + @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ + ,@@@@@@@@@@@@@@@@@@@@@@@@@ + .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ +@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ +@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ +@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. +@@ ,@@ @@@@@@@@@@@@@ @@@ @@ +@ @@. @@@@@@@@@@@@@ @@@ *@ +@ @@ @@@@@@@@@@@@ @@ @ + @ @@@@@@@@@. #@ + @ ,@@@@@ @ +EOF + ;; - NOTE: --gap can take a negative value which will move the text - closer to the left side. + "SmartOS"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyys oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyy syyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy yyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +EOF + ;; - --clean Delete cached files and thumbnails. + "Solus"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} -``````````` + `-+/------------.` + .---:mNo---------------. + .-----yMMMy:---------------. + `------oMMMMMm/----------------` + .------/MMMMMMMN+----------------. + .------/NMMMMMMMMm-+/--------------. +`------/NMMMMMMMMMN-:mh/-------------` +.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. +-----/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- +----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. +.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` +`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. +`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ + .------------:://+-/++++++${c1}oshddys: + -hhhhyyyyyyyyyyyhhhhddddhysssso- + `:ossssssyysssssssssssssssso:` + `:+ssssssssssssssssssss+- + `-/+ssssssssssso+/-` + `.-----..` +EOF + ;; -SCREENSHOT: - -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- - shot function will use \$scrot_dir and \$scrot_name. - -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. - --image_host imgur/teknik Website to upload scrots to. - --scrot_cmd cmd Screenshot program to launch + "Source Mage"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} :ymNMNho. +.+sdmNMMMMMMMMMMy` +.-::/yMMMMMMMMMMMm- + sMMMMMMMMMMMm/ + /NMMMMMMMMMMMMMm: + .MMMMMMMMMMMMMMMMM: + `MMMMMMMMMMMMMMMMMN. + NMMMMMMMMMMMMMMMMMd + mMMMMMMMMMMMMMMMMMMo + hhMMMMMMMMMMMMMMMMMM. + .`/MMMMMMMMMMMMMMMMMs + :mMMMMMMMMMMMMMMMN` + `sMMMMMMMMMMMMMMM+ + /NMMMMMMMMMMMMMN` + oMMMMMMMMMMMMM+ + ./sd.-hMMMMMMMMmmN` + ./+oyyyh- `MMMMMMMMMmNh + sMMMMMMMMMmmo + `NMMMMMMMMMd: + -dMMMMMMMMMo + -shmNMMms. +EOF + ;; -OTHER: - --config /path/to/config Specify a path to a custom config file - --config none Launch the script without a config file - --stdout Turn off all colors and disables any ASCII/image backend. - --help Print this text and exit - --version Show neofetch version - -v Display error messages. - -vv Display a verbose log for error reporting. + "Sparky"*) + set_colors 1 7 + read -rd '' ascii_data <<'EOF' +${c1} + . `-:-` + .o` .-///-` + `oo` .:/++:. + os+` -/+++:` ``.........``` + /ys+`./+++/-.-::::::----......`` + `syyo`++o+--::::-::/+++/-`` + -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` +::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` +`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` + -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- + .sdddy::syo--/:. `.:dy+-ohhho ./: + :yddds/:+oo+//:-`- /+ +hy+.shhy: `` + `:ydmmdysooooooo-.ss`/yss--oyyo + `./ossyyyyo+:-/oo:.osso- .oys + ``..-------::////.-oooo/ :so + `...----::::::::--.`/oooo: .o: + ``````` ++o+:` `:` + ./+/-` ` + `-:-. + `` +EOF + ;; -DEVELOPER: - --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) + "SteamOS"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} .,,,,. + .,'onNMMMMMNNnn',. + .'oNMANKMMMMMMMMMMMNNn'. + .'ANMMMMMMMXKNNWWWPFFWNNMNn. + ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, + ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, +,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, +'${c2}+#############, +. ,+' ${c1}+NMMM +${c2} '*#########*' '*,,*' ${c1}.+NMMMM. +${c2} `'*###*' ,.,;###${c1}+WNM, +${c2} .,;;, .;##########${c1}+W +${c2},',. '; ,+##############' + '###+. :,. .,; ,###############' + '####.. `'' .,###############' + '#####+++################' + '*##################*' + ''*##########*'' + '''''' +EOF + ;; + "SunOS" | "Solaris") + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. +EOF + ;; -Report bugs to https://github.com/dylanaraps/neofetch/issues + "openSUSE Tumbleweed"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c2} ...... + .,cdxxxoc,. .:kKMMMNWMMMNk:. + cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. + ;WMK;. .lKMMNM, :NMK, .OMW; + cMW; 'WMMMN ,XMK, oMM' +.MMc ..;l. xMN: KM0 +'MM. 'NMO oMM +.MM, .kMMl xMN + KM0 .kMM0. .dl:,.. .WMd + .XM0. ,OMMK, OMMMK. .XMK + oWMO:. .;xNMMk, NNNMKl. .xWMx + :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, + ..... .:dOOXXKOxl, +EOF + ;; -" -exit 1 -} + "openSUSE"* | "open SUSE"* | "SUSE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c2} .;ldkO0000Okdl;. + .;d00xl:^''''''^:ok00d;. + .d00l' 'o00d. + .d0Kd'${c1} Okxol:;,. ${c2}:O0d. + .OK${c1}KKK0kOKKKKKKKKKKOxo:, ${c2}lKO. + ,0K${c1}KKKKKKKKKKKKKKK0P^${c2},,,${c1}^dx:${c2} ;00, +.OK${c1}KKKKKKKKKKKKKKKk'${c2}.oOPPb.${c1}'0k.${c2} cKO. +:KK${c1}KKKKKKKKKKKKKKK: ${c2}kKx..dd ${c1}lKd${c2} 'OK: +dKK${c1}KKKKKKKKKOx0KKKd ${c2}^0KKKO' ${c1}kKKc${c2} dKd +dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd +:KK${c1}KKKKKKKKKK0o;...^cdxxOK0O/^^' ${c2}.0K: + kKK${c1}KKKKKKKKKKKKK0x;,,......,;od ${c2}lKk + '0K${c1}KKKKKKKKKKKKKKKKKKKK00KKOo^ ${c2}c00' + 'kK${c1}KKOxddxkOO00000Okxoc;'' ${c2}.dKk' + l0Ko. .c00l' + 'l0Kk:. .;xK0l' + 'lkK0xl:;,,,,;:ldO0kl' + '^:ldxkkkkxdl:^' +EOF + ;; -get_args() { - # Check the commandline flags early for '--config'. - [[ "$*" != *--config* ]] && get_user_config + "SwagArch"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} .;ldkOKXXNNNNXXK0Oxoc,. + ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; + 'K0xo ..,;:c:. `'lKMMMMM0 + .lONMMMMMM' `lNMk' +${c2} ;WMMMMMMMMMO. ${c1}....::... +${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, +${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. +${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. +${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: +${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. +${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: +${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. +${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. + :ccc:' `cccccccc:, + '' +EOF + ;; - while [[ "$1" ]]; do - case "$1" in - # Info - "--os_arch") os_arch="$2" ;; - "--cpu_cores") cpu_cores="$2" ;; - "--cpu_speed") cpu_speed="$2" ;; - "--speed_type") speed_type="$2" ;; - "--speed_shorthand") speed_shorthand="$2" ;; - "--distro_shorthand") distro_shorthand="$2" ;; - "--kernel_shorthand") kernel_shorthand="$2" ;; - "--uptime_shorthand") uptime_shorthand="$2" ;; - "--cpu_brand") cpu_brand="$2" ;; - "--gpu_brand") gpu_brand="$2" ;; - "--gpu_type") gpu_type="$2" ;; - "--refresh_rate") refresh_rate="$2" ;; - "--gtk_shorthand") gtk_shorthand="$2" ;; - "--gtk2") gtk2="$2" ;; - "--gtk3") gtk3="$2" ;; - "--shell_path") shell_path="$2" ;; - "--shell_version") shell_version="$2" ;; - "--ip_host") public_ip_host="$2" ;; - "--song_shorthand") song_shorthand="$2" ;; - "--music_player") music_player="$2" ;; - "--install_time") install_time="$2" ;; - "--install_time_format") install_time_format="$2" ;; - "--cpu_temp") - cpu_temp="$2" - [[ "$cpu_temp" == "on" ]] && cpu_temp="C" - ;; + "Tails"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} `` + ./yhNh +syy/Nshh `:o/ +N:dsNshh █ `ohNMMd +N-/+Nshh `yMMMMd +N-yhMshh yMMMMd +N-s:hshh █ yMMMMd so//. +N-oyNsyh yMMMMd d Mms. +N:hohhhd:. yMMMMd syMMM+ +Nsyh+-..+y+- yMMMMd :mMM+ ++hy- -ss/`yMMMM `+d+ + :sy/. ./yNMMMMm `` + .+ys- `:+hNMMMMMMy/` + `hNmmMMMMMMMMMMMMdo. + dMMMMMMMMMMMMMMMMMNh: + +hMMMMMMMMMMMMMMMMMmy. + -oNMMMMMMMMMMmy+.` + `:yNMMMds/.` + .//` +EOF + ;; - "--disk_subtitle") disk_subtitle="$2" ;; - "--disk_show") - unset disk_show - for arg in "$@"; do - case "$arg" in - "--disk_show") ;; - "-"*) break ;; - *) disk_show+=("$arg") ;; - esac - done - ;; + "Trisquel"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' +${c1} ▄▄▄▄▄▄ + ▄█████████▄ + ▄▄▄▄▄▄ ████▀ ▀████ + ▄██████████▄ ████▀ ▄▄ ▀███ + ▄███▀▀ ▀▀████ ███▄ ▄█ ███ +▄███ ▄▄▄ ████▄ ▀██████ ▄███ +███ █▀▀██▄ █████▄ ▀▀ ▄████ +▀███ ███ ███████▄▄ ▄▄██████ +${c1} ▀███▄ ▄███ █████████████${c2}████▀ +${c1} ▀█████████ ███████${c2}███▀▀▀ + ▀▀███▀▀ ██████▀▀ + ██████▀ ▄▄▄▄ + █████▀ ████████ + █████ ███▀ ▀███ + ████▄ ██▄▄▄ ███ + █████▄ ▀▀ ▄██ + ██████▄▄▄████ + ▀▀█████▀▀ +EOF + ;; - "--disable") - for func in "$@"; do - case "$func" in - "--disable") continue ;; - "-"*) break ;; - *) - ((bash_version >= 4)) && func="${func,,}" - unset -f "get_$func" - ;; - esac - done - ;; + "Ubuntu-Budgie"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} ./oydmMMMMMMmdyo/. + :smMMMMMMMMMMMhs+:++yhs: + `omMMMMMMMMMMMN+` `odo` + /NMMMMMMMMMMMMN- `sN/ + `hMMMMmhhmMMMMMMh sMh` + .mMmo- /yMMMMm` `MMm. + mN/ yMMMMMMMd- MMMm +oN- oMMMMMMMMMms+//+o+: :MMMMo +m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm +M` .NMMMMMMMMMMMMMMMNodMMMMMMM +M- sMMMMMMMMMMMMMMMMMMMMMMMMM +mm` mMMMMMMMMMNdhhdNMMMMMMMMMm +oMm/ .dMMMMMMMMh: :dMMMMMMMo + mMMNyo/:/sdMMMMMMMMM+ sMMMMMm + .mMMMMMMMMMMMMMMMMMs `NMMMm. + `hMMMMMMMMMMM.oo+. `MMMh` + /NMMMMMMMMMo sMN/ + `omMMMMMMMMy. :dmo` + :smMMMMMMMh+-` `.:ohs: + ./oydmMMMMMMdhyo/. +EOF + ;; - # Text Colors - "--colors") - unset colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) colors+=("$arg") ;; - esac - done - colors+=(7 7 7 7 7 7) - ;; + "Ubuntu-GNOME"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c3} ./o. + .oooooooo + .oooo```soooo + .oooo` `soooo + .ooo` ${c4}.o.${c3} `\/ooo. + :ooo ${c4}:oooo.${c3} `\/ooo. + sooo ${c4}`ooooo${c3} \/oooo + \/ooo ${c4}`soooo${c3} `ooooo + `soooo ${c4}`\/ooo${c3} `soooo +${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo +${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` +${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` +${c4} `ooooo ${c3}`` ${c4}.oooo +${c4} `soooo. .oooo` + `\/oooooooooo` + ``\/oo`` +EOF + ;; - # Text Formatting - "--underline") underline_enabled="$2" ;; - "--underline_char") underline_char="$2" ;; - "--bold") bold="$2" ;; + "Ubuntu-MATE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} `:+shmNNMMNNmhs+:` + .odMMMMMMMMMMMMMMMMMMdo. + /dMMMMMMMMMMMMMMMmMMMMMMMMd/ + :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: + `yMMMMMMMMMms:..-::oM: -omMMMMMy` + `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` + hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh +/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ +hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh +/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ + hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh + `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` + yMMMMMMMMMms/..-::oM: .+dMMMMMy + :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: + /dMMMMMMMMMMMMMMMdNMMMMMMMd/ + .odMMMMMMMMMMMMMMMMMMdo. + `:+shmNNMMNNmhs+:` +EOF + ;; - # Color Blocks - "--color_blocks") color_blocks="$2" ;; - "--block_range") block_range=("$2" "$3") ;; - "--block_width") block_width="$2" ;; - "--block_height") block_height="$2" ;; + "ubuntu_old") + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} ./+o+- +${c2} yyyyy- ${c1}-yyyyyy+ +${c2} ${c2}://+//////${c1}-yyyyyyo +${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` +${c3} .:++o: ${c2}/++++++++/:--:/- +${c3} o:+o+:++.${c2}`..```.-/oo+++++/ +${c3} .:+o:+o/.${c2} `+sssoo+/ +${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. +${c2}/+++//+:${c3}`oo+o${c2} /::--:. +${c2}+/+o+++${c3}`o++o${c1} ++////. +${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. +${c3} .+.o+oo:.${c1} `oddhhhh+ +${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ +${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: +${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` +${c1} /osyyyyyyo${c3}++ooo+++/ +${c1} ````` ${c3}+oo+++o: +${c3} `oo++. +EOF + ;; - # Bars - "--bar_char") - bar_char_elapsed="$2" - bar_char_total="$3" - ;; + "Ubuntu-Studio") + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} ..-::::::-.` + `.:+++++++++++${c2}ooo${c1}++:.` + ./+++++++++++++${c2}sMMMNdyo${c1}+/. + .++++++++++++++++${c2}oyhmMMMMms${c1}++. + `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` + `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` + +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` + :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: + ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. + ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ + :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: + +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ + `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` + `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ + ./+++++++++++++++${c2}oyhdNMMMms${c1}++. + ./+++++++++++++${c2}hMMMNdyo${c1}+/. + `.:+++++++++++${c2}sso${c1}++:. + ..-::::::-.. +EOF + ;; - "--bar_border") bar_border="$2" ;; - "--bar_length") bar_length="$2" ;; - "--bar_colors") - bar_color_elapsed="$2" - bar_color_total="$3" - ;; + "Ubuntu"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} .-/+oossssoo+/-. + `:+ssssssssssssssssss+:` + -+ssssssssssssssssssyyssss+- + .ossssssssssssssssss${c2}dMMMNy${c1}sssso. + /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ + +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ +.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. ++ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ +oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso +oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso ++ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ +.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ + +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ + /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ + .ossssssssssssssssss${c2}dMMMNy${c1}sssso. + -+sssssssssssssssss${c2}yyy${c1}ssss+- + `:+ssssssssssssssssss+:` + .-/+oossssoo+/-. +EOF + ;; - "--cpu_display") cpu_display="$2" ;; - "--memory_display") memory_display="$2" ;; - "--battery_display") battery_display="$2" ;; - "--disk_display") disk_display="$2" ;; + "void_small") + set_colors 2 8 + read -rd '' ascii_data <<'EOF' +${c1} _______ + _ \______ - +| \ ___ \ | +| | / \ | | +| | \___/ | | +| \______ \_| + -_______\ +EOF + ;; - # Image backend - "--backend") image_backend="$2" ;; - "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ - "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") - image_backend="${1/--}" - case "$2" in - "-"* | "") ;; - *) image_source="$2" ;; - esac - ;; + "Void"*) + set_colors 2 8 + read -rd '' ascii_data <<'EOF' +${c1} __.;=====;.__ + _.=+==++=++=+=+===;. + -=+++=+===+=+=+++++=_ + . -=:`` `--==+=++==. + _vi, ` --+=++++: + .uvnvi. _._ -==+==+. + .vvnvnI` .;==|==;. :|=||=|. +${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL +${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE +${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' +${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! +${c1} -1vvnvv. `~+++` ++|+++ + +vnvnnv, `-|=== + +vnvnvns. . :=- + -Invnvvnsi..___..=sv=. ` + +Invnvnvnnnnnnnnvvnn;. + ~|Invnvnvvnvvvnnv}+` + -~|{*l}*|~ +EOF + ;; - # Image options - "--loop") image_loop="on" ;; - "--image_size" | "--size") image_size="$2" ;; - "--crop_mode") crop_mode="$2" ;; - "--crop_offset") crop_offset="$2" ;; - "--xoffset") xoffset="$2" ;; - "--yoffset") yoffset="$2" ;; - "--background_color" | "--bg_color") background_color="$2" ;; - "--gap") gap="$2" ;; - "--clean") - [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" - rm -rf "/Library/Caches/neofetch/" - rm -rf "/tmp/neofetch/" - exit - ;; + *"[Windows 10]"* | *"on Windows 10"* | "Windows 8"* |\ + "Windows 10"* | "windows10" | "windows8" ) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} .., + ....,,:;+ccllll + ...,,+:; cllllllllllllllllll +,cclllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll - "--ascii_colors") - unset ascii_colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) ascii_colors+=("$arg") - esac - done - ascii_colors+=(7 7 7 7 7 7) - ;; +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +`'ccllllllllll lllllllllllllllllll + `' \\*:: :ccllllllllllllllll + ````''*::cll + `` +EOF + ;; - "--ascii_distro") - image_backend="ascii" - ascii_distro="$2" - case "$2" in "-"* | "") ascii_distro="$distro" ;; esac - ;; + "Windows"*) + set_colors 1 2 4 3 + read -rd '' ascii_data <<'EOF' +${c1} ,.=:!!t3Z3z., + :tt:::tt333EE3 +${c1} Et:::ztt33EEEL${c2} @Ee., .., +${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# +${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL +${c1} it::::tt333EEF${c2} @EEEEEEttttt33F +${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. +${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF +${c3} ;::::::::zt33)${c2} "4EEEtttji3P* +${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. +${c3} i::::::::zt33F${c4} AEEEtttt::::ztF +${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 +${c3} E::::::::zt33L${c4} @EEEtttt::::z3F +${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` +${c3} `${c4} :EEEEtttt::::z7 + "VEzjt:;;z>*` +EOF + ;; + + "Xubuntu"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `-/osyhddddhyso/-` + .+yddddddddddddddddddy+. + :yddddddddddddddddddddddddy: + -yddddddddddddddddddddhdddddddy- + odddddddddddyshdddddddh`dddd+ydddo + `yddddddhshdd- ydddddd+`ddh.:dddddy` + sddddddy /d. :dddddd-:dy`-ddddddds +:ddddddds /+ .dddddd`yy`:ddddddddd: +sdddddddd` . .-:/+ssdyodddddddddds +ddddddddy `:ohddddddddd +dddddddd. +dddddddd +sddddddy ydddddds +:dddddd+ .oddddddd: + sdddddo ./ydddddddds + `yddddd. `:ohddddddddddy` + oddddh/` `.:+shdddddddddddddo + -ydddddhyssyhdddddddddddddddddy- + :yddddddddddddddddddddddddy: + .+yddddddddddddddddddy+. + `-/osyhddddhyso/-` +EOF + ;; - "--ascii_bold") ascii_bold="$2" ;; - "--logo" | "-L") - image_backend="ascii" - print_info() { info line_break; } - ;; + "Zorin"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' +${c1} `osssssssssssssssssssso` + .osssssssssssssssssssssso. + .+oooooooooooooooooooooooo+. - # Screenshot - "--scrot" | "-s") - scrot_args "$@" - ;; - "--upload" | "-su") - scrot_upload="on" - scrot_args "$@" - ;; - "--image_host") image_host="$2" ;; - "--scrot_cmd") scrot_cmd="$2" ;; + `::::::::::::::::::::::. .:` + `+ssssssssssssssssss+:.` `.:+ssso` +.ossssssssssssssso/. `-+ossssssso. +ssssssssssssso/-` `-/osssssssssssss +.ossssssso/-` .-/ossssssssssssssso. + `+sss+:. `.:+ssssssssssssssssss+` + `:. .::::::::::::::::::::::` - # Other - "--config") - case "$2" in - "none" | "off" | "") ;; - *) - config_file="$(get_full_path "$2")" - get_user_config - ;; - esac - ;; - "--stdout") stdout="on" ;; - "-v") verbose="on" ;; - "-vv") set -x; verbose="on" ;; - "--help") usage ;; - "--version") - printf "%s\\n" "Neofetch $version" - exit 1 - ;; - "--gen-man") - help2man -n "A fast, highly customizable system info script" \ - -N ./neofetch -o neofetch.1 - exit 1 - ;; - "--travis") - print_info() { - info title - info underline + .+oooooooooooooooooooooooo+. + -osssssssssssssssssssssso- + `osssssssssssssssssssso` +EOF + ;; - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "GPU Driver" gpu_driver - info "Memory" memory + *) + case "$kernel_name" in + *"BSD") + set_colors 1 7 4 3 6 + read -rd '' ascii_data <<'EOF' +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) +EOF + ;; - info "CPU Usage" cpu_usage - info "Disk" disk - info "Battery" battery - info "Font" font - info "Song" song - info "Local IP" local_ip - info "Public IP" public_ip - info "Users" users - info "Install Date" install_date + "Darwin") + set_colors 2 3 1 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. +EOF + ;; - info line_break - info cols - info line_break + "GNU"*) + set_colors fg 7 + read -rd '' ascii_data <<'EOF' +${c1} _-`````-, ,- '- . + .' .- - | | - -. `. + /.' / `. \ +:/ : _... ..._ `` : +:: : /._ .`:'_.._\. || : +:: `._ ./ ,` : \ . _.'' . +`:. / | -. \-. \\_ / + \:._ _/ .' .@) \@) ` `\ ,.' + _/,--' .- .\,-.`--`. + ,'/'' (( \ ` ) + /'/' \ `-' ( + '/'' `._,-----' + ''/' .,---' + ''/' ;: + ''/'' ''/ + ''/''/'' + '/'/' + `; +EOF + ;; - # Testing. - prin "prin" - prin "prin" "prin" + "Linux") + set_colors fg 8 3 + read -rd '' ascii_data <<'EOF' +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### +EOF + ;; - # Testing no subtitles. - info uptime - info disk - } + "SunOS") + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. +EOF + ;; - refresh_rate="on" - shell_version="on" - cpu_display="infobar" - memory_display="infobar" - disk_display="infobar" - cpu_temp="C" - ;; - esac + "IRIX"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} ./ohmNd/ +dNmho/- + `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. + `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` + -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. + `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` ++mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ +dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd +oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ +.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. + hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh + /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: + `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd + `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` + `yNMMNho-yMMMM` NMMMm.+hNMMNh` + -MMMMd: oMMMM. NMMMh :hMMMM- + -yNMMMmooMMMM- NMMMyomMMMNy- + .omMMMMMMMM-`NMMMMMMMmo. + `:hMMMMMM. NMMMMMh/` + .odNm+ /dNms. +EOF + ;; + esac + ;; + esac - shift - done + # Overwrite distro colors if '$ascii_colors' doesn't + # equal 'distro'. + if [[ "${ascii_colors[0]}" != "distro" ]]; then + color_text="off" + set_colors "${ascii_colors[@]}" + fi } main() { From 4ee3eadbaa48f71a304ceaf9ef918496a4dee48d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 16:22:56 +1000 Subject: [PATCH 0261/1133] general: In-lined license --- neofetch | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index a2dd2d3d6..5fd7a83fc 100755 --- a/neofetch +++ b/neofetch @@ -1,12 +1,30 @@ #!/usr/bin/env bash -# set -x # vim: noai:ts=4:sw=4:expandtab # -# Neofetch: Simple system information script. +# Neofetch: A command-line system information tool written in bash 3.2+. # https://github.com/dylanaraps/neofetch # -# Created by Dylan Araps -# https://github.com/dylanaraps/ +# The MIT License (MIT) +# +# Copyright (c) 2016-2017 Dylan Araps +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # Neofetch version. version="3.4.1-git" From 2f5f7f5ab43502fa8f63ac9ab65d72eb8165c50d Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 3 May 2018 19:46:14 +0200 Subject: [PATCH 0262/1133] term_font: add qterminal support --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index f793a1e71..9797133e9 100755 --- a/neofetch +++ b/neofetch @@ -2195,6 +2195,11 @@ END term_font="$(trim_quotes "$term_font")" ;; + "qterminal") + term_font="$(awk -F '=' '/fontFamily=/ {a=$2} /fontSize=/ {b=$2} END{print a " " b}' \ + "${XDG_CONFIG_HOME}/qterminal.org/qterminal.ini")" + ;; + "sakura"*) term_font="$(awk -F '=' '/^font=/ {print $2; exit}' \ "${XDG_CONFIG_HOME}/sakura/sakura.conf")" From ca14085036e6bd3d5aabb45676990e7c2b789889 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 07:20:40 +1000 Subject: [PATCH 0263/1133] docs: update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ef80e2eda..7a385c7da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ - [**@robertwolter**](https://github.com/robertwolter) - [**@TsundereBug**](https://github.com/TsundereBug) - [**@dawidd6**](https://github.com/dawidd6) +- [**@mstraube**](https://github.com/mstraube) ## Operating System @@ -50,6 +51,7 @@ **Terminal Font** - Added support for `st`. [**@aidanharris**](https://github.com/aidanharris) +- Added support for `qterminal`. [**@mstraube**](https://github.com/mstraube) **Packages** From f9fe78898f1742c862401bff6f00f26e33e00995 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 07:45:41 +1000 Subject: [PATCH 0264/1133] docs: update --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index aeaeb73fc..621c11460 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,7 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, - https://www.ostechnix.com/neofetch-display-linux-systems-information/ - https://www.techrepublic.com/article/how-to-get-all-the-information-you-need-about-your-linux-machine-with-a-single-command/ - https://www.tecmint.com/neofetch-shows-linux-system-information-with-logo/ +- https://www.youtube.com/watch?v=bgepGW858fc ## Thanks From 698d1ef5cf65c6c438af2e728076741e0367fe4d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 07:56:18 +1000 Subject: [PATCH 0265/1133] general: Remove Makefile --- Makefile | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 7870d4566..000000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -PREFIX ?= /usr -MANDIR ?= $(PREFIX)/share/man - -all: - @echo Run \'make install\' to install Neofetch. - -install: - @echo 'Making directories...' - @mkdir -p $(DESTDIR)$(PREFIX)/bin - @mkdir -p $(DESTDIR)$(MANDIR)/man1 - - @echo 'Installing binaries...' - @chmod 755 $(DESTDIR)$(PREFIX)/bin/neofetch - - @echo 'Installing man page...' - @cp -p neofetch.1 $(DESTDIR)$(MANDIR)/man1 - -uninstall: - @echo 'Removing files...' - @rm -rf $(DESTDIR)$(PREFIX)/bin/neofetch - @rm -rf $(DESTDIR)$(MANDIR)/man1/neofetch.1* From 16b6e79340dc2d0d42cf3629931d564b2e64940c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 08:33:32 +1000 Subject: [PATCH 0266/1133] general: Added missing ascii --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 5fd7a83fc..7f6969aee 100755 --- a/neofetch +++ b/neofetch @@ -5313,6 +5313,32 @@ dhhyys+/-` EOF ;; + "ArcoLinux"*) + set_colors 7 4 + read -rd '' ascii_data <<'EOF' +${c2} /- + ooo: + yoooo/ + yooooooo + yooooooooo + yooooooooooo + .yooooooooooooo + .oooooooooooooooo + .oooooooarcoooooooo + .ooooooooo-oooooooooo + .ooooooooo- oooooooooo + :ooooooooo. :ooooooooo + :ooooooooo. :ooooooooo + :oooarcooo .oooarcooo + :ooooooooy .ooooooooo + :ooooooooo ${c1}/ooooooooooooooooooo${c2} + :ooooooooo ${c1}.-ooooooooooooooooo.${c2} + ooooooooo- ${c1}-ooooooooooooo.${c2} + ooooooooo- ${c1}.-oooooooooo.${c2} +ooooooooo. ${c1}-ooooooooo${c2} +EOF + ;; + "arch_small") set_colors 6 7 1 read -rd '' ascii_data <<'EOF' From 0c350594bbc65c656fab0cf9c9f4651f68b8aa15 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 08:49:13 +1000 Subject: [PATCH 0267/1133] general: Move ascii art back to fix merge conflicts. --- neofetch | 8039 +++++++++++++++++++++++++++--------------------------- 1 file changed, 4020 insertions(+), 4019 deletions(-) diff --git a/neofetch b/neofetch index 7f6969aee..4c6bba0e8 100755 --- a/neofetch +++ b/neofetch @@ -50,6 +50,7 @@ shopt -s nocasematch reset="\e[0m" # Neofetch default config. + read -rd '' config <<'EOF' # See this wiki page for more info: # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info @@ -4158,2516 +4159,3537 @@ uppercase() { # COLORS -set_colors() { - c1="$(color "$1")${ascii_bold}" - c2="$(color "$2")${ascii_bold}" - c3="$(color "$3")${ascii_bold}" - c4="$(color "$4")${ascii_bold}" - c5="$(color "$5")${ascii_bold}" - c6="$(color "$6")${ascii_bold}" - - [[ "$color_text" != "off" ]] && set_text_colors "$@" -} +get_distro_colors() { + # This function sets the text colors according + # to your OS/Distro's logo colors. + # + # $ascii_distro is the same as $distro. + case "$ascii_distro" in + "AIX"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} `:+ssssossossss+-` + .oys///oyhddddhyo///sy+. + /yo:+hNNNNNNNNNNNNNNNNh+:oy/ + :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: + `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh + h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy +/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: +h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y +N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m +N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m +h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y +:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- + yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy + sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo + :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- + :ys:/yNNNNNNNNNNNNNNNmy/:sy: + .+ys///osyhhhhys+///sy+. + -/osssossossso/- +EOF + ;; -set_text_colors() { - if [[ "${colors[0]}" == "distro" ]]; then - title_color="$(color "$1")" - at_color="$reset" - underline_color="$reset" - subtitle_color="$(color "$2")" - colon_color="$reset" - info_color="$reset" + "alpine_small") + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} /\\ /\\ + /${c2}/ ${c1}\\ \\ + /${c2}/ ${c1}\\ \\ +/${c2}// ${c1}\\ \\ +${c2}// ${c1}\\ \\ + \\ +EOF + ;; - # If the ascii art uses 8 as a color, make the text the fg. - ((${1:-1} == 8)) && title_color="$reset" - ((${2:-7} == 8)) && subtitle_color="$reset" + "Alpine"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} .hddddddddddddddddddddddh. + :dddddddddddddddddddddddddd: + /dddddddddddddddddddddddddddd/ + +dddddddddddddddddddddddddddddd+ + `sdddddddddddddddddddddddddddddddds` + `ydddddddddddd++hdddddddddddddddddddy` +.hddddddddddd+` `+ddddh:-sdddddddddddh. +hdddddddddd+` `+y: .sddddddddddh +ddddddddh+` `//` `.` -sddddddddd +ddddddh+` `/hddh/` `:s- -sddddddd +ddddh+` `/+/dddddh/` `+s- -sddddd +ddd+` `/o` :dddddddh/` `oy- .yddd +hdddyo+ohddyosdddddddddho+oydddy++ohdddh +.hddddddddddddddddddddddddddddddddddddh. + `yddddddddddddddddddddddddddddddddddy` + `sdddddddddddddddddddddddddddddddds` + +dddddddddddddddddddddddddddddd+ + /dddddddddddddddddddddddddddd/ + :dddddddddddddddddddddddddd: + .hddddddddddddddddddddddh. +EOF + ;; - # If the second color is white use the first for the subtitle. - ((${2:-7} == 7)) && subtitle_color="$(color "$1")" - ((${1:-1} == 7)) && title_color="$reset" - else - title_color="$(color "${colors[0]}")" - at_color="$(color "${colors[1]}")" - underline_color="$(color "${colors[2]}")" - subtitle_color="$(color "${colors[3]}")" - colon_color="$(color "${colors[4]}")" - info_color="$(color "${colors[5]}")" - fi + "Amazon"*) + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} `-/oydNNdyo:.` + `.:+shmMMMMMMMMMMMMMMmhs+:.` + -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- +.`` -/+shmNNMMMMMMNNmhs+/- ``. +dNmhs+:. `.:/oo/:.` .:+shmNd +dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd +dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. + `.:+shNMMMMMh yMMMMMNhs+:`` + `-+shy shs+:` +EOF + ;; - # Bar colors. - if [[ "$bar_color_elapsed" == "distro" ]]; then - bar_color_elapsed="$(color fg)" - else - bar_color_elapsed="$(color "$bar_color_elapsed")" - fi + "Anarchy"*) + set_colors 7 4 + read -rd '' ascii_data <<'EOF' + ${c2}..${c1} + ${c2}..${c1} + ${c2}:..${c1} + ${c2}:+++.${c1} + .:::++${c2}++++${c1}+::. + .:+######${c2}++++${c1}######+:. + .+#########${c2}+++++${c1}##########:. + .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. + +###########${c2}+++++++++${c1}############: + +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ + +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ + :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: + ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ +.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. +.##########${c2}+++++++++++++++++++${c1}###########. + #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ + :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: + +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ + +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ + :##${c2}++++++${c1}############${c2}++++++++++${c1}##: + .${c2}++++++${c1}#############${c2}++++++++++${c1}+. + :${c2}++++${c1}###############${c2}+++++++${c1}:: + .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. + ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. + ${c2}.${c1} ${c2}.:+++${c1}. + ${c2}.:${c1}: + ${c2}..${c1} + ${c2}..${c1} +EOF + ;; - case "$bar_color_total $1" in - "distro "[736]) bar_color_total="$(color "$1")" ;; - "distro "[0-9]) bar_color_total="$(color "$2")" ;; - *) bar_color_total="$(color "$bar_color_total")" ;; - esac -} + "Android"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} -o o- + +hydNNNNdyh+ + +mMMMMMMMMMMMMm+ + `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` + hMMMMMMMMMMMMMMMMMMh + .. yyyyyyyyyyyyyyyyyyyy .. +.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +-MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- + +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ + mMMMMMMMMMMMMMMMMMMm + `/++MMMMh++hMMMM++/` + MMMMo oMMMM + MMMMo oMMMM + oNMm- -mMNs +EOF + ;; -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" ;; - esac -} + "Antergos"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' +${c2} `.-/::/-`` + .-/osssssssso/. + :osyysssssssyyys+- + `.+yyyysssssssssyyyyy+. + `/syyyyyssssssssssyyyyys-` + `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` + .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. + .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. + -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: + -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- + .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` +`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo +.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. +ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy +dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh +-dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- +.smmmmddddddddhhhhhhhhhdddddddddmmmms. + `+ydmmmdddddddddddddddddddmmmmdy/. + `.:+ooyyddddddddddddyyso+:.` +EOF + ;; -# OTHER + "antiX"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} + \ + , - ~ ^ ~ - \ / + , ' \ ' , / + , \ '/ + , \ / , + ,___, \/ , + / | _ _ _|_ o /\ , +|, | / |/ | | | / \ , + \,_/\_/ | |_/|_/|_/_/ \, + , / ,\ + , / , ' \ + ' - , _ _ _ , ' +EOF + ;; -stdout() { - image_backend="off" - unset subtitle_color - unset colon_color - unset info_color - unset underline_color - unset bold - unset title_color - unset at_color - unset text_padding - unset zws - unset reset - unset color_blocks - unset get_line_break -} - -err() { - err+="$(color 1)[!]\e[0m $1\n" -} - -get_full_path() { - # This function finds the absolute path from a relative one. - # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" - - # If the file exists in the current directory, stop here. - [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - - if ! cd "${1%/*}"; then - err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" - err " Check that the directory exists or try another directory." - exit 1 - fi - - local full_dir="${1##*/}" + "AOSC"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} .:+syhhhhys+:. + .ohNMMMMMMMMMMMMMMNho. + `+mMMMMMMMMMMmdmNMMMMMMMMm+` + +NMMMMMMMMMMMM/ `./smMMMMMN+ + .mMMMMMMMMMMMMMMo -yMMMMMm. + :NMMMMMMMMMMMMMMMs .hMMMMN: + .NMMMMhmMMMMMMMMMMm+/- oMMMMN. + dMMMMs ./ymMMMMMMMMMMNy. sMMMMd +-MMMMN` oMMMMMMMMMMMN: `NMMMM- +/MMMMh NMMMMMMMMMMMMm hMMMM/ +/MMMMh NMMMMMMMMMMMMm hMMMM/ +-MMMMN` :MMMMMMMMMMMMy. `NMMMM- + dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd + .NMMMMo -/+sMMMMMMMMMMMmMMMMN. + :NMMMMh. .MMMMMMMMMMMMMMMN: + .mMMMMMy- NMMMMMMMMMMMMMm. + +NMMMMMms/.` mMMMMMMMMMMMN+ + `+mMMMMMMMMNmddMMMMMMMMMMm+` + .ohNMMMMMMMMMMMMMMNho. + .:+syhhhhys+:. +EOF + ;; - # Iterate down a (possible) chain of symlinks. - while [[ -L "$full_dir" ]]; do - full_dir="$(readlink "$full_dir")" - cd "${full_dir%/*}" || exit - full_dir="${full_dir##*/}" - done + "Apricity"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} ./o- + ``...`` `:. -/: + `-+ymNMMMMMNmho-` :sdNNm/ + `+dMMMMMMMMMMMMMMMmo` sh:.:::- + /mMMMMMMMMMMMMMMMMMMMm/`sNd/ + oMMMMMMMMMMMMMMMMMMMMMMMs -` +:MMMMMMMMMMMMMMMMMMMMMMMMM/ +NMMMMMMMMMMMMMMMMMMMMMMMMMd +MMMMMMMmdmMMMMMMMMMMMMMMMMd +MMMMMMy` .mMMMMMMMMMMMmho:` +MMMMMMNo/sMMMMMMMNdy+-.`-/ +MMMMMMMMMMMMNdy+:.`.:ohmm: +MMMMMMMmhs+-.`.:+ymNMMMy. +MMMMMM/`.-/ohmNMMMMMMy- +MMMMMMNmNNMMMMMMMMmo. +MMMMMMMMMMMMMMMms:` +MMMMMMMMMMNds/. +dhhyys+/-` +EOF + ;; - # Final directory. - full_dir="$(pwd -P)/${1/*\/}" + "ArcoLinux"*) + set_colors 7 4 + read -rd '' ascii_data <<'EOF' +${c2} /- + ooo: + yoooo/ + yooooooo + yooooooooo + yooooooooooo + .yooooooooooooo + .oooooooooooooooo + .oooooooarcoooooooo + .ooooooooo-oooooooooo + .ooooooooo- oooooooooo + :ooooooooo. :ooooooooo + :ooooooooo. :ooooooooo + :oooarcooo .oooarcooo + :ooooooooy .ooooooooo + :ooooooooo ${c1}/ooooooooooooooooooo${c2} + :ooooooooo ${c1}.-ooooooooooooooooo.${c2} + ooooooooo- ${c1}-ooooooooooooo.${c2} + ooooooooo- ${c1}.-oooooooooo.${c2} +ooooooooo. ${c1}-ooooooooo${c2} +EOF + ;; - [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" -} + "arch_small") + set_colors 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} /\ + /^^\ + /\ \ + /${c2} __ \ + / ( ) \ + / __| |__\\\ +/// \\\\\ +EOF + ;; -get_user_config() { - # Check $config_file. - if [[ -f "$config_file" ]]; then - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options - return - fi - mkdir -p "${XDG_CONFIG_HOME}/neofetch/" + "arch_old") + set_colors 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} __ + _=(SDGJT=_ + _GTDJHGGFCVS) + ,GTDJGGDTDFBGX0 +${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ +${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL +${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, +${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], +${c1} SDDFDFH' !YEWD,${c2} )HDROD +${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' +${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' +${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' +${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) +${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF +'EHTI !H + `0F' '! +EOF + ;; - # Check ${XDG_CONFIG_HOME}/neofetch and create the - # dir/files if they don't exist. - if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config" + "ArchBox"*) + set_colors 2 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ...:+oh/:::.. + ..-/oshhhhhh` `::::-. + .:/ohhhhhhhhhhhh` `-::::. + .+shhhhhhhhhhhhhhhhh` `.::-. + /`-:+shhhhhhhhhhhhhh` .-/+shh + / .:/ohhhhhhhhh` .:/ohhhhhhhh + / `-:+shhh` ..:+shhhhhhhhhhhh + / .:ohhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / .+o+ `hhhhhhhhhhhhhhhhhhhh + / -hhhhh `hhhhhhhhhhhhhhhhhhhh + / ohhhhho `hhhhhhhhhhhhhhhhhhhh + /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` + `--/:` /: `hhhhhhhhhhhho/- + -/:. `hhhhhhs+:-` + ::::/ho/-` +EOF + ;; - elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + "ARCHlabs"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} 'c' + 'kKk, + .dKKKx. + .oKXKXKd. + .l0XXXXKKo. + c0KXXXXKX0l. + :0XKKOxxOKX0l. + :OXKOc. .c0XX0l. + :OK0o. ${c4}...${c1}'dKKX0l. + :OX0c ${c4};xOx'${c1}'dKXX0l. + :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. + c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. + .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. + .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. + .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. + .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. + .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' + 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' + 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, + ,xko:'. ${c4}.. ${c1} .':okx; + .,'. .',. +EOF + ;; - else - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + *"XFerience"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ``--:::::::-.` + .-/+++ooooooooo+++:-` + `-/+oooooooooooooooooo++:. + -/+oooooo/+ooooooooo+/ooo++:` + `/+oo++oo. .+oooooo+.-: +:-o+- + `/+o/. -o. :oooooo+ ```:.+oo+- +`:+oo- -/` :oooooo+ .`-`+oooo/. +.+ooo+. .` `://///+-+..oooooo+:` +-+ooo:` ``.-+oooooo+/` +-+oo/` :+oooo/. +.+oo: ..-/. . -+oo+/` +`/++- -:::++::/. -+oo+- + ./o: `:///+- `./ooo+:` + .++- `` /-` -:/+oooo+:` + .:+/:`` `-:ooooooo++- + ./+o+//:...../+oooooooo++:` + `:/++ooooooooooooo++/-` + `.-//++++++//:-.` + `````` +EOF + ;; - # The config file doesn't exist, create it. - printf "%s\n" "$config" > "$config_file" - fi + "ArchMerge"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} y: + sMN- + +MMMm` + /MMMMMd` + :NMMMMMMy + -NMMMMMMMMs + .NMMMMMMMMMM+ + .mMMMMMMMMMMMM+ + oNMMMMMMMMMMMMM+ + `+:-+NMMMMMMMMMMMM+ + .sNMNhNMMMMMMMMMMMM/ + `hho/sNMMMMMMMMMMMMMMM/ + `.`omMMmMMMMMMMMMMMMMMMM+ + .mMNdshMMMMd+::oNMMMMMMMMMo + .mMMMMMMMMM+ `yMMMMMMMMMs + .NMMMMMMMMM/ yMMMMMMMMMy + -NMMMMMMMMMh `mNMMMMMMMMd` + /NMMMNds+:.` `-/oymMMMm. + +Mmy/. `:smN: +/+. -o. +EOF + ;; - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options -} - -bar() { - # Get the values. - elapsed="$(($1 * bar_length / $2))" - - # Create the bar with spaces. - printf -v prog "%${elapsed}s" - printf -v total "%$((bar_length - elapsed))s" - - # Set the colors and swap the spaces for $bar_char_. - bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" - bar+="${bar_color_total}${total// /${bar_char_total}}" - - # Borders. - [[ "$bar_border" == "on" ]] && \ - bar="$(color fg)[${bar}$(color fg)]" - - printf "%b" "${bar}${info_color}" -} - -cache() { - if [[ "$2" ]]; then - mkdir -p "${cache_dir}/neofetch" - printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" - fi -} - -get_cache_dir() { - case "$os" in - "Mac OS X") cache_dir="/Library/Caches" ;; - *) cache_dir="/tmp" ;; - esac -} - -kde_config_dir() { - # If the user is using KDE get the KDE - # configuration directory. - if [[ "$kde_config_dir" ]]; then - return - - elif type -p kf5-config >/dev/null 2>&1; then - kde_config_dir="$(kf5-config --path config)" - - elif type -p kde4-config >/dev/null 2>&1; then - kde_config_dir="$(kde4-config --path config)" - - elif type -p kde-config >/dev/null 2>&1; then - kde_config_dir="$(kde-config --path config)" - - elif [[ -d "${HOME}/.kde4" ]]; then - kde_config_dir="${HOME}/.kde4/share/config" + "Arch"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} -` + .o+` + `ooo/ + `+oooo: + `+oooooo: + -+oooooo+: + `/:-:++oooo+: + `/++++/+++++++: + `/++++++++++++++: + `/+++o${c2}oooooooo${c1}oooo/` +${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` +${c2} .oossssso-````/ossssss+` + -osssssso. :ssssssso. + :osssssss/ osssso+++. + /ossssssss/ +ssssooo/- + `/ossssso+/:- -:/+osssso+- + `+sso+:-` `.-/+oso: + `++:. `-/+/ + .` `/ +EOF + ;; - elif [[ -d "${HOME}/.kde3" ]]; then - kde_config_dir="${HOME}/.kde3/share/config" - fi + "Artix"*) + set_colors 6 4 2 7 + read -rd '' ascii_data <<'EOF' +${c1} d${c2}c. +${c1} x${c2}dc. +${c1} '.${c4}.${c1} d${c2}dlc. +${c1} c${c2}0d:${c1}o${c2}xllc; +${c1} :${c2}0ddlolc,lc, +${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. +${c1} ;${c1}K${c2}kxoOddollc' cllc. +${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: +${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: +${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, +${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. +${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; +${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, +${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. +${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. +${c1} 0${c2}Okd''dc. .cll; +${c1} k${c2}Okd' .llc, +${c1} d${c2}Od, 'lc. +${c1} :,${c4}. ${c2}... +EOF + ;; - kde_config_dir="${kde_config_dir/$'/:'*}" -} + "Arya"*) + set_colors 2 1 + read -rd '' ascii_data <<'EOF' +${c1} `oyyy/${c2}-yyyyyy+ +${c1} -syyyy/${c2}-yyyyyy+ +${c1} .syyyyy/${c2}-yyyyyy+ +${c1} :yyyyyy/${c2}-yyyyyy+ +${c1} `/ :yyyyyy/${c2}-yyyyyy+ +${c1} .+s :yyyyyy/${c2}-yyyyyy+ +${c1} .oys :yyyyyy/${c2}-yyyyyy+ +${c1} -oyys :yyyyyy/${c2}-yyyyyy+ +${c1} :syyys :yyyyyy/${c2}-yyyyyy+ +${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ +${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ +${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- +${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy +${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy +${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy +EOF + ;; -get_term_padding() { - # Terminal info. - # - # Parse terminal config files to get - # info about padding. Due to how w3m-img - # works padding around the terminal throws - # off the cursor placement calculation in - # specific terminals. - # - # Note: This issue only seems to affect - # URxvt. - ((term_run != 1)) && get_term + "Bitrig"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} `hMMMMN+ + -MMo-dMd` + oMN- oMN` + yMd /NM: + .mMmyyhMMs + :NMMMhsmMh + +MNhNNoyMm- + hMd.-hMNMN: + mMmsssmMMMo + .MMdyyhNMMMd + oMN.`/dMddMN` + yMm/hNm+./MM/ +.dMMMmo.``.NMo +:NMMMNmmmmmMMh +/MN/-------oNN: +hMd. .dMh +sm/ /ms +EOF + ;; - case "$term" in - "URxvt"*) - border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" + "BLAG"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} d + ,MK: + xMMMX: + .NMMMMMX; + lMMMMMMMM0clodkO0KXWW: + KMMMMMMMMMMMMMMMMMMX' + .;d0NMMMMMMMMMMMMMMMMMMK. + .;dONMMMMMMMMMMMMMMMMMMMMMMx +'dKMMMMMMMMMMMMMMMMMMMMMMMMl + .:xKWMMMMMMMMMMMMMMMMMMM0. + .:xNMMMMMMMMMMMMMMMMMK. + lMMMMMMMMMMMMMMMMMMK. + ,MMMMMMMMWkOXWMMMMMM0 + .NMMMMMNd. `':ldko + OMMMK: + oWk, + ;: +EOF ;; - esac -} -dynamic_prompt() { - case "$image_backend" in - "ascii") printf "\n" ;; - "off") return ;; - *) - get_term_padding - lines="$(((border + height + yoffset) / font_height))" - image_prompt="on" + "BlankOn"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` +${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ +${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys +${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys +${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys +${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys +${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys +${c2}NMMMMMN: .NMMMMMN${c1}yyyyys +${c2}MMMMMMm. NMMMMMN${c1}yyyyys +${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys +${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys +${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys +${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys +${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys +${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys +${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo +${c2} `.:/++++/:.` ${c1}:oys+. +EOF ;; - esac - # If the info is higher than the ascii/image place the prompt - # based on the info height instead of the ascii/image height. - if ((lines < info_height)); then - [[ "$image_prompt" ]] && printf "\n" - return - else - [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" - lines="$((lines - info_height + 1))" - fi + "BSD") + set_colors 1 7 4 3 6 + read -rd '' ascii_data <<'EOF' +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) +EOF + ;; - # Set the prompt location. - if ((lines > 1)); then - case "$kernel_name" in - "OpenBSD") tput cud "$lines" ;; - *) printf "%b" "\e[${lines}B" ;; - esac - fi -} - -old_functions() { - # Deprecated functions. - # Neofetch 2.0 changed the names of a few variables. - # This function adds backwards compatibility for the - # old variable names. - if type printinfo >/dev/null 2>&1; then - print_info() { printinfo ; } - get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } - get_termfont() { get_term_font; termfont="$term_font"; } - get_localip() { get_local_ip; localip="$local_ip"; } - get_publicip() { get_public_ip; publicip="$public_ip"; } - get_linebreak() { get_line_break; linebreak="$line_break"; } - fi - - get_birthday() { get_install_date; birthday="$install_date"; } -} - -old_options() { - [[ -n "$osx_buildversion" ]] && \ - err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." - [[ -n "$osx_codename" ]] && \ - err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." - [[ "$cpu_cores" == "on" ]] && \ - err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." - [[ -n "$image" ]] && \ - { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } - - # All progress_ variables were changed to bar_. - [[ -n "$progress_char" ]] && \ - err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." - [[ -n "$progress_border" ]] && \ - { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ - bar_border="$progress_border"; } - [[ -n "$progress_length" ]] && \ - { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ - bar_length="$progress_length"; } - [[ -n "$progress_color_elapsed" ]] && \ - { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ - bar_color_elapsed="$progress_color_elapsed"; } - [[ -n "$progress_color_total" ]] && \ - { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ - bar_color_total="$progress_color_total"; } - - # All cpufreq values were changed in 3.0. - [[ "$speed_type" == "current" ]] && \ - err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." - [[ "$speed_type" == "min" ]] && \ - err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." - [[ "$speed_type" == "max" ]] && \ - err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." - [[ "$speed_type" == "bios" ]] && \ - err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." - - # Ascii_logo_size was removed in 3.0. - [[ "$ascii_logo_size" ]] && \ - err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." - - # $start and $end were replaced with ${block_range[@]} in 3.0. - [[ "$start" && "$end" ]] && \ - { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ - block_range=("$start" "$end"); } - - # Fahrenheit support was added to CPU so the options were changed. - [[ "$cpu_temp" == "on" ]] && \ - { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; - cpu_temp="C"; } - - # Birthday was renamed to Install Date in 3.0 - [[ -n "$birthday_time" ]] && \ - { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ - install_time="$birthday_time"; } - - # Scrot dir was removed in 3.1.0. - [[ -n "$scrot_dir" ]] && scrot_dir= - - # cpu_shorthand was deprecated in 3.3.0 - [[ -n "$cpu_shorthand" ]] && \ - { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and - \$cpu_speed instead."; } -} - -cache_uname() { - # Cache the output of uname so we don't - # have to spawn it multiple times. - IFS=" " read -ra uname <<< "$(uname -sr)" - - kernel_name="${uname[0]}" - kernel_version="${uname[1]}" -} - -convert_time() { - # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. - year="$1" - day="${3#0}" - - # Split time into hours/minutes. - hour="${4/:*}" - min="${4/${hour}}" - - # Get month. (Month code is used for day of week) - # Due to different versions of 'ls', the month can be 1, 01 or Jan. - case "$2" in - 1 | 01 | "Jan") month="Jan"; month_code=0 ;; - 2 | 02 | "Feb") month="Feb"; month_code=3 ;; - 3 | 03 | "Mar") month="Mar"; month_code=3 ;; - 4 | 04 | "Apr") month="Apr"; month_code=6 ;; - 5 | 05 | "May") month="May"; month_code=1 ;; - 6 | 06 | "Jun") month="Jun"; month_code=4 ;; - 7 | 07 | "Jul") month="Jul"; month_code=6 ;; - 8 | 08 | "Aug") month="Aug"; month_code=2 ;; - 9 | 09 | "Sep") month="Sep"; month_code=5 ;; - 10 | "Oct") month="Oct"; month_code=0 ;; - 11 | "Nov") month="Nov"; month_code=3 ;; - 12 | "Dec") month="Dec"; month_code=5 ;; - esac - - # Get leap year. - # Source: http://stackoverflow.com/questions/725098/leap-year-calculation - [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ - [[ "$month" =~ (Jan|Feb) ]] && \ - leap_code=1 - - # Calculate day of week. - # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html - year_code="$((${year/??} + (${year/??} / 4) % 7))" - week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" - - case "$week_day" in - 0) week_day="Sun" ;; - 1) week_day="Mon" ;; - 2) week_day="Tue" ;; - 3) week_day="Wed" ;; - 4) week_day="Thu" ;; - 5) week_day="Fri" ;; - 6) week_day="Sat" ;; - esac - - # Convert 24 hour time to 12 hour time + AM/PM. - case "$install_time_format" in - "12h") - case "$hour" in - [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; - *) time="$((hour - 12))${min} PM" ;; - esac - ;; - *) time="$4" ;; - esac - - # Toggle showing the time. - [[ "$install_time" == "off" ]] && unset time - - # Print the install date. - printf "%s" "$week_day $day $month $year $time" -} - -get_ppid() { - # Get parent process ID of PID. - case "$os" in - "Windows") - ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" - ppid="${ppid/'PPID'}" - ;; - - "Linux") - ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" - ppid="$(trim "${ppid/PPid:}")" - ;; - - *) - ppid="$(ps -p "${1:-$PPID}" -o ppid=)" - ;; - esac - - printf "%s" "$ppid" -} - -get_process_name() { - # Get PID name. - case "$os" in - "Windows") - name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" - name="${name/'COMMAND'}" - name="${name/*\/}" + "BunsenLabs"*) + set_colors fg 7 + read -rd '' ascii_data <<'EOF' +${c1} `++ + -yMMs + `yMMMMN` + -NMMMMMMm. + :MMMMMMMMMN- + .NMMMMMMMMMMM/ + yMMMMMMMMMMMMM/ +`MMMMMMNMMMMMMMN. +-MMMMN+ /mMMMMMMy +-MMMm` `dMMMMMM +`MMN. .NMMMMM. + hMy yMMMMM` + -Mo +MMMMN + /o +MMMMs + +MMMN` + hMMM: + `NMM/ + +MN: + mh. + -/ +EOF ;; - "Linux") - name="$(< "/proc/${1:-$PPID}/comm")" + "Calculate"*) + set_colors 7 3 + read -rd '' ascii_data <<'EOF' +${c1} ...... + ,,+++++++,. + .,,,....,,,${c2}+**+,,.${c1} + ............,${c2}++++,,,${c1} + ............... + ......,,,........ + .....+*#####+,,,*+. + .....,*###############,..,,,,,,.. + ......,*#################*..,,,,,..,,,.. + .,,....*####################+***+,,,,...,++, + .,,..,..*#####################*, + ,+,.+*..*#######################. + ,+,,+*+..,########################* +.,++++++. ..+##**###################+ +..... ..+##***#################*. + .,.*#*****##############*. + ..,,*********#####****+. + ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} + ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} + ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} +EOF ;; - *) - name="$(ps -p "${1:-$PPID}" -o comm=)" + "CentOS"*) + set_colors 3 2 4 5 7 + read -rd '' ascii_data <<'EOF' +${c1} .. + .PLTJ. + <><><><> + ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK + ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK + ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V + ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. +${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. +${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. +${c4} +${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV +${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' + ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' + ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 + ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK + ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK +${c2} <><><><> + 'MKKM' + '' +EOF ;; - esac - - printf "%s" "$name" -} - -decode_url() { - decode="${1//+/ }" - printf "%b" "${decode//%/\\x}" -} -# FINISH UP - -usage() { printf "%s" "\ -Usage: neofetch --option \"value\" --option \"value\" - -Neofetch is a CLI system information tool written in BASH. Neofetch -displays information about your system next to an image, your OS logo, -or any ASCII file of your choice. - -NOTE: Every launch flag has a config option. - -Options: - -INFO: - --disable infoname Allows you to disable an info line from appearing - in the output. - - NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - - --os_arch on/off Hide/Show OS architecture. - --speed_type type Change the type of cpu speed to display. - Possible values: current, min, max, bios, - scaling_current, scaling_min, scaling_max - - NOTE: This only supports Linux with cpufreq. - - --speed_shorthand on/off Whether or not to show decimals in CPU speed. - - NOTE: This flag is not supported in systems with CPU speed less than - 1 GHz. - - --cpu_brand on/off Enable/Disable CPU brand in output. - --cpu_cores type Whether or not to display the number of CPU cores - Possible values: logical, physical, off - - NOTE: 'physical' doesn't work on BSD. - - --cpu_speed on/off Hide/Show cpu speed. - --cpu_temp C/F/off Hide/Show cpu temperature. - - NOTE: This only works on Linux and BSD. - - NOTE: For FreeBSD and NetBSD-based systems, you need to enable - coretemp kernel module. This only supports newer Intel processors. - - --distro_shorthand on/off Shorten the output of distro (tiny, on, off) - - NOTE: This option won't work in Windows (Cygwin) - - --kernel_shorthand on/off Shorten the output of kernel - - NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) - - --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) - --refresh_rate on/off Whether to display the refresh rate of each monitor - Unsupported on Windows - --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) - --gpu_type type Which GPU to display. (all, dedicated, integrated) - - NOTE: This only supports Linux. - - --gtk_shorthand on/off Shorten output of gtk theme/icons - --gtk2 on/off Enable/Disable gtk2 theme/font/icons output - --gtk3 on/off Enable/Disable gtk3 theme/font/icons output - --shell_path on/off Enable/Disable showing \$SHELL path - --shell_version on/off Enable/Disable showing \$SHELL version - --disk_show value Which disks to display. - Possible values: '/', '/dev/sdXX', '/path/to/mount point' - - NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') - - --disk_subtitle type What information to append to the Disk subtitle. - Takes: name, mount, dir - - 'name' shows the disk's name (sda1, sda2, etc) - - 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) + "Chakra"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} _ _ _ "kkkkkkkk. + ,kkkkkkkk., 'kkkkkkkkk, + ,kkkkkkkkkkkk., 'kkkkkkkkk. + ,kkkkkkkkkkkkkkkk,'kkkkkkkk, + ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. + "''"''',;::,,"''kkk''kkkkk; __ + ,kkkkkkkkkk, "k''kkkkk' ,kkkk + ,kkkkkkk' ., ' .: 'kkkk',kkkkkk + ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk + ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk +.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' +;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' +'kkkkkkk; 'kkkkkkkk.,""''"''"" + ''kkkk; 'kkkkkkkkkk., + ';' 'kkkkkkkkkkkk., + ';kkkkkkkkkk' + ';kkkkkk' + "''" +EOF + ;; - 'dir' shows the basename of the disks's path. (/, Local Disk, etc) + "ChaletOS"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `.//+osso+/:`` + `/sdNNmhyssssydmNNdo:` + :hNmy+-` .-+hNNs- + /mMh/` `+:` `+dMd: + .hMd- -sNNMNo. /yyy /mMs` + -NM+ `/dMd/--omNh::dMM `yMd` + .NN+ .sNNs:/dMNy:/hNmo/s yMd` + hMs `/hNd+-smMMMMMMd+:omNy- `dMo +:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` +/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: +/Md` MMMMMMMMMMMMMMMMMMMN .MN: +:NN. MMMMMMm....--NMMMMMN -Mm. +`dMo MMMMMMd mMMMMMN hMs + -MN: MMMMMMd mMMMMMN oMm` + :NM: MMMMMMd mMMMMMN +Mm- + -mMy. mmmmmmh dmmmmmh -hMh. + oNNs- :yMm/ + .+mMdo:` `:smMd/` + -ohNNmhsoo++osshmNNh+. + `./+syyhhyys+:`` +EOF + ;; - --ip_host url URL to query for public IP - --song_shorthand on/off Print the Artist/Title on separate lines - --music_player player-name Manually specify a player to use. - Available values are listed in the config file - --install_time on/off Enable/Disable showing the time in Install Date output. - --install_time_format 12h/24h - Set time format in Install Date to be 12 hour or 24 hour. + "Chapeau"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} .-/-. + ////////. + ////////${c2}y+${c1}//. + ////////${c2}mMN${c1}/////. + ////////${c2}mMN+${c1}////////. + ////////////////////////. + /////////+${c2}shhddhyo${c1}+////////. + ////////${c2}ymMNmdhhdmNNdo${c1}///////. +///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. +///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// +//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// +//////${c2}+MMmssssssssssssss+${c1}/////// +`//////${c2}yMMy${c1}//////////////////// + `//////${c2}smMNhso++oydNm${c1}//////// + `///////${c2}ohmNMMMNNdy+${c1}/////// + `//////////${c2}++${c1}////////// + `////////////////. + -////////- +EOF + ;; -TEXT FORMATTING: - --colors x x x x x x Changes the text colors in this order: - title, @, underline, subtitle, colon, info - --underline on/off Enable/Disable the underline. - --underline_char char Character to use when underlining title - --bold on/off Enable/Disable bold text + "Chrom"*) + set_colors 2 1 3 4 7 + read -rd '' ascii_data <<'EOF' +${c2} .,:loool:,. + .,coooooooooooooc,. + .,lllllllllllllllllllll,. + ;ccccccccccccccccccccccccc; +${c1} '${c2}ccccccccccccccccccccccccccccc. +${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: +${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. +${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d +${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 +${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 +${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d +${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. +${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; +${c1} .:ccccccccllllllllo${c3}O0000000OOO, +${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. +${c1} '::ccccccccc${c3}dOOOOOOOkx:. +${c1} ..,::cccc${c3}xOOOkkko;. +${c1} ..,:${c3}dOkxl:. +EOF + ;; -COLOR BLOCKS: - --color_blocks on/off Enable/Disable the color blocks - --block_width num Width of color blocks in spaces - --block_height num Height of color blocks in lines - --block_range num num Range of colors to print as blocks + "Clover"*) + set_colors 2 6 + read -rd '' ascii_data <<'EOF' +${c1} `omo``omo` + `oNMMMNNMMMNo` + `oNMMMMMMMMMMMMNo` + oNMMMMMMMMMMMMMMMMNo + `sNMMMMMMMMMMMMMMNs` + `omo` `sNMMMMMMMMMMNs` `omo` + `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` + `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` +oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo +`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` +`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` +oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo + `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` + `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` + `oNs` `sNMMMMMMMMMMNs` `oNs` + `sNMMMMMMMMMMMMMMNs` + +NMMMMMMMMMMMMMMMMNo + `oNMMMMMMMMMMMMNo` + `oNMMMNNMMMNs` + `omo``oNs` +EOF + ;; -BARS: - --bar_char 'elapsed char' 'total char' - Characters to use when drawing bars. - --bar_border on/off Whether or not to surround the bar with '[]' - --bar_length num Length in spaces to make the bars. - --bar_colors num num Colors to make the bar. - Set in this order: elapsed, total - --cpu_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --memory_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --battery_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --disk_display mode Bar mode. - Possible values: bar, infobar, barinfo, off + "Container Linux by CoreOS"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ..... + .';:cccccccc:;'. + ':ccccclc${c3}lllllllll${c1}cc:. + .;cccccccc${c3}lllllllllllllll${c1}c, + ;clllccccc${c3}llllllllllllllllll${c1}c, + .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: + ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: + :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, +.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c +.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. +.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. +.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc + :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; + .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc + .cllllllllllclcccclccclccllllcllc + :cllllllllccclcllllllllllllcc; + .cccccccccccccclcccccccccc:. + .;cccclccccccllllllccc,. + .';ccccclllccc:;.. + ..... +EOF + ;; -IMAGE BACKEND: - --backend backend Which image backend to use. - Possible values: 'ascii', 'caca', 'catimg', '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/' - --ascii source Shortcut to use 'ascii' backend. - --caca source Shortcut to use 'caca' backend. - --catimg source Shortcut to use 'catimg' backend. - --iterm2 source Shortcut to use 'iterm2' backend. - --jp2a source Shortcut to use 'jp2a' backend. - --kitty source Shortcut to use 'kitty' backend. - --pixterm source Shortcut to use 'pixterm' backend. - --sixel source Shortcut to use 'sixel' backend. - --termpix source Shortcut to use 'termpix' backend. - --tycat source Shortcut to use 'tycat' backend. - --w3m source Shortcut to use 'w3m' backend. - --off Shortcut to use 'off' backend. + "crux_small") + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} ___ + (${c3}.· ${c1}| + (${c2}<> ${c1}| + / ${c3}__ ${c1}\\ + ( ${c3}/ \\ ${c1}/| +${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) +${c2}\/${c1}-____${c2}\/ +EOF + ;; - NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' + "CRUX"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} odddd + oddxkkkxxdoo + ddcoddxxxdoool + xdclodod olol + xoc xdd olol + xdc ${c2}k00${c1}Okdlol + xxd${c2}kOKKKOkd${c1}ldd + xdco${c2}xOkdlo${c1}dldd + ddc:cl${c2}lll${c1}oooodo + odxxdd${c3}xkO000kx${c1}ooxdo + oxdd${c3}x0NMMMMMMWW0od${c1}kkxo + oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx +docldkXW${c3}MMMMMMMWWN${c1}Odolco +xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c +${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l +${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd +${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo +${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo +EOF + ;; -ASCII: - --ascii_colors x x x x x x Colors to print the ascii art - --ascii_distro distro Which Distro's ascii art to print + "debian_small") + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' + ${c1}_____ + / __ \\ +| / | +| \\___- +-_ + --_ +EOF + ;; - NOTE: Arch and Ubuntu have 'old' logo variants. + "Debian"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c2} _,met$$$$$gg. + ,g$$$$$$$$$$$$$$$P. + ,g$$P" """Y$$.". + ,$$P' `$$$. +',$$P ,ggs. `$$b: +`d$$' ,$P"' ${c1}.${c2} $$$ + $$P d$' ${c1},${c2} $$P + $$: $$. ${c1}-${c2} ,d$$' + $$; Y$b._ _,d$P' + Y$$. ${c1}`.${c2}`"Y$$$$P"' +${c2} `$$b ${c1}"-.__ +${c2} `Y$$ + `Y$$. + `$$b. + `Y$$b. + `"Y$b._ + `""" +EOF + ;; - NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. + "Deepin"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} ............ + .';;;;;. .,;,. + .,;;;;;;;. ';;;;;;;. + .;::::::::' .,::;;,''''',. + ,'.:::::::: .;;'. '; + ;' 'cccccc, ,' :: '.. .: + ,, :ccccc. ;: .c, '' :. ,; +.l. cllll' ., .lc :; .l' l. +.c :lllc ;cl: .l' .ll. :' +.l 'looc. . ,o: 'oo' c, +.o. .:ool::coc' .ooo' o. + :: ..... .;dddo ;c + l:... .';lddddo. ,o + lxxxxxdoolllodxxxxxxxxxc :l + ,dxxxxxxxxxxxxxxxxxxl. 'o, + ,dkkkkkkkkkkkkko;. .;o; + .;okkkkkdl;. .,cl:. + .,:cccccccc:,. +EOF + ;; - NOTE: Ubuntu has flavor variants. + "DesaOS") + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1}███████████████████████ +███████████████████████ +███████████████████████ +███████████████████████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +██████████████████████████████ +██████████████████████████████ +████████████████████████ +████████████████████████ +████████████████████████ +EOF + ;; - NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. + "Devuan"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} ..,,;;;::;,.. + `':ddd;:,. + `'dPPd:,. + `:b$$b`. + 'P$$$d` + .$$$$$` + ;$$$$$P + .:P$$$$$$` + .,:b$$$$$$$;' + .,:dP$$$$$$$$b:' + .,:;db$$$$$$$$$$Pd'` + ,db$$$$$$$$$$$$$$b:'` +:$$$$$$$$$$$$b:'` + `$$$$$bd:''` + `'''` +EOF + ;; - NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, - OpenBSD, and Void have a smaller logo variant. + "DracOS"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} `-:/- + -os: + -os/` + :sy+-` + `/yyyy+. + `+yyyyo- + `/yyyys: +`:osssoooo++- +yyyyyy/` + ./yyyyyyo yo`:syyyy+. + -oyyy+ +- :yyyyyo- + `:sy: `. `/yyyyys: + ./o/.` .oyyso+oo:` + :+oo+//::::///:-.` `.` +EOF + ;; - NOTE: Use '{distro name}_small' to use the small variants. + "dragonfly_old"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' + ${c1} | + .-. + ${c3} ()${c1}I${c3}() + ${c1} "==.__:-:__.==" + "==.__/~|~\__.==" + "==._( Y )_.==" + ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. +( ..=${c1}\\=${c1}/${c2}=.. ) + `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` + `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` + .-~` /${c1}|=|${c2}\ `~-. + .~` / ${c1}|=|${c2} \ `~. + .-~` .' ${c1}|=|${c2} `. `~-. + (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) + `~"~"` ${c1} |=|${c2} `"~"~` + ${c1} /=\\ + \\=/ + ^ +EOF + ;; - --ascii_bold on/off Whether or not to bold the ascii logo. - -L, --logo Hide the info text and only show the ascii logo. + "dragonfly_small"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c2}(\${c3}"${c2}/) +${c2}(/${c1}|${c2}\) +${c1} | + | +EOF + ;; - Possible values: bar, infobar, barinfo, off + "DragonFly"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c2},--, ${c1}| ${c2},--, +${c2}| `-, ${c1},^, ${c2},-' | +${c2} `, `-, ${c3}(/ \) ${c2},-' ,' +${c2} `-, `-,${c1}/ \${c2},-' ,-' +${c2} `------${c1}( )${c2}------' +${c2} ,----------${c1}( )${c2}----------, +${c2} | _,-${c1}( )${c2}-,_ | +${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' +${c1} | | + | | + | | + | | + | | + | | + `|' +EOF + ;; -IMAGE: - --loop Redraw the image constantly until Ctrl+C is used. This fixes issues - in some terminals emulators when using image mode. - --size 00px | --size 00% How to size the image. - Possible values: auto, 00px, 00%, none - --crop_mode mode Which crop mode to use - Takes the values: normal, fit, fill - --crop_offset value Change the crop offset for normal mode. - Possible values: northwest, north, northeast, - west, center, east, southwest, south, southeast + "Elementary"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee eeeeeeeeeeee eeeee + eeee eeeee eee eeee + eeee eeee eee eeee +eee eee eee eee +eee eee eee eee +ee eee eeee eeee +ee eee eeeee eeeeee +ee eee eeeee eeeee ee +eee eeee eeeeee eeeee eee +eee eeeeeeeeee eeeeee eee + eeeeeeeeeeeeeeeeeeeeeeee eeeee + eeeeeeee eeeeeeeeeeee eeee + eeeee eeeee + eeeeeee eeeeeee + eeeeeeeeeeeeeeeee +EOF + ;; - --xoffset px How close the image will be to the left edge of the - window. This only works with w3m. - --yoffset px How close the image will be to the top edge of the - window. This only works with w3m. - --bg_color color Background color to display behind transparent image. - This only works with w3m. - --gap num Gap between image and text. + "Endless"*) + set_colors 1 7 + read -rd '' ascii_data <<'EOF' +${c1} `:+yhmNMMMMNmhy+:` + -odMMNhso//////oshNMMdo- + /dMMh+. .+hMMd/ + /mMNo` `oNMm: + `yMMo` `oMMy` + `dMN- -NMd` + hMN. .NMh +/MM/ -os` /MM/ +dMm `smNmmhs/- `:sNMd+ `` mMd +MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM +MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM +dMm `/++/-``/yNNh+/sdNMNddMm- mMd +/MM/ `dNy: `-::- /MM/ + hMN. .NMh + `dMN- -NMd` + `yMMo` `oMMy` + /mMNo` `oNMm/ + /dMMh+. .+hMMd/ + -odMMNhso//////oshNMMdo- + `:+yhmNMMMMNmhy+:` +EOF + ;; - NOTE: --gap can take a negative value which will move the text - closer to the left side. + "Exherbo"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} , +OXo. +NXdX0: .cok0KXNNXXK0ko:. +KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... +'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. + cNMk NK .oXM. OMMMMO. 0MMNo kW. + lMc o: ., .oKNk; ;NMMWlxW' + ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO + XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk +.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl +,M: ,XMMWx::,''oOK0x; NM. +'Ml ,kNKOxxxxxkkO0XXKOd:. oMk + NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW + ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW + ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO + 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' + xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd + 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO + :XMNxl,';:lodxkOO000Oxc. .oWMMo + 'dXMMXkl;,. .,o0MMNo' + ':d0XWMMMMWNNNNMMMNOl' + ':okKXWNKkl' +EOF + ;; - --clean Delete cached files and thumbnails. + "Fedora"* | "RFRemix"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} /:-------------:\\ + :-------------------:: + :-----------${c2}/shhOHbmp${c1}---:\\ + /-----------${c2}omMMMNNNMMD ${c1}---: + :-----------${c2}sMMMMNMNMP${c1}. ---: + :-----------${c2}:MMMdP${c1}------- ---\\ +,------------${c2}:MMMd${c1}-------- ---: +:------------${c2}:MMMd${c1}------- .---: +:---- ${c2}oNMMMMMMMMMNho${c1} .----: +:-- .${c2}+shhhMMMmhhy++${c1} .------/ +:- -------${c2}:MMMd${c1}--------------: +:- --------${c2}/MMMd${c1}-------------; +:- ------${c2}/hMMMy${c1}------------: +:--${c2} :dMNdhhdNMMNo${c1}------------; +:---${c2}:sdNMMMMNds:${c1}------------: +:------${c2}:://:${c1}-------------:: +:---------------------:// +EOF + ;; -SCREENSHOT: - -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- - shot function will use \$scrot_dir and \$scrot_name. - -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. - --image_host imgur/teknik Website to upload scrots to. - --scrot_cmd cmd Screenshot program to launch + "freebsd_small") + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} /\\ _____ /\\ + \\_) (_/ + / \ +| | +| | + \ / + --_____-- +EOF + ;; -OTHER: - --config /path/to/config Specify a path to a custom config file - --config none Launch the script without a config file - --stdout Turn off all colors and disables any ASCII/image backend. - --help Print this text and exit - --version Show neofetch version - -v Display error messages. - -vv Display a verbose log for error reporting. + "FreeBSD"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' + ${c2}``` ${c1}` + ${c2}` `.....---...${c1}....--.``` -/ + ${c2}+o .--` ${c1}/y:` +. + ${c2} yo`:. ${c1}:o `+- + ${c2}y/ ${c1}-/` -o/ + ${c2}.- ${c1}::/sy+:. + ${c2}/ ${c1}`-- / + ${c2}`: ${c1}:` + ${c2}`: ${c1}:` + ${c2}/ ${c1}/ + ${c2}.- ${c1}-. + ${c2}-- ${c1}-. + ${c2}`:` ${c1}`:` + .-- `--. + .---.....----. +EOF + ;; -DEVELOPER: - --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) + "FreeMiNT"*) + # Don't explicitly set colors since + # TosWin2 doesn't reset well. + read -rd '' ascii_data <<'EOF' +${c1} ## + ## ######### + #### ## + #### #### ## +#### #### ## ## + #### #### ## ## + #### #### ## ## ## + #### ###### + ###### ## ## #### + #### ################ + #### ## #### + ## #### ###### + ## ## #### #### + ## ## ## ## ## #### + #### ## ## ## +EOF + ;; + "Frugalware"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `++/::-.` + /o+++++++++/::-.` + `o+++++++++++++++o++/::-.` + /+++++++++++++++++++++++oo++/:-.`` + .o+ooooooooooooooooooosssssssso++oo++/:-` + ++osoooooooooooosssssssssssssyyo+++++++o: + -o+ssoooooooooooosssssssssssssyyo+++++++s` + o++ssoooooo++++++++++++++sssyyyyo++++++o: + :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo + `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: + /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss + .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- + ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso + -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. + sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ + :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` + yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ +-ysooooooydhhhhhhhhhhhddddddddddddddddssy + .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: + ``.-/+oosysssssssssssssssssssssss + ``.:/+osyysssssssssssssh. + `-:/+osyyssssyo + .-:+++` +EOF + ;; -Report bugs to https://github.com/dylanaraps/neofetch/issues + "Funtoo"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c2} _______ ____ + /MMMMMMM/ /MMMM| _____ _____ + __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ +|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ +|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| +|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| + |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ + |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ +EOF + ;; -" -exit 1 -} + "GalliumOS"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1}sooooooooooooooooooooooooooooooooooooo+: +yyooooooooooooooooooooooooooooooooo+/::: +yyysoooooooooooooooooooooooooooo+/:::::: +yyyyyoooooooooooooooooooooooo+/::::::::: +yyyyyysoooooooooooooooooo++/:::::::::::: +yyyyyyysoooooooooooooo++/::::::::::::::: +yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: +yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: +yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: +yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: +yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: +yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: +yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: +yyyyyyyyyyyyyyys+:--...........-///::::: +yyyyyyyyyyyys+:--................://:::: +yyyyyyyyyo+:-.....................-//::: +yyyyyyo+:-..........................://: +yyyo+:-..............................-// +o/:-...................................: +EOF + ;; -get_args() { - # Check the commandline flags early for '--config'. - [[ "$*" != *--config* ]] && get_user_config + "gentoo_small") + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} _-----_ +( \\ +\ 0 \\ +${c2} \ ) + / _/ +( _- +\____- +EOF + ;; - while [[ "$1" ]]; do - case "$1" in - # Info - "--os_arch") os_arch="$2" ;; - "--cpu_cores") cpu_cores="$2" ;; - "--cpu_speed") cpu_speed="$2" ;; - "--speed_type") speed_type="$2" ;; - "--speed_shorthand") speed_shorthand="$2" ;; - "--distro_shorthand") distro_shorthand="$2" ;; - "--kernel_shorthand") kernel_shorthand="$2" ;; - "--uptime_shorthand") uptime_shorthand="$2" ;; - "--cpu_brand") cpu_brand="$2" ;; - "--gpu_brand") gpu_brand="$2" ;; - "--gpu_type") gpu_type="$2" ;; - "--refresh_rate") refresh_rate="$2" ;; - "--gtk_shorthand") gtk_shorthand="$2" ;; - "--gtk2") gtk2="$2" ;; - "--gtk3") gtk3="$2" ;; - "--shell_path") shell_path="$2" ;; - "--shell_version") shell_version="$2" ;; - "--ip_host") public_ip_host="$2" ;; - "--song_shorthand") song_shorthand="$2" ;; - "--music_player") music_player="$2" ;; - "--install_time") install_time="$2" ;; - "--install_time_format") install_time_format="$2" ;; - "--cpu_temp") - cpu_temp="$2" - [[ "$cpu_temp" == "on" ]] && cpu_temp="C" - ;; + "Gentoo"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} -/oyddmdhs+:. + -o${c2}dNMMMMMMMMNNmhy+${c1}-` + -y${c2}NMMMMMMMMMMMNNNmmdhy${c1}+- + `o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/` + om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o` +.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+` + oy${c2}hdmNMMMMMMMN${c1}dyooy${c2}dmddddhhhhyhN${c1}d. + :o${c2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${c1}Mh + .:${c2}+sydNMMMMMNNNmmmdddhhhhhhmM${c1}my + /m${c2}MMMMMMNNNmmmdddhhhhhmMNh${c1}s: + `o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+` + `s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. + /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:` ++M${c2}MMMMMMNNNNNmmmmdmNMNdso${c1}/- +yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` +/h${c2}MMNNNNNNNNMNdhs++/${c1}-` +`/${c2}ohdmmddhys+++/:${c1}.` + `-//////:--. +EOF + ;; - "--disk_subtitle") disk_subtitle="$2" ;; - "--disk_show") - unset disk_show - for arg in "$@"; do - case "$arg" in - "--disk_show") ;; - "-"*) break ;; - *) disk_show+=("$arg") ;; - esac - done - ;; + "gNewSense"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} ..,,,,.. + .oocchhhhhhhhhhccoo. + .ochhlllllllc hhhhhh ollllllhhco. + ochlllllllllll hhhllllllhhh lllllllllllhco + .cllllllllllllll hlllllo +hllh llllllllllllllc. +ollllllllllhco'' hlllllo +hllh ``ochllllllllllo +hllllllllc' hllllllllllllh `cllllllllh +ollllllh +llllllllllll+ hllllllo + `cllllh. ohllllllho .hllllc' + ochllc. ++++ .cllhco + `+occooo+. .+ooocco+' + `+oo++++ ++++oo+' +EOF + ;; - "--disable") - for func in "$@"; do - case "$func" in - "--disable") continue ;; - "-"*) break ;; - *) - ((bash_version >= 4)) && func="${func,,}" - unset -f "get_$func" - ;; - esac - done - ;; + "GNU") + set_colors fg 7 + read -rd '' ascii_data <<'EOF' +${c1} _-`````-, ,- '- . + .' .- - | | - -. `. + /.' / `. \ +:/ : _... ..._ `` : +:: : /._ .`:'_.._\. || : +:: `._ ./ ,` : \ . _.'' . +`:. / | -. \-. \\_ / + \:._ _/ .' .@) \@) ` `\ ,.' + _/,--' .- .\,-.`--`. + ,'/'' (( \ ` ) + /'/' \ `-' ( + '/'' `._,-----' + ''/' .,---' + ''/' ;: + ''/'' ''/ + ''/''/'' + '/'/' + `; +EOF + ;; - # Text Colors - "--colors") - unset colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) colors+=("$arg") ;; - esac - done - colors+=(7 7 7 7 7 7) - ;; + "GoboLinux"*) + set_colors 5 4 6 2 + read -rd '' ascii_data <<'EOF' +${c1}_____ _ +/ ____| | | +| | __ ___ | |__ ___ +| | |_ |/ _ \| '_ \ / _ \ +| |__| | (_) | |_) | (_) | + \_____|\___/|_.__/ \___/ +EOF + ;; - # Text Formatting - "--underline") underline_enabled="$2" ;; - "--underline_char") underline_char="$2" ;; - "--bold") bold="$2" ;; + "Grombyang"*) + set_colors 4 2 1 + read -rd '' ascii_data <<'EOF' +${c1} eeeeeeeeeeee + eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee ${c2}.o+ ${c1}eeee + eeee ${c2}`ooo/ ${c1}eeee + eeee ${c2}`+oooo: ${c1}eeee +eee ${c2}`+oooooo: ${c1}eee +eee ${c2}-+oooooo+: ${c1}eee +ee ${c2}`/:oooooooo+: ${c1}ee +ee ${c2}`/+ +++ +: ${c1}ee +ee ${c2}+o+\ ${c1}ee +eee ${c2}+o+\ ${c1}eee +eee ${c2}// \\ooo/ \\\ ${c1}eee + eee ${c2}//++++oooo++++\\\ ${c1}eee + eeee ${c2}::::++oooo+::::: ${c1}eeee + eeeee ${c3}Grombyang OS ${c1} eeee + eeeeeeeeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeee +EOF + ;; - # Color Blocks - "--color_blocks") color_blocks="$2" ;; - "--block_range") block_range=("$2" "$3") ;; - "--block_width") block_width="$2" ;; - "--block_height") block_height="$2" ;; + "GuixSD"*) + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1} .. `. + `--..```..` `..```..--` + .-:///-:::. `-:::///:-. + ````.:::` `:::.```` + -//:` -::- + ://: -::- + `///- .:::` + -+++-:::. + :+/:::- + `-....` +EOF + ;; - # Bars - "--bar_char") - bar_char_elapsed="$2" - bar_char_total="$3" - ;; + "Haiku"*) + set_colors 2 8 + read -rd '' ascii_data <<'EOF' +${c2} :dc' + 'l:;'${c1},${c2}'ck. .;dc:. + co ${c1}..${c2}k. .;; ':o. + co ${c1}..${c2}k. ol ${c1}.${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. +.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. + ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; + ..${c1}oOolllllccccccc:::::${c2}od; + cx:ooc${c1}:::::::;${c2}cooolcX. + cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. + cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. + .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. + '::c'${c1}...${c2}do${c1}..... .${c2}K, + cd,.${c1}....:${c2}O,${c1} + ':clod:'${c1} + ${c1} +EOF + ;; - "--bar_border") bar_border="$2" ;; - "--bar_length") bar_length="$2" ;; - "--bar_colors") - bar_color_elapsed="$2" - bar_color_total="$3" - ;; + "Hyperbola"*) + set_colors 8 + read -rd '' ascii_data <<'EOF' +${c1} WW + KX W + WO0W NX0O + NOO0NW WNXK0OOKW + W0OOOOOOOOOOOOKN + N0OOOOOOO0KXW + WNXXXNW + NXK00000KN + WNK0OOOOOOOOOO0W + NK0OOOOOOOOOOOOOO0W + X0OOOOOOO00KK00OOOOOK + X0OOOO0KNWW WX0OO0W + X0OO0XNW KOOW + N00KNW KOW + NKXN W0W +WW W +EOF + ;; - "--cpu_display") cpu_display="$2" ;; - "--memory_display") memory_display="$2" ;; - "--battery_display") battery_display="$2" ;; - "--disk_display") disk_display="$2" ;; + "Kali"*) + set_colors 4 8 + read -rd '' ascii_data <<'EOF' +${c1}.............. + ..,;:ccc,. + ......''';lxO. +.....''''..........,:ld; + .';;;:::;,,.x, + ..'''. 0Xxoc:,. ... + .... ,ONkc;,;cokOdc',. + . OMo ':${c2}dd${c1}o. + dMc :OO; + 0M. .:o. + ;Wd + ;XO, + ,d0Odlc;,.. + ..',;:cdOOd::,. + .:d;.':;. + 'd, .' + ;l .. + .o + c + .' + . +EOF + ;; - # Image backend - "--backend") image_backend="$2" ;; - "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ - "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") - image_backend="${1/--}" - case "$2" in - "-"* | "") ;; - *) image_source="$2" ;; - esac - ;; + "KaOS"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} .. + ..... ..OSSAAAAAAA.. + .KKKKSS. .SSAAAAAAAAAAA. +.KKKKKSO. .SAAAAAAAAAA... +KKKKKKS. .OAAAAAAAA. +KKKKKKS. .OAAAAAA. +KKKKKKS. .SSAA.. +.KKKKKS..OAAAAAAAAAAAA........ + DKKKKO.=AA=========A===AASSSO.. + AKKKS.==========AASSSSAAAAAASS. + .=KKO..========ASS.....SSSSASSSS. + .KK. .ASS..O.. =SSSSAOSS: + .OK. .ASSSSSSSO...=A.SSA. + .K ..SSSASSSS.. ..SSA. + .SSS.AAKAKSSKA. + .SSS....S.. +EOF + ;; - # Image options - "--loop") image_loop="on" ;; - "--image_size" | "--size") image_size="$2" ;; - "--crop_mode") crop_mode="$2" ;; - "--crop_offset") crop_offset="$2" ;; - "--xoffset") xoffset="$2" ;; - "--yoffset") yoffset="$2" ;; - "--background_color" | "--bg_color") background_color="$2" ;; - "--gap") gap="$2" ;; - "--clean") - [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" - rm -rf "/Library/Caches/neofetch/" - rm -rf "/tmp/neofetch/" - exit - ;; + "KDE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} `..---+/---..` + `---.`` `` `.---.` + .--.` `` `-:-. + `:/: `.----//----.` :/- + .:. `---` `--.` .:` + .:` `--` .:- `:. + `/ `:. `.-::-.` -:` `/` + /. /. `:++++++++:` .: .: +`/ .: `+++++++++++/ /` `+` +/+` -- .++++++++++++` :. .+: +`/ .: `+++++++++++/ /` `+` + /` /. `:++++++++:` .: .: + ./ `:. `.:::-.` -:` `/` + .:` `--` .:- `:. + .:. `---` `--.` .:` + `:/: `.----//----.` :/- + .-:.` `` `-:-. + `---.`` `` `.---.` + `..---+/---..` +EOF + ;; - "--ascii_colors") - unset ascii_colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) ascii_colors+=("$arg") - esac - done - ascii_colors+=(7 7 7 7 7 7) - ;; + "Kogaion"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ;; ,; + ;;; ,;; + ,;;;; ;;;; + ,;;;;;;;; ;;;; + ;;;;;;;;;;; ;;;;; + ,;;;;;;;;;;;; ';;;;;, + ;;;;;;;;;;;;;;, ';;;;;;; + ;;;;;;;;;;;;;;;;;, ';;;;; +; ';;;;;;;;;;;;;;;;;;, ;;; +;;;, ';;;;;;;;;;;;;;;;;;;,;; +;;;;;, ';;;;;;;;;;;;;;;;;;, +;;;;;;;;, ';;;;;;;;;;;;;;;;, +;;;;;;;;;;;;, ';;;;;;;;;;;;;; +';;;;;;;;;;;;; ';;;;;;;;;;;;; + ';;;;;;;;;;;;;, ';;;;;;;;;;; + ';;;;;;;;;;;;; ;;;;;;;;;; + ';;;;;;;;;;;; ;;;;;;;; + ';;;;;;;; ;;;;;; + ';;;;; ;;;; + ';;; ;; +EOF + ;; - "--ascii_distro") - image_backend="ascii" - ascii_distro="$2" - case "$2" in "-"* | "") ascii_distro="$distro" ;; esac - ;; + "Korora"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} ____________ + _add55555555554${c1}: + _w?'${c1}``````````'${c2})k${c1}: + _Z'${c1}`${c2} ]k${c1}: + m(${c1}`${c2} )k${c1}: + _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: + .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` + jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` + jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` +.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` +:#${c1}:${c2} ${c1}`${c2})e${c1}``` +:m${c1}:${c2} ,#'${c1}` +:#${c1}:${c2} .s2'${c1}` +:m,________.aa7^${c1}` +:#baaaaaaas!J'${c1}` + ``````````` +EOF + ;; - "--ascii_bold") ascii_bold="$2" ;; - "--logo" | "-L") - image_backend="ascii" - print_info() { info line_break; } - ;; + "KSLinux"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} K K U U RRRR ooo + K K U U R R o o + KKK U U RRRR o o + K K U U R R o o + K K UUU R R ooo - # Screenshot - "--scrot" | "-s") - scrot_args "$@" - ;; - "--upload" | "-su") - scrot_upload="on" - scrot_args "$@" - ;; +${c2} SSS AAA W W AAA + S A A W W A A + SSS AAAAA W W W AAAAA + S A A WW WW A A + SSS A A W W A A +EOF + ;; - "--image_host") image_host="$2" ;; - "--scrot_cmd") scrot_cmd="$2" ;; + "Kubuntu"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `.:/ossyyyysso/:. + .:oyyyyyyyyyyyyyyyyyyo:` + -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- + -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- + oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo + `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` + oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- +oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy +oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- + oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo + `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo + oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo + -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- + -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- + ./oyyyyyyyyyyyyyyyyyyo/. + `.:/oosyyyysso/:.` +EOF + ;; - # Other - "--config") - case "$2" in - "none" | "off" | "") ;; - *) - config_file="$(get_full_path "$2")" - get_user_config - ;; - esac - ;; - "--stdout") stdout="on" ;; - "-v") verbose="on" ;; - "-vv") set -x; verbose="on" ;; - "--help") usage ;; - "--version") - printf "%s\\n" "Neofetch $version" - exit 1 - ;; - "--gen-man") - help2man -n "A fast, highly customizable system info script" \ - -N ./neofetch -o neofetch.1 - exit 1 - ;; + "LEDE"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' + ${c1} _________ + / /\ + / LE / \ + / DE / \ + /________/ LE \ + \ \ DE / + \ LE \ / + \ DE \ / + \________\/ +EOF + ;; - "--travis") - print_info() { - info title - info underline + "Linux") + set_colors fg 8 3 + read -rd '' ascii_data <<'EOF' +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### +EOF + ;; - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "GPU Driver" gpu_driver - info "Memory" memory + "LMDE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' + ${c2}`.-::---.. +${c1} .:++++ooooosssoo:. + .+o++::. `.:oos+. +${c1} :oo:.` -+oo${c2}: +${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` +${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` +${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: +${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` +${c1}`s: `oo s m Myy+-o:` +`oo :+sdoohyoydyso/. + :o. .:////////++: +${c1} `/++ ${c2}-:::::- +${c1} ${c2}`${c1}++- +${c1} ${c2}`${c1}/+- +${c1} ${c2}.${c1}+/. +${c1} ${c2}.${c1}:+-. + `--.`` +EOF + ;; - info "CPU Usage" cpu_usage - info "Disk" disk - info "Battery" battery - info "Font" font - info "Song" song - info "Local IP" local_ip - info "Public IP" public_ip - info "Users" users - info "Install Date" install_date + "Lubuntu"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `-/+oyyhhhhyyo+/-` + ./shhhhhhhhhhhhhhhhhhs/. + `:shhhhhhhhhhhhhhhhhhhhhhhhs:` + :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: + `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` + `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` + shhhhhhhhy+. .ohhhhhhhhhhhhhs +:hhhhhhy/. /hhhhhhhhhhhhh: +shhhy/. :hhhhhhhhhhhhs +hy+. ` `+yhs/` +hhhhhhhhhhhh +-.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh +shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs +:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: + shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs + `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` + +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` + :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: + :shhhhhhhhhhhhhhhhhhhhhy`+s:` + .+shhhhhhhhhhhhhhhhhhs:` + `-/+oyyhhhhyys+/-` +EOF + ;; - info line_break - info cols - info line_break + "Lunar"*) + set_colors 4 7 3 + read -rd '' ascii_data <<'EOF' +${c1}`-. `-. + -ohys/-` `:+shy/` + -omNNdyo/` :+shmNNy/` + ${c3} - + /mMmo + hMMMN` + .NMMs + ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` + /:.` ${c3}/${c1} `.:/` +${c3} __ + | | _ _ ___ ___ ___ + | |__| | | | .'| _| + |_____|___|_|_|__,|_| +EOF + ;; - # Testing. - prin "prin" - prin "prin" "prin" + "mac"*"_small") + set_colors 2 3 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} .:' + _ :'_ +${c2} .'`_`-'_``. +:________.-' +${c3}:_______: +:_______: +${c4} :_______`-; +${c5} `._.-._.' +EOF + ;; - # Testing no subtitles. - info uptime - info disk - } + "mac" | "Darwin") + set_colors 2 3 1 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. +EOF + ;; - refresh_rate="on" - shell_version="on" - cpu_display="infobar" - memory_display="infobar" - disk_display="infobar" - cpu_temp="C" - ;; - esac + "Mageia"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} .°°. + °° .°°. + .°°°. °° + . . + °°° .°°°. + .°°°. '___' +${c2} .${c1}'___' ${c2} . + :dkxc;'. ..,cxkd; + .dkk. kkkkkkkkkk .kkd. +.dkk. ';cloolc;. .kkd +ckk. .kk; +xO: cOd +xO: lOd +lOO. .OO: +.k00. .00x + .k00; ;00O. + .lO0Kc;,,,,,,;c0KOc. + ;d00KKKKKK00d; + .,KKKK,. +EOF + ;; - shift - done -} + "MagpieOS"*) + set_colors 2 1 3 5 + read -rd '' ascii_data <<'EOF' +${c1} ;00000 :000Ol + .x00kk00: O0kk00k; + l00: :00. o0k :O0k. + .k0k. x${c2}d$dddd${c1}k' .d00; + k0k. ${c2}.dddddl ${c1}o00, + o00. ${c2}':cc:. ${c1}d0O +.00l ,00. +l00. d0x +k0O .:k0o +O0k ;dO0000d. +k0O .O0O${c2}xxxxk${c1}00: +o00. k0O${c2}dddddd${c1}occ +'00l x0O${c2}dddddo${c3};..${c1} + x00. .x00${c2}kxxd${c3}:..${c1} + .O0x .:oxxx${c4}Okl.${c1} + .x0d ${c4},xx,${c1} + .:o. ${c4}.xd ckd${c1} + .. ${c4}dxl .xx; + :xxolldxd' + ;oxdl. +EOF + ;; -get_distro_colors() { - # This function sets the text colors according - # to your OS/Distro's logo colors. - # - # $ascii_distro is the same as $distro. - case "$ascii_distro" in - "AIX"*) + "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} `:+ssssossossss+-` - .oys///oyhddddhyo///sy+. - /yo:+hNNNNNNNNNNNNNNNNh+:oy/ - :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: - `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh - h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy -/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: -h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y -N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m -N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m -h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y -:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- - yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy - sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo - :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- - :ys:/yNNNNNNNNNNNNNNNmy/:sy: - .+ys///osyhhhhys+///sy+. - -/osssossossso/- +${c1}██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ EOF ;; - "alpine_small") - set_colors 4 7 + "Maui"*) + set_colors 6 7 read -rd '' ascii_data <<'EOF' -${c1} /\\ /\\ - /${c2}/ ${c1}\\ \\ - /${c2}/ ${c1}\\ \\ -/${c2}// ${c1}\\ \\ -${c2}// ${c1}\\ \\ - \\ +${c1} `.-://////:--` + .:/oooooooooooooooo+:. + `:+ooooooooooooooooooooooo:` + `:oooooooooooooooooooooooooooo/` + ..```-oooooo/-`` `:oooooo+:.` `-- + :. +oo+-` /ooo/` -/ + -o. `o+- +o/` -o: +`oo` ::` :o/ `+. .+o` /oo. +/o+ . -+oo- ` /oo/ `ooo/ ++o- /ooo+` .+ooo. :ooo+ +++ .+oooo: -oooo+ `oooo+ +:. .oooooo` :ooooo- :oooo: +` .oooooo: :ooooo+ `ooo+-` + .+oooooo` -oooooo: `o/- + +oooooo: .ooooooo. + /ooooooo` /ooooooo/ .. + `:oooooooo/:::/ooooooooo+:--:/:` + `:+oooooooooooooooooooooo+:` + .:+oooooooooooooooo+:. + `.-://////:-.` EOF ;; - "Alpine"*) - set_colors 4 5 7 6 + "Mer"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} .hddddddddddddddddddddddh. - :dddddddddddddddddddddddddd: - /dddddddddddddddddddddddddddd/ - +dddddddddddddddddddddddddddddd+ - `sdddddddddddddddddddddddddddddddds` - `ydddddddddddd++hdddddddddddddddddddy` -.hddddddddddd+` `+ddddh:-sdddddddddddh. -hdddddddddd+` `+y: .sddddddddddh -ddddddddh+` `//` `.` -sddddddddd -ddddddh+` `/hddh/` `:s- -sddddddd -ddddh+` `/+/dddddh/` `+s- -sddddd -ddd+` `/o` :dddddddh/` `oy- .yddd -hdddyo+ohddyosdddddddddho+oydddy++ohdddh -.hddddddddddddddddddddddddddddddddddddh. - `yddddddddddddddddddddddddddddddddddy` - `sdddddddddddddddddddddddddddddddds` - +dddddddddddddddddddddddddddddd+ - /dddddddddddddddddddddddddddd/ - :dddddddddddddddddddddddddd: - .hddddddddddddddddddddddh. +${c1} dMs + .-` + `y`-o+` + ``NMMy + .--`:++. + .hNNNNs + /MMMMMN + `ommmd/ +/ + ```` +/ + `:+sssso/-` + .-::. `-::-` `smNMNmdmNMNd/ .://-` +.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo +dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- +MMm yMM- :MMs NMN` `:::::--sMMh dMM` +MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` +NNd sNN- -NNs -mMNs-.--..:dMMh` dNN +--- .--` `--. .smMMmdddmMNdo` .-- + ./ohddds+:` + +h- `.:-. + ./`.dMMMN+ + +MMMMMd + `+dmmy- + ``` .+` + .dMNo-y. + `hmm/ + .:` + dMs +EOF + ;; + + "Minix"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c2} -sdhyo+:-` -/syymm: + sdyooymmNNy. `` .smNmmdysNd + odyoso+syNNmysoyhhdhsoomNmm+/osdm/ + :hhy+-/syNNmddhddddddmNMNo:sdNd: + `smNNdNmmNmddddddddddmmmmmmmy` + `ohhhhdddddmmNNdmddNmNNmdddddmdh- + odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: + `+mNho:` smmd/ sNNh :dmms` -+ymmo. +-od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: ++sms -.` :so: .NN+ :os/ .-`mNh: +.-hyh+:////- -sNNd:` .--://ohNs- + `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ + -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: + //oydNMMMMydMMNysNMMmsMMMMMNyo/` + ../-yNMMy--/::/-.sMMmos+.` + -+oyhNsooo+omy/``` + `::ohdmds-` +EOF + ;; + + "Linux Mint"* | "LinuxMint"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. +MMm----::-://////////////oymNMd+` +MMd ${c2}/++ ${c1}-sNMd: +MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: +ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm + NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM + NMm ${c2}dMM` ..` ... ydm. ${c1}dMM + hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM + -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM + -dMNs-${c2}``-::::-------.`` ${c1}dMM + `/dMNmy+/:-------------:/yMMM + ./ydNMMMMMMMMMMMMMMMMMMMMM + .MMMMMMMMMMMMMMMMMMM EOF ;; - "Amazon"*) - set_colors 3 7 + "MX"*) + set_colors 4 6 7 read -rd '' ascii_data <<'EOF' -${c1} `-/oydNNdyo:.` - `.:+shmMMMMMMMMMMMMMMmhs+:.` - -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- -.`` -/+shmNNMMMMMMNNmhs+/- ``. -dNmhs+:. `.:/oo/:.` .:+shmNd -dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd -dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. - `.:+shNMMMMMh yMMMMMNhs+:`` - `-+shy shs+:` +${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM +MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM +MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM +MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM +MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM +MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM +MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM +MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM +MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM +MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM +MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM +MMMMMMMNo` :mMMN+` `-hMMMMMMMM +MMMMMMh. `oNMMd: `/mMMMMMM +MMMMm/ -hMd- `sNMMMM +MMNs` - :dMMM +Mm: `oMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM EOF ;; - "Anarchy"*) - set_colors 7 4 + "NetBSD"*) + set_colors 5 7 read -rd '' ascii_data <<'EOF' - ${c2}..${c1} - ${c2}..${c1} - ${c2}:..${c1} - ${c2}:+++.${c1} - .:::++${c2}++++${c1}+::. - .:+######${c2}++++${c1}######+:. - .+#########${c2}+++++${c1}##########:. - .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. - +###########${c2}+++++++++${c1}############: - +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ - +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ - :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: - ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ -.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. -.##########${c2}+++++++++++++++++++${c1}###########. - #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ - :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: - +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ - +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ - :##${c2}++++++${c1}############${c2}++++++++++${c1}##: - .${c2}++++++${c1}#############${c2}++++++++++${c1}+. - :${c2}++++${c1}###############${c2}+++++++${c1}:: - .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. - ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. - ${c2}.${c1} ${c2}.:+++${c1}. - ${c2}.:${c1}: - ${c2}..${c1} - ${c2}..${c1} +${c1} `-/oshdmNMNdhyo+:-` +${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` +${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` + ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` + ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` + ${c2}-N/${c1}hMMMMMMMMMmho:` + ${c2}-N/${c1}-:/++/:.` +${c2} :M+ + :Mo + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms EOF ;; - "Android"*) - set_colors 2 7 + "Netrunner"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} -o o- - +hydNNNNdyh+ - +mMMMMMMMMMMMMm+ - `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` - hMMMMMMMMMMMMMMMMMMh - .. yyyyyyyyyyyyyyyyyyyy .. -.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: --MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- - +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ - mMMMMMMMMMMMMMMMMMMm - `/++MMMMh++hMMMM++/` - MMMMo oMMMM - MMMMo oMMMM - oNMm- -mMNs +${c1} .:oydmMMMMMMmdyo:` + -smMMMMMMMMMMMMMMMMMMds- + +mMMMMMMMMMMMMMMMMMMMMMMMMd+ + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ + `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` + .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` + dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh ++MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ +mMMMMMMMMd+:.` `mMMMMMMMMMMMMd +MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM +mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd ++MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ + dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh + `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` + `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: + +dMMMMMMMMMMMMMMMMMMMMMMMMd/ + -odMMMMMMMMMMMMMMMMMMdo- + `:+ydmNMMMMNmhy+-` EOF ;; - "Antergos"*) - set_colors 4 6 + "Nitrux"*) + set_colors 4 read -rd '' ascii_data <<'EOF' -${c2} `.-/::/-`` - .-/osssssssso/. - :osyysssssssyyys+- - `.+yyyysssssssssyyyyy+. - `/syyyyyssssssssssyyyyys-` - `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` - .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. - .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. - -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: - -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- - .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` -`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo -.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. -ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy -dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh --dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- -.smmmmddddddddhhhhhhhhhdddddddddmmmms. - `+ydmmmdddddddddddddddddddmmmmdy/. - `.:+ooyyddddddddddddyyso+:.` +${c1}`:/. +`/yo +`/yo +`/yo .+:. +`/yo .sys+:.` +`/yo `-/sys+:.` +`/yo ./sss+:.` +`/yo .:oss+:-` +`/yo ./o///:-` +`/yo `.-:///////:` +`/yo `.://///++//-`` +`/yo `.-:////++++/-` +`/yo `-://///++o+/-` +`/yo `-/+o+++ooo+/-` +`/s+:+oooossso/.` +`//+sssssso:. +`+syyyy+:` +:+s+- EOF ;; - "antiX"*) - set_colors 1 7 3 + "nixos_small") + set_colors 4 6 read -rd '' ascii_data <<'EOF' -${c1} - \ - , - ~ ^ ~ - \ / - , ' \ ' , / - , \ '/ - , \ / , - ,___, \/ , - / | _ _ _|_ o /\ , -|, | / |/ | | | / \ , - \,_/\_/ | |_/|_/|_/_/ \, - , / ,\ - , / , ' \ - ' - , _ _ _ , ' + ${c1}\\\\ \\\\ // + ==\\\\__\\\\/ // + // \\\\// +==// //== + //\\\\___// +// /\\\\ \\\\== + // \\\\ \\\\ EOF ;; - "AOSC"*) - set_colors 4 7 1 + "NixOS"*) + set_colors 4 6 read -rd '' ascii_data <<'EOF' -${c2} .:+syhhhhys+:. - .ohNMMMMMMMMMMMMMMNho. - `+mMMMMMMMMMMmdmNMMMMMMMMm+` - +NMMMMMMMMMMMM/ `./smMMMMMN+ - .mMMMMMMMMMMMMMMo -yMMMMMm. - :NMMMMMMMMMMMMMMMs .hMMMMN: - .NMMMMhmMMMMMMMMMMm+/- oMMMMN. - dMMMMs ./ymMMMMMMMMMMNy. sMMMMd --MMMMN` oMMMMMMMMMMMN: `NMMMM- -/MMMMh NMMMMMMMMMMMMm hMMMM/ -/MMMMh NMMMMMMMMMMMMm hMMMM/ --MMMMN` :MMMMMMMMMMMMy. `NMMMM- - dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd - .NMMMMo -/+sMMMMMMMMMMMmMMMMN. - :NMMMMh. .MMMMMMMMMMMMMMMN: - .mMMMMMy- NMMMMMMMMMMMMMm. - +NMMMMMms/.` mMMMMMMMMMMMN+ - `+mMMMMMMMMNmddMMMMMMMMMMm+` - .ohNMMMMMMMMMMMMMMNho. - .:+syhhhhys+:. +${c1} ::::. ${c2}'::::: ::::' +${c1} '::::: ${c2}':::::. ::::' +${c1} ::::: ${c2}'::::.::::: +${c1} .......:::::..... ${c2}:::::::: +${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. + ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' +${c2} ..... ::::' ${c1}:::::' +${c2} ::::: '::' ${c1}:::::' +${c2} ........::::: ' ${c1}:::::::::::. +${c2}::::::::::::: ${c1}::::::::::::: +${c2} ::::::::::: ${c1}.. ${c1}::::: +${c2} .::::: ${c1}.::: ${c1}::::: +${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... + ::::: ${c1}':::::. ${c2}......:::::::::::::' + ::: ${c1}::::::. ${c2}':::::::::::::::::' +${c1} .:::::::: ${c2}':::::::::: +${c1} .::::''::::. ${c2}'::::. +${c1} .::::' ::::. ${c2}'::::. +${c1} .:::: :::: ${c2}'::::. EOF ;; - "Apricity"*) - set_colors 4 7 1 + "Nurunner"*) + set_colors 4 read -rd '' ascii_data <<'EOF' -${c2} ./o- - ``...`` `:. -/: - `-+ymNMMMMMNmho-` :sdNNm/ - `+dMMMMMMMMMMMMMMMmo` sh:.:::- - /mMMMMMMMMMMMMMMMMMMMm/`sNd/ - oMMMMMMMMMMMMMMMMMMMMMMMs -` -:MMMMMMMMMMMMMMMMMMMMMMMMM/ -NMMMMMMMMMMMMMMMMMMMMMMMMMd -MMMMMMMmdmMMMMMMMMMMMMMMMMd -MMMMMMy` .mMMMMMMMMMMMmho:` -MMMMMMNo/sMMMMMMMNdy+-.`-/ -MMMMMMMMMMMMNdy+:.`.:ohmm: -MMMMMMMmhs+-.`.:+ymNMMMy. -MMMMMM/`.-/ohmNMMMMMMy- -MMMMMMNmNNMMMMMMMMmo. -MMMMMMMMMMMMMMMms:` -MMMMMMMMMMNds/. -dhhyys+/-` +${c1} ,xc + ;00cxXl + ;K0, .xNo. + :KO' .lXx. + cXk. ;xl cXk. + cXk. ;k:.,xo. cXk. + .lXx. :x::0MNl,dd. :KO, + .xNx. cx;:KMMMMMNo'dx. ;KK; + .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: +;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO + 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: + .kNo .xo'xWMMMMMM0;:O: ;KK; + .dXd. .do,oNMMO;ck: ;00, + oNd. .dx,;'cO; ;K0, + oNx. okk; ;K0, + lXx. :KO' + cKk' cXk. + ;00:lXx. + ,kd. EOF ;; - "ArcoLinux"*) - set_colors 7 4 + "NuTyX"*) + set_colors 4 1 read -rd '' ascii_data <<'EOF' -${c2} /- - ooo: - yoooo/ - yooooooo - yooooooooo - yooooooooooo - .yooooooooooooo - .oooooooooooooooo - .oooooooarcoooooooo - .ooooooooo-oooooooooo - .ooooooooo- oooooooooo - :ooooooooo. :ooooooooo - :ooooooooo. :ooooooooo - :oooarcooo .oooarcooo - :ooooooooy .ooooooooo - :ooooooooo ${c1}/ooooooooooooooooooo${c2} - :ooooooooo ${c1}.-ooooooooooooooooo.${c2} - ooooooooo- ${c1}-ooooooooooooo.${c2} - ooooooooo- ${c1}.-oooooooooo.${c2} -ooooooooo. ${c1}-ooooooooo${c2} +${c1} . + . + ... + ... + .... .........--. + ..-++-----....--++++++---. + .-++++++-. .-++++++++++++-----.. + .--... .++..-+++--.....-++++++++++--.. + . .-+-. .**- .... ..-+----.. + .+++. .*+. + -++-----. + .+++++- ++. .*+. .....-+++-----. + -+++-++. .+. .-+***++***++--++++. . + -+-. -- -. -*- ...... ..--. +.-. .+- . -+. +. .+- +. + -- -- + -+----. .- + -++-.+. . + .++. -- + +. ----. + . .+. .. + - . + . EOF ;; - "arch_small") - set_colors 6 7 1 + "OBRevenge"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} /\ - /^^\ - /\ \ - /${c2} __ \ - / ( ) \ - / __| |__\\\ -/// \\\\\ +${c1} __ __ + _@@@@ @@@g_ + _@@@@@@ @@@@@@ + _@@@@@@M W@@@@@@_ + j@@@@P ^W@@@@ + @@@@L____ _____Q@@@@ +Q@@@@@@@@@@j@@@@@@@@@@ +@@@@@ T@j@ T@@@@@ +@@@@@ ___Q@J@ _@@@@@ +@@@@@fMMM@@j@jggg@@@@@@ +@@@@@ j@j@^MW@P @@@@ +Q@@@@@ggg@@f@ @@@@@@L +^@@@@WWMMP ^ Q@@@@ + @@@@@_ _@@@@l + W@@@@@g_____g@@@@@P + @@@@@@@@@@@@@@@@l + ^W@@@@@@@@@@@P + ^TMMMMTll EOF ;; - "arch_old") - set_colors 6 7 1 + "openbsd_small") + set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' -${c1} __ - _=(SDGJT=_ - _GTDJHGGFCVS) - ,GTDJGGDTDFBGX0 -${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ -${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL -${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, -${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], -${c1} SDDFDFH' !YEWD,${c2} )HDROD -${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' -${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' -${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' -${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) -${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF -'EHTI !H - `0F' '! +${c1} _____ + \\- -/ + \\_/ \\ + | ${c2}O O${c1} | + |_ < ) 3 ) + / \\ / + /-_____-\\ EOF ;; - "ArchBox"*) - set_colors 2 7 1 + "OpenBSD"*) + set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' -${c1} ...:+oh/:::.. - ..-/oshhhhhh` `::::-. - .:/ohhhhhhhhhhhh` `-::::. - .+shhhhhhhhhhhhhhhhh` `.::-. - /`-:+shhhhhhhhhhhhhh` .-/+shh - / .:/ohhhhhhhhh` .:/ohhhhhhhh - / `-:+shhh` ..:+shhhhhhhhhhhh - / .:ohhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / .+o+ `hhhhhhhhhhhhhhhhhhhh - / -hhhhh `hhhhhhhhhhhhhhhhhhhh - / ohhhhho `hhhhhhhhhhhhhhhhhhhh - /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` - `--/:` /: `hhhhhhhhhhhho/- - -/:. `hhhhhhs+:-` - ::::/ho/-` + ${c3} _ + (_) +${c1} | . +${c1} . |L /| . ${c3} _ +${c1} _ . |\ _| \--+._/| . ${c3}(_) +${c1} / ||\| Y J ) / |/| ./ + J |)'( | ` F`.'/ ${c3} _ +${c1} -<| F __ .-< ${c3}(_) +${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ + J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ +${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) +${c1} '-F -<_. \\ .-' `-' L__ +__J _ _. >-' ${c1})${c4}._. ${c1}|-' +${c1} `-|.' /_. ${c4}\_| ${c1} F + /.- . _.< + /' /.' .' `\\ + /L /' |/ _.-'-\\ + /'J ___.---'\| + |\ .--' V | `. ` + |/`. `-. `._) + / .-.\\ + \\ ( `\\ + `.\ EOF ;; - "ARCHlabs"*) - set_colors 6 6 7 1 + "OpenIndiana"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} 'c' - 'kKk, - .dKKKx. - .oKXKXKd. - .l0XXXXKKo. - c0KXXXXKX0l. - :0XKKOxxOKX0l. - :OXKOc. .c0XX0l. - :OK0o. ${c4}...${c1}'dKKX0l. - :OX0c ${c4};xOx'${c1}'dKXX0l. - :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. - c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. - .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. - .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. - .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. - .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. - .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' - 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' - 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, - ,xko:'. ${c4}.. ${c1} .':okx; - .,'. .',. -EOF - ;; +${c2} .sy/ + .yh+ - *"XFerience"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ``--:::::::-.` - .-/+++ooooooooo+++:-` - `-/+oooooooooooooooooo++:. - -/+oooooo/+ooooooooo+/ooo++:` - `/+oo++oo. .+oooooo+.-: +:-o+- - `/+o/. -o. :oooooo+ ```:.+oo+- -`:+oo- -/` :oooooo+ .`-`+oooo/. -.+ooo+. .` `://///+-+..oooooo+:` --+ooo:` ``.-+oooooo+/` --+oo/` :+oooo/. -.+oo: ..-/. . -+oo+/` -`/++- -:::++::/. -+oo+- - ./o: `:///+- `./ooo+:` - .++- `` /-` -:/+oooo+:` - .:+/:`` `-:ooooooo++- - ./+o+//:...../+oooooooo++:` - `:/++ooooooooooooo++/-` - `.-//++++++//:-.` - `````` + ${c1}-+syyyo+- ${c2} /+. + ${c1}+ddo/---/sdh/ ${c2} ym- + ${c1}`hm+ `sms${c2} ym-```````.-. + ${c1}sm+ sm/ ${c2} ym- +s + ${c1}hm. /mo ${c2} ym- /h + ${c1}omo ym: ${c2} ym- `os` + ${c1}smo` .ym+ ${c2} ym- .os- + `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. + ..` ${c1}`:+oo+/-` ${c2} -//oyo- + -:` .:oys/. ++- `./oyys/. +h+` `.-:+oyyyo/-` +`/ossssysso+/-.` EOF ;; - "ArchMerge"*) - set_colors 6 6 7 1 + "OpenMandriva"*) + set_colors 4 3 read -rd '' ascii_data <<'EOF' -${c1} y: - sMN- - +MMMm` - /MMMMMd` - :NMMMMMMy - -NMMMMMMMMs - .NMMMMMMMMMM+ - .mMMMMMMMMMMMM+ - oNMMMMMMMMMMMMM+ - `+:-+NMMMMMMMMMMMM+ - .sNMNhNMMMMMMMMMMMM/ - `hho/sNMMMMMMMMMMMMMMM/ - `.`omMMmMMMMMMMMMMMMMMMM+ - .mMNdshMMMMd+::oNMMMMMMMMMo - .mMMMMMMMMM+ `yMMMMMMMMMs - .NMMMMMMMMM/ yMMMMMMMMMy - -NMMMMMMMMMh `mNMMMMMMMMd` - /NMMMNds+:.` `-/oymMMMm. - +Mmy/. `:smN: -/+. -o. +${c2} `` + `-. +${c1} ` ${c2}.--- +${c1} -/ ${c2}-::--` +${c1} `++ ${c2}`----...```-:::::. +${c1} `os. ${c2}.::::::::::::::-``` ` ` +${c1} +s+ ${c2}.::::::::::::::::---...--` +${c1}-ss: ${c2}`-::::::::::::::::-.``.`` +${c1}/ss- ${c2}.::::::::::::-.`` ` +${c1}+ss: ${c2}.::::::::::::- +${c1}/sso ${c2}.::::::-::::::- +${c1}.sss/ ${c2}-:::-.` .::::: +${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: +${c1} -ossso+/:://+/-` ${c2}.:` +${c1} -/+ooo+/-. ${c2}` EOF ;; - "Arch"*) - set_colors 6 6 7 1 + "OpenWrt"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} -` - .o+` - `ooo/ - `+oooo: - `+oooooo: - -+oooooo+: - `/:-:++oooo+: - `/++++/+++++++: - `/++++++++++++++: - `/+++o${c2}oooooooo${c1}oooo/` -${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` -${c2} .oossssso-````/ossssss+` - -osssssso. :ssssssso. - :osssssss/ osssso+++. - /ossssssss/ +ssssooo/- - `/ossssso+/:- -:/+osssso+- - `+sso+:-` `.-/+oso: - `++:. `-/+/ - .` `/ +${c1} _______ +| |.-----.-----.-----. +| - || _ | -__| | +|_______|| __|_____|__|__| + |__| + ________ __ +| | | |.----.| |_ +| | | || _|| _| +|________||__| |____| EOF ;; - "Artix"*) - set_colors 6 4 2 7 + "Open Source Media Center"* | "osmc") + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} d${c2}c. -${c1} x${c2}dc. -${c1} '.${c4}.${c1} d${c2}dlc. -${c1} c${c2}0d:${c1}o${c2}xllc; -${c1} :${c2}0ddlolc,lc, -${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. -${c1} ;${c1}K${c2}kxoOddollc' cllc. -${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: -${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: -${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, -${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. -${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; -${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, -${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. -${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. -${c1} 0${c2}Okd''dc. .cll; -${c1} k${c2}Okd' .llc, -${c1} d${c2}Od, 'lc. -${c1} :,${c4}. ${c2}... +${c1} -+shdmNNNNmdhs+- + .+hMNho/:..``..:/ohNMh+. + :hMdo. .odMh: + -dMy- -yMd- + sMd- -dMs + hMy +. .+ yMh + yMy dMs. .sMd yMy +:Mm dMNMs` `sMNMd `mM: +yM+ dM//mNs``sNm//Md +My +mM- dM: +NNNN+ :Md -Mm +mM- dM: `oNN+ :Md -Mm +yM+ dM/+NNo` :Md +My +:Mm` dMMNs` :Md `mM: + yMy dMs` -ms yMy + hMy +. yMh + sMd- -dMs + -dMy- -yMd- + :hMdo. .odMh: + .+hMNho/:..``..:/ohNMh+. + -+shdmNNNNmdhs+- EOF ;; - "Arya"*) - set_colors 2 1 + "Oracle"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} `oyyy/${c2}-yyyyyy+ -${c1} -syyyy/${c2}-yyyyyy+ -${c1} .syyyyy/${c2}-yyyyyy+ -${c1} :yyyyyy/${c2}-yyyyyy+ -${c1} `/ :yyyyyy/${c2}-yyyyyy+ -${c1} .+s :yyyyyy/${c2}-yyyyyy+ -${c1} .oys :yyyyyy/${c2}-yyyyyy+ -${c1} -oyys :yyyyyy/${c2}-yyyyyy+ -${c1} :syyys :yyyyyy/${c2}-yyyyyy+ -${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ -${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ -${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- -${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy -${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy -${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy +${c1} + `-/+++++++++++++++++/-.` + `/syyyyyyyyyyyyyyyyyyyyyyys/. + :yyyyo/-...............-/oyyyy/ + /yyys- .oyyy+ +.yyyy` `syyy- +:yyyo /yyy/ +.yyyy` `syyy- + /yyys. .oyyyo + /yyyyo:-...............-:oyyyy/` + `/syyyyyyyyyyyyyyyyyyyyyyys+. + `.:/+ooooooooooooooo+/:.` EOF ;; - "Bitrig"*) - set_colors 2 7 + "PacBSD"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} `hMMMMN+ - -MMo-dMd` - oMN- oMN` - yMd /NM: - .mMmyyhMMs - :NMMMhsmMh - +MNhNNoyMm- - hMd.-hMNMN: - mMmsssmMMMo - .MMdyyhNMMMd - oMN.`/dMddMN` - yMm/hNm+./MM/ -.dMMMmo.``.NMo -:NMMMNmmmmmMMh -/MN/-------oNN: -hMd. .dMh -sm/ /ms +${c1} :+sMs. + `:ddNMd- -o--` + -sMMMMh: `+N+`` + yMMMMMs` .....-/-... `mNh/ + yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm + yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm + :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd + +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- + :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. + .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- + /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` +.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- +:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` +/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. +:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` +:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` + sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. + :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// + /dMMMMMMMMMMMMMs- ````````..`` + .oMMMMMMMMMMMMNs` ./y:` + +dNMMNMMMMMMMmy` ``./ys. + `/hMMMMMMMMMMMNo-`` `.+yy+-` + `-/hmNMNMMMMMMmmddddhhy/-` + `-+oooyMMMdsoo+/:. EOF ;; - "BLAG"*) + "Parabola"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' -${c1} d - ,MK: - xMMMX: - .NMMMMMX; - lMMMMMMMM0clodkO0KXWW: - KMMMMMMMMMMMMMMMMMMX' - .;d0NMMMMMMMMMMMMMMMMMMK. - .;dONMMMMMMMMMMMMMMMMMMMMMMx -'dKMMMMMMMMMMMMMMMMMMMMMMMMl - .:xKWMMMMMMMMMMMMMMMMMMM0. - .:xNMMMMMMMMMMMMMMMMMK. - lMMMMMMMMMMMMMMMMMMK. - ,MMMMMMMMWkOXWMMMMMM0 - .NMMMMMNd. `':ldko - OMMMK: - oWk, - ;: +${c1} `.-. `. + `.` `:++. `-+o+. + `` `:+/. `:+/. `-+oooo+ + ``-::-.:+/. `:+/. `-+oooooo+ + `.-:///- ..` .-. `-+oooooooo- + `..-..` `+ooooooooo: +`` :oooooooo/ + `ooooooo: + `oooooo: + -oooo+. + +ooo/` + -ooo- + `+o/. + /+- + //` + -. EOF ;; - "BlankOn"*) - set_colors 1 7 3 + "Pardus"*) + set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' -${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` -${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ -${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys -${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys -${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys -${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys -${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys -${c2}NMMMMMN: .NMMMMMN${c1}yyyyys -${c2}MMMMMMm. NMMMMMN${c1}yyyyys -${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys -${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys -${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys -${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys -${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys -${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys -${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo -${c2} `.:/++++/:.` ${c1}:oys+. +${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. +/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ +mN. oMdyy- -y `-dMo .Nm +.mN+` sMy hN+ -: yMs `+Nm. + `yMMddMs.dy `+` sMddMMy` + +MMMo .` . oMMM+ + `NM/ `````.` `.````` +MN` + yM+ `.-:yhomy ymohy:-.` +My + yM: yo oy :My + +Ms .N` `N. +h sM+ + `MN - -::::::- : :o:+`NM` + yM/ sh -dMMMMd- ho +y+My + .dNhsohMh-//: /mm/ ://-yMyoshNd` + `-ommNMm+:/. oo ./:+mMNmmo:` + `/o+.-somNh- :yy: -hNmos-.+o/` + ./` .s/`s+sMdd+``+ddMs+s`/s. `/. + : -y. -hNmddmNy. .y- : + -+ `..` +- EOF ;; - "BSD") - set_colors 1 7 4 3 6 + "Parrot"*) + set_colors 6 7 read -rd '' ascii_data <<'EOF' -${c1} , , - /( )` - \ \___ / | - /- _ `-/ ' - (${c2}/\/ \ ${c1}\ /\ - ${c2}/ / | ` ${c1}\ - ${c3}O O ${c2}) ${c1}/ | - ${c2}`-^--'${c1}`< ' - (_.) _ ) / - `.___/` / - `-----' / -${c4}<----. __ / __ \ -${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| -<----' ${c1}`--' `.__,' \ - | | - \ / /\ - ${c5}______${c1}( (_ / \______/ - ${c5},' ,-----' | - `--{__________) +${c1} `:oho/-` +`mMMMMMMMMMMMNmmdhy- + dMMMMMMMMMMMMMMMMMMs` + +MMsohNMMMMMMMMMMMMMm/ + .My .+dMMMMMMMMMMMMMh. + + :NMMMMMMMMMMMMNo + `yMMMMMMMMMMMMMm: + /NMMMMMMMMMMMMMy` + .hMMMMMMMMMMMMMN+ + ``-NMMMMMMMMMd- + /MMMMMMMMMMMs` + mMMMMMMMsyNMN/ + +MMMMMMMo :sNh. + `NMMMMMMm -o/ + oMMMMMMM. + `NMMMMMM+ + +MMd/NMh + mMm -mN` + /MM `h: + dM` . + :M- + d: + -+ + - EOF ;; - "BunsenLabs"*) - set_colors fg 7 + "Parsix"*) + set_colors 3 1 7 8 read -rd '' ascii_data <<'EOF' -${c1} `++ - -yMMs - `yMMMMN` - -NMMMMMMm. - :MMMMMMMMMN- - .NMMMMMMMMMMM/ - yMMMMMMMMMMMMM/ -`MMMMMMNMMMMMMMN. --MMMMN+ /mMMMMMMy --MMMm` `dMMMMMM -`MMN. .NMMMMM. - hMy yMMMMM` - -Mo +MMMMN - /o +MMMMs - +MMMN` - hMMM: - `NMM/ - +MN: - mh. - -/ + ${c2}-/+/:. + ${c2}.syssssys. + ${c1}.--. ${c2}ssssssssso${c1} ..--. + :++++++: ${c2}+ssssssss+${c1} ./++/+++: + /+++++++++.${c2}.yssooooy`${c1}-+///////o- + /++++++++++.${c2}+soooos:${c1}:+////////+- + :+++++////o-${c2}oooooo-${c1}+/////////- + `-/++//++-${c4}.-----.-${c1}:+/////:- + ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. +${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- +${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ +${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- + `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` + ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. + ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: + ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ + ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: + ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- + ${c1}`--` ${c2}+sssssssso ${c1}`--` + ${c2}+sssssy+` + ${c2}`.::-` EOF ;; - "Calculate"*) - set_colors 7 3 + "PCBSD"* | "TrueOS"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} ...... - ,,+++++++,. - .,,,....,,,${c2}+**+,,.${c1} - ............,${c2}++++,,,${c1} - ............... - ......,,,........ - .....+*#####+,,,*+. - .....,*###############,..,,,,,,.. - ......,*#################*..,,,,,..,,,.. - .,,....*####################+***+,,,,...,++, - .,,..,..*#####################*, - ,+,.+*..*#######################. - ,+,,+*+..,########################* -.,++++++. ..+##**###################+ -..... ..+##***#################*. - .,.*#*****##############*. - ..,,*********#####****+. - ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} - ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} - ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} +${c1} .. + s. + +y + yN + -MN `. + :NMs `m + .yMMm` `No + `-/+++sdMMMNs+-`+Ms + `:oo+-` .yMMMMy` `-+oNMh + -oo- +NMMMM/ oMMh- + .s+` ` oMMMMM/ - oMMMhy. + +s`- :: :MMMMMd -o `mMMMy`s+ + y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y + s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s +-h .NM` `hMMMMMMMMMMMMMMNMMNy: h- +y- hMN` hMMmMMMMMMMMMNsdMNs. -y +m` mMMy` oMMNoNMMMMMMo` sMMMo `m +m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m +h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h +:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: + y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y + `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` + so -NMMMN /mmd+ `dMMMMMMMm- os + :y: `yMMM` `+NMMMMMMNo`:y: + /s+`.omy /NMMMMMNh/.+s: + .+oo:-. /mdhs+::oo+. + -/o+++++++++++/- EOF ;; - "CentOS"*) - set_colors 3 2 4 5 7 + "PCLinuxOS"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} .. - .PLTJ. - <><><><> - ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK - ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK - ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V - ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. -${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. -${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. -${c4} -${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV -${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' - ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' - ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 - ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK - ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK -${c2} <><><><> - 'MKKM' - '' + ${c1}mhhhyyyyhhhdN + dyssyhhhhhhhhhhhssyhN + Nysyhhyo/:-.....-/oyhhhssd + Nsshhy+. `/shhysm + dohhy/ -shhsy + dohhs` /hhys +N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy +ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ ++hho ${c2}ymm- /mmy+mms ${c1}:hhod +/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh ++hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m +yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ + ohhy` ${c2}://` -/+++/- ${c1}ohhom + N+hhy- `shhoh + sshho. `+hhyom + dsyhhs/. `:ohhhoy + dysyhhhso///://+syhhhssh + dhyssyhhhhhhyssyyhN + mddhdhdmN EOF ;; - "Chakra"*) - set_colors 4 5 7 6 + "Peppermint"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} _ _ _ "kkkkkkkk. - ,kkkkkkkk., 'kkkkkkkkk, - ,kkkkkkkkkkkk., 'kkkkkkkkk. - ,kkkkkkkkkkkkkkkk,'kkkkkkkk, - ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. - "''"''',;::,,"''kkk''kkkkk; __ - ,kkkkkkkkkk, "k''kkkkk' ,kkkk - ,kkkkkkk' ., ' .: 'kkkk',kkkkkk - ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk - ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk -.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' -;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' -'kkkkkkk; 'kkkkkkkk.,""''"''"" - ''kkkk; 'kkkkkkkkkk., - ';' 'kkkkkkkkkkkk., - ';kkkkkkkkkk' - ';kkkkkk' - "''" +${c1} 8ZZZZZZ${c2}MMMMM +${c1} .ZZZZZZZZZ${c2}MMMMMMM. +${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ +${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM +${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. +${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI +${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM +${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM +${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM +${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM +${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM +${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M +${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 +${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 +${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 +${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z +${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM +${c1} NZZZZZZZZZZZ${c2}MMMMM +${c1} ZZZZZZZZZ${c2}MM) EOF ;; - "ChaletOS"*) - set_colors 4 7 1 + "Pop!_OS"*) + set_colors 6 7 read -rd '' ascii_data <<'EOF' -${c1} `.//+osso+/:`` - `/sdNNmhyssssydmNNdo:` - :hNmy+-` .-+hNNs- - /mMh/` `+:` `+dMd: - .hMd- -sNNMNo. /yyy /mMs` - -NM+ `/dMd/--omNh::dMM `yMd` - .NN+ .sNNs:/dMNy:/hNmo/s yMd` - hMs `/hNd+-smMMMMMMd+:omNy- `dMo -:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` -/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: -/Md` MMMMMMMMMMMMMMMMMMMN .MN: -:NN. MMMMMMm....--NMMMMMN -Mm. -`dMo MMMMMMd mMMMMMN hMs - -MN: MMMMMMd mMMMMMN oMm` - :NM: MMMMMMd mMMMMMN +Mm- - -mMy. mmmmmmh dmmmmmh -hMh. - oNNs- :yMm/ - .+mMdo:` `:smMd/` - -ohNNmhsoo++osshmNNh+. - `./+syyhhyys+:`` +${c1} ///////////// + ///////////////////// + ///////${c2}*767${c1}//////////////// + //////${c2}7676767676*${c1}////////////// + /////${c2}76767${c1}//${c2}7676767${c1}////////////// + /////${c2}767676${c1}///${c2}*76767${c1}/////////////// + ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// +/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// +//////////${c2}76767676767${c1}////${c2}76767${c1}///////// +///////////${c2}76767676${c1}//////${c2}7676${c1}////////// +////////////,${c2}7676${c1},///////${c2}767${c1}/////////// +/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// +///////////////${c2}7676${c1}//////////////////// + ///////////////${c2}7676${c1}///${c2}767${c1}//////////// + //////////////////////${c2}'${c1}//////////// + //////${c2}.7676767676767676767,${c1}////// + /////${c2}767676767676767676767${c1}///// + /////////////////////////// + ///////////////////// + ///////////// EOF ;; - "Chapeau"*) - set_colors 2 7 + "Porteus"*) + set_colors 6 7 read -rd '' ascii_data <<'EOF' -${c1} .-/-. - ////////. - ////////${c2}y+${c1}//. - ////////${c2}mMN${c1}/////. - ////////${c2}mMN+${c1}////////. - ////////////////////////. - /////////+${c2}shhddhyo${c1}+////////. - ////////${c2}ymMNmdhhdmNNdo${c1}///////. -///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. -///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// -//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// -//////${c2}+MMmssssssssssssss+${c1}/////// -`//////${c2}yMMy${c1}//////////////////// - `//////${c2}smMNhso++oydNm${c1}//////// - `///////${c2}ohmNMMMNNdy+${c1}/////// - `//////////${c2}++${c1}////////// - `////////////////. - -////////- +${c1} `.-:::-.` + -+ydmNNNNNNNmdy+- + .+dNmdhs+//////+shdmdo. + .smmy+-` ./sdy: + `omdo. `.-/+osssso+/-` `+dy. + `yms. `:shmNmdhsoo++osyyo-``oh. + hm/ .odNmds/.` ``.....:::-+s +/m: `+dNmy:` `./oyhhhhyyooo++so +ys `yNmy- .+hmmho:-.` ``` +s: yNm+` .smNd+. +`` /Nm: +dNd+` + yN+ `smNy. + dm oNNy` + hy -mNm. + +y oNNo + `y` sNN: + `: +NN: + ` .mNo + /mm` + /my` + .sy` + .+: + ` EOF ;; - "Chrom"*) - set_colors 2 1 3 4 7 + "PostMarketOS"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c2} .,:loool:,. - .,coooooooooooooc,. - .,lllllllllllllllllllll,. - ;ccccccccccccccccccccccccc; -${c1} '${c2}ccccccccccccccccccccccccccccc. -${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: -${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. -${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d -${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 -${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 -${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d -${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. -${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; -${c1} .:ccccccccllllllllo${c3}O0000000OOO, -${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. -${c1} '::ccccccccc${c3}dOOOOOOOkx:. -${c1} ..,::cccc${c3}xOOOkkko;. -${c1} ..,:${c3}dOkxl:. +${c1} ss + `hMMh` + .dMMMMd. + -NMMMMMMN- + /MMMMMMMMMN/ + hMMMMMMMMMMMo + y+`mMMmdNMMMMMMy + `dMM-.-:- .mMMMMMMh` + .mMMMMMMd` `dMMMMMMm. + :NMMMMMMy yMMMMMMN: + /MMMMMMMo oMMMmdmN/ + oMMMMMMM/ /MN.-/:-. + `yMMMMMMN- -:.NMMMMy` + `dMMMMMMM- -/////////////dMMMMMMd` + -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- + :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: ++MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ EOF ;; - "Clover"*) - set_colors 2 6 + "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) + set_colors 4 7 read -rd '' ascii_data <<'EOF' -${c1} `omo``omo` - `oNMMMNNMMMNo` - `oNMMMMMMMMMMMMNo` - oNMMMMMMMMMMMMMMMMNo - `sNMMMMMMMMMMMMMMNs` - `omo` `sNMMMMMMMMMMNs` `omo` - `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` - `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` -oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo -`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` -`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` -oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo - `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` - `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` - `oNs` `sNMMMMMMMMMMNs` `oNs` - `sNMMMMMMMMMMMMMMNs` - +NMMMMMMMMMMMMMMMMNo - `oNMMMMMMMMMMMMNo` - `oNMMMNNMMMNs` - `omo``oNs` +${c1} `-/osyyyysosyhhhhhyys+- + -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ + yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy +.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ +-NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ +.Nm+shddyooo+/smNNNNmmmmNh. :mmd. + NNNNy:` ./hmmmmmmmNNNN: hNMh + NMN- -++- +NNNNNNNNNNm+..-sMMMM- +.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ +.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ + mMM+ .. `sNN+. hMMMMhhMMM- + +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy + yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` + sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` + :mMMMMMMMMMMMmddNMMMMMMMMmh/ + /dMMMMMMMMMMMMMMMMMMNdy/` + .+hNMMMMMMMMMNmdhs/. + .:/+ooo+/:-. EOF ;; - "Container Linux by CoreOS"*) - set_colors 4 7 1 + "Qubes"*) + set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c1} ..... - .';:cccccccc:;'. - ':ccccclc${c3}lllllllll${c1}cc:. - .;cccccccc${c3}lllllllllllllll${c1}c, - ;clllccccc${c3}llllllllllllllllll${c1}c, - .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: - ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: - :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, -.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c -.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. -.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. -.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc - :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; - .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc - .cllllllllllclcccclccclccllllcllc - :cllllllllccclcllllllllllllcc; - .cccccccccccccclcccccccccc:. - .;cccclccccccllllllccc,. - .';ccccclllccc:;.. - ..... +${c1} `..--..` + `.----------.` + `..----------------..` + `.------------------------.`` + `..-------------....-------------..` +.::----------..`` ``..----------:+: +:////:----..` `..---:/ossso +:///////:` `/osssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:////////-` .:sssssssso +:///////////-.` `-/osssssssssso +`//////////////:-```.:+ssssssssssssso- + .-://////////////sssssssssssssso/-` + `.:///////////sssssssssssssso:. + .-:///////ssssssssssssssssss/` + `.:////ssss+/+ssssssssssss. + `--//- `-/osssso/. EOF ;; - "crux_small") - set_colors 4 5 7 6 + "Raspbian"*) + set_colors 2 1 read -rd '' ascii_data <<'EOF' -${c1} ___ - (${c3}.· ${c1}| - (${c2}<> ${c1}| - / ${c3}__ ${c1}\\ - ( ${c3}/ \\ ${c1}/| -${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) -${c2}\/${c1}-____${c2}\/ +${c1} `.::///+:/-. --///+//-:`` + `+oooooooooooo: `+oooooooooooo: + /oooo++//ooooo: ooooo+//+ooooo. + `+ooooooo:-:oo- +o+::/ooooooo: + `:oooooooo+`` `.oooooooo+- + `:++ooo/. :+ooo+/.` + ${c2}...` `.----.` ``.. + .::::-``:::::::::.`-:::-` + -:::-` .:::::::-` `-:::- + `::. `.--.` `` `.---.``.::` + .::::::::` -::::::::` ` + .::` .:::::::::- `::::::::::``::. +-:::` ::::::::::. ::::::::::.`:::- +:::: -::::::::. `-:::::::: :::: +-::- .-:::-.``....``.-::-. -::- + .. `` .::::::::. `..`.. + -:::-` -::::::::::` .:::::` + :::::::` -::::::::::` :::::::. + .::::::: -::::::::. :::::::: + `-:::::` ..--.` ::::::. + `...` `...--..` `...` + .:::::::::: + `.-::::-` EOF ;; - "CRUX"*) - set_colors 4 5 7 6 + "Red Star"* | "Redstar"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} odddd - oddxkkkxxdoo - ddcoddxxxdoool - xdclodod olol - xoc xdd olol - xdc ${c2}k00${c1}Okdlol - xxd${c2}kOKKKOkd${c1}ldd - xdco${c2}xOkdlo${c1}dldd - ddc:cl${c2}lll${c1}oooodo - odxxdd${c3}xkO000kx${c1}ooxdo - oxdd${c3}x0NMMMMMMWW0od${c1}kkxo - oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx -docldkXW${c3}MMMMMMMWWN${c1}Odolco -xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c -${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l -${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd -${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo -${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo +${c1} .. + .oK0l + :0KKKKd. + .xKO0KKKKd + ,Od' .d0000l + .c;. .'''... ..'. +.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: +;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. + .okkkkd,.lko .......',;:cllc:;,,'''''. + .cdo. :xd' cd:. ..';'',,,'',,;;;,'. + . .ddl.;doooc'..;oc;'..';::;,'. + coo;.oooolllllllcccc:'. . + .ool''lllllccccccc:::::;. + ;lll. .':cccc:::::::;;;;' + :lcc:'',..';::::;;;;;;;,,. + :cccc::::;...';;;;;,,,,,,. + ,::::::;;;,'. ..',,,,'''. + ........ ...... EOF ;; - "debian_small") + "Redhat"* | "Red Hat"* | "rhel"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - ${c1}_____ - / __ \\ -| / | -| \\___- --_ - --_ +${c1} `.-..........` + `////////::.`-/. + -: ....-////////. + //:-::///////////` + `--::: `-://////////////: + //////- ``.-:///////// .` + `://////:-.` :///////::///:` + .-/////////:---/////////////: + .-://////////////////////. +${c2} yMN+`.-${c1}::///////////////-` +${c2} .-`:NMMNMs` `..-------..` + MN+/mMMMMMhoooyysshsss +MMM MMMMMMMMMMMMMMyyddMMM+ + MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM + MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM + MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM EOF ;; - "Debian"*) - set_colors 1 7 3 + "Refracted Devuan"*) + set_colors 8 7 read -rd '' ascii_data <<'EOF' -${c2} _,met$$$$$gg. - ,g$$$$$$$$$$$$$$$P. - ,g$$P" """Y$$.". - ,$$P' `$$$. -',$$P ,ggs. `$$b: -`d$$' ,$P"' ${c1}.${c2} $$$ - $$P d$' ${c1},${c2} $$P - $$: $$. ${c1}-${c2} ,d$$' - $$; Y$b._ _,d$P' - Y$$. ${c1}`.${c2}`"Y$$$$P"' -${c2} `$$b ${c1}"-.__ -${c2} `Y$$ - `Y$$. - `$$b. - `Y$$b. - `"Y$b._ - `""" +${c2} A + VW + VVW\\ + .yWWW\\ + ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ + *WWWWWWWWWWWWWWWW/ $VWWWWw , + ^*%WWWWWWVWWX $WWWW** ,yy + , "**WWW/' **' ,yy/WWW*` + &WWWWwy `*` <,ywWW%VWWW* + yWWWWWWWWWW* ., "**WW%W + ,&WWWWWM*"` ,y/ &WWWww ^* + XWWX*^ ,yWWWW09 .WWWWWWWWwy, + *` &WWWWWM WWWWWWWWWWWWWww, + (WWWWW` /#####WWW*********** + ^WWWW + VWW + Wh. + V/ EOF ;; - "Deepin"*) - set_colors 2 7 + "Rosa"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} ............ - .';;;;;. .,;,. - .,;;;;;;;. ';;;;;;;. - .;::::::::' .,::;;,''''',. - ,'.:::::::: .;;'. '; - ;' 'cccccc, ,' :: '.. .: - ,, :ccccc. ;: .c, '' :. ,; -.l. cllll' ., .lc :; .l' l. -.c :lllc ;cl: .l' .ll. :' -.l 'looc. . ,o: 'oo' c, -.o. .:ool::coc' .ooo' o. - :: ..... .;dddo ;c - l:... .';lddddo. ,o - lxxxxxdoolllodxxxxxxxxxc :l - ,dxxxxxxxxxxxxxxxxxxl. 'o, - ,dkkkkkkkkkkkkko;. .;o; - .;okkkkkdl;. .,cl:. - .,:cccccccc:,. +${c1} ROSAROSAROSAROSAR + ROSA AROS + ROS SAROSAROSAROSAR AROS + RO ROSAROSAROSAROSAROSAR RO + ARO AROSAROSAROSARO AROS ROS + ARO ROSAROS OSAR ROSA ROS + RO AROSA ROSAROSAROSA ROSAR RO +RO ROSAR ROSAROSAROSAR R ROSARO RO +RO ROSA AROSAROSAROSA AR ROSARO AR +RO AROS ROSAROSAROSA ROS AROSARO AR +RO AROS ROSAROSARO ROSARO ROSARO AR +RO ROS AROSAROS ROSAROSA AROSAR AR +RO ROSA ROS ROSAROSAR ROSARO RO + RO ROS AROSAROSAROSA ROSARO AR + ARO ROSA ROSAROSAROS AROSAR ARO + ARO OROSA R ROSAROS ROS + RO AROSAROS AROSAROSAR RO + AROS AROSAROSAROSARO AROS + ROSA SARO + ROSAROSAROSAROSAR EOF ;; - "DesaOS") - set_colors 2 7 + "sabotage"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1}███████████████████████ -███████████████████████ -███████████████████████ -███████████████████████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -██████████████████████████████ -██████████████████████████████ -████████████████████████ -████████████████████████ -████████████████████████ +${c2} .|'''.| | '||''|. ..|''|| + ||.. ' ||| || || .|' || + ''|||. | || ||'''|. || || +. '|| .''''|. || || '|. || +|'....|' .|. .||. .||...|' ''|...|' + +|''||''| | ..|'''.| '||''''| + || ||| .|' ' || . + || | || || .... ||''| + || .''''|. '|. || || + .||. .|. .||. ''|...'| .||.....| EOF ;; - "Devuan"*) - set_colors 5 7 + "Sabayon"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} ..,,;;;::;,.. - `':ddd;:,. - `'dPPd:,. - `:b$$b`. - 'P$$$d` - .$$$$$` - ;$$$$$P - .:P$$$$$$` - .,:b$$$$$$$;' - .,:dP$$$$$$$$b:' - .,:;db$$$$$$$$$$Pd'` - ,db$$$$$$$$$$$$$$b:'` -:$$$$$$$$$$$$b:'` - `$$$$$bd:''` - `'''` +${c1} ........... + .. .. + .. .. + .. ${c2}o ${c1}.. + .. ${c2}:W' ${c1}.. + .. ${c2}.d. ${c1}.. +:. ${c2}.KNO ${c1}.: +:. ${c2}cNNN. ${c1}.: +: ${c2}dXXX, ${c1}: +: ${c2}. dXXX, .cd, ${c1}: +: ${c2}'kc .. dKKK. ,ll;:' ${c1}: +: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: +:. ${c2}.,cdddddddddddddo:. ${c1}.: + .. ${c2}:lllllll: ${c1}.. + .. ${c2}',,,,, ${c1}.. + .. .. + .. .. + ............... EOF ;; - "DracOS"*) - set_colors 1 7 3 + "SailfishOS"*) + set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c1} `-:/- - -os: - -os/` - :sy+-` - `/yyyy+. - `+yyyyo- - `/yyyys: -`:osssoooo++- +yyyyyy/` - ./yyyyyyo yo`:syyyy+. - -oyyy+ +- :yyyyyo- - `:sy: `. `/yyyyys: - ./o/.` .oyyso+oo:` - :+oo+//::::///:-.` `.` +${c1} .+eWWW + .+ee+++eee e. + .ee++eeeeeeee +e. + .e++ee++eeeeeee+eee+e+ + ee.e+.ee+eee++eeeeee+ + W.+e.e+.e++ee+eee + W.+e.W.ee.W++ee' + +e.W W.e+.W.W+ + W.e.+e.W W W. + e e e +e.W.W + .W W W. + W.+e.W. + W++e.ee+. + ++ +ee++eeeee++. + ' '+++e 'ee. + ee + ee + e EOF ;; - "dragonfly_old"*) - set_colors 1 7 3 + "SalentOS"*) + set_colors 2 1 3 7 read -rd '' ascii_data <<'EOF' - ${c1} | - .-. - ${c3} ()${c1}I${c3}() - ${c1} "==.__:-:__.==" - "==.__/~|~\__.==" - "==._( Y )_.==" - ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. -( ..=${c1}\\=${c1}/${c2}=.. ) - `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` - `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` - .-~` /${c1}|=|${c2}\ `~-. - .~` / ${c1}|=|${c2} \ `~. - .-~` .' ${c1}|=|${c2} `. `~-. - (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) - `~"~"` ${c1} |=|${c2} `"~"~` - ${c1} /=\\ - \\=/ - ^ +${c1} ``..`` + .-:+oshdNMMMMMMNdhyo+:-.` + -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ +${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` +${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- +${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` +${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` +${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd +${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy +${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo +${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ +${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- +${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` +${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm +${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy +${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: +${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. +${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: +${c2} `:smMM${c4}yy${c3}MMNy/` + ${c2}.- ${c4}`${c3}:. EOF ;; - "dragonfly_small"*) - set_colors 1 7 3 + "Scientific"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c2}(\${c3}"${c2}/) -${c2}(/${c1}|${c2}\) -${c1} | - | +${c1} =/;;/- + +: // + /; /; + -X H. +.//;;;:;;-, X= :+ .-;:=;:;#;. +M- ,=;;;#:, ,:#;;:=, ,@ +:# :#.=/++++/=.$= #= + ,#; #/:+/;,,/++:+/ ;+. + ,+/. ,;@+, ,#H;, ,/+, + ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; + ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. + ,;: :@#= =$H: .+#- + ,#= #;-///==///-// =#, +;+ :#-;;;:;;;;-X- +: +@- .-;;;;M- =M/;;;-. -X + :;;::;;-. #- :+ ,-;;-;:== + ,X H. + ;/ #= + // +; + '////' EOF ;; - "DragonFly"*) - set_colors 1 7 3 + "Siduction"*) + set_colors 4 4 read -rd '' ascii_data <<'EOF' -${c2},--, ${c1}| ${c2},--, -${c2}| `-, ${c1},^, ${c2},-' | -${c2} `, `-, ${c3}(/ \) ${c2},-' ,' -${c2} `-, `-,${c1}/ \${c2},-' ,-' -${c2} `------${c1}( )${c2}------' -${c2} ,----------${c1}( )${c2}----------, -${c2} | _,-${c1}( )${c2}-,_ | -${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' -${c1} | | - | | - | | - | | - | | - | | - `|' +${c1} _aass, + jQh: =$w + QWmwawQW + )$QQQQ@( .. + _a_a. ~??^ syDY?Sa, + _mW>-<$c jWmi imm. + ]QQwayQE 4QQmgwmQQ` + ?WWQWP' -9QQQQQ@'._aas, + _a%is. .adYYs,. -"?!` aQB*~^3$c +_Qh;.nm .QWc. {QL ]QQp;..vmQ/ +"QQmmQ@ -QQQggmQP ]QQWmggmQQ( + -???" "$WQQQY` __, ?QQQQQQW! + _yZ!?q, - .yWY!!Sw, "???^ + .QQa_=qQ mQm>..vmm + $QQWQQP $QQQgmQQ@ + "???" _aa, -9WWQQWY` + _mB>~)$a -~~ + mQms_vmQ. + ]WQQQQQP + -?T??" EOF ;; - "Elementary"*) + "Slackware"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c2} eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee eeeeeeeeeeee eeeee - eeee eeeee eee eeee - eeee eeee eee eeee -eee eee eee eee -eee eee eee eee -ee eee eeee eeee -ee eee eeeee eeeeee -ee eee eeeee eeeee ee -eee eeee eeeeee eeeee eee -eee eeeeeeeeee eeeeee eee - eeeeeeeeeeeeeeeeeeeeeeee eeeee - eeeeeeee eeeeeeeeeeee eeee - eeeee eeeee - eeeeeee eeeeeee - eeeeeeeeeeeeeeeee +${c1} ::::::: + ::::::::::::::::::: + ::::::::::::::::::::::::: + ::::::::${c2}cllcccccllllllll${c1}:::::: + :::::::::${c2}lc dc${c1}::::::: + ::::::::${c2}cl clllccllll oc${c1}::::::::: + :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: + ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: + :::::::::::${c2}lc cclccclc${c1}::::::::::::: +::::::::::::::${c2}lcclcc lc${c1}:::::::::::: +::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: +::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: + :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: + :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: + ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: + :::${c2}oclcccccccccccccllllllllllllll${c1}::::: + ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: + :::::::::::::::::::::::::::::::: + :::::::::::::::::::::::::::: + :::::::::::::::::::::: + :::::::::::: EOF ;; - "Endless"*) - set_colors 1 7 + "SliTaz"*) + set_colors 3 3 read -rd '' ascii_data <<'EOF' -${c1} `:+yhmNMMMMNmhy+:` - -odMMNhso//////oshNMMdo- - /dMMh+. .+hMMd/ - /mMNo` `oNMm: - `yMMo` `oMMy` - `dMN- -NMd` - hMN. .NMh -/MM/ -os` /MM/ -dMm `smNmmhs/- `:sNMd+ `` mMd -MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM -MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM -dMm `/++/-``/yNNh+/sdNMNddMm- mMd -/MM/ `dNy: `-::- /MM/ - hMN. .NMh - `dMN- -NMd` - `yMMo` `oMMy` - /mMNo` `oNMm/ - /dMMh+. .+hMMd/ - -odMMNhso//////oshNMMdo- - `:+yhmNMMMMNmhy+:` +${c1} @ @( @ + @@ @@ @ @/ + @@ @@ @@ @@ + @@ %@@ @@ @@ + @@ %@@@ @@@@@. @@@@ @@ + @@@ @@@@ @@@@@@@ &@@@ @@@ + @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ + ,@@@@@@@@@@@@@@@@@@@@@@@@@ + .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ +@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ +@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ +@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. +@@ ,@@ @@@@@@@@@@@@@ @@@ @@ +@ @@. @@@@@@@@@@@@@ @@@ *@ +@ @@ @@@@@@@@@@@@ @@ @ + @ @@@@@@@@@. #@ + @ ,@@@@@ @ EOF ;; - "Exherbo"*) + "SmartOS"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyys oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyy syyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy yyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +EOF + ;; + + "Solus"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c2} , -OXo. -NXdX0: .cok0KXNNXXK0ko:. -KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... -'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. - cNMk NK .oXM. OMMMMO. 0MMNo kW. - lMc o: ., .oKNk; ;NMMWlxW' - ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO - XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk -.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl -,M: ,XMMWx::,''oOK0x; NM. -'Ml ,kNKOxxxxxkkO0XXKOd:. oMk - NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW - ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW - ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO - 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' - xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd - 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO - :XMNxl,';:lodxkOO000Oxc. .oWMMo - 'dXMMXkl;,. .,o0MMNo' - ':d0XWMMMMWNNNNMMMNOl' - ':okKXWNKkl' +${c2} -``````````` + `-+/------------.` + .---:mNo---------------. + .-----yMMMy:---------------. + `------oMMMMMm/----------------` + .------/MMMMMMMN+----------------. + .------/NMMMMMMMMm-+/--------------. +`------/NMMMMMMMMMN-:mh/-------------` +.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. +-----/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- +----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. +.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` +`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. +`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ + .------------:://+-/++++++${c1}oshddys: + -hhhhyyyyyyyyyyyhhhhddddhysssso- + `:ossssssyysssssssssssssssso:` + `:+ssssssssssssssssssss+- + `-/+ssssssssssso+/-` + `.-----..` EOF ;; - "Fedora"* | "RFRemix"*) + "Source Mage"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} /:-------------:\\ - :-------------------:: - :-----------${c2}/shhOHbmp${c1}---:\\ - /-----------${c2}omMMMNNNMMD ${c1}---: - :-----------${c2}sMMMMNMNMP${c1}. ---: - :-----------${c2}:MMMdP${c1}------- ---\\ -,------------${c2}:MMMd${c1}-------- ---: -:------------${c2}:MMMd${c1}------- .---: -:---- ${c2}oNMMMMMMMMMNho${c1} .----: -:-- .${c2}+shhhMMMmhhy++${c1} .------/ -:- -------${c2}:MMMd${c1}--------------: -:- --------${c2}/MMMd${c1}-------------; -:- ------${c2}/hMMMy${c1}------------: -:--${c2} :dMNdhhdNMMNo${c1}------------; -:---${c2}:sdNMMMMNds:${c1}------------: -:------${c2}:://:${c1}-------------:: -:---------------------:// +${c2} :ymNMNho. +.+sdmNMMMMMMMMMMy` +.-::/yMMMMMMMMMMMm- + sMMMMMMMMMMMm/ + /NMMMMMMMMMMMMMm: + .MMMMMMMMMMMMMMMMM: + `MMMMMMMMMMMMMMMMMN. + NMMMMMMMMMMMMMMMMMd + mMMMMMMMMMMMMMMMMMMo + hhMMMMMMMMMMMMMMMMMM. + .`/MMMMMMMMMMMMMMMMMs + :mMMMMMMMMMMMMMMMN` + `sMMMMMMMMMMMMMMM+ + /NMMMMMMMMMMMMMN` + oMMMMMMMMMMMMM+ + ./sd.-hMMMMMMMMmmN` + ./+oyyyh- `MMMMMMMMMmNh + sMMMMMMMMMmmo + `NMMMMMMMMMd: + -dMMMMMMMMMo + -shmNMMms. EOF ;; - "freebsd_small") - set_colors 1 7 3 + "Sparky"*) + set_colors 1 7 read -rd '' ascii_data <<'EOF' -${c1} /\\ _____ /\\ - \\_) (_/ - / \ -| | -| | - \ / - --_____-- +${c1} + . `-:-` + .o` .-///-` + `oo` .:/++:. + os+` -/+++:` ``.........``` + /ys+`./+++/-.-::::::----......`` + `syyo`++o+--::::-::/+++/-`` + -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` +::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` +`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` + -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- + .sdddy::syo--/:. `.:dy+-ohhho ./: + :yddds/:+oo+//:-`- /+ +hy+.shhy: `` + `:ydmmdysooooooo-.ss`/yss--oyyo + `./ossyyyyo+:-/oo:.osso- .oys + ``..-------::////.-oooo/ :so + `...----::::::::--.`/oooo: .o: + ``````` ++o+:` `:` + ./+/-` ` + `-:-. + `` EOF ;; - "FreeBSD"*) - set_colors 1 7 3 + "SteamOS"*) + set_colors 5 7 read -rd '' ascii_data <<'EOF' - ${c2}``` ${c1}` - ${c2}` `.....---...${c1}....--.``` -/ - ${c2}+o .--` ${c1}/y:` +. - ${c2} yo`:. ${c1}:o `+- - ${c2}y/ ${c1}-/` -o/ - ${c2}.- ${c1}::/sy+:. - ${c2}/ ${c1}`-- / - ${c2}`: ${c1}:` - ${c2}`: ${c1}:` - ${c2}/ ${c1}/ - ${c2}.- ${c1}-. - ${c2}-- ${c1}-. - ${c2}`:` ${c1}`:` - .-- `--. - .---.....----. +${c1} .,,,,. + .,'onNMMMMMNNnn',. + .'oNMANKMMMMMMMMMMMNNn'. + .'ANMMMMMMMXKNNWWWPFFWNNMNn. + ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, + ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, +,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, +'${c2}+#############, +. ,+' ${c1}+NMMM +${c2} '*#########*' '*,,*' ${c1}.+NMMMM. +${c2} `'*###*' ,.,;###${c1}+WNM, +${c2} .,;;, .;##########${c1}+W +${c2},',. '; ,+##############' + '###+. :,. .,; ,###############' + '####.. `'' .,###############' + '#####+++################' + '*##################*' + ''*##########*'' + '''''' EOF ;; - "FreeMiNT"*) - # Don't explicitly set colors since - # TosWin2 doesn't reset well. + "SunOS" | "Solaris") + set_colors 3 7 read -rd '' ascii_data <<'EOF' -${c1} ## - ## ######### - #### ## - #### #### ## -#### #### ## ## - #### #### ## ## - #### #### ## ## ## - #### ###### - ###### ## ## #### - #### ################ - #### ## #### - ## #### ###### - ## ## #### #### - ## ## ## ## ## #### - #### ## ## ## +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. EOF ;; - "Frugalware"*) - set_colors 4 7 1 + "openSUSE Tumbleweed"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} `++/::-.` - /o+++++++++/::-.` - `o+++++++++++++++o++/::-.` - /+++++++++++++++++++++++oo++/:-.`` - .o+ooooooooooooooooooosssssssso++oo++/:-` - ++osoooooooooooosssssssssssssyyo+++++++o: - -o+ssoooooooooooosssssssssssssyyo+++++++s` - o++ssoooooo++++++++++++++sssyyyyo++++++o: - :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo - `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: - /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss - .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- - ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso - -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. - sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ - :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` - yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ --ysooooooydhhhhhhhhhhhddddddddddddddddssy - .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: - ``.-/+oosysssssssssssssssssssssss - ``.:/+osyysssssssssssssh. - `-:/+osyyssssyo - .-:+++` +${c2} ...... + .,cdxxxoc,. .:kKMMMNWMMMNk:. + cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. + ;WMK;. .lKMMNM, :NMK, .OMW; + cMW; 'WMMMN ,XMK, oMM' +.MMc ..;l. xMN: KM0 +'MM. 'NMO oMM +.MM, .kMMl xMN + KM0 .kMM0. .dl:,.. .WMd + .XM0. ,OMMK, OMMMK. .XMK + oWMO:. .;xNMMk, NNNMKl. .xWMx + :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, + ..... .:dOOXXKOxl, EOF ;; - "Funtoo"*) - set_colors 5 7 + "openSUSE"* | "open SUSE"* | "SUSE"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c2} _______ ____ - /MMMMMMM/ /MMMM| _____ _____ - __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ -|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ -|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| -|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| - |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ - |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ +${c2} .;ldkO0000Okdl;. + .;d00xl:^''''''^:ok00d;. + .d00l' 'o00d. + .d0Kd'${c1} Okxol:;,. ${c2}:O0d. + .OK${c1}KKK0kOKKKKKKKKKKOxo:, ${c2}lKO. + ,0K${c1}KKKKKKKKKKKKKKK0P^${c2},,,${c1}^dx:${c2} ;00, +.OK${c1}KKKKKKKKKKKKKKKk'${c2}.oOPPb.${c1}'0k.${c2} cKO. +:KK${c1}KKKKKKKKKKKKKKK: ${c2}kKx..dd ${c1}lKd${c2} 'OK: +dKK${c1}KKKKKKKKKOx0KKKd ${c2}^0KKKO' ${c1}kKKc${c2} dKd +dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd +:KK${c1}KKKKKKKKKK0o;...^cdxxOK0O/^^' ${c2}.0K: + kKK${c1}KKKKKKKKKKKKK0x;,,......,;od ${c2}lKk + '0K${c1}KKKKKKKKKKKKKKKKKKKK00KKOo^ ${c2}c00' + 'kK${c1}KKOxddxkOO00000Okxoc;'' ${c2}.dKk' + l0Ko. .c00l' + 'l0Kk:. .;xK0l' + 'lkK0xl:;,,,,;:ldO0kl' + '^:ldxkkkkxdl:^' EOF ;; - "GalliumOS"*) + "SwagArch"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1}sooooooooooooooooooooooooooooooooooooo+: -yyooooooooooooooooooooooooooooooooo+/::: -yyysoooooooooooooooooooooooooooo+/:::::: -yyyyyoooooooooooooooooooooooo+/::::::::: -yyyyyysoooooooooooooooooo++/:::::::::::: -yyyyyyysoooooooooooooo++/::::::::::::::: -yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: -yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: -yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: -yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: -yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: -yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: -yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: -yyyyyyyyyyyyyyys+:--...........-///::::: -yyyyyyyyyyyys+:--................://:::: -yyyyyyyyyo+:-.....................-//::: -yyyyyyo+:-..........................://: -yyyo+:-..............................-// -o/:-...................................: -EOF - ;; - - "gentoo_small") - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} _-----_ -( \\ -\ 0 \\ -${c2} \ ) - / _/ -( _- -\____- +${c2} .;ldkOKXXNNNNXXK0Oxoc,. + ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; + 'K0xo ..,;:c:. `'lKMMMMM0 + .lONMMMMMM' `lNMk' +${c2} ;WMMMMMMMMMO. ${c1}....::... +${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, +${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. +${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. +${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: +${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. +${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: +${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. +${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. + :ccc:' `cccccccc:, + '' EOF ;; - "Gentoo"*) + "Tails"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' -${c1} -/oyddmdhs+:. - -o${c2}dNMMMMMMMMNNmhy+${c1}-` - -y${c2}NMMMMMMMMMMMNNNmmdhy${c1}+- - `o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/` - om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o` -.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+` - oy${c2}hdmNMMMMMMMN${c1}dyooy${c2}dmddddhhhhyhN${c1}d. - :o${c2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${c1}Mh - .:${c2}+sydNMMMMMNNNmmmdddhhhhhhmM${c1}my - /m${c2}MMMMMMNNNmmmdddhhhhhmMNh${c1}s: - `o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+` - `s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. - /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:` -+M${c2}MMMMMMNNNNNmmmmdmNMNdso${c1}/- -yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` -/h${c2}MMNNNNNNNNMNdhs++/${c1}-` -`/${c2}ohdmmddhys+++/:${c1}.` - `-//////:--. +${c1} `` + ./yhNh +syy/Nshh `:o/ +N:dsNshh █ `ohNMMd +N-/+Nshh `yMMMMd +N-yhMshh yMMMMd +N-s:hshh █ yMMMMd so//. +N-oyNsyh yMMMMd d Mms. +N:hohhhd:. yMMMMd syMMM+ +Nsyh+-..+y+- yMMMMd :mMM+ ++hy- -ss/`yMMMM `+d+ + :sy/. ./yNMMMMm `` + .+ys- `:+hNMMMMMMy/` + `hNmmMMMMMMMMMMMMdo. + dMMMMMMMMMMMMMMMMMNh: + +hMMMMMMMMMMMMMMMMMmy. + -oNMMMMMMMMMMmy+.` + `:yNMMMds/.` + .//` EOF ;; - "gNewSense"*) - set_colors 4 5 7 6 + "Trisquel"*) + set_colors 4 6 read -rd '' ascii_data <<'EOF' -${c1} ..,,,,.. - .oocchhhhhhhhhhccoo. - .ochhlllllllc hhhhhh ollllllhhco. - ochlllllllllll hhhllllllhhh lllllllllllhco - .cllllllllllllll hlllllo +hllh llllllllllllllc. -ollllllllllhco'' hlllllo +hllh ``ochllllllllllo -hllllllllc' hllllllllllllh `cllllllllh -ollllllh +llllllllllll+ hllllllo - `cllllh. ohllllllho .hllllc' - ochllc. ++++ .cllhco - `+occooo+. .+ooocco+' - `+oo++++ ++++oo+' +${c1} ▄▄▄▄▄▄ + ▄█████████▄ + ▄▄▄▄▄▄ ████▀ ▀████ + ▄██████████▄ ████▀ ▄▄ ▀███ + ▄███▀▀ ▀▀████ ███▄ ▄█ ███ +▄███ ▄▄▄ ████▄ ▀██████ ▄███ +███ █▀▀██▄ █████▄ ▀▀ ▄████ +▀███ ███ ███████▄▄ ▄▄██████ +${c1} ▀███▄ ▄███ █████████████${c2}████▀ +${c1} ▀█████████ ███████${c2}███▀▀▀ + ▀▀███▀▀ ██████▀▀ + ██████▀ ▄▄▄▄ + █████▀ ████████ + █████ ███▀ ▀███ + ████▄ ██▄▄▄ ███ + █████▄ ▀▀ ▄██ + ██████▄▄▄████ + ▀▀█████▀▀ EOF ;; - "GNU") - set_colors fg 7 + "Ubuntu-Budgie"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} _-`````-, ,- '- . - .' .- - | | - -. `. - /.' / `. \ -:/ : _... ..._ `` : -:: : /._ .`:'_.._\. || : -:: `._ ./ ,` : \ . _.'' . -`:. / | -. \-. \\_ / - \:._ _/ .' .@) \@) ` `\ ,.' - _/,--' .- .\,-.`--`. - ,'/'' (( \ ` ) - /'/' \ `-' ( - '/'' `._,-----' - ''/' .,---' - ''/' ;: - ''/'' ''/ - ''/''/'' - '/'/' - `; +${c2} ./oydmMMMMMMmdyo/. + :smMMMMMMMMMMMhs+:++yhs: + `omMMMMMMMMMMMN+` `odo` + /NMMMMMMMMMMMMN- `sN/ + `hMMMMmhhmMMMMMMh sMh` + .mMmo- /yMMMMm` `MMm. + mN/ yMMMMMMMd- MMMm +oN- oMMMMMMMMMms+//+o+: :MMMMo +m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm +M` .NMMMMMMMMMMMMMMMNodMMMMMMM +M- sMMMMMMMMMMMMMMMMMMMMMMMMM +mm` mMMMMMMMMMNdhhdNMMMMMMMMMm +oMm/ .dMMMMMMMMh: :dMMMMMMMo + mMMNyo/:/sdMMMMMMMMM+ sMMMMMm + .mMMMMMMMMMMMMMMMMMs `NMMMm. + `hMMMMMMMMMMM.oo+. `MMMh` + /NMMMMMMMMMo sMN/ + `omMMMMMMMMy. :dmo` + :smMMMMMMMh+-` `.:ohs: + ./oydmMMMMMMdhyo/. EOF ;; - "GoboLinux"*) - set_colors 5 4 6 2 + "Ubuntu-GNOME"*) + set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c1}_____ _ -/ ____| | | -| | __ ___ | |__ ___ -| | |_ |/ _ \| '_ \ / _ \ -| |__| | (_) | |_) | (_) | - \_____|\___/|_.__/ \___/ +${c3} ./o. + .oooooooo + .oooo```soooo + .oooo` `soooo + .ooo` ${c4}.o.${c3} `\/ooo. + :ooo ${c4}:oooo.${c3} `\/ooo. + sooo ${c4}`ooooo${c3} \/oooo + \/ooo ${c4}`soooo${c3} `ooooo + `soooo ${c4}`\/ooo${c3} `soooo +${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo +${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` +${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` +${c4} `ooooo ${c3}`` ${c4}.oooo +${c4} `soooo. .oooo` + `\/oooooooooo` + ``\/oo`` EOF ;; - "Grombyang"*) - set_colors 4 2 1 + "Ubuntu-MATE"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} eeeeeeeeeeee - eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee ${c2}.o+ ${c1}eeee - eeee ${c2}`ooo/ ${c1}eeee - eeee ${c2}`+oooo: ${c1}eeee -eee ${c2}`+oooooo: ${c1}eee -eee ${c2}-+oooooo+: ${c1}eee -ee ${c2}`/:oooooooo+: ${c1}ee -ee ${c2}`/+ +++ +: ${c1}ee -ee ${c2}+o+\ ${c1}ee -eee ${c2}+o+\ ${c1}eee -eee ${c2}// \\ooo/ \\\ ${c1}eee - eee ${c2}//++++oooo++++\\\ ${c1}eee - eeee ${c2}::::++oooo+::::: ${c1}eeee - eeeee ${c3}Grombyang OS ${c1} eeee - eeeeeeeeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeee +${c1} `:+shmNNMMNNmhs+:` + .odMMMMMMMMMMMMMMMMMMdo. + /dMMMMMMMMMMMMMMMmMMMMMMMMd/ + :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: + `yMMMMMMMMMms:..-::oM: -omMMMMMy` + `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` + hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh +/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ +hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh +/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ + hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh + `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` + yMMMMMMMMMms/..-::oM: .+dMMMMMy + :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: + /dMMMMMMMMMMMMMMMdNMMMMMMMd/ + .odMMMMMMMMMMMMMMMMMMdo. + `:+shmNNMMNNmhs+:` EOF ;; - "GuixSD"*) - set_colors 3 7 6 1 8 + "ubuntu_old") + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} .. `. - `--..```..` `..```..--` - .-:///-:::. `-:::///:-. - ````.:::` `:::.```` - -//:` -::- - ://: -::- - `///- .:::` - -+++-:::. - :+/:::- - `-....` +${c1} ./+o+- +${c2} yyyyy- ${c1}-yyyyyy+ +${c2} ${c2}://+//////${c1}-yyyyyyo +${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` +${c3} .:++o: ${c2}/++++++++/:--:/- +${c3} o:+o+:++.${c2}`..```.-/oo+++++/ +${c3} .:+o:+o/.${c2} `+sssoo+/ +${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. +${c2}/+++//+:${c3}`oo+o${c2} /::--:. +${c2}+/+o+++${c3}`o++o${c1} ++////. +${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. +${c3} .+.o+oo:.${c1} `oddhhhh+ +${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ +${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: +${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` +${c1} /osyyyyyyo${c3}++ooo+++/ +${c1} ````` ${c3}+oo+++o: +${c3} `oo++. EOF ;; - "Haiku"*) - set_colors 2 8 + "Ubuntu-Studio") + set_colors 6 7 read -rd '' ascii_data <<'EOF' -${c2} :dc' - 'l:;'${c1},${c2}'ck. .;dc:. - co ${c1}..${c2}k. .;; ':o. - co ${c1}..${c2}k. ol ${c1}.${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. -.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. - ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; - ..${c1}oOolllllccccccc:::::${c2}od; - cx:ooc${c1}:::::::;${c2}cooolcX. - cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. - cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. - .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. - '::c'${c1}...${c2}do${c1}..... .${c2}K, - cd,.${c1}....:${c2}O,${c1} - ':clod:'${c1} - ${c1} +${c1} ..-::::::-.` + `.:+++++++++++${c2}ooo${c1}++:.` + ./+++++++++++++${c2}sMMMNdyo${c1}+/. + .++++++++++++++++${c2}oyhmMMMMms${c1}++. + `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` + `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` + +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` + :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: + ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. + ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ + :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: + +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ + `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` + `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ + ./+++++++++++++++${c2}oyhdNMMMms${c1}++. + ./+++++++++++++${c2}hMMMNdyo${c1}+/. + `.:+++++++++++${c2}sso${c1}++:. + ..-::::::-.. EOF ;; - "Hyperbola"*) - set_colors 8 + "Ubuntu"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} WW - KX W - WO0W NX0O - NOO0NW WNXK0OOKW - W0OOOOOOOOOOOOKN - N0OOOOOOO0KXW - WNXXXNW - NXK00000KN - WNK0OOOOOOOOOO0W - NK0OOOOOOOOOOOOOO0W - X0OOOOOOO00KK00OOOOOK - X0OOOO0KNWW WX0OO0W - X0OO0XNW KOOW - N00KNW KOW - NKXN W0W -WW W +${c1} .-/+oossssoo+/-. + `:+ssssssssssssssssss+:` + -+ssssssssssssssssssyyssss+- + .ossssssssssssssssss${c2}dMMMNy${c1}sssso. + /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ + +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ +.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. ++ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ +oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso +oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso ++ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ +.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ + +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ + /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ + .ossssssssssssssssss${c2}dMMMNy${c1}sssso. + -+sssssssssssssssss${c2}yyy${c1}ssss+- + `:+ssssssssssssssssss+:` + .-/+oossssoo+/-. EOF ;; - "Kali"*) - set_colors 4 8 + "void_small") + set_colors 2 8 read -rd '' ascii_data <<'EOF' -${c1}.............. - ..,;:ccc,. - ......''';lxO. -.....''''..........,:ld; - .';;;:::;,,.x, - ..'''. 0Xxoc:,. ... - .... ,ONkc;,;cokOdc',. - . OMo ':${c2}dd${c1}o. - dMc :OO; - 0M. .:o. - ;Wd - ;XO, - ,d0Odlc;,.. - ..',;:cdOOd::,. - .:d;.':;. - 'd, .' - ;l .. - .o - c - .' - . +${c1} _______ + _ \______ - +| \ ___ \ | +| | / \ | | +| | \___/ | | +| \______ \_| + -_______\ EOF ;; - "KaOS"*) - set_colors 4 7 1 + "Void"*) + set_colors 2 8 read -rd '' ascii_data <<'EOF' -${c1} .. - ..... ..OSSAAAAAAA.. - .KKKKSS. .SSAAAAAAAAAAA. -.KKKKKSO. .SAAAAAAAAAA... -KKKKKKS. .OAAAAAAAA. -KKKKKKS. .OAAAAAA. -KKKKKKS. .SSAA.. -.KKKKKS..OAAAAAAAAAAAA........ - DKKKKO.=AA=========A===AASSSO.. - AKKKS.==========AASSSSAAAAAASS. - .=KKO..========ASS.....SSSSASSSS. - .KK. .ASS..O.. =SSSSAOSS: - .OK. .ASSSSSSSO...=A.SSA. - .K ..SSSASSSS.. ..SSA. - .SSS.AAKAKSSKA. - .SSS....S.. +${c1} __.;=====;.__ + _.=+==++=++=+=+===;. + -=+++=+===+=+=+++++=_ + . -=:`` `--==+=++==. + _vi, ` --+=++++: + .uvnvi. _._ -==+==+. + .vvnvnI` .;==|==;. :|=||=|. +${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL +${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE +${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' +${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! +${c1} -1vvnvv. `~+++` ++|+++ + +vnvnnv, `-|=== + +vnvnvns. . :=- + -Invnvvnsi..___..=sv=. ` + +Invnvnvnnnnnnnnvvnn;. + ~|Invnvnvvnvvvnnv}+` + -~|{*l}*|~ EOF ;; - "KDE"*) - set_colors 2 7 + *"[Windows 10]"* | *"on Windows 10"* | "Windows 8"* |\ + "Windows 10"* | "windows10" | "windows8" ) + set_colors 6 7 read -rd '' ascii_data <<'EOF' -${c1} `..---+/---..` - `---.`` `` `.---.` - .--.` `` `-:-. - `:/: `.----//----.` :/- - .:. `---` `--.` .:` - .:` `--` .:- `:. - `/ `:. `.-::-.` -:` `/` - /. /. `:++++++++:` .: .: -`/ .: `+++++++++++/ /` `+` -/+` -- .++++++++++++` :. .+: -`/ .: `+++++++++++/ /` `+` - /` /. `:++++++++:` .: .: - ./ `:. `.:::-.` -:` `/` - .:` `--` .:- `:. - .:. `---` `--.` .:` - `:/: `.----//----.` :/- - .-:.` `` `-:-. - `---.`` `` `.---.` - `..---+/---..` +${c1} .., + ....,,:;+ccllll + ...,,+:; cllllllllllllllllll +,cclllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll + +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +`'ccllllllllll lllllllllllllllllll + `' \\*:: :ccllllllllllllllll + ````''*::cll + `` EOF ;; - "Kogaion"*) - set_colors 4 7 1 + "Windows"*) + set_colors 1 2 4 3 read -rd '' ascii_data <<'EOF' -${c1} ;; ,; - ;;; ,;; - ,;;;; ;;;; - ,;;;;;;;; ;;;; - ;;;;;;;;;;; ;;;;; - ,;;;;;;;;;;;; ';;;;;, - ;;;;;;;;;;;;;;, ';;;;;;; - ;;;;;;;;;;;;;;;;;, ';;;;; -; ';;;;;;;;;;;;;;;;;;, ;;; -;;;, ';;;;;;;;;;;;;;;;;;;,;; -;;;;;, ';;;;;;;;;;;;;;;;;;, -;;;;;;;;, ';;;;;;;;;;;;;;;;, -;;;;;;;;;;;;, ';;;;;;;;;;;;;; -';;;;;;;;;;;;; ';;;;;;;;;;;;; - ';;;;;;;;;;;;;, ';;;;;;;;;;; - ';;;;;;;;;;;;; ;;;;;;;;;; - ';;;;;;;;;;;; ;;;;;;;; - ';;;;;;;; ;;;;;; - ';;;;; ;;;; - ';;; ;; +${c1} ,.=:!!t3Z3z., + :tt:::tt333EE3 +${c1} Et:::ztt33EEEL${c2} @Ee., .., +${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# +${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL +${c1} it::::tt333EEF${c2} @EEEEEEttttt33F +${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. +${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF +${c3} ;::::::::zt33)${c2} "4EEEtttji3P* +${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. +${c3} i::::::::zt33F${c4} AEEEtttt::::ztF +${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 +${c3} E::::::::zt33L${c4} @EEEtttt::::z3F +${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` +${c3} `${c4} :EEEEtttt::::z7 + "VEzjt:;;z>*` EOF ;; - "Korora"*) + "Xubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c2} ____________ - _add55555555554${c1}: - _w?'${c1}``````````'${c2})k${c1}: - _Z'${c1}`${c2} ]k${c1}: - m(${c1}`${c2} )k${c1}: - _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: - .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` - jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` - jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` -.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` -:#${c1}:${c2} ${c1}`${c2})e${c1}``` -:m${c1}:${c2} ,#'${c1}` -:#${c1}:${c2} .s2'${c1}` -:m,________.aa7^${c1}` -:#baaaaaaas!J'${c1}` - ``````````` +${c1} `-/osyhddddhyso/-` + .+yddddddddddddddddddy+. + :yddddddddddddddddddddddddy: + -yddddddddddddddddddddhdddddddy- + odddddddddddyshdddddddh`dddd+ydddo + `yddddddhshdd- ydddddd+`ddh.:dddddy` + sddddddy /d. :dddddd-:dy`-ddddddds +:ddddddds /+ .dddddd`yy`:ddddddddd: +sdddddddd` . .-:/+ssdyodddddddddds +ddddddddy `:ohddddddddd +dddddddd. +dddddddd +sddddddy ydddddds +:dddddd+ .oddddddd: + sdddddo ./ydddddddds + `yddddd. `:ohddddddddddy` + oddddh/` `.:+shdddddddddddddo + -ydddddhyssyhdddddddddddddddddy- + :yddddddddddddddddddddddddy: + .+yddddddddddddddddddy+. + `-/osyhddddhyso/-` EOF ;; - "KSLinux"*) - set_colors 4 7 1 + "Zorin"*) + set_colors 4 6 read -rd '' ascii_data <<'EOF' -${c1} K K U U RRRR ooo - K K U U R R o o - KKK U U RRRR o o - K K U U R R o o - K K UUU R R ooo +${c1} `osssssssssssssssssssso` + .osssssssssssssssssssssso. + .+oooooooooooooooooooooooo+. -${c2} SSS AAA W W AAA - S A A W W A A - SSS AAAAA W W W AAAAA - S A A WW WW A A - SSS A A W W A A + + `::::::::::::::::::::::. .:` + `+ssssssssssssssssss+:.` `.:+ssso` +.ossssssssssssssso/. `-+ossssssso. +ssssssssssssso/-` `-/osssssssssssss +.ossssssso/-` .-/ossssssssssssssso. + `+sss+:. `.:+ssssssssssssssssss+` + `:. .::::::::::::::::::::::` + + + .+oooooooooooooooooooooooo+. + -osssssssssssssssssssssso- + `osssssssssssssssssssso` EOF ;; - "Kubuntu"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `.:/ossyyyysso/:. - .:oyyyyyyyyyyyyyyyyyyo:` - -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- - -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- - oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo - `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` - oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- -oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy -oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- - oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo - `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo - oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo - -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- - -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- - ./oyyyyyyyyyyyyyyyyyyo/. - `.:/oosyyyysso/:.` + *) + case "$kernel_name" in + *"BSD") + set_colors 1 7 4 3 6 + read -rd '' ascii_data <<'EOF' +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) EOF - ;; + ;; - "LEDE"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' - ${c1} _________ - / /\ - / LE / \ - / DE / \ - /________/ LE \ - \ \ DE / - \ LE \ / - \ DE \ / - \________\/ + "Darwin") + set_colors 2 3 1 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. EOF - ;; + ;; - "Linux") - set_colors fg 8 3 - read -rd '' ascii_data <<'EOF' + "GNU"*) + set_colors fg 7 + read -rd '' ascii_data <<'EOF' +${c1} _-`````-, ,- '- . + .' .- - | | - -. `. + /.' / `. \ +:/ : _... ..._ `` : +:: : /._ .`:'_.._\. || : +:: `._ ./ ,` : \ . _.'' . +`:. / | -. \-. \\_ / + \:._ _/ .' .@) \@) ` `\ ,.' + _/,--' .- .\,-.`--`. + ,'/'' (( \ ` ) + /'/' \ `-' ( + '/'' `._,-----' + ''/' .,---' + ''/' ;: + ''/'' ''/ + ''/''/'' + '/'/' + `; +EOF + ;; + + "Linux") + set_colors fg 8 3 + read -rd '' ascii_data <<'EOF' ${c2} ##### ${c2} ####### ${c2} ##${c1}O${c2}#${c1}O${c2}## @@ -6681,1985 +7703,964 @@ ${c3}######${c2}#${c1}#######${c2}#${c3}###### ${c3}#######${c2}#${c1}#####${c2}#${c3}####### ${c3} #####${c2}#######${c3}##### EOF - ;; + ;; - "LMDE"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' - ${c2}`.-::---.. -${c1} .:++++ooooosssoo:. - .+o++::. `.:oos+. -${c1} :oo:.` -+oo${c2}: -${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` -${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` -${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: -${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` -${c1}`s: `oo s m Myy+-o:` -`oo :+sdoohyoydyso/. - :o. .:////////++: -${c1} `/++ ${c2}-:::::- -${c1} ${c2}`${c1}++- -${c1} ${c2}`${c1}/+- -${c1} ${c2}.${c1}+/. -${c1} ${c2}.${c1}:+-. - `--.`` + "SunOS") + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. EOF - ;; + ;; - "Lubuntu"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `-/+oyyhhhhyyo+/-` - ./shhhhhhhhhhhhhhhhhhs/. - `:shhhhhhhhhhhhhhhhhhhhhhhhs:` - :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: - `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` - `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` - shhhhhhhhy+. .ohhhhhhhhhhhhhs -:hhhhhhy/. /hhhhhhhhhhhhh: -shhhy/. :hhhhhhhhhhhhs -hy+. ` `+yhs/` +hhhhhhhhhhhh --.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh -shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs -:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: - shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs - `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` - +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` - :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: - :shhhhhhhhhhhhhhhhhhhhhy`+s:` - .+shhhhhhhhhhhhhhhhhhs:` - `-/+oyyhhhhyys+/-` + "IRIX"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} ./ohmNd/ +dNmho/- + `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. + `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` + -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. + `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` ++mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ +dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd +oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ +.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. + hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh + /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: + `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd + `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` + `yNMMNho-yMMMM` NMMMm.+hNMMNh` + -MMMMd: oMMMM. NMMMh :hMMMM- + -yNMMMmooMMMM- NMMMyomMMMNy- + .omMMMMMMMM-`NMMMMMMMmo. + `:hMMMMMM. NMMMMMh/` + .odNm+ /dNms. EOF + ;; + esac ;; + esac + + # Overwrite distro colors if '$ascii_colors' doesn't + # equal 'distro'. + if [[ "${ascii_colors[0]}" != "distro" ]]; then + color_text="off" + set_colors "${ascii_colors[@]}" + fi +} + +set_colors() { + c1="$(color "$1")${ascii_bold}" + c2="$(color "$2")${ascii_bold}" + c3="$(color "$3")${ascii_bold}" + c4="$(color "$4")${ascii_bold}" + c5="$(color "$5")${ascii_bold}" + c6="$(color "$6")${ascii_bold}" + + [[ "$color_text" != "off" ]] && set_text_colors "$@" +} + +set_text_colors() { + if [[ "${colors[0]}" == "distro" ]]; then + title_color="$(color "$1")" + at_color="$reset" + underline_color="$reset" + subtitle_color="$(color "$2")" + colon_color="$reset" + info_color="$reset" + + # If the ascii art uses 8 as a color, make the text the fg. + ((${1:-1} == 8)) && title_color="$reset" + ((${2:-7} == 8)) && subtitle_color="$reset" + + # If the second color is white use the first for the subtitle. + ((${2:-7} == 7)) && subtitle_color="$(color "$1")" + ((${1:-1} == 7)) && title_color="$reset" + else + title_color="$(color "${colors[0]}")" + at_color="$(color "${colors[1]}")" + underline_color="$(color "${colors[2]}")" + subtitle_color="$(color "${colors[3]}")" + colon_color="$(color "${colors[4]}")" + info_color="$(color "${colors[5]}")" + fi + + # Bar colors. + if [[ "$bar_color_elapsed" == "distro" ]]; then + bar_color_elapsed="$(color fg)" + else + bar_color_elapsed="$(color "$bar_color_elapsed")" + fi + + case "$bar_color_total $1" in + "distro "[736]) bar_color_total="$(color "$1")" ;; + "distro "[0-9]) bar_color_total="$(color "$2")" ;; + *) bar_color_total="$(color "$bar_color_total")" ;; + esac +} + +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" ;; + esac +} + +# OTHER + +stdout() { + image_backend="off" + unset subtitle_color + unset colon_color + unset info_color + unset underline_color + unset bold + unset title_color + unset at_color + unset text_padding + unset zws + unset reset + unset color_blocks + unset get_line_break +} + +err() { + err+="$(color 1)[!]\e[0m $1\n" +} + +get_full_path() { + # This function finds the absolute path from a relative one. + # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" - "Lunar"*) - set_colors 4 7 3 - read -rd '' ascii_data <<'EOF' -${c1}`-. `-. - -ohys/-` `:+shy/` - -omNNdyo/` :+shmNNy/` - ${c3} - - /mMmo - hMMMN` - .NMMs - ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` - /:.` ${c3}/${c1} `.:/` -${c3} __ - | | _ _ ___ ___ ___ - | |__| | | | .'| _| - |_____|___|_|_|__,|_| -EOF - ;; + # If the file exists in the current directory, stop here. + [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - "mac"*"_small") - set_colors 2 3 1 5 4 - read -rd '' ascii_data <<'EOF' -${c1} .:' - _ :'_ -${c2} .'`_`-'_``. -:________.-' -${c3}:_______: -:_______: -${c4} :_______`-; -${c5} `._.-._.' -EOF - ;; + if ! cd "${1%/*}"; then + err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" + err " Check that the directory exists or try another directory." + exit 1 + fi - "mac" | "Darwin") - set_colors 2 3 1 1 5 4 - read -rd '' ascii_data <<'EOF' -${c1} 'c. - ,xNMM. - .OMMMMo - OMMM0, - .;loddo:' loolloddol;. - cKMMMMMMMMMMNWMMMMMMMMMM0: -${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. - XMMMMMMMMMMMMMMMMMMMMMMMX. -${c3};MMMMMMMMMMMMMMMMMMMMMMMM: -:MMMMMMMMMMMMMMMMMMMMMMMM: -${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. - kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. - ${c6}kMMMMMMMMMMMMMMMMMMMMMMd - ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. -EOF - ;; + local full_dir="${1##*/}" - "Mageia"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} .°°. - °° .°°. - .°°°. °° - . . - °°° .°°°. - .°°°. '___' -${c2} .${c1}'___' ${c2} . - :dkxc;'. ..,cxkd; - .dkk. kkkkkkkkkk .kkd. -.dkk. ';cloolc;. .kkd -ckk. .kk; -xO: cOd -xO: lOd -lOO. .OO: -.k00. .00x - .k00; ;00O. - .lO0Kc;,,,,,,;c0KOc. - ;d00KKKKKK00d; - .,KKKK,. -EOF - ;; + # Iterate down a (possible) chain of symlinks. + while [[ -L "$full_dir" ]]; do + full_dir="$(readlink "$full_dir")" + cd "${full_dir%/*}" || exit + full_dir="${full_dir##*/}" + done - "MagpieOS"*) - set_colors 2 1 3 5 - read -rd '' ascii_data <<'EOF' -${c1} ;00000 :000Ol - .x00kk00: O0kk00k; - l00: :00. o0k :O0k. - .k0k. x${c2}d$dddd${c1}k' .d00; - k0k. ${c2}.dddddl ${c1}o00, - o00. ${c2}':cc:. ${c1}d0O -.00l ,00. -l00. d0x -k0O .:k0o -O0k ;dO0000d. -k0O .O0O${c2}xxxxk${c1}00: -o00. k0O${c2}dddddd${c1}occ -'00l x0O${c2}dddddo${c3};..${c1} - x00. .x00${c2}kxxd${c3}:..${c1} - .O0x .:oxxx${c4}Okl.${c1} - .x0d ${c4},xx,${c1} - .:o. ${c4}.xd ckd${c1} - .. ${c4}dxl .xx; - :xxolldxd' - ;oxdl. -EOF - ;; + # Final directory. + full_dir="$(pwd -P)/${1/*\/}" - "Manjaro"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1}██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -EOF - ;; + [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" +} - "Maui"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} `.-://////:--` - .:/oooooooooooooooo+:. - `:+ooooooooooooooooooooooo:` - `:oooooooooooooooooooooooooooo/` - ..```-oooooo/-`` `:oooooo+:.` `-- - :. +oo+-` /ooo/` -/ - -o. `o+- +o/` -o: -`oo` ::` :o/ `+. .+o` /oo. -/o+ . -+oo- ` /oo/ `ooo/ -+o- /ooo+` .+ooo. :ooo+ -++ .+oooo: -oooo+ `oooo+ -:. .oooooo` :ooooo- :oooo: -` .oooooo: :ooooo+ `ooo+-` - .+oooooo` -oooooo: `o/- - +oooooo: .ooooooo. - /ooooooo` /ooooooo/ .. - `:oooooooo/:::/ooooooooo+:--:/:` - `:+oooooooooooooooooooooo+:` - .:+oooooooooooooooo+:. - `.-://////:-.` -EOF - ;; +get_user_config() { + # Check $config_file. + if [[ -f "$config_file" ]]; then + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options + return + fi + mkdir -p "${XDG_CONFIG_HOME}/neofetch/" - "Mer"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} dMs - .-` - `y`-o+` - ``NMMy - .--`:++. - .hNNNNs - /MMMMMN - `ommmd/ +/ - ```` +/ - `:+sssso/-` - .-::. `-::-` `smNMNmdmNMNd/ .://-` -.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo -dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- -MMm yMM- :MMs NMN` `:::::--sMMh dMM` -MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` -NNd sNN- -NNs -mMNs-.--..:dMMh` dNN ---- .--` `--. .smMMmdddmMNdo` .-- - ./ohddds+:` - +h- `.:-. - ./`.dMMMN+ - +MMMMMd - `+dmmy- - ``` .+` - .dMNo-y. - `hmm/ - .:` - dMs -EOF - ;; + # Check ${XDG_CONFIG_HOME}/neofetch and create the + # dir/files if they don't exist. + if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config" - "Minix"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2} -sdhyo+:-` -/syymm: - sdyooymmNNy. `` .smNmmdysNd - odyoso+syNNmysoyhhdhsoomNmm+/osdm/ - :hhy+-/syNNmddhddddddmNMNo:sdNd: - `smNNdNmmNmddddddddddmmmmmmmy` - `ohhhhdddddmmNNdmddNmNNmdddddmdh- - odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: - `+mNho:` smmd/ sNNh :dmms` -+ymmo. --od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: -+sms -.` :so: .NN+ :os/ .-`mNh: -.-hyh+:////- -sNNd:` .--://ohNs- - `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ - -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: - //oydNMMMMydMMNysNMMmsMMMMMNyo/` - ../-yNMMy--/::/-.sMMmos+.` - -+oyhNsooo+omy/``` - `::ohdmds-` -EOF - ;; + elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - "Linux Mint"* | "LinuxMint"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. -MMm----::-://////////////oymNMd+` -MMd ${c2}/++ ${c1}-sNMd: -MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: -ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm - NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM - NMm ${c2}dMM` ..` ... ydm. ${c1}dMM - hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM - -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM - -dMNs-${c2}``-::::-------.`` ${c1}dMM - `/dMNmy+/:-------------:/yMMM - ./ydNMMMMMMMMMMMMMMMMMMMMM - .MMMMMMMMMMMMMMMMMMM -EOF - ;; + else + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - "MX"*) - set_colors 4 6 7 - read -rd '' ascii_data <<'EOF' -${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM -MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM -MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM -MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM -MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM -MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM -MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM -MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM -MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM -MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM -MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM -MMMMMMMNo` :mMMN+` `-hMMMMMMMM -MMMMMMh. `oNMMd: `/mMMMMMM -MMMMm/ -hMd- `sNMMMM -MMNs` - :dMMM -Mm: `oMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM -EOF - ;; + # The config file doesn't exist, create it. + printf "%s\n" "$config" > "$config_file" + fi - "NetBSD"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} `-/oshdmNMNdhyo+:-` -${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` -${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` - ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` - ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` - ${c2}-N/${c1}hMMMMMMMMMmho:` - ${c2}-N/${c1}-:/++/:.` -${c2} :M+ - :Mo - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms -EOF - ;; + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options +} - "Netrunner"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} .:oydmMMMMMMmdyo:` - -smMMMMMMMMMMMMMMMMMMds- - +mMMMMMMMMMMMMMMMMMMMMMMMMd+ - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ - `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` - .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` - dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh -+MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ -mMMMMMMMMd+:.` `mMMMMMMMMMMMMd -MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM -mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd -+MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ - dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh - `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` - `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: - +dMMMMMMMMMMMMMMMMMMMMMMMMd/ - -odMMMMMMMMMMMMMMMMMMdo- - `:+ydmNMMMMNmhy+-` -EOF - ;; +bar() { + # Get the values. + elapsed="$(($1 * bar_length / $2))" - "Nitrux"*) - set_colors 4 - read -rd '' ascii_data <<'EOF' -${c1}`:/. -`/yo -`/yo -`/yo .+:. -`/yo .sys+:.` -`/yo `-/sys+:.` -`/yo ./sss+:.` -`/yo .:oss+:-` -`/yo ./o///:-` -`/yo `.-:///////:` -`/yo `.://///++//-`` -`/yo `.-:////++++/-` -`/yo `-://///++o+/-` -`/yo `-/+o+++ooo+/-` -`/s+:+oooossso/.` -`//+sssssso:. -`+syyyy+:` -:+s+- -EOF - ;; + # Create the bar with spaces. + printf -v prog "%${elapsed}s" + printf -v total "%$((bar_length - elapsed))s" - "nixos_small") - set_colors 4 6 - read -rd '' ascii_data <<'EOF' - ${c1}\\\\ \\\\ // - ==\\\\__\\\\/ // - // \\\\// -==// //== - //\\\\___// -// /\\\\ \\\\== - // \\\\ \\\\ -EOF - ;; + # Set the colors and swap the spaces for $bar_char_. + bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" + bar+="${bar_color_total}${total// /${bar_char_total}}" - "NixOS"*) - set_colors 4 6 - read -rd '' ascii_data <<'EOF' -${c1} ::::. ${c2}'::::: ::::' -${c1} '::::: ${c2}':::::. ::::' -${c1} ::::: ${c2}'::::.::::: -${c1} .......:::::..... ${c2}:::::::: -${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. - ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' -${c2} ..... ::::' ${c1}:::::' -${c2} ::::: '::' ${c1}:::::' -${c2} ........::::: ' ${c1}:::::::::::. -${c2}::::::::::::: ${c1}::::::::::::: -${c2} ::::::::::: ${c1}.. ${c1}::::: -${c2} .::::: ${c1}.::: ${c1}::::: -${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... - ::::: ${c1}':::::. ${c2}......:::::::::::::' - ::: ${c1}::::::. ${c2}':::::::::::::::::' -${c1} .:::::::: ${c2}':::::::::: -${c1} .::::''::::. ${c2}'::::. -${c1} .::::' ::::. ${c2}'::::. -${c1} .:::: :::: ${c2}'::::. -EOF - ;; + # Borders. + [[ "$bar_border" == "on" ]] && \ + bar="$(color fg)[${bar}$(color fg)]" - "Nurunner"*) - set_colors 4 - read -rd '' ascii_data <<'EOF' -${c1} ,xc - ;00cxXl - ;K0, .xNo. - :KO' .lXx. - cXk. ;xl cXk. - cXk. ;k:.,xo. cXk. - .lXx. :x::0MNl,dd. :KO, - .xNx. cx;:KMMMMMNo'dx. ;KK; - .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: -;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO - 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: - .kNo .xo'xWMMMMMM0;:O: ;KK; - .dXd. .do,oNMMO;ck: ;00, - oNd. .dx,;'cO; ;K0, - oNx. okk; ;K0, - lXx. :KO' - cKk' cXk. - ;00:lXx. - ,kd. -EOF - ;; + printf "%b" "${bar}${info_color}" +} - "NuTyX"*) - set_colors 4 1 - read -rd '' ascii_data <<'EOF' -${c1} . - . - ... - ... - .... .........--. - ..-++-----....--++++++---. - .-++++++-. .-++++++++++++-----.. - .--... .++..-+++--.....-++++++++++--.. - . .-+-. .**- .... ..-+----.. - .+++. .*+. + -++-----. - .+++++- ++. .*+. .....-+++-----. - -+++-++. .+. .-+***++***++--++++. . - -+-. -- -. -*- ...... ..--. -.-. .+- . -+. -. .+- +. - -- -- - -+----. .- - -++-.+. . - .++. -- - +. ----. - . .+. .. - - . - . -EOF - ;; +cache() { + if [[ "$2" ]]; then + mkdir -p "${cache_dir}/neofetch" + printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" + fi +} - "OBRevenge"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} __ __ - _@@@@ @@@g_ - _@@@@@@ @@@@@@ - _@@@@@@M W@@@@@@_ - j@@@@P ^W@@@@ - @@@@L____ _____Q@@@@ -Q@@@@@@@@@@j@@@@@@@@@@ -@@@@@ T@j@ T@@@@@ -@@@@@ ___Q@J@ _@@@@@ -@@@@@fMMM@@j@jggg@@@@@@ -@@@@@ j@j@^MW@P @@@@ -Q@@@@@ggg@@f@ @@@@@@L -^@@@@WWMMP ^ Q@@@@ - @@@@@_ _@@@@l - W@@@@@g_____g@@@@@P - @@@@@@@@@@@@@@@@l - ^W@@@@@@@@@@@P - ^TMMMMTll -EOF - ;; +get_cache_dir() { + case "$os" in + "Mac OS X") cache_dir="/Library/Caches" ;; + *) cache_dir="/tmp" ;; + esac +} + +kde_config_dir() { + # If the user is using KDE get the KDE + # configuration directory. + if [[ "$kde_config_dir" ]]; then + return + + elif type -p kf5-config >/dev/null 2>&1; then + kde_config_dir="$(kf5-config --path config)" + + elif type -p kde4-config >/dev/null 2>&1; then + kde_config_dir="$(kde4-config --path config)" + + elif type -p kde-config >/dev/null 2>&1; then + kde_config_dir="$(kde-config --path config)" + + elif [[ -d "${HOME}/.kde4" ]]; then + kde_config_dir="${HOME}/.kde4/share/config" - "openbsd_small") - set_colors 3 7 6 1 8 - read -rd '' ascii_data <<'EOF' -${c1} _____ - \\- -/ - \\_/ \\ - | ${c2}O O${c1} | - |_ < ) 3 ) - / \\ / - /-_____-\\ -EOF - ;; + elif [[ -d "${HOME}/.kde3" ]]; then + kde_config_dir="${HOME}/.kde3/share/config" + fi - "OpenBSD"*) - set_colors 3 7 6 1 8 - read -rd '' ascii_data <<'EOF' - ${c3} _ - (_) -${c1} | . -${c1} . |L /| . ${c3} _ -${c1} _ . |\ _| \--+._/| . ${c3}(_) -${c1} / ||\| Y J ) / |/| ./ - J |)'( | ` F`.'/ ${c3} _ -${c1} -<| F __ .-< ${c3}(_) -${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ - J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ -${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) -${c1} '-F -<_. \\ .-' `-' L__ -__J _ _. >-' ${c1})${c4}._. ${c1}|-' -${c1} `-|.' /_. ${c4}\_| ${c1} F - /.- . _.< - /' /.' .' `\\ - /L /' |/ _.-'-\\ - /'J ___.---'\| - |\ .--' V | `. ` - |/`. `-. `._) - / .-.\\ - \\ ( `\\ - `.\ -EOF - ;; + kde_config_dir="${kde_config_dir/$'/:'*}" +} - "OpenIndiana"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} .sy/ - .yh+ +get_term_padding() { + # Terminal info. + # + # Parse terminal config files to get + # info about padding. Due to how w3m-img + # works padding around the terminal throws + # off the cursor placement calculation in + # specific terminals. + # + # Note: This issue only seems to affect + # URxvt. + ((term_run != 1)) && get_term - ${c1}-+syyyo+- ${c2} /+. - ${c1}+ddo/---/sdh/ ${c2} ym- - ${c1}`hm+ `sms${c2} ym-```````.-. - ${c1}sm+ sm/ ${c2} ym- +s - ${c1}hm. /mo ${c2} ym- /h - ${c1}omo ym: ${c2} ym- `os` - ${c1}smo` .ym+ ${c2} ym- .os- - `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. - ..` ${c1}`:+oo+/-` ${c2} -//oyo- - -:` .:oys/. -+- `./oyys/. -h+` `.-:+oyyyo/-` -`/ossssysso+/-.` -EOF + case "$term" in + "URxvt"*) + border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" ;; + esac +} - "OpenMandriva"*) - set_colors 4 3 - read -rd '' ascii_data <<'EOF' -${c2} `` - `-. -${c1} ` ${c2}.--- -${c1} -/ ${c2}-::--` -${c1} `++ ${c2}`----...```-:::::. -${c1} `os. ${c2}.::::::::::::::-``` ` ` -${c1} +s+ ${c2}.::::::::::::::::---...--` -${c1}-ss: ${c2}`-::::::::::::::::-.``.`` -${c1}/ss- ${c2}.::::::::::::-.`` ` -${c1}+ss: ${c2}.::::::::::::- -${c1}/sso ${c2}.::::::-::::::- -${c1}.sss/ ${c2}-:::-.` .::::: -${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: -${c1} -ossso+/:://+/-` ${c2}.:` -${c1} -/+ooo+/-. ${c2}` -EOF +dynamic_prompt() { + case "$image_backend" in + "ascii") printf "\n" ;; + "off") return ;; + *) + get_term_padding + lines="$(((border + height + yoffset) / font_height))" + image_prompt="on" ;; + esac - "OpenWrt"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} _______ -| |.-----.-----.-----. -| - || _ | -__| | -|_______|| __|_____|__|__| - |__| - ________ __ -| | | |.----.| |_ -| | | || _|| _| -|________||__| |____| -EOF - ;; + # If the info is higher than the ascii/image place the prompt + # based on the info height instead of the ascii/image height. + if ((lines < info_height)); then + [[ "$image_prompt" ]] && printf "\n" + return + else + [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" + lines="$((lines - info_height + 1))" + fi - "Open Source Media Center"* | "osmc") - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} -+shdmNNNNmdhs+- - .+hMNho/:..``..:/ohNMh+. - :hMdo. .odMh: - -dMy- -yMd- - sMd- -dMs - hMy +. .+ yMh - yMy dMs. .sMd yMy -:Mm dMNMs` `sMNMd `mM: -yM+ dM//mNs``sNm//Md +My -mM- dM: +NNNN+ :Md -Mm -mM- dM: `oNN+ :Md -Mm -yM+ dM/+NNo` :Md +My -:Mm` dMMNs` :Md `mM: - yMy dMs` -ms yMy - hMy +. yMh - sMd- -dMs - -dMy- -yMd- - :hMdo. .odMh: - .+hMNho/:..``..:/ohNMh+. - -+shdmNNNNmdhs+- -EOF - ;; + # Set the prompt location. + if ((lines > 1)); then + case "$kernel_name" in + "OpenBSD") tput cud "$lines" ;; + *) printf "%b" "\e[${lines}B" ;; + esac + fi +} - "Oracle"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} - `-/+++++++++++++++++/-.` - `/syyyyyyyyyyyyyyyyyyyyyyys/. - :yyyyo/-...............-/oyyyy/ - /yyys- .oyyy+ -.yyyy` `syyy- -:yyyo /yyy/ -.yyyy` `syyy- - /yyys. .oyyyo - /yyyyo:-...............-:oyyyy/` - `/syyyyyyyyyyyyyyyyyyyyyyys+. - `.:/+ooooooooooooooo+/:.` -EOF - ;; +old_functions() { + # Deprecated functions. + # Neofetch 2.0 changed the names of a few variables. + # This function adds backwards compatibility for the + # old variable names. + if type printinfo >/dev/null 2>&1; then + print_info() { printinfo ; } + get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } + get_termfont() { get_term_font; termfont="$term_font"; } + get_localip() { get_local_ip; localip="$local_ip"; } + get_publicip() { get_public_ip; publicip="$public_ip"; } + get_linebreak() { get_line_break; linebreak="$line_break"; } + fi - "PacBSD"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} :+sMs. - `:ddNMd- -o--` - -sMMMMh: `+N+`` - yMMMMMs` .....-/-... `mNh/ - yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm - yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm - :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd - +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- - :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. - .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- - /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` -.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- -:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` -/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. -:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` -:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` - sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. - :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// - /dMMMMMMMMMMMMMs- ````````..`` - .oMMMMMMMMMMMMNs` ./y:` - +dNMMNMMMMMMMmy` ``./ys. - `/hMMMMMMMMMMMNo-`` `.+yy+-` - `-/hmNMNMMMMMMmmddddhhy/-` - `-+oooyMMMdsoo+/:. -EOF - ;; + get_birthday() { get_install_date; birthday="$install_date"; } +} - "Parabola"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} `.-. `. - `.` `:++. `-+o+. - `` `:+/. `:+/. `-+oooo+ - ``-::-.:+/. `:+/. `-+oooooo+ - `.-:///- ..` .-. `-+oooooooo- - `..-..` `+ooooooooo: -`` :oooooooo/ - `ooooooo: - `oooooo: - -oooo+. - +ooo/` - -ooo- - `+o/. - /+- - //` - -. -EOF - ;; +old_options() { + [[ -n "$osx_buildversion" ]] && \ + err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." + [[ -n "$osx_codename" ]] && \ + err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." + [[ "$cpu_cores" == "on" ]] && \ + err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." + [[ -n "$image" ]] && \ + { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } - "Pardus"*) - set_colors 3 7 6 1 8 - read -rd '' ascii_data <<'EOF' -${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. -/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ -mN. oMdyy- -y `-dMo .Nm -.mN+` sMy hN+ -: yMs `+Nm. - `yMMddMs.dy `+` sMddMMy` - +MMMo .` . oMMM+ - `NM/ `````.` `.````` +MN` - yM+ `.-:yhomy ymohy:-.` +My - yM: yo oy :My - +Ms .N` `N. +h sM+ - `MN - -::::::- : :o:+`NM` - yM/ sh -dMMMMd- ho +y+My - .dNhsohMh-//: /mm/ ://-yMyoshNd` - `-ommNMm+:/. oo ./:+mMNmmo:` - `/o+.-somNh- :yy: -hNmos-.+o/` - ./` .s/`s+sMdd+``+ddMs+s`/s. `/. - : -y. -hNmddmNy. .y- : - -+ `..` +- -EOF - ;; + # All progress_ variables were changed to bar_. + [[ -n "$progress_char" ]] && \ + err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." + [[ -n "$progress_border" ]] && \ + { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ + bar_border="$progress_border"; } + [[ -n "$progress_length" ]] && \ + { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ + bar_length="$progress_length"; } + [[ -n "$progress_color_elapsed" ]] && \ + { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ + bar_color_elapsed="$progress_color_elapsed"; } + [[ -n "$progress_color_total" ]] && \ + { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ + bar_color_total="$progress_color_total"; } - "Parrot"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} `:oho/-` -`mMMMMMMMMMMMNmmdhy- - dMMMMMMMMMMMMMMMMMMs` - +MMsohNMMMMMMMMMMMMMm/ - .My .+dMMMMMMMMMMMMMh. - + :NMMMMMMMMMMMMNo - `yMMMMMMMMMMMMMm: - /NMMMMMMMMMMMMMy` - .hMMMMMMMMMMMMMN+ - ``-NMMMMMMMMMd- - /MMMMMMMMMMMs` - mMMMMMMMsyNMN/ - +MMMMMMMo :sNh. - `NMMMMMMm -o/ - oMMMMMMM. - `NMMMMMM+ - +MMd/NMh - mMm -mN` - /MM `h: - dM` . - :M- - d: - -+ - - -EOF - ;; + # All cpufreq values were changed in 3.0. + [[ "$speed_type" == "current" ]] && \ + err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." + [[ "$speed_type" == "min" ]] && \ + err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." + [[ "$speed_type" == "max" ]] && \ + err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." + [[ "$speed_type" == "bios" ]] && \ + err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." - "Parsix"*) - set_colors 3 1 7 8 - read -rd '' ascii_data <<'EOF' - ${c2}-/+/:. - ${c2}.syssssys. - ${c1}.--. ${c2}ssssssssso${c1} ..--. - :++++++: ${c2}+ssssssss+${c1} ./++/+++: - /+++++++++.${c2}.yssooooy`${c1}-+///////o- - /++++++++++.${c2}+soooos:${c1}:+////////+- - :+++++////o-${c2}oooooo-${c1}+/////////- - `-/++//++-${c4}.-----.-${c1}:+/////:- - ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. -${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- -${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ -${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- - `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` - ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. - ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: - ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ - ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: - ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- - ${c1}`--` ${c2}+sssssssso ${c1}`--` - ${c2}+sssssy+` - ${c2}`.::-` -EOF - ;; + # Ascii_logo_size was removed in 3.0. + [[ "$ascii_logo_size" ]] && \ + err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." - "PCBSD"* | "TrueOS"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} .. - s. - +y - yN - -MN `. - :NMs `m - .yMMm` `No - `-/+++sdMMMNs+-`+Ms - `:oo+-` .yMMMMy` `-+oNMh - -oo- +NMMMM/ oMMh- - .s+` ` oMMMMM/ - oMMMhy. - +s`- :: :MMMMMd -o `mMMMy`s+ - y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y - s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s --h .NM` `hMMMMMMMMMMMMMMNMMNy: h- -y- hMN` hMMmMMMMMMMMMNsdMNs. -y -m` mMMy` oMMNoNMMMMMMo` sMMMo `m -m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m -h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h -:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: - y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y - `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` - so -NMMMN /mmd+ `dMMMMMMMm- os - :y: `yMMM` `+NMMMMMMNo`:y: - /s+`.omy /NMMMMMNh/.+s: - .+oo:-. /mdhs+::oo+. - -/o+++++++++++/- -EOF - ;; + # $start and $end were replaced with ${block_range[@]} in 3.0. + [[ "$start" && "$end" ]] && \ + { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ + block_range=("$start" "$end"); } - "PCLinuxOS"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' - ${c1}mhhhyyyyhhhdN - dyssyhhhhhhhhhhhssyhN - Nysyhhyo/:-.....-/oyhhhssd - Nsshhy+. `/shhysm - dohhy/ -shhsy - dohhs` /hhys -N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy -ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ -+hho ${c2}ymm- /mmy+mms ${c1}:hhod -/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh -+hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m -yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ - ohhy` ${c2}://` -/+++/- ${c1}ohhom - N+hhy- `shhoh - sshho. `+hhyom - dsyhhs/. `:ohhhoy - dysyhhhso///://+syhhhssh - dhyssyhhhhhhyssyyhN - mddhdhdmN -EOF - ;; + # Fahrenheit support was added to CPU so the options were changed. + [[ "$cpu_temp" == "on" ]] && \ + { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; + cpu_temp="C"; } - "Peppermint"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} 8ZZZZZZ${c2}MMMMM -${c1} .ZZZZZZZZZ${c2}MMMMMMM. -${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ -${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM -${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. -${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI -${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM -${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM -${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM -${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM -${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM -${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M -${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 -${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 -${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 -${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z -${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM -${c1} NZZZZZZZZZZZ${c2}MMMMM -${c1} ZZZZZZZZZ${c2}MM) -EOF - ;; + # Birthday was renamed to Install Date in 3.0 + [[ -n "$birthday_time" ]] && \ + { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ + install_time="$birthday_time"; } - "Pop!_OS"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} ///////////// - ///////////////////// - ///////${c2}*767${c1}//////////////// - //////${c2}7676767676*${c1}////////////// - /////${c2}76767${c1}//${c2}7676767${c1}////////////// - /////${c2}767676${c1}///${c2}*76767${c1}/////////////// - ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// -/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// -//////////${c2}76767676767${c1}////${c2}76767${c1}///////// -///////////${c2}76767676${c1}//////${c2}7676${c1}////////// -////////////,${c2}7676${c1},///////${c2}767${c1}/////////// -/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// -///////////////${c2}7676${c1}//////////////////// - ///////////////${c2}7676${c1}///${c2}767${c1}//////////// - //////////////////////${c2}'${c1}//////////// - //////${c2}.7676767676767676767,${c1}////// - /////${c2}767676767676767676767${c1}///// - /////////////////////////// - ///////////////////// - ///////////// -EOF - ;; + # Scrot dir was removed in 3.1.0. + [[ -n "$scrot_dir" ]] && scrot_dir= - "Porteus"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} `.-:::-.` - -+ydmNNNNNNNmdy+- - .+dNmdhs+//////+shdmdo. - .smmy+-` ./sdy: - `omdo. `.-/+osssso+/-` `+dy. - `yms. `:shmNmdhsoo++osyyo-``oh. - hm/ .odNmds/.` ``.....:::-+s -/m: `+dNmy:` `./oyhhhhyyooo++so -ys `yNmy- .+hmmho:-.` ``` -s: yNm+` .smNd+. -`` /Nm: +dNd+` - yN+ `smNy. - dm oNNy` - hy -mNm. - +y oNNo - `y` sNN: - `: +NN: - ` .mNo - /mm` - /my` - .sy` - .+: - ` -EOF - ;; + # cpu_shorthand was deprecated in 3.3.0 + [[ -n "$cpu_shorthand" ]] && \ + { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and + \$cpu_speed instead."; } +} - "PostMarketOS"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} ss - `hMMh` - .dMMMMd. - -NMMMMMMN- - /MMMMMMMMMN/ - hMMMMMMMMMMMo - y+`mMMmdNMMMMMMy - `dMM-.-:- .mMMMMMMh` - .mMMMMMMd` `dMMMMMMm. - :NMMMMMMy yMMMMMMN: - /MMMMMMMo oMMMmdmN/ - oMMMMMMM/ /MN.-/:-. - `yMMMMMMN- -:.NMMMMy` - `dMMMMMMM- -/////////////dMMMMMMd` - -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- - :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: -+MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ -EOF - ;; +cache_uname() { + # Cache the output of uname so we don't + # have to spawn it multiple times. + IFS=" " read -ra uname <<< "$(uname -sr)" - "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) - set_colors 4 7 - read -rd '' ascii_data <<'EOF' -${c1} `-/osyyyysosyhhhhhyys+- - -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ - yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy -.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ --NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ -.Nm+shddyooo+/smNNNNmmmmNh. :mmd. - NNNNy:` ./hmmmmmmmNNNN: hNMh - NMN- -++- +NNNNNNNNNNm+..-sMMMM- -.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ -.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ - mMM+ .. `sNN+. hMMMMhhMMM- - +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy - yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` - sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` - :mMMMMMMMMMMMmddNMMMMMMMMmh/ - /dMMMMMMMMMMMMMMMMMMNdy/` - .+hNMMMMMMMMMNmdhs/. - .:/+ooo+/:-. -EOF - ;; + kernel_name="${uname[0]}" + kernel_version="${uname[1]}" +} - "Qubes"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} `..--..` - `.----------.` - `..----------------..` - `.------------------------.`` - `..-------------....-------------..` -.::----------..`` ``..----------:+: -:////:----..` `..---:/ossso -:///////:` `/osssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:////////-` .:sssssssso -:///////////-.` `-/osssssssssso -`//////////////:-```.:+ssssssssssssso- - .-://////////////sssssssssssssso/-` - `.:///////////sssssssssssssso:. - .-:///////ssssssssssssssssss/` - `.:////ssss+/+ssssssssssss. - `--//- `-/osssso/. -EOF - ;; +convert_time() { + # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. + year="$1" + day="${3#0}" - "Raspbian"*) - set_colors 2 1 - read -rd '' ascii_data <<'EOF' -${c1} `.::///+:/-. --///+//-:`` - `+oooooooooooo: `+oooooooooooo: - /oooo++//ooooo: ooooo+//+ooooo. - `+ooooooo:-:oo- +o+::/ooooooo: - `:oooooooo+`` `.oooooooo+- - `:++ooo/. :+ooo+/.` - ${c2}...` `.----.` ``.. - .::::-``:::::::::.`-:::-` - -:::-` .:::::::-` `-:::- - `::. `.--.` `` `.---.``.::` - .::::::::` -::::::::` ` - .::` .:::::::::- `::::::::::``::. --:::` ::::::::::. ::::::::::.`:::- -:::: -::::::::. `-:::::::: :::: --::- .-:::-.``....``.-::-. -::- - .. `` .::::::::. `..`.. - -:::-` -::::::::::` .:::::` - :::::::` -::::::::::` :::::::. - .::::::: -::::::::. :::::::: - `-:::::` ..--.` ::::::. - `...` `...--..` `...` - .:::::::::: - `.-::::-` -EOF - ;; + # Split time into hours/minutes. + hour="${4/:*}" + min="${4/${hour}}" - "Red Star"* | "Redstar"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} .. - .oK0l - :0KKKKd. - .xKO0KKKKd - ,Od' .d0000l - .c;. .'''... ..'. -.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: -;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. - .okkkkd,.lko .......',;:cllc:;,,'''''. - .cdo. :xd' cd:. ..';'',,,'',,;;;,'. - . .ddl.;doooc'..;oc;'..';::;,'. - coo;.oooolllllllcccc:'. . - .ool''lllllccccccc:::::;. - ;lll. .':cccc:::::::;;;;' - :lcc:'',..';::::;;;;;;;,,. - :cccc::::;...';;;;;,,,,,,. - ,::::::;;;,'. ..',,,,'''. - ........ ...... -EOF - ;; + # Get month. (Month code is used for day of week) + # Due to different versions of 'ls', the month can be 1, 01 or Jan. + case "$2" in + 1 | 01 | "Jan") month="Jan"; month_code=0 ;; + 2 | 02 | "Feb") month="Feb"; month_code=3 ;; + 3 | 03 | "Mar") month="Mar"; month_code=3 ;; + 4 | 04 | "Apr") month="Apr"; month_code=6 ;; + 5 | 05 | "May") month="May"; month_code=1 ;; + 6 | 06 | "Jun") month="Jun"; month_code=4 ;; + 7 | 07 | "Jul") month="Jul"; month_code=6 ;; + 8 | 08 | "Aug") month="Aug"; month_code=2 ;; + 9 | 09 | "Sep") month="Sep"; month_code=5 ;; + 10 | "Oct") month="Oct"; month_code=0 ;; + 11 | "Nov") month="Nov"; month_code=3 ;; + 12 | "Dec") month="Dec"; month_code=5 ;; + esac - "Redhat"* | "Red Hat"* | "rhel"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} `.-..........` - `////////::.`-/. - -: ....-////////. - //:-::///////////` - `--::: `-://////////////: - //////- ``.-:///////// .` - `://////:-.` :///////::///:` - .-/////////:---/////////////: - .-://////////////////////. -${c2} yMN+`.-${c1}::///////////////-` -${c2} .-`:NMMNMs` `..-------..` - MN+/mMMMMMhoooyysshsss -MMM MMMMMMMMMMMMMMyyddMMM+ - MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM - MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM - MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM -EOF - ;; + # Get leap year. + # Source: http://stackoverflow.com/questions/725098/leap-year-calculation + [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ + [[ "$month" =~ (Jan|Feb) ]] && \ + leap_code=1 - "Refracted Devuan"*) - set_colors 8 7 - read -rd '' ascii_data <<'EOF' -${c2} A - VW - VVW\\ - .yWWW\\ - ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ - *WWWWWWWWWWWWWWWW/ $VWWWWw , - ^*%WWWWWWVWWX $WWWW** ,yy - , "**WWW/' **' ,yy/WWW*` - &WWWWwy `*` <,ywWW%VWWW* - yWWWWWWWWWW* ., "**WW%W - ,&WWWWWM*"` ,y/ &WWWww ^* - XWWX*^ ,yWWWW09 .WWWWWWWWwy, - *` &WWWWWM WWWWWWWWWWWWWww, - (WWWWW` /#####WWW*********** - ^WWWW - VWW - Wh. - V/ -EOF + # Calculate day of week. + # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html + year_code="$((${year/??} + (${year/??} / 4) % 7))" + week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" + + case "$week_day" in + 0) week_day="Sun" ;; + 1) week_day="Mon" ;; + 2) week_day="Tue" ;; + 3) week_day="Wed" ;; + 4) week_day="Thu" ;; + 5) week_day="Fri" ;; + 6) week_day="Sat" ;; + esac + + # Convert 24 hour time to 12 hour time + AM/PM. + case "$install_time_format" in + "12h") + case "$hour" in + [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; + *) time="$((hour - 12))${min} PM" ;; + esac ;; + *) time="$4" ;; + esac - "Rosa"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ROSAROSAROSAROSAR - ROSA AROS - ROS SAROSAROSAROSAR AROS - RO ROSAROSAROSAROSAROSAR RO - ARO AROSAROSAROSARO AROS ROS - ARO ROSAROS OSAR ROSA ROS - RO AROSA ROSAROSAROSA ROSAR RO -RO ROSAR ROSAROSAROSAR R ROSARO RO -RO ROSA AROSAROSAROSA AR ROSARO AR -RO AROS ROSAROSAROSA ROS AROSARO AR -RO AROS ROSAROSARO ROSARO ROSARO AR -RO ROS AROSAROS ROSAROSA AROSAR AR -RO ROSA ROS ROSAROSAR ROSARO RO - RO ROS AROSAROSAROSA ROSARO AR - ARO ROSA ROSAROSAROS AROSAR ARO - ARO OROSA R ROSAROS ROS - RO AROSAROS AROSAROSAR RO - AROS AROSAROSAROSARO AROS - ROSA SARO - ROSAROSAROSAROSAR -EOF + # Toggle showing the time. + [[ "$install_time" == "off" ]] && unset time + + # Print the install date. + printf "%s" "$week_day $day $month $year $time" +} + +get_ppid() { + # Get parent process ID of PID. + case "$os" in + "Windows") + ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" + ppid="${ppid/'PPID'}" ;; - "sabotage"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} .|'''.| | '||''|. ..|''|| - ||.. ' ||| || || .|' || - ''|||. | || ||'''|. || || -. '|| .''''|. || || '|. || -|'....|' .|. .||. .||...|' ''|...|' + "Linux") + ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" + ppid="$(trim "${ppid/PPid:}")" + ;; -|''||''| | ..|'''.| '||''''| - || ||| .|' ' || . - || | || || .... ||''| - || .''''|. '|. || || - .||. .|. .||. ''|...'| .||.....| -EOF + *) + ppid="$(ps -p "${1:-$PPID}" -o ppid=)" ;; + esac - "Sabayon"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ........... - .. .. - .. .. - .. ${c2}o ${c1}.. - .. ${c2}:W' ${c1}.. - .. ${c2}.d. ${c1}.. -:. ${c2}.KNO ${c1}.: -:. ${c2}cNNN. ${c1}.: -: ${c2}dXXX, ${c1}: -: ${c2}. dXXX, .cd, ${c1}: -: ${c2}'kc .. dKKK. ,ll;:' ${c1}: -: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: -:. ${c2}.,cdddddddddddddo:. ${c1}.: - .. ${c2}:lllllll: ${c1}.. - .. ${c2}',,,,, ${c1}.. - .. .. - .. .. - ............... -EOF + printf "%s" "$ppid" +} + +get_process_name() { + # Get PID name. + case "$os" in + "Windows") + name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" + name="${name/'COMMAND'}" + name="${name/*\/}" ;; - "SailfishOS"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} .+eWWW - .+ee+++eee e. - .ee++eeeeeeee +e. - .e++ee++eeeeeee+eee+e+ - ee.e+.ee+eee++eeeeee+ - W.+e.e+.e++ee+eee - W.+e.W.ee.W++ee' - +e.W W.e+.W.W+ - W.e.+e.W W W. - e e e +e.W.W - .W W W. - W.+e.W. - W++e.ee+. - ++ +ee++eeeee++. - ' '+++e 'ee. - ee - ee - e -EOF + "Linux") + name="$(< "/proc/${1:-$PPID}/comm")" ;; - "SalentOS"*) - set_colors 2 1 3 7 - read -rd '' ascii_data <<'EOF' -${c1} ``..`` - .-:+oshdNMMMMMMNdhyo+:-.` - -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ -${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` -${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- -${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` -${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` -${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd -${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy -${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo -${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ -${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- -${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` -${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm -${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy -${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: -${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. -${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: -${c2} `:smMM${c4}yy${c3}MMNy/` - ${c2}.- ${c4}`${c3}:. -EOF + *) + name="$(ps -p "${1:-$PPID}" -o comm=)" ;; + esac + + printf "%s" "$name" +} + +decode_url() { + decode="${1//+/ }" + printf "%b" "${decode//%/\\x}" +} + +# FINISH UP + +usage() { printf "%s" "\ +Usage: neofetch --option \"value\" --option \"value\" + +Neofetch is a CLI system information tool written in BASH. Neofetch +displays information about your system next to an image, your OS logo, +or any ASCII file of your choice. + +NOTE: Every launch flag has a config option. + +Options: + +INFO: + --disable infoname Allows you to disable an info line from appearing + in the output. + + NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' + + --os_arch on/off Hide/Show OS architecture. + --speed_type type Change the type of cpu speed to display. + Possible values: current, min, max, bios, + scaling_current, scaling_min, scaling_max + + NOTE: This only supports Linux with cpufreq. + + --speed_shorthand on/off Whether or not to show decimals in CPU speed. + + NOTE: This flag is not supported in systems with CPU speed less than + 1 GHz. + + --cpu_brand on/off Enable/Disable CPU brand in output. + --cpu_cores type Whether or not to display the number of CPU cores + Possible values: logical, physical, off + + NOTE: 'physical' doesn't work on BSD. + + --cpu_speed on/off Hide/Show cpu speed. + --cpu_temp C/F/off Hide/Show cpu temperature. + + NOTE: This only works on Linux and BSD. + + NOTE: For FreeBSD and NetBSD-based systems, you need to enable + coretemp kernel module. This only supports newer Intel processors. + + --distro_shorthand on/off Shorten the output of distro (tiny, on, off) + + NOTE: This option won't work in Windows (Cygwin) + + --kernel_shorthand on/off Shorten the output of kernel + + NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) + + --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) + --refresh_rate on/off Whether to display the refresh rate of each monitor + Unsupported on Windows + --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) + --gpu_type type Which GPU to display. (all, dedicated, integrated) + + NOTE: This only supports Linux. + + --gtk_shorthand on/off Shorten output of gtk theme/icons + --gtk2 on/off Enable/Disable gtk2 theme/font/icons output + --gtk3 on/off Enable/Disable gtk3 theme/font/icons output + --shell_path on/off Enable/Disable showing \$SHELL path + --shell_version on/off Enable/Disable showing \$SHELL version + --disk_show value Which disks to display. + Possible values: '/', '/dev/sdXX', '/path/to/mount point' + + NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') + + --disk_subtitle type What information to append to the Disk subtitle. + Takes: name, mount, dir + + 'name' shows the disk's name (sda1, sda2, etc) + + 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) + + 'dir' shows the basename of the disks's path. (/, Local Disk, etc) + + --ip_host url URL to query for public IP + --song_shorthand on/off Print the Artist/Title on separate lines + --music_player player-name Manually specify a player to use. + Available values are listed in the config file + --install_time on/off Enable/Disable showing the time in Install Date output. + --install_time_format 12h/24h + Set time format in Install Date to be 12 hour or 24 hour. + +TEXT FORMATTING: + --colors x x x x x x Changes the text colors in this order: + title, @, underline, subtitle, colon, info + --underline on/off Enable/Disable the underline. + --underline_char char Character to use when underlining title + --bold on/off Enable/Disable bold text + +COLOR BLOCKS: + --color_blocks on/off Enable/Disable the color blocks + --block_width num Width of color blocks in spaces + --block_height num Height of color blocks in lines + --block_range num num Range of colors to print as blocks + +BARS: + --bar_char 'elapsed char' 'total char' + Characters to use when drawing bars. + --bar_border on/off Whether or not to surround the bar with '[]' + --bar_length num Length in spaces to make the bars. + --bar_colors num num Colors to make the bar. + Set in this order: elapsed, total + --cpu_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --memory_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --battery_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --disk_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + +IMAGE BACKEND: + --backend backend Which image backend to use. + Possible values: 'ascii', 'caca', 'catimg', '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/' + --ascii source Shortcut to use 'ascii' backend. + --caca source Shortcut to use 'caca' backend. + --catimg source Shortcut to use 'catimg' backend. + --iterm2 source Shortcut to use 'iterm2' backend. + --jp2a source Shortcut to use 'jp2a' backend. + --kitty source Shortcut to use 'kitty' backend. + --pixterm source Shortcut to use 'pixterm' backend. + --sixel source Shortcut to use 'sixel' backend. + --termpix source Shortcut to use 'termpix' backend. + --tycat source Shortcut to use 'tycat' backend. + --w3m source Shortcut to use 'w3m' backend. + --off Shortcut to use 'off' backend. + + NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', + '/path/to/ascii', '/path/to/dir/' - "Scientific"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} =/;;/- - +: // - /; /; - -X H. -.//;;;:;;-, X= :+ .-;:=;:;#;. -M- ,=;;;#:, ,:#;;:=, ,@ -:# :#.=/++++/=.$= #= - ,#; #/:+/;,,/++:+/ ;+. - ,+/. ,;@+, ,#H;, ,/+, - ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; - ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. - ,;: :@#= =$H: .+#- - ,#= #;-///==///-// =#, -;+ :#-;;;:;;;;-X- +: -@- .-;;;;M- =M/;;;-. -X - :;;::;;-. #- :+ ,-;;-;:== - ,X H. - ;/ #= - // +; - '////' -EOF - ;; +ASCII: + --ascii_colors x x x x x x Colors to print the ascii art + --ascii_distro distro Which Distro's ascii art to print - "Siduction"*) - set_colors 4 4 - read -rd '' ascii_data <<'EOF' -${c1} _aass, - jQh: =$w - QWmwawQW - )$QQQQ@( .. - _a_a. ~??^ syDY?Sa, - _mW>-<$c jWmi imm. - ]QQwayQE 4QQmgwmQQ` - ?WWQWP' -9QQQQQ@'._aas, - _a%is. .adYYs,. -"?!` aQB*~^3$c -_Qh;.nm .QWc. {QL ]QQp;..vmQ/ -"QQmmQ@ -QQQggmQP ]QQWmggmQQ( - -???" "$WQQQY` __, ?QQQQQQW! - _yZ!?q, - .yWY!!Sw, "???^ - .QQa_=qQ mQm>..vmm - $QQWQQP $QQQgmQQ@ - "???" _aa, -9WWQQWY` - _mB>~)$a -~~ - mQms_vmQ. - ]WQQQQQP - -?T??" -EOF - ;; + NOTE: Arch and Ubuntu have 'old' logo variants. - "Slackware"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ::::::: - ::::::::::::::::::: - ::::::::::::::::::::::::: - ::::::::${c2}cllcccccllllllll${c1}:::::: - :::::::::${c2}lc dc${c1}::::::: - ::::::::${c2}cl clllccllll oc${c1}::::::::: - :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: - ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: - :::::::::::${c2}lc cclccclc${c1}::::::::::::: -::::::::::::::${c2}lcclcc lc${c1}:::::::::::: -::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: -::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: - :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: - :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: - ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: - :::${c2}oclcccccccccccccllllllllllllll${c1}::::: - ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: - :::::::::::::::::::::::::::::::: - :::::::::::::::::::::::::::: - :::::::::::::::::::::: - :::::::::::: -EOF - ;; + NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. - "SliTaz"*) - set_colors 3 3 - read -rd '' ascii_data <<'EOF' -${c1} @ @( @ - @@ @@ @ @/ - @@ @@ @@ @@ - @@ %@@ @@ @@ - @@ %@@@ @@@@@. @@@@ @@ - @@@ @@@@ @@@@@@@ &@@@ @@@ - @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ - ,@@@@@@@@@@@@@@@@@@@@@@@@@ - .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ -@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ -@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ -@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. -@@ ,@@ @@@@@@@@@@@@@ @@@ @@ -@ @@. @@@@@@@@@@@@@ @@@ *@ -@ @@ @@@@@@@@@@@@ @@ @ - @ @@@@@@@@@. #@ - @ ,@@@@@ @ -EOF - ;; + NOTE: Ubuntu has flavor variants. - "SmartOS"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyys oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyy syyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy yyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -EOF - ;; + NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', + 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. - "Solus"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} -``````````` - `-+/------------.` - .---:mNo---------------. - .-----yMMMy:---------------. - `------oMMMMMm/----------------` - .------/MMMMMMMN+----------------. - .------/NMMMMMMMMm-+/--------------. -`------/NMMMMMMMMMN-:mh/-------------` -.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. ------/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- -----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. -.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` -`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. -`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ - .------------:://+-/++++++${c1}oshddys: - -hhhhyyyyyyyyyyyhhhhddddhysssso- - `:ossssssyysssssssssssssssso:` - `:+ssssssssssssssssssss+- - `-/+ssssssssssso+/-` - `.-----..` -EOF - ;; + NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, + OpenBSD, and Void have a smaller logo variant. - "Source Mage"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} :ymNMNho. -.+sdmNMMMMMMMMMMy` -.-::/yMMMMMMMMMMMm- - sMMMMMMMMMMMm/ - /NMMMMMMMMMMMMMm: - .MMMMMMMMMMMMMMMMM: - `MMMMMMMMMMMMMMMMMN. - NMMMMMMMMMMMMMMMMMd - mMMMMMMMMMMMMMMMMMMo - hhMMMMMMMMMMMMMMMMMM. - .`/MMMMMMMMMMMMMMMMMs - :mMMMMMMMMMMMMMMMN` - `sMMMMMMMMMMMMMMM+ - /NMMMMMMMMMMMMMN` - oMMMMMMMMMMMMM+ - ./sd.-hMMMMMMMMmmN` - ./+oyyyh- `MMMMMMMMMmNh - sMMMMMMMMMmmo - `NMMMMMMMMMd: - -dMMMMMMMMMo - -shmNMMms. -EOF - ;; + NOTE: Use '{distro name}_small' to use the small variants. - "Sparky"*) - set_colors 1 7 - read -rd '' ascii_data <<'EOF' -${c1} - . `-:-` - .o` .-///-` - `oo` .:/++:. - os+` -/+++:` ``.........``` - /ys+`./+++/-.-::::::----......`` - `syyo`++o+--::::-::/+++/-`` - -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` -::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` -`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` - -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- - .sdddy::syo--/:. `.:dy+-ohhho ./: - :yddds/:+oo+//:-`- /+ +hy+.shhy: `` - `:ydmmdysooooooo-.ss`/yss--oyyo - `./ossyyyyo+:-/oo:.osso- .oys - ``..-------::////.-oooo/ :so - `...----::::::::--.`/oooo: .o: - ``````` ++o+:` `:` - ./+/-` ` - `-:-. - `` -EOF - ;; + --ascii_bold on/off Whether or not to bold the ascii logo. + -L, --logo Hide the info text and only show the ascii logo. - "SteamOS"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} .,,,,. - .,'onNMMMMMNNnn',. - .'oNMANKMMMMMMMMMMMNNn'. - .'ANMMMMMMMXKNNWWWPFFWNNMNn. - ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, - ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, -,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, -'${c2}+#############, +. ,+' ${c1}+NMMM -${c2} '*#########*' '*,,*' ${c1}.+NMMMM. -${c2} `'*###*' ,.,;###${c1}+WNM, -${c2} .,;;, .;##########${c1}+W -${c2},',. '; ,+##############' - '###+. :,. .,; ,###############' - '####.. `'' .,###############' - '#####+++################' - '*##################*' - ''*##########*'' - '''''' -EOF - ;; + Possible values: bar, infobar, barinfo, off + +IMAGE: + --loop Redraw the image constantly until Ctrl+C is used. This fixes issues + in some terminals emulators when using image mode. + --size 00px | --size 00% How to size the image. + Possible values: auto, 00px, 00%, none + --crop_mode mode Which crop mode to use + Takes the values: normal, fit, fill + --crop_offset value Change the crop offset for normal mode. + Possible values: northwest, north, northeast, + west, center, east, southwest, south, southeast + + --xoffset px How close the image will be to the left edge of the + window. This only works with w3m. + --yoffset px How close the image will be to the top edge of the + window. This only works with w3m. + --bg_color color Background color to display behind transparent image. + This only works with w3m. + --gap num Gap between image and text. + + NOTE: --gap can take a negative value which will move the text + closer to the left side. - "SunOS" | "Solaris") - set_colors 3 7 - read -rd '' ascii_data <<'EOF' -${c1} `- ` - `-- `+- .: - .+: `++: -/+- . - `.::` -++/``:::`./+/ `.-/. - `++/-`.` ` /++:` - `` ./:` .: `..`.- -``./+/:- -+++:- - -/+` :. -EOF - ;; + --clean Delete cached files and thumbnails. - "openSUSE Tumbleweed"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c2} ...... - .,cdxxxoc,. .:kKMMMNWMMMNk:. - cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. - ;WMK;. .lKMMNM, :NMK, .OMW; - cMW; 'WMMMN ,XMK, oMM' -.MMc ..;l. xMN: KM0 -'MM. 'NMO oMM -.MM, .kMMl xMN - KM0 .kMM0. .dl:,.. .WMd - .XM0. ,OMMK, OMMMK. .XMK - oWMO:. .;xNMMk, NNNMKl. .xWMx - :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, - ..... .:dOOXXKOxl, -EOF - ;; +SCREENSHOT: + -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- + shot function will use \$scrot_dir and \$scrot_name. + -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. + --image_host imgur/teknik Website to upload scrots to. + --scrot_cmd cmd Screenshot program to launch - "openSUSE"* | "open SUSE"* | "SUSE"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c2} .;ldkO0000Okdl;. - .;d00xl:^''''''^:ok00d;. - .d00l' 'o00d. - .d0Kd'${c1} Okxol:;,. ${c2}:O0d. - .OK${c1}KKK0kOKKKKKKKKKKOxo:, ${c2}lKO. - ,0K${c1}KKKKKKKKKKKKKKK0P^${c2},,,${c1}^dx:${c2} ;00, -.OK${c1}KKKKKKKKKKKKKKKk'${c2}.oOPPb.${c1}'0k.${c2} cKO. -:KK${c1}KKKKKKKKKKKKKKK: ${c2}kKx..dd ${c1}lKd${c2} 'OK: -dKK${c1}KKKKKKKKKOx0KKKd ${c2}^0KKKO' ${c1}kKKc${c2} dKd -dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd -:KK${c1}KKKKKKKKKK0o;...^cdxxOK0O/^^' ${c2}.0K: - kKK${c1}KKKKKKKKKKKKK0x;,,......,;od ${c2}lKk - '0K${c1}KKKKKKKKKKKKKKKKKKKK00KKOo^ ${c2}c00' - 'kK${c1}KKOxddxkOO00000Okxoc;'' ${c2}.dKk' - l0Ko. .c00l' - 'l0Kk:. .;xK0l' - 'lkK0xl:;,,,,;:ldO0kl' - '^:ldxkkkkxdl:^' -EOF - ;; +OTHER: + --config /path/to/config Specify a path to a custom config file + --config none Launch the script without a config file + --stdout Turn off all colors and disables any ASCII/image backend. + --help Print this text and exit + --version Show neofetch version + -v Display error messages. + -vv Display a verbose log for error reporting. - "SwagArch"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} .;ldkOKXXNNNNXXK0Oxoc,. - ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; - 'K0xo ..,;:c:. `'lKMMMMM0 - .lONMMMMMM' `lNMk' -${c2} ;WMMMMMMMMMO. ${c1}....::... -${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, -${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. -${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. -${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: -${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. -${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: -${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. -${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. - :ccc:' `cccccccc:, - '' -EOF - ;; +DEVELOPER: + --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) - "Tails"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} `` - ./yhNh -syy/Nshh `:o/ -N:dsNshh █ `ohNMMd -N-/+Nshh `yMMMMd -N-yhMshh yMMMMd -N-s:hshh █ yMMMMd so//. -N-oyNsyh yMMMMd d Mms. -N:hohhhd:. yMMMMd syMMM+ -Nsyh+-..+y+- yMMMMd :mMM+ -+hy- -ss/`yMMMM `+d+ - :sy/. ./yNMMMMm `` - .+ys- `:+hNMMMMMMy/` - `hNmmMMMMMMMMMMMMdo. - dMMMMMMMMMMMMMMMMMNh: - +hMMMMMMMMMMMMMMMMMmy. - -oNMMMMMMMMMMmy+.` - `:yNMMMds/.` - .//` -EOF - ;; - "Trisquel"*) - set_colors 4 6 - read -rd '' ascii_data <<'EOF' -${c1} ▄▄▄▄▄▄ - ▄█████████▄ - ▄▄▄▄▄▄ ████▀ ▀████ - ▄██████████▄ ████▀ ▄▄ ▀███ - ▄███▀▀ ▀▀████ ███▄ ▄█ ███ -▄███ ▄▄▄ ████▄ ▀██████ ▄███ -███ █▀▀██▄ █████▄ ▀▀ ▄████ -▀███ ███ ███████▄▄ ▄▄██████ -${c1} ▀███▄ ▄███ █████████████${c2}████▀ -${c1} ▀█████████ ███████${c2}███▀▀▀ - ▀▀███▀▀ ██████▀▀ - ██████▀ ▄▄▄▄ - █████▀ ████████ - █████ ███▀ ▀███ - ████▄ ██▄▄▄ ███ - █████▄ ▀▀ ▄██ - ██████▄▄▄████ - ▀▀█████▀▀ -EOF - ;; +Report bugs to https://github.com/dylanaraps/neofetch/issues - "Ubuntu-Budgie"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} ./oydmMMMMMMmdyo/. - :smMMMMMMMMMMMhs+:++yhs: - `omMMMMMMMMMMMN+` `odo` - /NMMMMMMMMMMMMN- `sN/ - `hMMMMmhhmMMMMMMh sMh` - .mMmo- /yMMMMm` `MMm. - mN/ yMMMMMMMd- MMMm -oN- oMMMMMMMMMms+//+o+: :MMMMo -m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm -M` .NMMMMMMMMMMMMMMMNodMMMMMMM -M- sMMMMMMMMMMMMMMMMMMMMMMMMM -mm` mMMMMMMMMMNdhhdNMMMMMMMMMm -oMm/ .dMMMMMMMMh: :dMMMMMMMo - mMMNyo/:/sdMMMMMMMMM+ sMMMMMm - .mMMMMMMMMMMMMMMMMMs `NMMMm. - `hMMMMMMMMMMM.oo+. `MMMh` - /NMMMMMMMMMo sMN/ - `omMMMMMMMMy. :dmo` - :smMMMMMMMh+-` `.:ohs: - ./oydmMMMMMMdhyo/. -EOF - ;; +" +exit 1 +} - "Ubuntu-GNOME"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c3} ./o. - .oooooooo - .oooo```soooo - .oooo` `soooo - .ooo` ${c4}.o.${c3} `\/ooo. - :ooo ${c4}:oooo.${c3} `\/ooo. - sooo ${c4}`ooooo${c3} \/oooo - \/ooo ${c4}`soooo${c3} `ooooo - `soooo ${c4}`\/ooo${c3} `soooo -${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo -${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` -${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` -${c4} `ooooo ${c3}`` ${c4}.oooo -${c4} `soooo. .oooo` - `\/oooooooooo` - ``\/oo`` -EOF - ;; +get_args() { + # Check the commandline flags early for '--config'. + [[ "$*" != *--config* ]] && get_user_config - "Ubuntu-MATE"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} `:+shmNNMMNNmhs+:` - .odMMMMMMMMMMMMMMMMMMdo. - /dMMMMMMMMMMMMMMMmMMMMMMMMd/ - :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: - `yMMMMMMMMMms:..-::oM: -omMMMMMy` - `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` - hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh -/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ -hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh -/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ - hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh - `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` - yMMMMMMMMMms/..-::oM: .+dMMMMMy - :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: - /dMMMMMMMMMMMMMMMdNMMMMMMMd/ - .odMMMMMMMMMMMMMMMMMMdo. - `:+shmNNMMNNmhs+:` -EOF - ;; + while [[ "$1" ]]; do + case "$1" in + # Info + "--os_arch") os_arch="$2" ;; + "--cpu_cores") cpu_cores="$2" ;; + "--cpu_speed") cpu_speed="$2" ;; + "--speed_type") speed_type="$2" ;; + "--speed_shorthand") speed_shorthand="$2" ;; + "--distro_shorthand") distro_shorthand="$2" ;; + "--kernel_shorthand") kernel_shorthand="$2" ;; + "--uptime_shorthand") uptime_shorthand="$2" ;; + "--cpu_brand") cpu_brand="$2" ;; + "--gpu_brand") gpu_brand="$2" ;; + "--gpu_type") gpu_type="$2" ;; + "--refresh_rate") refresh_rate="$2" ;; + "--gtk_shorthand") gtk_shorthand="$2" ;; + "--gtk2") gtk2="$2" ;; + "--gtk3") gtk3="$2" ;; + "--shell_path") shell_path="$2" ;; + "--shell_version") shell_version="$2" ;; + "--ip_host") public_ip_host="$2" ;; + "--song_shorthand") song_shorthand="$2" ;; + "--music_player") music_player="$2" ;; + "--install_time") install_time="$2" ;; + "--install_time_format") install_time_format="$2" ;; + "--cpu_temp") + cpu_temp="$2" + [[ "$cpu_temp" == "on" ]] && cpu_temp="C" + ;; + + "--disk_subtitle") disk_subtitle="$2" ;; + "--disk_show") + unset disk_show + for arg in "$@"; do + case "$arg" in + "--disk_show") ;; + "-"*) break ;; + *) disk_show+=("$arg") ;; + esac + done + ;; - "ubuntu_old") - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} ./+o+- -${c2} yyyyy- ${c1}-yyyyyy+ -${c2} ${c2}://+//////${c1}-yyyyyyo -${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` -${c3} .:++o: ${c2}/++++++++/:--:/- -${c3} o:+o+:++.${c2}`..```.-/oo+++++/ -${c3} .:+o:+o/.${c2} `+sssoo+/ -${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. -${c2}/+++//+:${c3}`oo+o${c2} /::--:. -${c2}+/+o+++${c3}`o++o${c1} ++////. -${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. -${c3} .+.o+oo:.${c1} `oddhhhh+ -${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ -${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: -${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` -${c1} /osyyyyyyo${c3}++ooo+++/ -${c1} ````` ${c3}+oo+++o: -${c3} `oo++. -EOF - ;; + "--disable") + for func in "$@"; do + case "$func" in + "--disable") continue ;; + "-"*) break ;; + *) + ((bash_version >= 4)) && func="${func,,}" + unset -f "get_$func" + ;; + esac + done + ;; - "Ubuntu-Studio") - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} ..-::::::-.` - `.:+++++++++++${c2}ooo${c1}++:.` - ./+++++++++++++${c2}sMMMNdyo${c1}+/. - .++++++++++++++++${c2}oyhmMMMMms${c1}++. - `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` - `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` - +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` - :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: - ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. - ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ - :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: - +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ - `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` - `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ - ./+++++++++++++++${c2}oyhdNMMMms${c1}++. - ./+++++++++++++${c2}hMMMNdyo${c1}+/. - `.:+++++++++++${c2}sso${c1}++:. - ..-::::::-.. -EOF - ;; + # Text Colors + "--colors") + unset colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) colors+=("$arg") ;; + esac + done + colors+=(7 7 7 7 7 7) + ;; - "Ubuntu"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} .-/+oossssoo+/-. - `:+ssssssssssssssssss+:` - -+ssssssssssssssssssyyssss+- - .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ - +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ -.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. -+ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ -oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso -oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso -+ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ -.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ - +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ - /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ - .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - -+sssssssssssssssss${c2}yyy${c1}ssss+- - `:+ssssssssssssssssss+:` - .-/+oossssoo+/-. -EOF - ;; + # Text Formatting + "--underline") underline_enabled="$2" ;; + "--underline_char") underline_char="$2" ;; + "--bold") bold="$2" ;; - "void_small") - set_colors 2 8 - read -rd '' ascii_data <<'EOF' -${c1} _______ - _ \______ - -| \ ___ \ | -| | / \ | | -| | \___/ | | -| \______ \_| - -_______\ -EOF - ;; + # Color Blocks + "--color_blocks") color_blocks="$2" ;; + "--block_range") block_range=("$2" "$3") ;; + "--block_width") block_width="$2" ;; + "--block_height") block_height="$2" ;; - "Void"*) - set_colors 2 8 - read -rd '' ascii_data <<'EOF' -${c1} __.;=====;.__ - _.=+==++=++=+=+===;. - -=+++=+===+=+=+++++=_ - . -=:`` `--==+=++==. - _vi, ` --+=++++: - .uvnvi. _._ -==+==+. - .vvnvnI` .;==|==;. :|=||=|. -${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL -${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE -${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' -${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! -${c1} -1vvnvv. `~+++` ++|+++ - +vnvnnv, `-|=== - +vnvnvns. . :=- - -Invnvvnsi..___..=sv=. ` - +Invnvnvnnnnnnnnvvnn;. - ~|Invnvnvvnvvvnnv}+` - -~|{*l}*|~ -EOF - ;; + # Bars + "--bar_char") + bar_char_elapsed="$2" + bar_char_total="$3" + ;; - *"[Windows 10]"* | *"on Windows 10"* | "Windows 8"* |\ - "Windows 10"* | "windows10" | "windows8" ) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} .., - ....,,:;+ccllll - ...,,+:; cllllllllllllllllll -,cclllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll + "--bar_border") bar_border="$2" ;; + "--bar_length") bar_length="$2" ;; + "--bar_colors") + bar_color_elapsed="$2" + bar_color_total="$3" + ;; -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -`'ccllllllllll lllllllllllllllllll - `' \\*:: :ccllllllllllllllll - ````''*::cll - `` -EOF - ;; + "--cpu_display") cpu_display="$2" ;; + "--memory_display") memory_display="$2" ;; + "--battery_display") battery_display="$2" ;; + "--disk_display") disk_display="$2" ;; - "Windows"*) - set_colors 1 2 4 3 - read -rd '' ascii_data <<'EOF' -${c1} ,.=:!!t3Z3z., - :tt:::tt333EE3 -${c1} Et:::ztt33EEEL${c2} @Ee., .., -${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# -${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL -${c1} it::::tt333EEF${c2} @EEEEEEttttt33F -${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. -${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF -${c3} ;::::::::zt33)${c2} "4EEEtttji3P* -${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. -${c3} i::::::::zt33F${c4} AEEEtttt::::ztF -${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 -${c3} E::::::::zt33L${c4} @EEEtttt::::z3F -${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` -${c3} `${c4} :EEEEtttt::::z7 - "VEzjt:;;z>*` -EOF - ;; + # Image backend + "--backend") image_backend="$2" ;; + "--source") image_source="$2" ;; + "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + image_backend="${1/--}" + case "$2" in + "-"* | "") ;; + *) image_source="$2" ;; + esac + ;; - "Xubuntu"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `-/osyhddddhyso/-` - .+yddddddddddddddddddy+. - :yddddddddddddddddddddddddy: - -yddddddddddddddddddddhdddddddy- - odddddddddddyshdddddddh`dddd+ydddo - `yddddddhshdd- ydddddd+`ddh.:dddddy` - sddddddy /d. :dddddd-:dy`-ddddddds -:ddddddds /+ .dddddd`yy`:ddddddddd: -sdddddddd` . .-:/+ssdyodddddddddds -ddddddddy `:ohddddddddd -dddddddd. +dddddddd -sddddddy ydddddds -:dddddd+ .oddddddd: - sdddddo ./ydddddddds - `yddddd. `:ohddddddddddy` - oddddh/` `.:+shdddddddddddddo - -ydddddhyssyhdddddddddddddddddy- - :yddddddddddddddddddddddddy: - .+yddddddddddddddddddy+. - `-/osyhddddhyso/-` -EOF - ;; + # Image options + "--loop") image_loop="on" ;; + "--image_size" | "--size") image_size="$2" ;; + "--crop_mode") crop_mode="$2" ;; + "--crop_offset") crop_offset="$2" ;; + "--xoffset") xoffset="$2" ;; + "--yoffset") yoffset="$2" ;; + "--background_color" | "--bg_color") background_color="$2" ;; + "--gap") gap="$2" ;; + "--clean") + [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" + rm -rf "/Library/Caches/neofetch/" + rm -rf "/tmp/neofetch/" + exit + ;; + + "--ascii_colors") + unset ascii_colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) ascii_colors+=("$arg") + esac + done + ascii_colors+=(7 7 7 7 7 7) + ;; - "Zorin"*) - set_colors 4 6 - read -rd '' ascii_data <<'EOF' -${c1} `osssssssssssssssssssso` - .osssssssssssssssssssssso. - .+oooooooooooooooooooooooo+. + "--ascii_distro") + image_backend="ascii" + ascii_distro="$2" + case "$2" in "-"* | "") ascii_distro="$distro" ;; esac + ;; + "--ascii_bold") ascii_bold="$2" ;; + "--logo" | "-L") + image_backend="ascii" + print_info() { info line_break; } + ;; - `::::::::::::::::::::::. .:` - `+ssssssssssssssssss+:.` `.:+ssso` -.ossssssssssssssso/. `-+ossssssso. -ssssssssssssso/-` `-/osssssssssssss -.ossssssso/-` .-/ossssssssssssssso. - `+sss+:. `.:+ssssssssssssssssss+` - `:. .::::::::::::::::::::::` + # Screenshot + "--scrot" | "-s") + scrot_args "$@" + ;; + "--upload" | "-su") + scrot_upload="on" + scrot_args "$@" + ;; + "--image_host") image_host="$2" ;; + "--scrot_cmd") scrot_cmd="$2" ;; - .+oooooooooooooooooooooooo+. - -osssssssssssssssssssssso- - `osssssssssssssssssssso` -EOF - ;; + # Other + "--config") + case "$2" in + "none" | "off" | "") ;; + *) + config_file="$(get_full_path "$2")" + get_user_config + ;; + esac + ;; + "--stdout") stdout="on" ;; + "-v") verbose="on" ;; + "-vv") set -x; verbose="on" ;; + "--help") usage ;; + "--version") + printf "%s\\n" "Neofetch $version" + exit 1 + ;; + "--gen-man") + help2man -n "A fast, highly customizable system info script" \ + -N ./neofetch -o neofetch.1 + exit 1 + ;; - *) - case "$kernel_name" in - *"BSD") - set_colors 1 7 4 3 6 - read -rd '' ascii_data <<'EOF' -${c1} , , - /( )` - \ \___ / | - /- _ `-/ ' - (${c2}/\/ \ ${c1}\ /\ - ${c2}/ / | ` ${c1}\ - ${c3}O O ${c2}) ${c1}/ | - ${c2}`-^--'${c1}`< ' - (_.) _ ) / - `.___/` / - `-----' / -${c4}<----. __ / __ \ -${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| -<----' ${c1}`--' `.__,' \ - | | - \ / /\ - ${c5}______${c1}( (_ / \______/ - ${c5},' ,-----' | - `--{__________) -EOF - ;; + "--travis") + print_info() { + info title + info underline - "Darwin") - set_colors 2 3 1 1 5 4 - read -rd '' ascii_data <<'EOF' -${c1} 'c. - ,xNMM. - .OMMMMo - OMMM0, - .;loddo:' loolloddol;. - cKMMMMMMMMMMNWMMMMMMMMMM0: -${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. - XMMMMMMMMMMMMMMMMMMMMMMMX. -${c3};MMMMMMMMMMMMMMMMMMMMMMMM: -:MMMMMMMMMMMMMMMMMMMMMMMM: -${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. - kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. - ${c6}kMMMMMMMMMMMMMMMMMMMMMMd - ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. -EOF - ;; + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "GPU Driver" gpu_driver + info "Memory" memory - "GNU"*) - set_colors fg 7 - read -rd '' ascii_data <<'EOF' -${c1} _-`````-, ,- '- . - .' .- - | | - -. `. - /.' / `. \ -:/ : _... ..._ `` : -:: : /._ .`:'_.._\. || : -:: `._ ./ ,` : \ . _.'' . -`:. / | -. \-. \\_ / - \:._ _/ .' .@) \@) ` `\ ,.' - _/,--' .- .\,-.`--`. - ,'/'' (( \ ` ) - /'/' \ `-' ( - '/'' `._,-----' - ''/' .,---' - ''/' ;: - ''/'' ''/ - ''/''/'' - '/'/' - `; -EOF - ;; + info "CPU Usage" cpu_usage + info "Disk" disk + info "Battery" battery + info "Font" font + info "Song" song + info "Local IP" local_ip + info "Public IP" public_ip + info "Users" users + info "Install Date" install_date - "Linux") - set_colors fg 8 3 - read -rd '' ascii_data <<'EOF' -${c2} ##### -${c2} ####### -${c2} ##${c1}O${c2}#${c1}O${c2}## -${c2} #${c3}#####${c2}# -${c2} ##${c1}##${c3}###${c1}##${c2}## -${c2} #${c1}##########${c2}## -${c2} #${c1}############${c2}## -${c2} #${c1}############${c2}### -${c3} ##${c2}#${c1}###########${c2}##${c3}# -${c3}######${c2}#${c1}#######${c2}#${c3}###### -${c3}#######${c2}#${c1}#####${c2}#${c3}####### -${c3} #####${c2}#######${c3}##### -EOF - ;; + info line_break + info cols + info line_break - "SunOS") - set_colors 3 7 - read -rd '' ascii_data <<'EOF' -${c1} `- ` - `-- `+- .: - .+: `++: -/+- . - `.::` -++/``:::`./+/ `.-/. - `++/-`.` ` /++:` - `` ./:` .: `..`.- -``./+/:- -+++:- - -/+` :. -EOF - ;; + # Testing. + prin "prin" + prin "prin" "prin" - "IRIX"*) - set_colors 4 7 - read -rd '' ascii_data <<'EOF' -${c1} ./ohmNd/ +dNmho/- - `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. - `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` - -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. - `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` -+mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ -dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd -oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ -.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. - hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh - /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: - `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd - `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` - `yNMMNho-yMMMM` NMMMm.+hNMMNh` - -MMMMd: oMMMM. NMMMh :hMMMM- - -yNMMMmooMMMM- NMMMyomMMMNy- - .omMMMMMMMM-`NMMMMMMMmo. - `:hMMMMMM. NMMMMMh/` - .odNm+ /dNms. -EOF - ;; - esac - ;; - esac + # Testing no subtitles. + info uptime + info disk + } - # Overwrite distro colors if '$ascii_colors' doesn't - # equal 'distro'. - if [[ "${ascii_colors[0]}" != "distro" ]]; then - color_text="off" - set_colors "${ascii_colors[@]}" - fi + refresh_rate="on" + shell_version="on" + cpu_display="infobar" + memory_display="infobar" + disk_display="infobar" + cpu_temp="C" + ;; + esac + + shift + done } main() { From 9d6d62ece5d360a81b3dd4b2785b97911fa002e7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 20 Apr 2018 08:13:01 +1000 Subject: [PATCH 0268/1133] wm: Added WM version. --- config/config.conf | 11 +++++++++++ neofetch | 11 +++++++++++ neofetch.1 | 3 +++ 3 files changed, 25 insertions(+) diff --git a/config/config.conf b/config/config.conf index d754e0230..65d01d492 100644 --- a/config/config.conf +++ b/config/config.conf @@ -303,6 +303,17 @@ gtk3="on" public_ip_host="http://ident.me" +# Window Manager + + +# Show Window Manager Version. +# +# Default: 'off' +# Values: 'on', off +# Flag: --wm_version +wm_version="off" + + # Disk diff --git a/neofetch b/neofetch index 9797133e9..3edf034e6 100755 --- a/neofetch +++ b/neofetch @@ -793,6 +793,15 @@ get_wm() { -e "monsterwm" \ -e "tinywm")" + if [[ "$wm_version" == "on" ]]; then + wmv="$wm $("${wm,,}" --version || "${wm,,}" -v)" + wmv="${wmv/$wm $wm/$wm}" + wmv="${wmv/copyright*}" + wmv="${wmv/version }" + wmv="${wmv/©*}" + wmv="${wmv/(c)*}" + wm="$wmv" + fi else case "$os" in "Mac OS X") @@ -4704,6 +4713,7 @@ INFO: NOTE: This only supports Linux. + --wm_version on/off Show/Hide Window Manager version. --gtk_shorthand on/off Shorten output of gtk theme/icons --gtk2 on/off Enable/Disable gtk2 theme/font/icons output --gtk3 on/off Enable/Disable gtk3 theme/font/icons output @@ -4874,6 +4884,7 @@ get_args() { "--cpu_brand") cpu_brand="$2" ;; "--gpu_brand") gpu_brand="$2" ;; "--gpu_type") gpu_type="$2" ;; + "--wm_version") wm_version="$2" ;; "--refresh_rate") refresh_rate="$2" ;; "--gtk_shorthand") gtk_shorthand="$2" ;; "--gtk2") gtk2="$2" ;; diff --git a/neofetch.1 b/neofetch.1 index d43db1d83..391cb7d6d 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -81,6 +81,9 @@ Which GPU to display. (all, dedicated, integrated) .IP NOTE: This only supports Linux. .TP +\fB\-\-wm_version\fR on/off +Show/Hide Window Manager version. +.TP \fB\-\-gtk_shorthand\fR on/off Shorten output of gtk theme/icons .TP From d239a05782177ef73ca6a5ea14b57cbdddd69ea6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 1 May 2018 19:25:19 +1000 Subject: [PATCH 0269/1133] wm: Show version for KDE and dwm. --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 3edf034e6..99231fd07 100755 --- a/neofetch +++ b/neofetch @@ -794,8 +794,12 @@ get_wm() { -e "tinywm")" if [[ "$wm_version" == "on" ]]; then - wmv="$wm $("${wm,,}" --version || "${wm,,}" -v)" + wmv="$wm $("${wm,,}" --version || \ + "${wm,,}" -v || \ + "${wm,,}_x11" -v)" || \ + "${wm,,}_wayland" -v")" wmv="${wmv/$wm $wm/$wm}" + wmv="${wmv/$wm $wm-/$wm}" wmv="${wmv/copyright*}" wmv="${wmv/version }" wmv="${wmv/©*}" From 52c2e871a3f400c1f13a30e45793f50d2bd83339 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 1 May 2018 19:30:18 +1000 Subject: [PATCH 0270/1133] wm: Added support for aewm --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 99231fd07..f0b473034 100755 --- a/neofetch +++ b/neofetch @@ -799,7 +799,7 @@ get_wm() { "${wm,,}_x11" -v)" || \ "${wm,,}_wayland" -v")" wmv="${wmv/$wm $wm/$wm}" - wmv="${wmv/$wm $wm-/$wm}" + wmv="${wmv/$wm ${wm}?/$wm}" wmv="${wmv/copyright*}" wmv="${wmv/version }" wmv="${wmv/©*}" From 1ddcc47dd60351ec8a845a86f489fcfc3dd527bf Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 1 May 2018 19:41:44 +1000 Subject: [PATCH 0271/1133] wm: Added support for more window managers. --- neofetch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index f0b473034..15bcffe5a 100755 --- a/neofetch +++ b/neofetch @@ -793,17 +793,16 @@ get_wm() { -e "monsterwm" \ -e "tinywm")" - if [[ "$wm_version" == "on" ]]; then - wmv="$wm $("${wm,,}" --version || \ - "${wm,,}" -v || \ - "${wm,,}_x11" -v)" || \ - "${wm,,}_wayland" -v")" + if [[ "$wm_version" == "on" && "$wm" ]]; then + wmv="$("${wm,,}" --version || "${wm,,}" -v 2>&1)" + wmv="$wm ${wmv:-$("${wm,,}_x11" -v || "${wm,,}_wayland" -v)}" + wmv="${wmv/$wm ${wm}?/$wm }" wmv="${wmv/$wm $wm/$wm}" - wmv="${wmv/$wm ${wm}?/$wm}" wmv="${wmv/copyright*}" wmv="${wmv/version }" wmv="${wmv/©*}" wmv="${wmv/(c)*}" + wmv="${wmv/ : }" wm="$wmv" fi else From 9573aaee345c0ca06cd2f746375298744da8ec54 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:05:49 +1000 Subject: [PATCH 0272/1133] config: Inline config file. --- config/config.conf | 782 ------------------------------------------- neofetch | 814 +++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 790 insertions(+), 806 deletions(-) delete mode 100644 config/config.conf diff --git a/config/config.conf b/config/config.conf deleted file mode 100644 index 65d01d492..000000000 --- a/config/config.conf +++ /dev/null @@ -1,782 +0,0 @@ -# Neofetch config file -# https://github.com/dylanaraps/neofetch - - -# See this wiki page for more info: -# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info -print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "Memory" memory - - # info "GPU Driver" gpu_driver # Linux/macOS only - # info "CPU Usage" cpu_usage - # info "Disk" disk - # info "Battery" battery - # info "Font" font - # info "Song" song - # info "Local IP" local_ip - # info "Public IP" public_ip - # info "Users" users - # info "Install Date" install_date - # info "Locale" locale # This only works on glibc systems. - - info line_break - info cols - info line_break -} - - -# Kernel - - -# Shorten the output of the kernel function. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --kernel_shorthand -# Supports: Everything except *BSDs (except PacBSD and PC-BSD) -# -# Example: -# on: '4.8.9-1-ARCH' -# off: 'Linux 4.8.9-1-ARCH' -kernel_shorthand="on" - - -# Distro - - -# Shorten the output of the distro function -# -# Default: 'off' -# Values: 'on', 'off', 'tiny' -# Flag: --distro_shorthand -# Supports: Everything except Windows and Haiku -distro_shorthand="off" - -# Show/Hide OS Architecture. -# Show 'x86_64', 'x86' and etc in 'Distro:' output. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --os_arch -# -# Example: -# on: 'Arch Linux x86_64' -# off: 'Arch Linux' -os_arch="on" - - -# Uptime - - -# Shorten the output of the uptime function -# -# Default: 'on' -# Values: 'on', 'off', 'tiny' -# Flag: --uptime_shorthand -# -# Example: -# on: '2 days, 10 hours, 3 mins' -# off: '2 days, 10 hours, 3 minutes' -# tiny: '2d 10h 3m' -uptime_shorthand="on" - - -# Shell - - -# Show the path to $SHELL -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --shell_path -# -# Example: -# on: '/bin/bash' -# off: 'bash' -shell_path="off" - -# Show $SHELL version -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --shell_version -# -# Example: -# on: 'bash 4.4.5' -# off: 'bash' -shell_version="on" - - -# CPU - - -# CPU speed type -# -# Default: 'bios_limit' -# Values: 'scaling_cur_freq', 'scaling_min_freq', 'scaling_max_freq', 'bios_limit'. -# Flag: --speed_type -# Supports: Linux with 'cpufreq' -# NOTE: Any file in '/sys/devices/system/cpu/cpu0/cpufreq' can be used as a value. -speed_type="bios_limit" - -# CPU speed shorthand -# -# Default: 'off' -# Values: 'on', 'off'. -# Flag: --speed_shorthand. -# NOTE: This flag is not supported in systems with CPU speed less than 1 GHz -# -# Example: -# on: 'i7-6500U (4) @ 3.1GHz' -# off: 'i7-6500U (4) @ 3.100GHz' -speed_shorthand="off" - -# Enable/Disable CPU brand in output. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --cpu_brand -# -# Example: -# on: 'Intel i7-6500U' -# off: 'i7-6500U (4)' -cpu_brand="on" - -# CPU Speed -# Hide/Show CPU speed. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --cpu_speed -# -# Example: -# on: 'Intel i7-6500U (4) @ 3.1GHz' -# off: 'Intel i7-6500U (4)' -cpu_speed="on" - -# CPU Cores -# Display CPU cores in output -# -# Default: 'logical' -# Values: 'logical', 'physical', 'off' -# Flag: --cpu_cores -# Support: 'physical' doesn't work on BSD. -# -# Example: -# logical: 'Intel i7-6500U (4) @ 3.1GHz' (All virtual cores) -# physical: 'Intel i7-6500U (2) @ 3.1GHz' (All physical cores) -# off: 'Intel i7-6500U @ 3.1GHz' -cpu_cores="logical" - -# CPU Temperature -# Hide/Show CPU temperature. -# Note the temperature is added to the regular CPU function. -# -# Default: 'off' -# Values: 'C', 'F', 'off' -# Flag: --cpu_temp -# Supports: Linux, BSD -# NOTE: For FreeBSD and NetBSD-based systems, you'll need to enable -# coretemp kernel module. This only supports newer Intel processors. -# -# Example: -# C: 'Intel i7-6500U (4) @ 3.1GHz [27.2°C]' -# F: 'Intel i7-6500U (4) @ 3.1GHz [82.0°F]' -# off: 'Intel i7-6500U (4) @ 3.1GHz' -cpu_temp="off" - - -# GPU - - -# Enable/Disable GPU Brand -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gpu_brand -# -# Example: -# on: 'AMD HD 7950' -# off: 'HD 7950' -gpu_brand="on" - -# Which GPU to display -# -# Default: 'all' -# Values: 'all', 'dedicated', 'integrated' -# Flag: --gpu_type -# Supports: Linux -# -# Example: -# all: -# GPU1: AMD HD 7950 -# GPU2: Intel Integrated Graphics -# -# dedicated: -# GPU1: AMD HD 7950 -# -# integrated: -# GPU1: Intel Integrated Graphics -gpu_type="all" - - -# Resolution - - -# Display refresh rate next to each monitor -# Default: 'off' -# Values: 'on', 'off' -# Flag: --refresh_rate -# Supports: Doesn't work on Windows. -# -# Example: -# on: '1920x1080 @ 60Hz' -# off: '1920x1080' -refresh_rate="off" - - -# Gtk Theme / Icons / Font - - -# Shorten output of GTK Theme / Icons / Font -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --gtk_shorthand -# -# Example: -# on: 'Numix, Adwaita' -# off: 'Numix [GTK2], Adwaita [GTK3]' -gtk_shorthand="off" - - -# Enable/Disable gtk2 Theme / Icons / Font -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gtk2 -# -# Example: -# on: 'Numix [GTK2], Adwaita [GTK3]' -# off: 'Adwaita [GTK3]' -gtk2="on" - -# Enable/Disable gtk3 Theme / Icons / Font -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gtk3 -# -# Example: -# on: 'Numix [GTK2], Adwaita [GTK3]' -# off: 'Numix [GTK2]' -gtk3="on" - - -# IP Address - - -# Website to ping for the public IP -# -# Default: 'http://ident.me' -# Values: 'url' -# Flag: --ip_host -public_ip_host="http://ident.me" - - -# Window Manager - - -# Show Window Manager Version. -# -# Default: 'off' -# Values: 'on', off -# Flag: --wm_version -wm_version="off" - - -# Disk - - -# Which disks to display. -# The values can be any /dev/sdXX, mount point or directory. -# NOTE: By default we only show the disk info for '/'. -# -# Default: '/' -# Values: '/', '/dev/sdXX', '/path/to/drive'. -# Flag: --disk_show -# -# Example: -# disk_show=('/' '/dev/sdb1'): -# 'Disk (/): 74G / 118G (66%)' -# 'Disk (/mnt/Videos): 823G / 893G (93%)' -# -# disk_show=('/'): -# 'Disk (/): 74G / 118G (66%)' -# -disk_show=('/') - -# Disk subtitle. -# What to append to the Disk subtitle. -# -# Default: 'mount' -# Values: 'mount', 'name', 'dir' -# Flag: --disk_subtitle -# -# Example: -# name: 'Disk (/dev/sda1): 74G / 118G (66%)' -# 'Disk (/dev/sdb2): 74G / 118G (66%)' -# -# mount: 'Disk (/): 74G / 118G (66%)' -# 'Disk (/mnt/Local Disk): 74G / 118G (66%)' -# 'Disk (/mnt/Videos): 74G / 118G (66%)' -# -# dir: 'Disk (/): 74G / 118G (66%)' -# 'Disk (Local Disk): 74G / 118G (66%)' -# 'Disk (Videos): 74G / 118G (66%)' -disk_subtitle="mount" - - -# Song - - -# Manually specify a music player. -# -# Default: 'auto' -# Values: 'auto', 'player-name' -# Flag: --music_player -# -# Available values for 'player-name': -# -# Google Play -# Spotify -# amarok -# audacious -# banshee -# bluemindo -# clementine -# cmus -# deadbeef -# deepin-music -# elisa -# exaile -# gnome-music -# guayadeque -# iTunes$ -# juk -# lollypop -# mocp -# mopidy -# mpd -# pogo -# pragha -# qmmp -# quodlibet -# rhythmbox -# spotify -# tomahawk -# xmms2d -# yarock -music_player="auto" - -# Print the Artist and Title on separate lines -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --song_shorthand -# -# Example: -# on: 'Artist: The Fratellis' -# 'Song: Chelsea Dagger' -# -# off: 'Song: The Fratellis - Chelsea Dagger' -song_shorthand="off" - - -# Install Date - - -# Whether to show the time in the output -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --install_time -# -# Example: -# on: 'Thu 14 Apr 2016 11:50 PM' -# off: 'Thu 14 Apr 2016' -install_time="on" - -# Set time format in the output -# -# Default: '24h' -# Values: '12h', '24h' -# Flag: --install_time_format -# -# Example: -# 12h: 'Thu 14 Apr 2016 11:50 PM' -# 24h: 'Thu 14 Apr 2016 23:50' -install_time_format="12h" - - -# Text Colors - - -# Text Colors -# -# Default: 'distro' -# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' -# Flag: --colors -# -# Each number represents a different part of the text in -# this order: 'title', '@', 'underline', 'subtitle', 'colon', 'info' -# -# Example: -# colors=(distro) - Text is colored based on Distro colors. -# colors=(4 6 1 8 8 6) - Text is colored in the order above. -colors=(distro) - - -# Text Options - - -# Toggle bold text -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --bold -bold="on" - -# Enable/Disable Underline -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --underline -underline_enabled="on" - -# Underline character -# -# Default: '-' -# Values: 'string' -# Flag: --underline_char -underline_char="-" - - -# Color Blocks - - -# Color block range -# The range of colors to print. -# -# Default: '0', '7' -# Values: 'num' -# Flag: --block_range -# -# Example: -# -# Display colors 0-7 in the blocks. (8 colors) -# neofetch --block_range 0 7 -# -# Display colors 0-15 in the blocks. (16 colors) -# neofetch --block_range 0 15 -block_range=(0 7) - -# Toggle color blocks -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --color_blocks -color_blocks="on" - -# Color block width in spaces -# -# Default: '3' -# Values: 'num' -# Flag: --block_width -block_width=3 - -# Color block height in lines -# -# Default: '1' -# Values: 'num' -# Flag: --block_height -block_height=1 - - -# Progress Bars - - -# Bar characters -# -# Default: '-', '=' -# Values: 'string', 'string' -# Flag: --bar_char -# -# Example: -# neofetch --bar_char 'elapsed' 'total' -# neofetch --bar_char '-' '=' -bar_char_elapsed="-" -bar_char_total="=" - -# Toggle Bar border -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --bar_border -bar_border="on" - -# Progress bar length in spaces -# Number of chars long to make the progress bars. -# -# Default: '15' -# Values: 'num' -# Flag: --bar_length -bar_length=15 - -# Progress bar colors -# When set to distro, uses your distro's logo colors. -# -# Default: 'distro', 'distro' -# Values: 'distro', 'num' -# Flag: --bar_colors -# -# Example: -# neofetch --bar_colors 3 4 -# neofetch --bar_colors distro 5 -bar_color_elapsed="distro" -bar_color_total="distro" - - -# Info display -# Display a bar with the info. -# -# Default: 'off' -# Values: 'bar', 'infobar', 'barinfo', 'off' -# Flags: --cpu_display -# --memory_display -# --battery_display -# --disk_display -# -# Example: -# bar: '[---=======]' -# infobar: 'info [---=======]' -# barinfo: '[---=======] info' -# off: 'info' -cpu_display="off" -memory_display="off" -battery_display="off" -disk_display="off" - - -# Backend Settings - - -# Image backend. -# -# Default: 'ascii' -# Values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m' -# Flag: --backend -image_backend="ascii" - -# Image Source -# -# Which image or ascii file to display. -# -# Default: 'auto' -# Values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/' -# Flag: --source -# -# NOTE: 'auto' will pick the best image source for whatever image backend is used. -# In ascii mode, distro ascii art will be used and in an image mode, your -# wallpaper will be used. -image_source="auto" - - -# Ascii Options - - -# Ascii distro -# Which distro's ascii art to display. -# -# Default: 'auto' -# Values: 'auto', 'distro_name' -# Flag: --ascii_distro -# -# NOTE: Arch and Ubuntu have 'old' logo variants. -# Change this to 'arch_old' or 'ubuntu_old' to use the old logos. -# NOTE: Ubuntu has flavor variants. -# Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME' or 'Ubuntu-Budgie' to use the flavors. -# NOTE: Arch, Crux and Gentoo have a smaller logo variant. -# Change this to 'arch_small', 'crux_small' or 'gentoo_small' to use the small logos. -ascii_distro="auto" - -# Ascii Colors -# -# Default: 'distro' -# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' -# Flag: --ascii_colors -# -# Example: -# ascii_colors=(distro) - Ascii is colored based on Distro colors. -# ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors. -ascii_colors=(distro) - -# Bold ascii logo -# Whether or not to bold the ascii logo. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --ascii_bold -ascii_bold="on" - - -# Image Options - - -# Image loop -# Setting this to on will make neofetch redraw the image constantly until -# Ctrl+C is pressed. This fixes display issues in some terminal emulators. -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --loop -image_loop="off" - -# Thumbnail directory -# -# Default: '~/.cache/thumbnails/neofetch' -# Values: 'dir' -thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch" - -# Crop mode -# -# Default: 'normal' -# Values: 'normal', 'fit', 'fill' -# Flag: --crop_mode -# -# See this wiki page to learn about the fit and fill options. -# https://github.com/dylanaraps/neofetch/wiki/What-is-Waifu-Crop%3F -crop_mode="normal" - -# Crop offset -# Note: Only affects 'normal' crop mode. -# -# Default: 'center' -# Values: 'northwest', 'north', 'northeast', 'west', 'center' -# 'east', 'southwest', 'south', 'southeast' -# Flag: --crop_offset -crop_offset="center" - -# Image size -# The image is half the terminal width by default. -# -# Default: 'auto' -# Values: 'auto', '00px', '00%', 'none' -# Flags: --image_size -# --size -image_size="auto" - -# Gap between image and text -# -# Default: '3' -# Values: 'num', '-num' -# Flag: --gap -gap=3 - -# Image offsets -# Only works with the w3m backend. -# -# Default: '0' -# Values: 'px' -# Flags: --xoffset -# --yoffset -yoffset=0 -xoffset=0 - -# Image background color -# Only works with the w3m backend. -# -# Default: '' -# Values: 'color', 'blue' -# Flag: --bg_color -background_color= - - -# Scrot Options - - -# Whether or not to always take a screenshot -# You can manually take a screenshot with "--scrot" or "-s" -# -# Default: 'off' -# Values: 'on', 'off' -# Flags: --scrot -# -s -scrot="off" - -# Screenshot Program -# Neofetch will automatically use whatever screenshot tool -# is installed on your system. -# -# If 'neofetch -v' says that it couldn't find a screenshot -# tool or you're using a custom tool then you can change -# the option below to a custom command. -# -# Default: 'auto' -# Values: 'auto' 'cmd -flags' -# Flag: --scrot_cmd -scrot_cmd="auto" - -# Screenshot Filename -# What to name the screenshots -# -# Default: 'neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png' -# Values: 'string' -# Flag: --scrot_name -scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png" - -# Image upload host -# Where to upload the image. -# -# Default: 'teknik' -# Values: 'imgur', 'teknik' -# Flag: --image_host -# -# NOTE: If you'd like another image host to be added to Neofetch. -# Open an issue on github. -image_host="teknik" - - -# Misc Options - -# Stdout mode -# Turn off all colors and disables image backend (ASCII/Image). -# Useful for piping into another command. -# Default: 'off' -# Values: 'on', 'off' -stdout="off" - -# Config version. -# -# NOTE: Don't change this value, neofetch reads this to determine -# how to handle backwards compatibility. -config_version="3.4.1-git" diff --git a/neofetch b/neofetch index 15bcffe5a..f8d63fab6 100755 --- a/neofetch +++ b/neofetch @@ -31,6 +31,789 @@ shopt -s nocasematch # Reset colors and bold. reset="\e[0m" +# Neofetch default config. +readarray -t config <<'EOM' +# See this wiki page for more info: +# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info +print_info() { + info title + info underline + + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "Memory" memory + + # info "GPU Driver" gpu_driver # Linux/macOS only + # info "CPU Usage" cpu_usage + # info "Disk" disk + # info "Battery" battery + # info "Font" font + # info "Song" song + # info "Local IP" local_ip + # info "Public IP" public_ip + # info "Users" users + # info "Install Date" install_date + # info "Locale" locale # This only works on glibc systems. + + info line_break + info cols + info line_break +} + + +# Kernel + + +# Shorten the output of the kernel function. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --kernel_shorthand +# Supports: Everything except *BSDs (except PacBSD and PC-BSD) +# +# Example: +# on: '4.8.9-1-ARCH' +# off: 'Linux 4.8.9-1-ARCH' +kernel_shorthand="on" + + +# Distro + + +# Shorten the output of the distro function +# +# Default: 'off' +# Values: 'on', 'off', 'tiny' +# Flag: --distro_shorthand +# Supports: Everything except Windows and Haiku +distro_shorthand="off" + +# Show/Hide OS Architecture. +# Show 'x86_64', 'x86' and etc in 'Distro:' output. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --os_arch +# +# Example: +# on: 'Arch Linux x86_64' +# off: 'Arch Linux' +os_arch="on" + + +# Uptime + + +# Shorten the output of the uptime function +# +# Default: 'on' +# Values: 'on', 'off', 'tiny' +# Flag: --uptime_shorthand +# +# Example: +# on: '2 days, 10 hours, 3 mins' +# off: '2 days, 10 hours, 3 minutes' +# tiny: '2d 10h 3m' +uptime_shorthand="on" + + +# Shell + + +# Show the path to $SHELL +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --shell_path +# +# Example: +# on: '/bin/bash' +# off: 'bash' +shell_path="off" + +# Show $SHELL version +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --shell_version +# +# Example: +# on: 'bash 4.4.5' +# off: 'bash' +shell_version="on" + + +# CPU + + +# CPU speed type +# +# Default: 'bios_limit' +# Values: 'scaling_cur_freq', 'scaling_min_freq', 'scaling_max_freq', 'bios_limit'. +# Flag: --speed_type +# Supports: Linux with 'cpufreq' +# NOTE: Any file in '/sys/devices/system/cpu/cpu0/cpufreq' can be used as a value. +speed_type="bios_limit" + +# CPU speed shorthand +# +# Default: 'off' +# Values: 'on', 'off'. +# Flag: --speed_shorthand. +# NOTE: This flag is not supported in systems with CPU speed less than 1 GHz +# +# Example: +# on: 'i7-6500U (4) @ 3.1GHz' +# off: 'i7-6500U (4) @ 3.100GHz' +speed_shorthand="off" + +# Enable/Disable CPU brand in output. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --cpu_brand +# +# Example: +# on: 'Intel i7-6500U' +# off: 'i7-6500U (4)' +cpu_brand="on" + +# CPU Speed +# Hide/Show CPU speed. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --cpu_speed +# +# Example: +# on: 'Intel i7-6500U (4) @ 3.1GHz' +# off: 'Intel i7-6500U (4)' +cpu_speed="on" + +# CPU Cores +# Display CPU cores in output +# +# Default: 'logical' +# Values: 'logical', 'physical', 'off' +# Flag: --cpu_cores +# Support: 'physical' doesn't work on BSD. +# +# Example: +# logical: 'Intel i7-6500U (4) @ 3.1GHz' (All virtual cores) +# physical: 'Intel i7-6500U (2) @ 3.1GHz' (All physical cores) +# off: 'Intel i7-6500U @ 3.1GHz' +cpu_cores="logical" + +# CPU Temperature +# Hide/Show CPU temperature. +# Note the temperature is added to the regular CPU function. +# +# Default: 'off' +# Values: 'C', 'F', 'off' +# Flag: --cpu_temp +# Supports: Linux, BSD +# NOTE: For FreeBSD and NetBSD-based systems, you'll need to enable +# coretemp kernel module. This only supports newer Intel processors. +# +# Example: +# C: 'Intel i7-6500U (4) @ 3.1GHz [27.2°C]' +# F: 'Intel i7-6500U (4) @ 3.1GHz [82.0°F]' +# off: 'Intel i7-6500U (4) @ 3.1GHz' +cpu_temp="off" + + +# GPU + + +# Enable/Disable GPU Brand +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --gpu_brand +# +# Example: +# on: 'AMD HD 7950' +# off: 'HD 7950' +gpu_brand="on" + +# Which GPU to display +# +# Default: 'all' +# Values: 'all', 'dedicated', 'integrated' +# Flag: --gpu_type +# Supports: Linux +# +# Example: +# all: +# GPU1: AMD HD 7950 +# GPU2: Intel Integrated Graphics +# +# dedicated: +# GPU1: AMD HD 7950 +# +# integrated: +# GPU1: Intel Integrated Graphics +gpu_type="all" + + +# Resolution + + +# Display refresh rate next to each monitor +# Default: 'off' +# Values: 'on', 'off' +# Flag: --refresh_rate +# Supports: Doesn't work on Windows. +# +# Example: +# on: '1920x1080 @ 60Hz' +# off: '1920x1080' +refresh_rate="off" + + +# Gtk Theme / Icons / Font + + +# Shorten output of GTK Theme / Icons / Font +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --gtk_shorthand +# +# Example: +# on: 'Numix, Adwaita' +# off: 'Numix [GTK2], Adwaita [GTK3]' +gtk_shorthand="off" + + +# Enable/Disable gtk2 Theme / Icons / Font +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --gtk2 +# +# Example: +# on: 'Numix [GTK2], Adwaita [GTK3]' +# off: 'Adwaita [GTK3]' +gtk2="on" + +# Enable/Disable gtk3 Theme / Icons / Font +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --gtk3 +# +# Example: +# on: 'Numix [GTK2], Adwaita [GTK3]' +# off: 'Numix [GTK2]' +gtk3="on" + + +# IP Address + + +# Website to ping for the public IP +# +# Default: 'http://ident.me' +# Values: 'url' +# Flag: --ip_host +public_ip_host="http://ident.me" + + +# Window Manager + + +# Show Window Manager Version. +# +# Default: 'off' +# Values: 'on', off +# Flag: --wm_version +wm_version="off" + + +# Disk + + +# Which disks to display. +# The values can be any /dev/sdXX, mount point or directory. +# NOTE: By default we only show the disk info for '/'. +# +# Default: '/' +# Values: '/', '/dev/sdXX', '/path/to/drive'. +# Flag: --disk_show +# +# Example: +# disk_show=('/' '/dev/sdb1'): +# 'Disk (/): 74G / 118G (66%)' +# 'Disk (/mnt/Videos): 823G / 893G (93%)' +# +# disk_show=('/'): +# 'Disk (/): 74G / 118G (66%)' +# +disk_show=('/') + +# Disk subtitle. +# What to append to the Disk subtitle. +# +# Default: 'mount' +# Values: 'mount', 'name', 'dir' +# Flag: --disk_subtitle +# +# Example: +# name: 'Disk (/dev/sda1): 74G / 118G (66%)' +# 'Disk (/dev/sdb2): 74G / 118G (66%)' +# +# mount: 'Disk (/): 74G / 118G (66%)' +# 'Disk (/mnt/Local Disk): 74G / 118G (66%)' +# 'Disk (/mnt/Videos): 74G / 118G (66%)' +# +# dir: 'Disk (/): 74G / 118G (66%)' +# 'Disk (Local Disk): 74G / 118G (66%)' +# 'Disk (Videos): 74G / 118G (66%)' +disk_subtitle="mount" + + +# Song + + +# Manually specify a music player. +# +# Default: 'auto' +# Values: 'auto', 'player-name' +# Flag: --music_player +# +# Available values for 'player-name': +# +# Google Play +# Spotify +# amarok +# audacious +# banshee +# bluemindo +# clementine +# cmus +# deadbeef +# deepin-music +# elisa +# exaile +# gnome-music +# guayadeque +# iTunes$ +# juk +# lollypop +# mocp +# mopidy +# mpd +# pogo +# pragha +# qmmp +# quodlibet +# rhythmbox +# spotify +# tomahawk +# xmms2d +# yarock +music_player="auto" + +# Print the Artist and Title on separate lines +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --song_shorthand +# +# Example: +# on: 'Artist: The Fratellis' +# 'Song: Chelsea Dagger' +# +# off: 'Song: The Fratellis - Chelsea Dagger' +song_shorthand="off" + + +# Install Date + + +# Whether to show the time in the output +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --install_time +# +# Example: +# on: 'Thu 14 Apr 2016 11:50 PM' +# off: 'Thu 14 Apr 2016' +install_time="on" + +# Set time format in the output +# +# Default: '24h' +# Values: '12h', '24h' +# Flag: --install_time_format +# +# Example: +# 12h: 'Thu 14 Apr 2016 11:50 PM' +# 24h: 'Thu 14 Apr 2016 23:50' +install_time_format="12h" + + +# Text Colors + + +# Text Colors +# +# Default: 'distro' +# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' +# Flag: --colors +# +# Each number represents a different part of the text in +# this order: 'title', '@', 'underline', 'subtitle', 'colon', 'info' +# +# Example: +# colors=(distro) - Text is colored based on Distro colors. +# colors=(4 6 1 8 8 6) - Text is colored in the order above. +colors=(distro) + + +# Text Options + + +# Toggle bold text +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --bold +bold="on" + +# Enable/Disable Underline +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --underline +underline_enabled="on" + +# Underline character +# +# Default: '-' +# Values: 'string' +# Flag: --underline_char +underline_char="-" + + +# Color Blocks + + +# Color block range +# The range of colors to print. +# +# Default: '0', '7' +# Values: 'num' +# Flag: --block_range +# +# Example: +# +# Display colors 0-7 in the blocks. (8 colors) +# neofetch --block_range 0 7 +# +# Display colors 0-15 in the blocks. (16 colors) +# neofetch --block_range 0 15 +block_range=(0 7) + +# Toggle color blocks +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --color_blocks +color_blocks="on" + +# Color block width in spaces +# +# Default: '3' +# Values: 'num' +# Flag: --block_width +block_width=3 + +# Color block height in lines +# +# Default: '1' +# Values: 'num' +# Flag: --block_height +block_height=1 + + +# Progress Bars + + +# Bar characters +# +# Default: '-', '=' +# Values: 'string', 'string' +# Flag: --bar_char +# +# Example: +# neofetch --bar_char 'elapsed' 'total' +# neofetch --bar_char '-' '=' +bar_char_elapsed="-" +bar_char_total="=" + +# Toggle Bar border +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --bar_border +bar_border="on" + +# Progress bar length in spaces +# Number of chars long to make the progress bars. +# +# Default: '15' +# Values: 'num' +# Flag: --bar_length +bar_length=15 + +# Progress bar colors +# When set to distro, uses your distro's logo colors. +# +# Default: 'distro', 'distro' +# Values: 'distro', 'num' +# Flag: --bar_colors +# +# Example: +# neofetch --bar_colors 3 4 +# neofetch --bar_colors distro 5 +bar_color_elapsed="distro" +bar_color_total="distro" + + +# Info display +# Display a bar with the info. +# +# Default: 'off' +# Values: 'bar', 'infobar', 'barinfo', 'off' +# Flags: --cpu_display +# --memory_display +# --battery_display +# --disk_display +# +# Example: +# bar: '[---=======]' +# infobar: 'info [---=======]' +# barinfo: '[---=======] info' +# off: 'info' +cpu_display="off" +memory_display="off" +battery_display="off" +disk_display="off" + + +# Backend Settings + + +# Image backend. +# +# Default: 'ascii' +# Values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m' +# Flag: --backend +image_backend="ascii" + +# Image Source +# +# Which image or ascii file to display. +# +# Default: 'auto' +# Values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/' +# Flag: --source +# +# NOTE: 'auto' will pick the best image source for whatever image backend is used. +# In ascii mode, distro ascii art will be used and in an image mode, your +# wallpaper will be used. +image_source="auto" + + +# Ascii Options + + +# Ascii distro +# Which distro's ascii art to display. +# +# Default: 'auto' +# Values: 'auto', 'distro_name' +# Flag: --ascii_distro +# +# NOTE: Arch and Ubuntu have 'old' logo variants. +# Change this to 'arch_old' or 'ubuntu_old' to use the old logos. +# NOTE: Ubuntu has flavor variants. +# Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME' or 'Ubuntu-Budgie' to use the flavors. +# NOTE: Arch, Crux and Gentoo have a smaller logo variant. +# Change this to 'arch_small', 'crux_small' or 'gentoo_small' to use the small logos. +ascii_distro="auto" + +# Ascii Colors +# +# Default: 'distro' +# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' +# Flag: --ascii_colors +# +# Example: +# ascii_colors=(distro) - Ascii is colored based on Distro colors. +# ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors. +ascii_colors=(distro) + +# Bold ascii logo +# Whether or not to bold the ascii logo. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --ascii_bold +ascii_bold="on" + + +# Image Options + + +# Image loop +# Setting this to on will make neofetch redraw the image constantly until +# Ctrl+C is pressed. This fixes display issues in some terminal emulators. +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --loop +image_loop="off" + +# Thumbnail directory +# +# Default: '~/.cache/thumbnails/neofetch' +# Values: 'dir' +thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch" + +# Crop mode +# +# Default: 'normal' +# Values: 'normal', 'fit', 'fill' +# Flag: --crop_mode +# +# See this wiki page to learn about the fit and fill options. +# https://github.com/dylanaraps/neofetch/wiki/What-is-Waifu-Crop%3F +crop_mode="normal" + +# Crop offset +# Note: Only affects 'normal' crop mode. +# +# Default: 'center' +# Values: 'northwest', 'north', 'northeast', 'west', 'center' +# 'east', 'southwest', 'south', 'southeast' +# Flag: --crop_offset +crop_offset="center" + +# Image size +# The image is half the terminal width by default. +# +# Default: 'auto' +# Values: 'auto', '00px', '00%', 'none' +# Flags: --image_size +# --size +image_size="auto" + +# Gap between image and text +# +# Default: '3' +# Values: 'num', '-num' +# Flag: --gap +gap=3 + +# Image offsets +# Only works with the w3m backend. +# +# Default: '0' +# Values: 'px' +# Flags: --xoffset +# --yoffset +yoffset=0 +xoffset=0 + +# Image background color +# Only works with the w3m backend. +# +# Default: '' +# Values: 'color', 'blue' +# Flag: --bg_color +background_color= + + +# Scrot Options + + +# Whether or not to always take a screenshot +# You can manually take a screenshot with "--scrot" or "-s" +# +# Default: 'off' +# Values: 'on', 'off' +# Flags: --scrot +# -s +scrot="off" + +# Screenshot Program +# Neofetch will automatically use whatever screenshot tool +# is installed on your system. +# +# If 'neofetch -v' says that it couldn't find a screenshot +# tool or you're using a custom tool then you can change +# the option below to a custom command. +# +# Default: 'auto' +# Values: 'auto' 'cmd -flags' +# Flag: --scrot_cmd +scrot_cmd="auto" + +# Screenshot Filename +# What to name the screenshots +# +# Default: 'neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png' +# Values: 'string' +# Flag: --scrot_name +scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png" + +# Image upload host +# Where to upload the image. +# +# Default: 'teknik' +# Values: 'imgur', 'teknik' +# Flag: --image_host +# +# NOTE: If you'd like another image host to be added to Neofetch. +# Open an issue on github. +image_host="teknik" + + +# Misc Options + +# Stdout mode +# Turn off all colors and disables image backend (ASCII/Image). +# Useful for piping into another command. +# Default: 'off' +# Values: 'on', 'off' +stdout="off" + +# Config version. +# +# NOTE: Don't change this value, neofetch reads this to determine +# how to handle backwards compatibility. +config_version="3.4.1-git" +EOM + + # DETECT INFORMATION get_os() { @@ -4295,22 +5078,6 @@ get_full_path() { [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" } -get_default_config() { - if [[ -f "CONFDIR/config.conf" ]]; then - default_config="CONFDIR/config.conf" - - else - [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" - default_config="${script_dir%/*}/config/config.conf" - fi - - if source "$default_config"; then - err "Config: Sourced default config. (${default_config})" - else - err "Config: Default config not found, continuing..." - fi -} - get_user_config() { # Check $config_file. if [[ -f "$config_file" ]]; then @@ -4329,15 +5096,11 @@ get_user_config() { elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - elif [[ -f "CONFDIR/config.conf" ]]; then - cp "CONFDIR/config.conf" "${XDG_CONFIG_HOME}/neofetch" - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - else - [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" - - cp "${script_dir%/*}/config/config.conf" "${XDG_CONFIG_HOME}/neofetch" config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + + # The config file doesn't exist, create it. + printf "%s\n" "${config[@]}" > "$config_file" fi source "$config_file" @@ -5065,7 +5828,10 @@ get_args() { main() { cache_uname get_os - get_default_config + + # Load default config. + source /dev/stdin < <(printf "%s\\n" "${config[@]}") + get_args "$@" [[ "$verbose" != "on" ]] && exec 2>/dev/null get_distro From c794f7f072b5f066d7986a849f2ea18df86c2c0f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:09:58 +1000 Subject: [PATCH 0273/1133] general: Removed changes from other branch --- neofetch | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/neofetch b/neofetch index f8d63fab6..a4b10bfe0 100755 --- a/neofetch +++ b/neofetch @@ -334,16 +334,6 @@ gtk3="on" public_ip_host="http://ident.me" -# Window Manager - - -# Show Window Manager Version. -# -# Default: 'off' -# Values: 'on', off -# Flag: --wm_version -wm_version="off" - # Disk @@ -1576,18 +1566,6 @@ get_wm() { -e "monsterwm" \ -e "tinywm")" - if [[ "$wm_version" == "on" && "$wm" ]]; then - wmv="$("${wm,,}" --version || "${wm,,}" -v 2>&1)" - wmv="$wm ${wmv:-$("${wm,,}_x11" -v || "${wm,,}_wayland" -v)}" - wmv="${wmv/$wm ${wm}?/$wm }" - wmv="${wmv/$wm $wm/$wm}" - wmv="${wmv/copyright*}" - wmv="${wmv/version }" - wmv="${wmv/©*}" - wmv="${wmv/(c)*}" - wmv="${wmv/ : }" - wm="$wmv" - fi else case "$os" in "Mac OS X") @@ -5479,7 +5457,6 @@ INFO: NOTE: This only supports Linux. - --wm_version on/off Show/Hide Window Manager version. --gtk_shorthand on/off Shorten output of gtk theme/icons --gtk2 on/off Enable/Disable gtk2 theme/font/icons output --gtk3 on/off Enable/Disable gtk3 theme/font/icons output @@ -5650,7 +5627,6 @@ get_args() { "--cpu_brand") cpu_brand="$2" ;; "--gpu_brand") gpu_brand="$2" ;; "--gpu_type") gpu_type="$2" ;; - "--wm_version") wm_version="$2" ;; "--refresh_rate") refresh_rate="$2" ;; "--gtk_shorthand") gtk_shorthand="$2" ;; "--gtk2") gtk2="$2" ;; From 3af0341804fabbac7279fc50af68c1543f05210a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:10:50 +1000 Subject: [PATCH 0274/1133] docs: update --- neofetch.1 | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 391cb7d6d..b0bcd8ac1 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "April 2018" "Neofetch 3.4.1-git" "User Commands" +.TH NEOFETCH "1" "May 2018" "Neofetch 3.4.1-git" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -81,9 +81,6 @@ Which GPU to display. (all, dedicated, integrated) .IP NOTE: This only supports Linux. .TP -\fB\-\-wm_version\fR on/off -Show/Hide Window Manager version. -.TP \fB\-\-gtk_shorthand\fR on/off Shorten output of gtk theme/icons .TP From 3ee733e982a58a9685638bbd3fde6cd9d77e694f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:32:59 +1000 Subject: [PATCH 0275/1133] general: Start inlining ascii. --- neofetch | 1024 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 862 insertions(+), 162 deletions(-) diff --git a/neofetch b/neofetch index a4b10bfe0..2b89f8e1e 100755 --- a/neofetch +++ b/neofetch @@ -3460,19 +3460,6 @@ get_ascii() { # Fallback to distro ascii mode if source is an image. [[ "$image_source" =~ \.(png|jpg|jpe|jpeg|gif)$ ]] && \ err "Image: Source is image file but ascii backend was selected. Using distro ascii." - - if [[ -d "ASCIIDIR" ]]; then - ascii_dir="ASCIIDIR" - else - [[ -z "$script_dir" ]] && script_dir="$(get_full_path "$0")" - ascii_dir="${script_dir%/*}/ascii/distro" - fi - - image_source="${ascii_dir}/${ascii_file}" - - # Fallback to no ascii mode if distro ascii isn't found. - [[ ! -f "$image_source" ]] && \ - { to_off "Ascii: Failed to find distro ascii, falling back to no ascii mode."; return; } fi # Set locale to get correct padding. @@ -3490,7 +3477,7 @@ get_ascii() { line="${line//\\\\/\\}" ((${#line} > ascii_length)) && ascii_length="${#line}" ((++lines)) - done < "$image_source" + done <<< "$ascii_data" # Colors. print="${print//'${c1}'/$c1}" @@ -4160,52 +4147,239 @@ get_distro_colors() { case "$ascii_distro" in "AIX"*) set_colors 2 7 - ascii_file="aix" + read -rd '' ascii_data <<'EOF' +${c1} `:+ssssossossss+-` + .oys///oyhddddhyo///sy+. + /yo:+hNNNNNNNNNNNNNNNNh+:oy/ + :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: + `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh + h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy +/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: +h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y +N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m +N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m +h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y +:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- + yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy + sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo + :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- + :ys:/yNNNNNNNNNNNNNNNmy/:sy: + .+ys///osyhhhhys+///sy+. + -/osssossossso/- +EOF ;; "alpine_small") set_colors 4 7 - ascii_file="alpine_small" + read -rd '' ascii_data <<'EOF' +${c1} /\\ /\\ + /${c2}/ ${c1}\\ \\ + /${c2}/ ${c1}\\ \\ +/${c2}// ${c1}\\ \\ +${c2}// ${c1}\\ \\ + \\ +EOF ;; "Alpine"*) set_colors 4 5 7 6 - ascii_file="alpine" + read -rd '' ascii_data <<'EOF' +${c1} .hddddddddddddddddddddddh. + :dddddddddddddddddddddddddd: + /dddddddddddddddddddddddddddd/ + +dddddddddddddddddddddddddddddd+ + `sdddddddddddddddddddddddddddddddds` + `ydddddddddddd++hdddddddddddddddddddy` +.hddddddddddd+` `+ddddh:-sdddddddddddh. +hdddddddddd+` `+y: .sddddddddddh +ddddddddh+` `//` `.` -sddddddddd +ddddddh+` `/hddh/` `:s- -sddddddd +ddddh+` `/+/dddddh/` `+s- -sddddd +ddd+` `/o` :dddddddh/` `oy- .yddd +hdddyo+ohddyosdddddddddho+oydddy++ohdddh +.hddddddddddddddddddddddddddddddddddddh. + `yddddddddddddddddddddddddddddddddddy` + `sdddddddddddddddddddddddddddddddds` + +dddddddddddddddddddddddddddddd+ + /dddddddddddddddddddddddddddd/ + :dddddddddddddddddddddddddd: + .hddddddddddddddddddddddh. +EOF ;; "Amazon"*) set_colors 3 7 - ascii_file="amazon" + read -rd '' ascii_data <<'EOF' +${c1} `-/oydNNdyo:.` + `.:+shmMMMMMMMMMMMMMMmhs+:.` + -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- +.`` -/+shmNNMMMMMMNNmhs+/- ``. +dNmhs+:. `.:/oo/:.` .:+shmNd +dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd +dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. + `.:+shNMMMMMh yMMMMMNhs+:`` + `-+shy shs+:` +EOF ;; "Anarchy"*) set_colors 7 4 - ascii_file="anarchy" + read -rd '' ascii_data <<'EOF' + ${c2}..${c1} + ${c2}..${c1} + ${c2}:..${c1} + ${c2}:+++.${c1} + .:::++${c2}++++${c1}+::. + .:+######${c2}++++${c1}######+:. + .+#########${c2}+++++${c1}##########:. + .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. + +###########${c2}+++++++++${c1}############: + +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ + +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ + :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: + ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ +.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. +.##########${c2}+++++++++++++++++++${c1}###########. + #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ + :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: + +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ + +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ + :##${c2}++++++${c1}############${c2}++++++++++${c1}##: + .${c2}++++++${c1}#############${c2}++++++++++${c1}+. + :${c2}++++${c1}###############${c2}+++++++${c1}:: + .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. + ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. + ${c2}.${c1} ${c2}.:+++${c1}. + ${c2}.:${c1}: + ${c2}..${c1} + ${c2}..${c1} +EOF ;; "Android"*) set_colors 2 7 - ascii_file="android" + ascii_length_force=19 + read -rd '' ascii_data <<'EOF' +${c1} ╲ ▁▂▂▂▁ ╱ + ▄███████▄ + ▄██${c2} ${c1}███${c2} ${c1}██▄ + ▄███████████▄ +▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄ █▄ +██ █████████████ ██ +██ █████████████ ██ +██ █████████████ ██ +██ █████████████ ██ + █████████████ + ███████████ + ██ ██ + ██ ██ +EOF ;; "Antergos"*) set_colors 4 6 - ascii_file="antergos" + read -rd '' ascii_data <<'EOF' +${c2} `.-/::/-`` + .-/osssssssso/. + :osyysssssssyyys+- + `.+yyyysssssssssyyyyy+. + `/syyyyyssssssssssyyyyys-` + `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` + .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. + .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. + -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: + -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- + .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` +`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo +.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. +ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy +dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh +-dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- +.smmmmddddddddhhhhhhhhhdddddddddmmmms. + `+ydmmmdddddddddddddddddddmmmmdy/. + `.:+ooyyddddddddddddyyso+:.` +EOF ;; "antiX"*) set_colors 1 7 3 - ascii_file="antix" + read -rd '' ascii_data <<'EOF' +${c1} + \ + , - ~ ^ ~ - \ / + , ' \ ' , / + , \ '/ + , \ / , + ,___, \/ , + / | _ _ _|_ o /\ , +|, | / |/ | | | / \ , + \,_/\_/ | |_/|_/|_/_/ \, + , / ,\ + , / , ' \ + ' - , _ _ _ , ' +EOF ;; "AOSC"*) set_colors 4 7 1 - ascii_file="aosc" + read -rd '' ascii_data <<'EOF' +${c2} .:+syhhhhys+:. + .ohNMMMMMMMMMMMMMMNho. + `+mMMMMMMMMMMmdmNMMMMMMMMm+` + +NMMMMMMMMMMMM/ `./smMMMMMN+ + .mMMMMMMMMMMMMMMo -yMMMMMm. + :NMMMMMMMMMMMMMMMs .hMMMMN: + .NMMMMhmMMMMMMMMMMm+/- oMMMMN. + dMMMMs ./ymMMMMMMMMMMNy. sMMMMd +-MMMMN` oMMMMMMMMMMMN: `NMMMM- +/MMMMh NMMMMMMMMMMMMm hMMMM/ +/MMMMh NMMMMMMMMMMMMm hMMMM/ +-MMMMN` :MMMMMMMMMMMMy. `NMMMM- + dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd + .NMMMMo -/+sMMMMMMMMMMMmMMMMN. + :NMMMMh. .MMMMMMMMMMMMMMMN: + .mMMMMMy- NMMMMMMMMMMMMMm. + +NMMMMMms/.` mMMMMMMMMMMMN+ + `+mMMMMMMMMNmddMMMMMMMMMMm+` + .ohNMMMMMMMMMMMMMMNho. + .:+syhhhhys+:. +EOF ;; "Apricity"*) set_colors 4 7 1 - ascii_file="apricity" + read -rd '' ascii_data <<'EOF' +${c2} ./o- + ``...`` `:. -/: + `-+ymNMMMMMNmho-` :sdNNm/ + `+dMMMMMMMMMMMMMMMmo` sh:.:::- + /mMMMMMMMMMMMMMMMMMMMm/`sNd/ + oMMMMMMMMMMMMMMMMMMMMMMMs -` +:MMMMMMMMMMMMMMMMMMMMMMMMM/ +NMMMMMMMMMMMMMMMMMMMMMMMMMd +MMMMMMMmdmMMMMMMMMMMMMMMMMd +MMMMMMy` .mMMMMMMMMMMMmho:` +MMMMMMNo/sMMMMMMMNdy+-.`-/ +MMMMMMMMMMMMNdy+:.`.:ohmm: +MMMMMMMmhs+-.`.:+ymNMMMy. +MMMMMM/`.-/ohmNMMMMMMy- +MMMMMMNmNNMMMMMMMMmo. +MMMMMMMMMMMMMMMms:` +MMMMMMMMMMNds/. +dhhyys+/-` +EOF ;; "ArcoLinux"*) @@ -4215,694 +4389,1220 @@ get_distro_colors() { "arch_small") set_colors 6 7 1 - ascii_file="arch_small" + read -rd '' ascii_data <<'EOF' +${c1} /\ + /^^\ + /\ \ + /${c2} __ \ + / ( ) \ + / __| |__\\\ +/// \\\\\ +EOF ;; "arch_old") set_colors 6 7 1 - ascii_file="arch_old" + read -rd '' ascii_data <<'EOF' +${c1} __ + _=(SDGJT=_ + _GTDJHGGFCVS) + ,GTDJGGDTDFBGX0 +${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ +${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL +${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, +${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], +${c1} SDDFDFH' !YEWD,${c2} )HDROD +${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' +${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' +${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' +${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) +${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF +'EHTI !H + `0F' '! +EOF ;; "ArchBox"*) set_colors 2 7 1 - ascii_file="archbox" + read -rd '' ascii_data <<'EOF' +${c1} ...:+oh/:::.. + ..-/oshhhhhh` `::::-. + .:/ohhhhhhhhhhhh` `-::::. + .+shhhhhhhhhhhhhhhhh` `.::-. + /`-:+shhhhhhhhhhhhhh` .-/+shh + / .:/ohhhhhhhhh` .:/ohhhhhhhh + / `-:+shhh` ..:+shhhhhhhhhhhh + / .:ohhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / .+o+ `hhhhhhhhhhhhhhhhhhhh + / -hhhhh `hhhhhhhhhhhhhhhhhhhh + / ohhhhho `hhhhhhhhhhhhhhhhhhhh + /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` + `--/:` /: `hhhhhhhhhhhho/- + -/:. `hhhhhhs+:-` + ::::/ho/-` +EOF ;; "ARCHlabs"*) set_colors 6 6 7 1 - ascii_file="archlabs" + read -rd '' ascii_data <<'EOF' +${c1} 'c' + 'kKk, + .dKKKx. + .oKXKXKd. + .l0XXXXKKo. + c0KXXXXKX0l. + :0XKKOxxOKX0l. + :OXKOc. .c0XX0l. + :OK0o. ${c4}...${c1}'dKKX0l. + :OX0c ${c4};xOx'${c1}'dKXX0l. + :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. + c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. + .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. + .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. + .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. + .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. + .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' + 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' + 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, + ,xko:'. ${c4}.. ${c1} .':okx; + .,'. .',. +EOF ;; *"XFerience"*) set_colors 6 6 7 1 - ascii_file="arch_xferience" + read -rd '' ascii_data <<'EOF' +${c1} ``--:::::::-.` + .-/+++ooooooooo+++:-` + `-/+oooooooooooooooooo++:. + -/+oooooo/+ooooooooo+/ooo++:` + `/+oo++oo. .+oooooo+.-: +:-o+- + `/+o/. -o. :oooooo+ ```:.+oo+- +`:+oo- -/` :oooooo+ .`-`+oooo/. +.+ooo+. .` `://///+-+..oooooo+:` +-+ooo:` ``.-+oooooo+/` +-+oo/` :+oooo/. +.+oo: ..-/. . -+oo+/` +`/++- -:::++::/. -+oo+- + ./o: `:///+- `./ooo+:` + .++- `` /-` -:/+oooo+:` + .:+/:`` `-:ooooooo++- + ./+o+//:...../+oooooooo++:` + `:/++ooooooooooooo++/-` + `.-//++++++//:-.` + `````` +EOF ;; "ArchMerge"*) set_colors 6 6 7 1 - ascii_file="archmerge" + read -rd '' ascii_data <<'EOF' +${c1} y: + sMN- + +MMMm` + /MMMMMd` + :NMMMMMMy + -NMMMMMMMMs + .NMMMMMMMMMM+ + .mMMMMMMMMMMMM+ + oNMMMMMMMMMMMMM+ + `+:-+NMMMMMMMMMMMM+ + .sNMNhNMMMMMMMMMMMM/ + `hho/sNMMMMMMMMMMMMMMM/ + `.`omMMmMMMMMMMMMMMMMMMM+ + .mMNdshMMMMd+::oNMMMMMMMMMo + .mMMMMMMMMM+ `yMMMMMMMMMs + .NMMMMMMMMM/ yMMMMMMMMMy + -NMMMMMMMMMh `mNMMMMMMMMd` + /NMMMNds+:.` `-/oymMMMm. + +Mmy/. `:smN: +/+. -o. +EOF ;; "Arch"*) set_colors 6 6 7 1 - ascii_file="arch" + read -rd '' ascii_data <<'EOF' +${c1} -` + .o+` + `ooo/ + `+oooo: + `+oooooo: + -+oooooo+: + `/:-:++oooo+: + `/++++/+++++++: + `/++++++++++++++: + `/+++o${c2}oooooooo${c1}oooo/` +${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` +${c2} .oossssso-````/ossssss+` + -osssssso. :ssssssso. + :osssssss/ osssso+++. + /ossssssss/ +ssssooo/- + `/ossssso+/:- -:/+osssso+- + `+sso+:-` `.-/+oso: + `++:. `-/+/ + .` `/ +EOF ;; "Artix"*) set_colors 6 4 2 7 - ascii_file="artix" + read -rd '' ascii_data <<'EOF' +${c1} d${c2}c. +${c1} x${c2}dc. +${c1} '.${c4}.${c1} d${c2}dlc. +${c1} c${c2}0d:${c1}o${c2}xllc; +${c1} :${c2}0ddlolc,lc, +${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. +${c1} ;${c1}K${c2}kxoOddollc' cllc. +${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: +${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: +${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, +${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. +${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; +${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, +${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. +${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. +${c1} 0${c2}Okd''dc. .cll; +${c1} k${c2}Okd' .llc, +${c1} d${c2}Od, 'lc. +${c1} :,${c4}. ${c2}... +EOF ;; "Arya"*) set_colors 2 1 - ascii_file="arya" + read -rd '' ascii_data <<'EOF' +${c1} `oyyy/${c2}-yyyyyy+ +${c1} -syyyy/${c2}-yyyyyy+ +${c1} .syyyyy/${c2}-yyyyyy+ +${c1} :yyyyyy/${c2}-yyyyyy+ +${c1} `/ :yyyyyy/${c2}-yyyyyy+ +${c1} .+s :yyyyyy/${c2}-yyyyyy+ +${c1} .oys :yyyyyy/${c2}-yyyyyy+ +${c1} -oyys :yyyyyy/${c2}-yyyyyy+ +${c1} :syyys :yyyyyy/${c2}-yyyyyy+ +${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ +${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ +${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- +${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy +${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy +${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy +EOF ;; "Bitrig"*) set_colors 2 7 - ascii_file="bitrig" + read -rd '' ascii_data <<'EOF' +${c1} `hMMMMN+ + -MMo-dMd` + oMN- oMN` + yMd /NM: + .mMmyyhMMs + :NMMMhsmMh + +MNhNNoyMm- + hMd.-hMNMN: + mMmsssmMMMo + .MMdyyhNMMMd + oMN.`/dMddMN` + yMm/hNm+./MM/ +.dMMMmo.``.NMo +:NMMMNmmmmmMMh +/MN/-------oNN: +hMd. .dMh +sm/ /ms +EOF ;; "BLAG"*) set_colors 5 7 - ascii_file="blag" + read -rd '' ascii_data <<'EOF' +${c1} d + ,MK: + xMMMX: + .NMMMMMX; + lMMMMMMMM0clodkO0KXWW: + KMMMMMMMMMMMMMMMMMMX' + .;d0NMMMMMMMMMMMMMMMMMMK. + .;dONMMMMMMMMMMMMMMMMMMMMMMx +'dKMMMMMMMMMMMMMMMMMMMMMMMMl + .:xKWMMMMMMMMMMMMMMMMMMM0. + .:xNMMMMMMMMMMMMMMMMMK. + lMMMMMMMMMMMMMMMMMMK. + ,MMMMMMMMWkOXWMMMMMM0 + .NMMMMMNd. `':ldko + OMMMK: + oWk, + ;: +EOF ;; "BlankOn"*) set_colors 1 7 3 - ascii_file="blankon" + read -rd '' ascii_data <<'EOF' +${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` +${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ +${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys +${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys +${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys +${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys +${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys +${c2}NMMMMMN: .NMMMMMN${c1}yyyyys +${c2}MMMMMMm. NMMMMMN${c1}yyyyys +${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys +${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys +${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys +${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys +${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys +${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys +${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo +${c2} `.:/++++/:.` ${c1}:oys+. +EOF ;; "BSD") set_colors 1 7 4 3 6 - ascii_file="bsd" + read -rd '' ascii_data <<'EOF' +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) +EOF ;; "BunsenLabs"*) set_colors fg 7 - ascii_file="bunsenlabs" + read -rd '' ascii_data <<'EOF' +${c1} `++ + -yMMs + `yMMMMN` + -NMMMMMMm. + :MMMMMMMMMN- + .NMMMMMMMMMMM/ + yMMMMMMMMMMMMM/ +`MMMMMMNMMMMMMMN. +-MMMMN+ /mMMMMMMy +-MMMm` `dMMMMMM +`MMN. .NMMMMM. + hMy yMMMMM` + -Mo +MMMMN + /o +MMMMs + +MMMN` + hMMM: + `NMM/ + +MN: + mh. + -/ +EOF ;; "Calculate"*) set_colors 7 3 - ascii_file="calculate" + read -rd '' ascii_data <<'EOF' +${c1} ...... + ,,+++++++,. + .,,,....,,,${c2}+**+,,.${c1} + ............,${c2}++++,,,${c1} + ............... + ......,,,........ + .....+*#####+,,,*+. + .....,*###############,..,,,,,,.. + ......,*#################*..,,,,,..,,,.. + .,,....*####################+***+,,,,...,++, + .,,..,..*#####################*, + ,+,.+*..*#######################. + ,+,,+*+..,########################* +.,++++++. ..+##**###################+ +..... ..+##***#################*. + .,.*#*****##############*. + ..,,*********#####****+. + ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} + ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} + ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} +EOF ;; "CentOS"*) set_colors 3 2 4 5 7 - ascii_file="centos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Chakra"*) set_colors 4 5 7 6 - ascii_file="chakra" + read -rd '' ascii_data <<'EOF' + +EOF ;; "ChaletOS"*) set_colors 4 7 1 - ascii_file="chaletos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Chapeau"*) set_colors 2 7 - ascii_file="chapeau" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Chrom"*) set_colors 2 1 3 4 7 - ascii_file="chrome" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Clover"*) set_colors 2 6 - ascii_file="cloveros" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Container Linux by CoreOS"*) set_colors 4 7 1 - ascii_file="coreos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "crux_small") set_colors 4 5 7 6 - ascii_file="crux_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "CRUX"*) set_colors 4 5 7 6 - ascii_file="crux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "debian_small") set_colors 1 7 3 - ascii_file="debian_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Debian"*) set_colors 1 7 3 - ascii_file="debian" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Deepin"*) set_colors 2 7 - ascii_file="deepin" + read -rd '' ascii_data <<'EOF' + +EOF ;; "DesaOS") set_colors 2 7 - ascii_file="desaos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Devuan"*) set_colors 5 7 - ascii_file="devuan" + read -rd '' ascii_data <<'EOF' + +EOF ;; "DracOS"*) set_colors 1 7 3 - ascii_file="dracos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "dragonfly_old"*) set_colors 1 7 3 - ascii_file="dragonflybsd_old" + read -rd '' ascii_data <<'EOF' + +EOF ;; "dragonfly_small"*) set_colors 1 7 3 - ascii_file="dragonflybsd_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "DragonFly"*) set_colors 1 7 3 - ascii_file="dragonflybsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Elementary"*) set_colors 4 7 1 - ascii_file="elementary" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Endless"*) set_colors 1 7 - ascii_file="endless" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Exherbo"*) set_colors 4 7 1 - ascii_file="exherbo" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Fedora"* | "RFRemix"*) set_colors 4 7 1 - ascii_file="fedora" + read -rd '' ascii_data <<'EOF' + +EOF ;; "freebsd_small") set_colors 1 7 3 - ascii_file="freebsd_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "FreeBSD"*) set_colors 1 7 3 - ascii_file="freebsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "FreeMiNT"*) # Don't explicitly set colors since # TosWin2 doesn't reset well. - ascii_file="gem" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Frugalware"*) set_colors 4 7 1 - ascii_file="frugalware" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Funtoo"*) set_colors 5 7 - ascii_file="funtoo" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GalliumOS"*) set_colors 4 7 1 - ascii_file="galliumos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "gentoo_small") set_colors 5 7 - ascii_file="gentoo_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Gentoo"*) set_colors 5 7 - ascii_file="gentoo" + read -rd '' ascii_data <<'EOF' + +EOF ;; "gNewSense"*) set_colors 4 5 7 6 - ascii_file="gnewsense" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GNU") set_colors fg 7 - ascii_file="gnu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GoboLinux"*) set_colors 5 4 6 2 - ascii_file="gobolinux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Grombyang"*) set_colors 4 2 1 - ascii_file="grombyang" + read -rd '' ascii_data <<'EOF' + +EOF ;; "GuixSD"*) set_colors 3 7 6 1 8 - ascii_file="guixsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Haiku"*) set_colors 2 8 - ascii_file="haiku" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Hyperbola"*) set_colors 8 - ascii_file="hyperbola" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Kali"*) set_colors 4 8 - ascii_file="kali" + read -rd '' ascii_data <<'EOF' + +EOF ;; "KaOS"*) set_colors 4 7 1 - ascii_file="kaos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "KDE"*) set_colors 2 7 - ascii_file="kde" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Kogaion"*) set_colors 4 7 1 - ascii_file="kogaion" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Korora"*) set_colors 4 7 1 - ascii_file="korora" + read -rd '' ascii_data <<'EOF' + +EOF ;; "KSLinux"*) set_colors 4 7 1 - ascii_file="kslinux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Kubuntu"*) set_colors 4 7 1 - ascii_file="kubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "LEDE"*) set_colors 4 7 1 - ascii_file="lede" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Linux") set_colors fg 8 3 - ascii_file="linux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "LMDE"*) set_colors 2 7 - ascii_file="lmde" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Lubuntu"*) set_colors 4 7 1 - ascii_file="lubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Lunar"*) set_colors 4 7 3 - ascii_file="lunar" + read -rd '' ascii_data <<'EOF' + +EOF ;; "mac"*"_small") set_colors 2 3 1 5 4 - ascii_file="mac_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "mac" | "Darwin") set_colors 2 3 1 1 5 4 - ascii_file="mac" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Mageia"*) set_colors 6 7 - ascii_file="mageia" + read -rd '' ascii_data <<'EOF' + +EOF ;; "MagpieOS"*) set_colors 2 1 3 5 - ascii_file="magpieos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Manjaro"*) set_colors 2 7 - ascii_file="manjaro" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Maui"*) set_colors 6 7 - ascii_file="maui" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Mer"*) set_colors 4 7 1 - ascii_file="mer" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Minix"*) set_colors 1 7 3 - ascii_file="minix" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Linux Mint"* | "LinuxMint"*) set_colors 2 7 - ascii_file="mint" + read -rd '' ascii_data <<'EOF' + +EOF ;; "MX"*) set_colors 4 6 7 - ascii_file="mx" + read -rd '' ascii_data <<'EOF' + +EOF ;; "NetBSD"*) set_colors 5 7 - ascii_file="netbsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Netrunner"*) set_colors 4 7 1 - ascii_file="netrunner" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Nitrux"*) set_colors 4 - ascii_file="nitrux" + read -rd '' ascii_data <<'EOF' + +EOF ;; "nixos_small") set_colors 4 6 - ascii_file="nixos_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "NixOS"*) set_colors 4 6 - ascii_file="nixos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Nurunner"*) set_colors 4 - ascii_file="nurunner" + read -rd '' ascii_data <<'EOF' + +EOF ;; "NuTyX"*) set_colors 4 1 - ascii_file="nutyx" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OBRevenge"*) set_colors 1 7 3 - ascii_file="obrevenge" + read -rd '' ascii_data <<'EOF' + +EOF ;; "openbsd_small") set_colors 3 7 6 1 8 - ascii_file="openbsd_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenBSD"*) set_colors 3 7 6 1 8 - ascii_file="openbsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenIndiana"*) set_colors 4 7 1 - ascii_file="openindiana" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenMandriva"*) set_colors 4 3 - ascii_file="openmandriva" + read -rd '' ascii_data <<'EOF' + +EOF ;; "OpenWrt"*) set_colors 4 7 1 - ascii_file="openwrt" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Open Source Media Center"* | "osmc") set_colors 4 7 1 - ascii_file="osmc" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Oracle"*) set_colors 1 7 3 - ascii_file="oracle" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PacBSD"*) set_colors 1 7 3 - ascii_file="pacbsd" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Parabola"*) set_colors 5 7 - ascii_file="parabola" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Pardus"*) set_colors 3 7 6 1 8 - ascii_file="pardus" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Parrot"*) set_colors 6 7 - ascii_file="parrot" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Parsix"*) set_colors 3 1 7 8 - ascii_file="parsix" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PCBSD"* | "TrueOS"*) set_colors 1 7 3 - ascii_file="trueos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PCLinuxOS"*) set_colors 4 7 1 - ascii_file="pclinuxos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Peppermint"*) set_colors 1 7 3 - ascii_file="peppermint" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Pop!_OS"*) set_colors 6 7 - ascii_file="pop_os" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Porteus"*) set_colors 6 7 - ascii_file="porteus" + read -rd '' ascii_data <<'EOF' + +EOF ;; "PostMarketOS"*) set_colors 2 7 - ascii_file="postmarketos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) set_colors 4 7 - ascii_file="puppy" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Qubes"*) set_colors 4 5 7 6 - ascii_file="qubes" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Raspbian"*) set_colors 2 1 - ascii_file="raspbian" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Red Star"* | "Redstar"*) set_colors 1 7 3 - ascii_file="redstar" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Redhat"* | "Red Hat"* | "rhel"*) set_colors 1 7 3 - ascii_file="redhat" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Refracted Devuan"*) set_colors 8 7 - ascii_file="refracta" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Rosa"*) set_colors 4 7 1 - ascii_file="rosa" + read -rd '' ascii_data <<'EOF' + +EOF ;; "sabotage"*) set_colors 4 7 1 - ascii_file="sabotage" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Sabayon"*) set_colors 4 7 1 - ascii_file="sabayon" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SailfishOS"*) set_colors 4 5 7 6 - ascii_file="sailfishos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SalentOS"*) set_colors 2 1 3 7 - ascii_file="salentos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Scientific"*) set_colors 4 7 1 - ascii_file="scientific" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Siduction"*) set_colors 4 4 - ascii_file="siduction" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Slackware"*) set_colors 4 7 1 - ascii_file="slackware" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SliTaz"*) set_colors 3 3 - ascii_file="slitaz" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SmartOS"*) set_colors 6 7 - ascii_file="smartos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Solus"*) set_colors 4 7 1 - ascii_file="solus" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Source Mage"*) set_colors 4 7 1 - ascii_file="source_mage" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Sparky"*) set_colors 1 7 - ascii_file="sparky" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SteamOS"*) set_colors 5 7 - ascii_file="steamos" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SunOS" | "Solaris") set_colors 3 7 - ascii_file="solaris" + read -rd '' ascii_data <<'EOF' + +EOF ;; "openSUSE Tumbleweed"*) set_colors 2 7 - ascii_file="tumbleweed" + read -rd '' ascii_data <<'EOF' + +EOF ;; "openSUSE"* | "open SUSE"* | "SUSE"*) set_colors 2 7 - ascii_file="suse" + read -rd '' ascii_data <<'EOF' + +EOF ;; "SwagArch"*) set_colors 4 7 1 - ascii_file="swagarch" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Tails"*) set_colors 5 7 - ascii_file="tails" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Trisquel"*) set_colors 4 6 - ascii_file="trisquel" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-Budgie"*) set_colors 4 7 1 - ascii_file="ubuntu-budgie" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-GNOME"*) set_colors 4 5 7 6 - ascii_file="ubuntu-gnome" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-MATE"*) set_colors 2 7 - ascii_file="ubuntu-mate" + read -rd '' ascii_data <<'EOF' + +EOF ;; "ubuntu_old") set_colors 1 7 3 - ascii_file="ubuntu_old" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu-Studio") set_colors 6 7 - ascii_file="ubuntu-studio" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Ubuntu"*) set_colors 1 7 3 - ascii_file="ubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "void_small") set_colors 2 8 - ascii_file="void_small" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Void"*) set_colors 2 8 - ascii_file="void" + read -rd '' ascii_data <<'EOF' + +EOF ;; *"[Windows 10]"* | *"on Windows 10"* | "Windows 8"* |\ "Windows 10"* | "windows10" | "windows8" ) set_colors 6 7 - ascii_file="windows10" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Windows"*) set_colors 1 2 4 3 - ascii_file="windows" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Xubuntu"*) set_colors 4 7 1 - ascii_file="xubuntu" + read -rd '' ascii_data <<'EOF' + +EOF ;; "Zorin"*) set_colors 4 6 - ascii_file="zorin" + read -rd '' ascii_data <<'EOF' + +EOF ;; *) From f790170578dd541bcbf2bf5f59f8b6267f79ac90 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:39:24 +1000 Subject: [PATCH 0276/1133] general: Start inlining ascii. --- neofetch | 463 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 435 insertions(+), 28 deletions(-) diff --git a/neofetch b/neofetch index 2b89f8e1e..bf6dbc9ba 100755 --- a/neofetch +++ b/neofetch @@ -4745,14 +4745,49 @@ EOF "CentOS"*) set_colors 3 2 4 5 7 read -rd '' ascii_data <<'EOF' - +${c1} .. + .PLTJ. + <><><><> + ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK + ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK + ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V + ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. +${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. +${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. +${c4} +${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV +${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' + ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' + ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 + ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK + ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK +${c2} <><><><> + 'MKKM' + '' EOF ;; "Chakra"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} _ _ _ "kkkkkkkk. + ,kkkkkkkk., 'kkkkkkkkk, + ,kkkkkkkkkkkk., 'kkkkkkkkk. + ,kkkkkkkkkkkkkkkk,'kkkkkkkk, + ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. + "''"''',;::,,"''kkk''kkkkk; __ + ,kkkkkkkkkk, "k''kkkkk' ,kkkk + ,kkkkkkk' ., ' .: 'kkkk',kkkkkk + ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk + ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk +.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' +;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' +'kkkkkkk; 'kkkkkkkk.,""''"''"" + ''kkkk; 'kkkkkkkkkk., + ';' 'kkkkkkkkkkkk., + ';kkkkkkkkkk' + ';kkkkkk' + "''" EOF ;; @@ -4773,140 +4808,425 @@ EOF "Chrom"*) set_colors 2 1 3 4 7 read -rd '' ascii_data <<'EOF' - +${c1} `.//+osso+/:`` + `/sdNNmhyssssydmNNdo:` + :hNmy+-` .-+hNNs- + /mMh/` `+:` `+dMd: + .hMd- -sNNMNo. /yyy /mMs` + -NM+ `/dMd/--omNh::dMM `yMd` + .NN+ .sNNs:/dMNy:/hNmo/s yMd` + hMs `/hNd+-smMMMMMMd+:omNy- `dMo +:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` +/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: +/Md` MMMMMMMMMMMMMMMMMMMN .MN: +:NN. MMMMMMm....--NMMMMMN -Mm. +`dMo MMMMMMd mMMMMMN hMs + -MN: MMMMMMd mMMMMMN oMm` + :NM: MMMMMMd mMMMMMN +Mm- + -mMy. mmmmmmh dmmmmmh -hMh. + oNNs- :yMm/ + .+mMdo:` `:smMd/` + -ohNNmhsoo++osshmNNh+. + `./+syyhhyys+:`` EOF ;; "Clover"*) set_colors 2 6 read -rd '' ascii_data <<'EOF' - +${c1} `omo``omo` + `oNMMMNNMMMNo` + `oNMMMMMMMMMMMMNo` + oNMMMMMMMMMMMMMMMMNo + `sNMMMMMMMMMMMMMMNs` + `omo` `sNMMMMMMMMMMNs` `omo` + `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` + `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` +oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo +`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` +`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` +oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo + `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` + `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` + `oNs` `sNMMMMMMMMMMNs` `oNs` + `sNMMMMMMMMMMMMMMNs` + +NMMMMMMMMMMMMMMMMNo + `oNMMMMMMMMMMMMNo` + `oNMMMNNMMMNs` + `omo``oNs` EOF ;; "Container Linux by CoreOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ..... + .';:cccccccc:;'. + ':ccccclc${c3}lllllllll${c1}cc:. + .;cccccccc${c3}lllllllllllllll${c1}c, + ;clllccccc${c3}llllllllllllllllll${c1}c, + .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: + ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: + :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, +.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c +.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. +.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. +.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc + :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; + .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc + .cllllllllllclcccclccclccllllcllc + :cllllllllccclcllllllllllllcc; + .cccccccccccccclcccccccccc:. + .;cccclccccccllllllccc,. + .';ccccclllccc:;.. + ..... EOF ;; "crux_small") set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} ___ + (${c3}.· ${c1}| + (${c2}<> ${c1}| + / ${c3}__ ${c1}\\ + ( ${c3}/ \\ ${c1}/| +${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) +${c2}\/${c1}-____${c2}\/ EOF ;; "CRUX"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} odddd + oddxkkkxxdoo + ddcoddxxxdoool + xdclodod olol + xoc xdd olol + xdc ${c2}k00${c1}Okdlol + xxd${c2}kOKKKOkd${c1}ldd + xdco${c2}xOkdlo${c1}dldd + ddc:cl${c2}lll${c1}oooodo + odxxdd${c3}xkO000kx${c1}ooxdo + oxdd${c3}x0NMMMMMMWW0od${c1}kkxo + oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx +docldkXW${c3}MMMMMMMWWN${c1}Odolco +xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c +${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l +${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd +${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo +${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; "debian_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - + ${c1}_____ + / __ \\ +| / | +| \\___- +-_ + --_ EOF ;; "Debian"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c2} _,met$$$$$gg. + ,g$$$$$$$$$$$$$$$P. + ,g$$P" """Y$$.". + ,$$P' `$$$. +',$$P ,ggs. `$$b: +`d$$' ,$P"' ${c1}.${c2} $$$ + $$P d$' ${c1},${c2} $$P + $$: $$. ${c1}-${c2} ,d$$' + $$; Y$b._ _,d$P' + Y$$. ${c1}`.${c2}`"Y$$$$P"' +${c2} `$$b ${c1}"-.__ +${c2} `Y$$ + `Y$$. + `$$b. + `Y$$b. + `"Y$b._ + `""" EOF ;; "Deepin"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} ............ + .';;;;;. .,;,. + .,;;;;;;;. ';;;;;;;. + .;::::::::' .,::;;,''''',. + ,'.:::::::: .;;'. '; + ;' 'cccccc, ,' :: '.. .: + ,, :ccccc. ;: .c, '' :. ,; +.l. cllll' ., .lc :; .l' l. +.c :lllc ;cl: .l' .ll. :' +.l 'looc. . ,o: 'oo' c, +.o. .:ool::coc' .ooo' o. + :: ..... .;dddo ;c + l:... .';lddddo. ,o + lxxxxxdoolllodxxxxxxxxxc :l + ,dxxxxxxxxxxxxxxxxxxl. 'o, + ,dkkkkkkkkkkkkko;. .;o; + .;okkkkkdl;. .,cl:. + .,:cccccccc:,. EOF ;; "DesaOS") set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1}███████████████████████ +███████████████████████ +███████████████████████ +███████████████████████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +██████████████████████████████ +██████████████████████████████ +████████████████████████ +████████████████████████ +████████████████████████ EOF ;; "Devuan"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} ..,,;;;::;,.. + `':ddd;:,. + `'dPPd:,. + `:b$$b`. + 'P$$$d` + .$$$$$` + ;$$$$$P + .:P$$$$$$` + .,:b$$$$$$$;' + .,:dP$$$$$$$$b:' + .,:;db$$$$$$$$$$Pd'` + ,db$$$$$$$$$$$$$$b:'` +:$$$$$$$$$$$$b:'` + `$$$$$bd:''` + `'''` EOF ;; "DracOS"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} `-:/- + -os: + -os/` + :sy+-` + `/yyyy+. + `+yyyyo- + `/yyyys: +`:osssoooo++- +yyyyyy/` + ./yyyyyyo yo`:syyyy+. + -oyyy+ +- :yyyyyo- + `:sy: `. `/yyyyys: + ./o/.` .oyyso+oo:` + :+oo+//::::///:-.` `.` EOF ;; "dragonfly_old"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - + ${c1} | + .-. + ${c3} ()${c1}I${c3}() + ${c1} "==.__:-:__.==" + "==.__/~|~\__.==" + "==._( Y )_.==" + ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. +( ..=${c1}\\=${c1}/${c2}=.. ) + `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` + `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` + .-~` /${c1}|=|${c2}\ `~-. + .~` / ${c1}|=|${c2} \ `~. + .-~` .' ${c1}|=|${c2} `. `~-. + (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) + `~"~"` ${c1} |=|${c2} `"~"~` + ${c1} /=\\ + \\=/ + ^ EOF ;; "dragonfly_small"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c2}(\${c3}"${c2}/) +${c2}(/${c1}|${c2}\) +${c1} | + | EOF ;; "DragonFly"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c2},--, ${c1}| ${c2},--, +${c2}| `-, ${c1},^, ${c2},-' | +${c2} `, `-, ${c3}(/ \) ${c2},-' ,' +${c2} `-, `-,${c1}/ \${c2},-' ,-' +${c2} `------${c1}( )${c2}------' +${c2} ,----------${c1}( )${c2}----------, +${c2} | _,-${c1}( )${c2}-,_ | +${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' +${c1} | | + | | + | | + | | + | | + | | + `|' EOF ;; "Elementary"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee eeeeeeeeeeee eeeee + eeee eeeee eee eeee + eeee eeee eee eeee +eee eee eee eee +eee eee eee eee +ee eee eeee eeee +ee eee eeeee eeeeee +ee eee eeeee eeeee ee +eee eeee eeeeee eeeee eee +eee eeeeeeeeee eeeeee eee + eeeeeeeeeeeeeeeeeeeeeeee eeeee + eeeeeeee eeeeeeeeeeee eeee + eeeee eeeee + eeeeeee eeeeeee + eeeeeeeeeeeeeeeee EOF ;; "Endless"*) set_colors 1 7 read -rd '' ascii_data <<'EOF' - +${c1} `:+yhmNMMMMNmhy+:` + -odMMNhso//////oshNMMdo- + /dMMh+. .+hMMd/ + /mMNo` `oNMm: + `yMMo` `oMMy` + `dMN- -NMd` + hMN. .NMh +/MM/ -os` /MM/ +dMm `smNmmhs/- `:sNMd+ `` mMd +MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM +MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM +dMm `/++/-``/yNNh+/sdNMNddMm- mMd +/MM/ `dNy: `-::- /MM/ + hMN. .NMh + `dMN- -NMd` + `yMMo` `oMMy` + /mMNo` `oNMm/ + /dMMh+. .+hMMd/ + -odMMNhso//////oshNMMdo- + `:+yhmNMMMMNmhy+:` EOF ;; "Exherbo"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} , +OXo. +NXdX0: .cok0KXNNXXK0ko:. +KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... +'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. + cNMk NK .oXM. OMMMMO. 0MMNo kW. + lMc o: ., .oKNk; ;NMMWlxW' + ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO + XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk +.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl +,M: ,XMMWx::,''oOK0x; NM. +'Ml ,kNKOxxxxxkkO0XXKOd:. oMk + NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW + ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW + ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO + 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' + xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd + 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO + :XMNxl,';:lodxkOO000Oxc. .oWMMo + 'dXMMXkl;,. .,o0MMNo' + ':d0XWMMMMWNNNNMMMNOl' + ':okKXWNKkl' EOF ;; "Fedora"* | "RFRemix"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} /:-------------:\\ + :-------------------:: + :-----------${c2}/shhOHbmp${c1}---:\\ + /-----------${c2}omMMMNNNMMD ${c1}---: + :-----------${c2}sMMMMNMNMP${c1}. ---: + :-----------${c2}:MMMdP${c1}------- ---\\ +,------------${c2}:MMMd${c1}-------- ---: +:------------${c2}:MMMd${c1}------- .---: +:---- ${c2}oNMMMMMMMMMNho${c1} .----: +:-- .${c2}+shhhMMMmhhy++${c1} .------/ +:- -------${c2}:MMMd${c1}--------------: +:- --------${c2}/MMMd${c1}-------------; +:- ------${c2}/hMMMy${c1}------------: +:--${c2} :dMNdhhdNMMNo${c1}------------; +:---${c2}:sdNMMMMNds:${c1}------------: +:------${c2}:://:${c1}-------------:: +:---------------------:// EOF ;; "freebsd_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} /\\ _____ /\\ + \\_) (_/ + / \ +| | +| | + \ / + --_____-- EOF ;; "FreeBSD"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - + ${c2}``` ${c1}` + ${c2}` `.....---...${c1}....--.``` -/ + ${c2}+o .--` ${c1}/y:` +. + ${c2} yo`:. ${c1}:o `+- + ${c2}y/ ${c1}-/` -o/ + ${c2}.- ${c1}::/sy+:. + ${c2}/ ${c1}`-- / + ${c2}`: ${c1}:` + ${c2}`: ${c1}:` + ${c2}/ ${c1}/ + ${c2}.- ${c1}-. + ${c2}-- ${c1}-. + ${c2}`:` ${c1}`:` + .-- `--. + .---.....----. EOF ;; @@ -4914,42 +5234,129 @@ EOF # Don't explicitly set colors since # TosWin2 doesn't reset well. read -rd '' ascii_data <<'EOF' - +${c1} ## + ## ######### + #### ## + #### #### ## +#### #### ## ## + #### #### ## ## + #### #### ## ## ## + #### ###### + ###### ## ## #### + #### ################ + #### ## #### + ## #### ###### + ## ## #### #### + ## ## ## ## ## #### + #### ## ## ## EOF ;; "Frugalware"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `++/::-.` + /o+++++++++/::-.` + `o+++++++++++++++o++/::-.` + /+++++++++++++++++++++++oo++/:-.`` + .o+ooooooooooooooooooosssssssso++oo++/:-` + ++osoooooooooooosssssssssssssyyo+++++++o: + -o+ssoooooooooooosssssssssssssyyo+++++++s` + o++ssoooooo++++++++++++++sssyyyyo++++++o: + :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo + `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: + /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss + .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- + ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso + -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. + sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ + :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` + yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ +-ysooooooydhhhhhhhhhhhddddddddddddddddssy + .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: + ``.-/+oosysssssssssssssssssssssss + ``.:/+osyysssssssssssssh. + `-:/+osyyssssyo + .-:+++` EOF ;; "Funtoo"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c2} _______ ____ + /MMMMMMM/ /MMMM| _____ _____ + __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ +|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ +|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| +|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| + |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ + |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ EOF ;; "GalliumOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1}sooooooooooooooooooooooooooooooooooooo+: +yyooooooooooooooooooooooooooooooooo+/::: +yyysoooooooooooooooooooooooooooo+/:::::: +yyyyyoooooooooooooooooooooooo+/::::::::: +yyyyyysoooooooooooooooooo++/:::::::::::: +yyyyyyysoooooooooooooo++/::::::::::::::: +yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: +yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: +yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: +yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: +yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: +yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: +yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: +yyyyyyyyyyyyyyys+:--...........-///::::: +yyyyyyyyyyyys+:--................://:::: +yyyyyyyyyo+:-.....................-//::: +yyyyyyo+:-..........................://: +yyyo+:-..............................-// +o/:-...................................: EOF ;; "gentoo_small") set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} _-----_ +( \\ +\ 0 \\ +${c2} \ ) + / _/ +( _- +\____- EOF ;; "Gentoo"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} -/oyddmdhs+:. + -o${c2}dNMMMMMMMMNNmhy+${c1}-` + -y${c2}NMMMMMMMMMMMNNNmmdhy${c1}+- + `o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/` + om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o` +.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+` + oy${c2}hdmNMMMMMMMN${c1}dyooy${c2}dmddddhhhhyhN${c1}d. + :o${c2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${c1}Mh + .:${c2}+sydNMMMMMNNNmmmdddhhhhhhmM${c1}my + /m${c2}MMMMMMNNNmmmdddhhhhhmMNh${c1}s: + `o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+` + `s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. + /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:` ++M${c2}MMMMMMNNNNNmmmmdmNMNdso${c1}/- +yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` +/h${c2}MMNNNNNNNNMNdhs++/${c1}-` +`/${c2}ohdmmddhys+++/:${c1}.` + `-//////:--. EOF ;; From 473a5986e828b1d957210a7b0fe25434ef7aee40 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:43:28 +1000 Subject: [PATCH 0277/1133] general: Start inlining ascii. --- neofetch | 458 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 432 insertions(+), 26 deletions(-) diff --git a/neofetch b/neofetch index bf6dbc9ba..a22e11205 100755 --- a/neofetch +++ b/neofetch @@ -5363,189 +5363,595 @@ EOF "gNewSense"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} ..,,,,.. + .oocchhhhhhhhhhccoo. + .ochhlllllllc hhhhhh ollllllhhco. + ochlllllllllll hhhllllllhhh lllllllllllhco + .cllllllllllllll hlllllo +hllh llllllllllllllc. +ollllllllllhco'' hlllllo +hllh ``ochllllllllllo +hllllllllc' hllllllllllllh `cllllllllh +ollllllh +llllllllllll+ hllllllo + `cllllh. ohllllllho .hllllc' + ochllc. ++++ .cllhco + `+occooo+. .+ooocco+' + `+oo++++ ++++oo+' EOF ;; "GNU") set_colors fg 7 read -rd '' ascii_data <<'EOF' - +${c1} _-`````-, ,- '- . + .' .- - | | - -. `. + /.' / `. \ +:/ : _... ..._ `` : +:: : /._ .`:'_.._\. || : +:: `._ ./ ,` : \ . _.'' . +`:. / | -. \-. \\_ / + \:._ _/ .' .@) \@) ` `\ ,.' + _/,--' .- .\,-.`--`. + ,'/'' (( \ ` ) + /'/' \ `-' ( + '/'' `._,-----' + ''/' .,---' + ''/' ;: + ''/'' ''/ + ''/''/'' + '/'/' + `; EOF ;; "GoboLinux"*) set_colors 5 4 6 2 read -rd '' ascii_data <<'EOF' - +${c1}_____ _ +/ ____| | | +| | __ ___ | |__ ___ +| | |_ |/ _ \| '_ \ / _ \ +| |__| | (_) | |_) | (_) | + \_____|\___/|_.__/ \___/ EOF ;; "Grombyang"*) set_colors 4 2 1 read -rd '' ascii_data <<'EOF' - +${c1} eeeeeeeeeeee + eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee ${c2}.o+ ${c1}eeee + eeee ${c2}`ooo/ ${c1}eeee + eeee ${c2}`+oooo: ${c1}eeee +eee ${c2}`+oooooo: ${c1}eee +eee ${c2}-+oooooo+: ${c1}eee +ee ${c2}`/:oooooooo+: ${c1}ee +ee ${c2}`/+ +++ +: ${c1}ee +ee ${c2}+o+\ ${c1}ee +eee ${c2}+o+\ ${c1}eee +eee ${c2}// \\ooo/ \\\ ${c1}eee + eee ${c2}//++++oooo++++\\\ ${c1}eee + eeee ${c2}::::++oooo+::::: ${c1}eeee + eeeee ${c3}Grombyang OS ${c1} eeee + eeeeeeeeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeee EOF ;; "GuixSD"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - +${c1} .. `. + `--..```..` `..```..--` + .-:///-:::. `-:::///:-. + ````.:::` `:::.```` + -//:` -::- + ://: -::- + `///- .:::` + -+++-:::. + :+/:::- + `-....` EOF ;; "Haiku"*) set_colors 2 8 read -rd '' ascii_data <<'EOF' - +${c2} :dc' + 'l:;'${c1},${c2}'ck. .;dc:. + co ${c1}..${c2}k. .;; ':o. + co ${c1}..${c2}k. ol ${c1}.${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. +.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. + ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; + ..${c1}oOolllllccccccc:::::${c2}od; + cx:ooc${c1}:::::::;${c2}cooolcX. + cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. + cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. + .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. + '::c'${c1}...${c2}do${c1}..... .${c2}K, + cd,.${c1}....:${c2}O,${c1} + ':clod:'${c1} + ${c1} EOF ;; "Hyperbola"*) set_colors 8 read -rd '' ascii_data <<'EOF' - +${c1} WW + KX W + WO0W NX0O + NOO0NW WNXK0OOKW + W0OOOOOOOOOOOOKN + N0OOOOOOO0KXW + WNXXXNW + NXK00000KN + WNK0OOOOOOOOOO0W + NK0OOOOOOOOOOOOOO0W + X0OOOOOOO00KK00OOOOOK + X0OOOO0KNWW WX0OO0W + X0OO0XNW KOOW + N00KNW KOW + NKXN W0W +WW W EOF ;; "Kali"*) set_colors 4 8 read -rd '' ascii_data <<'EOF' - +${c1}.............. + ..,;:ccc,. + ......''';lxO. +.....''''..........,:ld; + .';;;:::;,,.x, + ..'''. 0Xxoc:,. ... + .... ,ONkc;,;cokOdc',. + . OMo ':${c2}dd${c1}o. + dMc :OO; + 0M. .:o. + ;Wd + ;XO, + ,d0Odlc;,.. + ..',;:cdOOd::,. + .:d;.':;. + 'd, .' + ;l .. + .o + c + .' + . EOF ;; "KaOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} .. + ..... ..OSSAAAAAAA.. + .KKKKSS. .SSAAAAAAAAAAA. +.KKKKKSO. .SAAAAAAAAAA... +KKKKKKS. .OAAAAAAAA. +KKKKKKS. .OAAAAAA. +KKKKKKS. .SSAA.. +.KKKKKS..OAAAAAAAAAAAA........ + DKKKKO.=AA=========A===AASSSO.. + AKKKS.==========AASSSSAAAAAASS. + .=KKO..========ASS.....SSSSASSSS. + .KK. .ASS..O.. =SSSSAOSS: + .OK. .ASSSSSSSO...=A.SSA. + .K ..SSSASSSS.. ..SSA. + .SSS.AAKAKSSKA. + .SSS....S.. EOF ;; "KDE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} `..---+/---..` + `---.`` `` `.---.` + .--.` `` `-:-. + `:/: `.----//----.` :/- + .:. `---` `--.` .:` + .:` `--` .:- `:. + `/ `:. `.-::-.` -:` `/` + /. /. `:++++++++:` .: .: +`/ .: `+++++++++++/ /` `+` +/+` -- .++++++++++++` :. .+: +`/ .: `+++++++++++/ /` `+` + /` /. `:++++++++:` .: .: + ./ `:. `.:::-.` -:` `/` + .:` `--` .:- `:. + .:. `---` `--.` .:` + `:/: `.----//----.` :/- + .-:.` `` `-:-. + `---.`` `` `.---.` + `..---+/---..` EOF ;; "Kogaion"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ;; ,; + ;;; ,;; + ,;;;; ;;;; + ,;;;;;;;; ;;;; + ;;;;;;;;;;; ;;;;; + ,;;;;;;;;;;;; ';;;;;, + ;;;;;;;;;;;;;;, ';;;;;;; + ;;;;;;;;;;;;;;;;;, ';;;;; +; ';;;;;;;;;;;;;;;;;;, ;;; +;;;, ';;;;;;;;;;;;;;;;;;;,;; +;;;;;, ';;;;;;;;;;;;;;;;;;, +;;;;;;;;, ';;;;;;;;;;;;;;;;, +;;;;;;;;;;;;, ';;;;;;;;;;;;;; +';;;;;;;;;;;;; ';;;;;;;;;;;;; + ';;;;;;;;;;;;;, ';;;;;;;;;;; + ';;;;;;;;;;;;; ;;;;;;;;;; + ';;;;;;;;;;;; ;;;;;;;; + ';;;;;;;; ;;;;;; + ';;;;; ;;;; + ';;; ;; EOF ;; "Korora"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} ____________ + _add55555555554${c1}: + _w?'${c1}``````````'${c2})k${c1}: + _Z'${c1}`${c2} ]k${c1}: + m(${c1}`${c2} )k${c1}: + _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: + .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` + jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` + jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` +.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` +:#${c1}:${c2} ${c1}`${c2})e${c1}``` +:m${c1}:${c2} ,#'${c1}` +:#${c1}:${c2} .s2'${c1}` +:m,________.aa7^${c1}` +:#baaaaaaas!J'${c1}` + ``````````` EOF ;; "KSLinux"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' +${c1} K K U U RRRR ooo + K K U U R R o o + KKK U U RRRR o o + K K U U R R o o + K K UUU R R ooo +${c2} SSS AAA W W AAA + S A A W W A A + SSS AAAAA W W W AAAAA + S A A WW WW A A + SSS A A W W A A EOF ;; "Kubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `.:/ossyyyysso/:. + .:oyyyyyyyyyyyyyyyyyyo:` + -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- + -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- + oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo + `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` + oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- +oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy +oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- + oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo + `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo + oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo + -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- + -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- + ./oyyyyyyyyyyyyyyyyyyo/. + `.:/oosyyyysso/:.` EOF ;; "LEDE"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - + ${c1} _________ + / /\ + / LE / \ + / DE / \ + /________/ LE \ + \ \ DE / + \ LE \ / + \ DE \ / + \________\/ EOF ;; "Linux") set_colors fg 8 3 read -rd '' ascii_data <<'EOF' - +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### EOF ;; "LMDE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - + ${c2}`.-::---.. +${c1} .:++++ooooosssoo:. + .+o++::. `.:oos+. +${c1} :oo:.` -+oo${c2}: +${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` +${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` +${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: +${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` +${c1}`s: `oo s m Myy+-o:` +`oo :+sdoohyoydyso/. + :o. .:////////++: +${c1} `/++ ${c2}-:::::- +${c1} ${c2}`${c1}++- +${c1} ${c2}`${c1}/+- +${c1} ${c2}.${c1}+/. +${c1} ${c2}.${c1}:+-. + `--.`` EOF ;; "Lubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `-/+oyyhhhhyyo+/-` + ./shhhhhhhhhhhhhhhhhhs/. + `:shhhhhhhhhhhhhhhhhhhhhhhhs:` + :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: + `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` + `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` + shhhhhhhhy+. .ohhhhhhhhhhhhhs +:hhhhhhy/. /hhhhhhhhhhhhh: +shhhy/. :hhhhhhhhhhhhs +hy+. ` `+yhs/` +hhhhhhhhhhhh +-.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh +shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs +:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: + shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs + `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` + +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` + :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: + :shhhhhhhhhhhhhhhhhhhhhy`+s:` + .+shhhhhhhhhhhhhhhhhhs:` + `-/+oyyhhhhyys+/-` EOF ;; "Lunar"*) set_colors 4 7 3 read -rd '' ascii_data <<'EOF' - +${c1}`-. `-. + -ohys/-` `:+shy/` + -omNNdyo/` :+shmNNy/` + ${c3} - + /mMmo + hMMMN` + .NMMs + ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` + /:.` ${c3}/${c1} `.:/` +${c3} __ + | | _ _ ___ ___ ___ + | |__| | | | .'| _| + |_____|___|_|_|__,|_| EOF ;; "mac"*"_small") set_colors 2 3 1 5 4 read -rd '' ascii_data <<'EOF' - +${c1} .:' + _ :'_ +${c2} .'`_`-'_``. +:________.-' +${c3}:_______: +:_______: +${c4} :_______`-; +${c5} `._.-._.' EOF ;; "mac" | "Darwin") set_colors 2 3 1 1 5 4 read -rd '' ascii_data <<'EOF' - +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. EOF ;; "Mageia"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} .°°. + °° .°°. + .°°°. °° + . . + °°° .°°°. + .°°°. '___' +${c2} .${c1}'___' ${c2} . + :dkxc;'. ..,cxkd; + .dkk. kkkkkkkkkk .kkd. +.dkk. ';cloolc;. .kkd +ckk. .kk; +xO: cOd +xO: lOd +lOO. .OO: +.k00. .00x + .k00; ;00O. + .lO0Kc;,,,,,,;c0KOc. + ;d00KKKKKK00d; + .,KKKK,. EOF ;; "MagpieOS"*) set_colors 2 1 3 5 read -rd '' ascii_data <<'EOF' - +${c1} ;00000 :000Ol + .x00kk00: O0kk00k; + l00: :00. o0k :O0k. + .k0k. x${c2}d$dddd${c1}k' .d00; + k0k. ${c2}.dddddl ${c1}o00, + o00. ${c2}':cc:. ${c1}d0O +.00l ,00. +l00. d0x +k0O .:k0o +O0k ;dO0000d. +k0O .O0O${c2}xxxxk${c1}00: +o00. k0O${c2}dddddd${c1}occ +'00l x0O${c2}dddddo${c3};..${c1} + x00. .x00${c2}kxxd${c3}:..${c1} + .O0x .:oxxx${c4}Okl.${c1} + .x0d ${c4},xx,${c1} + .:o. ${c4}.xd ckd${c1} + .. ${c4}dxl .xx; + :xxolldxd' + ;oxdl. EOF ;; "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1}██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ EOF ;; "Maui"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} `.-://////:--` + .:/oooooooooooooooo+:. + `:+ooooooooooooooooooooooo:` + `:oooooooooooooooooooooooooooo/` + ..```-oooooo/-`` `:oooooo+:.` `-- + :. +oo+-` /ooo/` -/ + -o. `o+- +o/` -o: +`oo` ::` :o/ `+. .+o` /oo. +/o+ . -+oo- ` /oo/ `ooo/ ++o- /ooo+` .+ooo. :ooo+ +++ .+oooo: -oooo+ `oooo+ +:. .oooooo` :ooooo- :oooo: +` .oooooo: :ooooo+ `ooo+-` + .+oooooo` -oooooo: `o/- + +oooooo: .ooooooo. + /ooooooo` /ooooooo/ .. + `:oooooooo/:::/ooooooooo+:--:/:` + `:+oooooooooooooooooooooo+:` + .:+oooooooooooooooo+:. + `.-://////:-.` EOF ;; "Mer"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} dMs + .-` + `y`-o+` + ``NMMy + .--`:++. + .hNNNNs + /MMMMMN + `ommmd/ +/ + ```` +/ + `:+sssso/-` + .-::. `-::-` `smNMNmdmNMNd/ .://-` +.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo +dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- +MMm yMM- :MMs NMN` `:::::--sMMh dMM` +MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` +NNd sNN- -NNs -mMNs-.--..:dMMh` dNN +--- .--` `--. .smMMmdddmMNdo` .-- + ./ohddds+:` + +h- `.:-. + ./`.dMMMN+ + +MMMMMd + `+dmmy- + ``` .+` + .dMNo-y. + `hmm/ + .:` + dMs EOF ;; "Minix"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c2} -sdhyo+:-` -/syymm: + sdyooymmNNy. `` .smNmmdysNd + odyoso+syNNmysoyhhdhsoomNmm+/osdm/ + :hhy+-/syNNmddhddddddmNMNo:sdNd: + `smNNdNmmNmddddddddddmmmmmmmy` + `ohhhhdddddmmNNdmddNmNNmdddddmdh- + odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: + `+mNho:` smmd/ sNNh :dmms` -+ymmo. +-od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: ++sms -.` :so: .NN+ :os/ .-`mNh: +.-hyh+:////- -sNNd:` .--://ohNs- + `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ + -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: + //oydNMMMMydMMNysNMMmsMMMMMNyo/` + ../-yNMMy--/::/-.sMMmos+.` + -+oyhNsooo+omy/``` + `::ohdmds-` EOF ;; From bdad66511a43ab29fd0e7981fbb6b9ba7823b22e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:48:02 +1000 Subject: [PATCH 0278/1133] general: Start inlining ascii. --- neofetch | 631 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 599 insertions(+), 32 deletions(-) diff --git a/neofetch b/neofetch index a22e11205..8a5eeb91e 100755 --- a/neofetch +++ b/neofetch @@ -5958,231 +5958,798 @@ EOF "Linux Mint"* | "LinuxMint"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. +MMm----::-://////////////oymNMd+` +MMd ${c2}/++ ${c1}-sNMd: +MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: +ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm + NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM + NMm ${c2}dMM` ..` ... ydm. ${c1}dMM + hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM + -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM + -dMNs-${c2}``-::::-------.`` ${c1}dMM + `/dMNmy+/:-------------:/yMMM + ./ydNMMMMMMMMMMMMMMMMMMMMM + .MMMMMMMMMMMMMMMMMMM EOF ;; "MX"*) set_colors 4 6 7 read -rd '' ascii_data <<'EOF' - +${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM +MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM +MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM +MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM +MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM +MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM +MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM +MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM +MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM +MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM +MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM +MMMMMMMNo` :mMMN+` `-hMMMMMMMM +MMMMMMh. `oNMMd: `/mMMMMMM +MMMMm/ -hMd- `sNMMMM +MMNs` - :dMMM +Mm: `oMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM EOF ;; "NetBSD"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} `-/oshdmNMNdhyo+:-` +${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` +${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` + ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` + ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` + ${c2}-N/${c1}hMMMMMMMMMmho:` + ${c2}-N/${c1}-:/++/:.` +${c2} :M+ + :Mo + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms EOF ;; "Netrunner"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} .:oydmMMMMMMmdyo:` + -smMMMMMMMMMMMMMMMMMMds- + +mMMMMMMMMMMMMMMMMMMMMMMMMd+ + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ + `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` + .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` + dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh ++MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ +mMMMMMMMMd+:.` `mMMMMMMMMMMMMd +MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM +mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd ++MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ + dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh + `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` + `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: + +dMMMMMMMMMMMMMMMMMMMMMMMMd/ + -odMMMMMMMMMMMMMMMMMMdo- + `:+ydmNMMMMNmhy+-` EOF ;; "Nitrux"*) set_colors 4 read -rd '' ascii_data <<'EOF' - +${c1}`:/. +`/yo +`/yo +`/yo .+:. +`/yo .sys+:.` +`/yo `-/sys+:.` +`/yo ./sss+:.` +`/yo .:oss+:-` +`/yo ./o///:-` +`/yo `.-:///////:` +`/yo `.://///++//-`` +`/yo `.-:////++++/-` +`/yo `-://///++o+/-` +`/yo `-/+o+++ooo+/-` +`/s+:+oooossso/.` +`//+sssssso:. +`+syyyy+:` +:+s+- EOF ;; "nixos_small") set_colors 4 6 read -rd '' ascii_data <<'EOF' - + ${c1}\\\\ \\\\ // + ==\\\\__\\\\/ // + // \\\\// +==// //== + //\\\\___// +// /\\\\ \\\\== + // \\\\ \\\\ EOF ;; "NixOS"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' - +${c1} ::::. ${c2}'::::: ::::' +${c1} '::::: ${c2}':::::. ::::' +${c1} ::::: ${c2}'::::.::::: +${c1} .......:::::..... ${c2}:::::::: +${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. + ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' +${c2} ..... ::::' ${c1}:::::' +${c2} ::::: '::' ${c1}:::::' +${c2} ........::::: ' ${c1}:::::::::::. +${c2}::::::::::::: ${c1}::::::::::::: +${c2} ::::::::::: ${c1}.. ${c1}::::: +${c2} .::::: ${c1}.::: ${c1}::::: +${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... + ::::: ${c1}':::::. ${c2}......:::::::::::::' + ::: ${c1}::::::. ${c2}':::::::::::::::::' +${c1} .:::::::: ${c2}':::::::::: +${c1} .::::''::::. ${c2}'::::. +${c1} .::::' ::::. ${c2}'::::. +${c1} .:::: :::: ${c2}'::::. EOF ;; "Nurunner"*) set_colors 4 read -rd '' ascii_data <<'EOF' - +${c1} ,xc + ;00cxXl + ;K0, .xNo. + :KO' .lXx. + cXk. ;xl cXk. + cXk. ;k:.,xo. cXk. + .lXx. :x::0MNl,dd. :KO, + .xNx. cx;:KMMMMMNo'dx. ;KK; + .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: +;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO + 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: + .kNo .xo'xWMMMMMM0;:O: ;KK; + .dXd. .do,oNMMO;ck: ;00, + oNd. .dx,;'cO; ;K0, + oNx. okk; ;K0, + lXx. :KO' + cKk' cXk. + ;00:lXx. + ,kd. EOF ;; "NuTyX"*) set_colors 4 1 read -rd '' ascii_data <<'EOF' - +${c1} . + . + ... + ... + .... .........--. + ..-++-----....--++++++---. + .-++++++-. .-++++++++++++-----.. + .--... .++..-+++--.....-++++++++++--.. + . .-+-. .**- .... ..-+----.. + .+++. .*+. + -++-----. + .+++++- ++. .*+. .....-+++-----. + -+++-++. .+. .-+***++***++--++++. . + -+-. -- -. -*- ...... ..--. +.-. .+- . -+. +. .+- +. + -- -- + -+----. .- + -++-.+. . + .++. -- + +. ----. + . .+. .. + - . + . EOF ;; "OBRevenge"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} __ __ + _@@@@ @@@g_ + _@@@@@@ @@@@@@ + _@@@@@@M W@@@@@@_ + j@@@@P ^W@@@@ + @@@@L____ _____Q@@@@ +Q@@@@@@@@@@j@@@@@@@@@@ +@@@@@ T@j@ T@@@@@ +@@@@@ ___Q@J@ _@@@@@ +@@@@@fMMM@@j@jggg@@@@@@ +@@@@@ j@j@^MW@P @@@@ +Q@@@@@ggg@@f@ @@@@@@L +^@@@@WWMMP ^ Q@@@@ + @@@@@_ _@@@@l + W@@@@@g_____g@@@@@P + @@@@@@@@@@@@@@@@l + ^W@@@@@@@@@@@P + ^TMMMMTll EOF ;; "openbsd_small") set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - +${c1} _____ + \\- -/ + \\_/ \\ + | ${c2}O O${c1} | + |_ < ) 3 ) + / \\ / + /-_____-\\ EOF ;; "OpenBSD"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - + ${c3} _ + (_) +${c1} | . +${c1} . |L /| . ${c3} _ +${c1} _ . |\ _| \--+._/| . ${c3}(_) +${c1} / ||\| Y J ) / |/| ./ + J |)'( | ` F`.'/ ${c3} _ +${c1} -<| F __ .-< ${c3}(_) +${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ + J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ +${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) +${c1} '-F -<_. \\ .-' `-' L__ +__J _ _. >-' ${c1})${c4}._. ${c1}|-' +${c1} `-|.' /_. ${c4}\_| ${c1} F + /.- . _.< + /' /.' .' `\\ + /L /' |/ _.-'-\\ + /'J ___.---'\| + |\ .--' V | `. ` + |/`. `-. `._) + / .-.\\ + \\ ( `\\ + `.\ EOF ;; "OpenIndiana"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' +${c2} .sy/ + .yh+ + ${c1}-+syyyo+- ${c2} /+. + ${c1}+ddo/---/sdh/ ${c2} ym- + ${c1}`hm+ `sms${c2} ym-```````.-. + ${c1}sm+ sm/ ${c2} ym- +s + ${c1}hm. /mo ${c2} ym- /h + ${c1}omo ym: ${c2} ym- `os` + ${c1}smo` .ym+ ${c2} ym- .os- + `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. + ..` ${c1}`:+oo+/-` ${c2} -//oyo- + -:` .:oys/. ++- `./oyys/. +h+` `.-:+oyyyo/-` +`/ossssysso+/-.` EOF ;; "OpenMandriva"*) set_colors 4 3 read -rd '' ascii_data <<'EOF' - +${c2} `` + `-. +${c1} ` ${c2}.--- +${c1} -/ ${c2}-::--` +${c1} `++ ${c2}`----...```-:::::. +${c1} `os. ${c2}.::::::::::::::-``` ` ` +${c1} +s+ ${c2}.::::::::::::::::---...--` +${c1}-ss: ${c2}`-::::::::::::::::-.``.`` +${c1}/ss- ${c2}.::::::::::::-.`` ` +${c1}+ss: ${c2}.::::::::::::- +${c1}/sso ${c2}.::::::-::::::- +${c1}.sss/ ${c2}-:::-.` .::::: +${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: +${c1} -ossso+/:://+/-` ${c2}.:` +${c1} -/+ooo+/-. ${c2}` EOF ;; "OpenWrt"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} _______ +| |.-----.-----.-----. +| - || _ | -__| | +|_______|| __|_____|__|__| + |__| + ________ __ +| | | |.----.| |_ +| | | || _|| _| +|________||__| |____| EOF ;; "Open Source Media Center"* | "osmc") set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} -+shdmNNNNmdhs+- + .+hMNho/:..``..:/ohNMh+. + :hMdo. .odMh: + -dMy- -yMd- + sMd- -dMs + hMy +. .+ yMh + yMy dMs. .sMd yMy +:Mm dMNMs` `sMNMd `mM: +yM+ dM//mNs``sNm//Md +My +mM- dM: +NNNN+ :Md -Mm +mM- dM: `oNN+ :Md -Mm +yM+ dM/+NNo` :Md +My +:Mm` dMMNs` :Md `mM: + yMy dMs` -ms yMy + hMy +. yMh + sMd- -dMs + -dMy- -yMd- + :hMdo. .odMh: + .+hMNho/:..``..:/ohNMh+. + -+shdmNNNNmdhs+- EOF ;; "Oracle"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} + `-/+++++++++++++++++/-.` + `/syyyyyyyyyyyyyyyyyyyyyyys/. + :yyyyo/-...............-/oyyyy/ + /yyys- .oyyy+ +.yyyy` `syyy- +:yyyo /yyy/ +.yyyy` `syyy- + /yyys. .oyyyo + /yyyyo:-...............-:oyyyy/` + `/syyyyyyyyyyyyyyyyyyyyyyys+. + `.:/+ooooooooooooooo+/:.` EOF ;; "PacBSD"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} :+sMs. + `:ddNMd- -o--` + -sMMMMh: `+N+`` + yMMMMMs` .....-/-... `mNh/ + yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm + yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm + :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd + +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- + :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. + .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- + /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` +.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- +:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` +/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. +:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` +:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` + sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. + :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// + /dMMMMMMMMMMMMMs- ````````..`` + .oMMMMMMMMMMMMNs` ./y:` + +dNMMNMMMMMMMmy` ``./ys. + `/hMMMMMMMMMMMNo-`` `.+yy+-` + `-/hmNMNMMMMMMmmddddhhy/-` + `-+oooyMMMdsoo+/:. EOF ;; "Parabola"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} `.-. `. + `.` `:++. `-+o+. + `` `:+/. `:+/. `-+oooo+ + ``-::-.:+/. `:+/. `-+oooooo+ + `.-:///- ..` .-. `-+oooooooo- + `..-..` `+ooooooooo: +`` :oooooooo/ + `ooooooo: + `oooooo: + -oooo+. + +ooo/` + -ooo- + `+o/. + /+- + //` + -. EOF ;; "Pardus"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - +${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. +/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ +mN. oMdyy- -y `-dMo .Nm +.mN+` sMy hN+ -: yMs `+Nm. + `yMMddMs.dy `+` sMddMMy` + +MMMo .` . oMMM+ + `NM/ `````.` `.````` +MN` + yM+ `.-:yhomy ymohy:-.` +My + yM: yo oy :My + +Ms .N` `N. +h sM+ + `MN - -::::::- : :o:+`NM` + yM/ sh -dMMMMd- ho +y+My + .dNhsohMh-//: /mm/ ://-yMyoshNd` + `-ommNMm+:/. oo ./:+mMNmmo:` + `/o+.-somNh- :yy: -hNmos-.+o/` + ./` .s/`s+sMdd+``+ddMs+s`/s. `/. + : -y. -hNmddmNy. .y- : + -+ `..` +- EOF ;; "Parrot"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} `:oho/-` +`mMMMMMMMMMMMNmmdhy- + dMMMMMMMMMMMMMMMMMMs` + +MMsohNMMMMMMMMMMMMMm/ + .My .+dMMMMMMMMMMMMMh. + + :NMMMMMMMMMMMMNo + `yMMMMMMMMMMMMMm: + /NMMMMMMMMMMMMMy` + .hMMMMMMMMMMMMMN+ + ``-NMMMMMMMMMd- + /MMMMMMMMMMMs` + mMMMMMMMsyNMN/ + +MMMMMMMo :sNh. + `NMMMMMMm -o/ + oMMMMMMM. + `NMMMMMM+ + +MMd/NMh + mMm -mN` + /MM `h: + dM` . + :M- + d: + -+ + - EOF ;; "Parsix"*) set_colors 3 1 7 8 read -rd '' ascii_data <<'EOF' - + ${c2}-/+/:. + ${c2}.syssssys. + ${c1}.--. ${c2}ssssssssso${c1} ..--. + :++++++: ${c2}+ssssssss+${c1} ./++/+++: + /+++++++++.${c2}.yssooooy`${c1}-+///////o- + /++++++++++.${c2}+soooos:${c1}:+////////+- + :+++++////o-${c2}oooooo-${c1}+/////////- + `-/++//++-${c4}.-----.-${c1}:+/////:- + ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. +${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- +${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ +${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- + `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` + ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. + ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: + ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ + ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: + ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- + ${c1}`--` ${c2}+sssssssso ${c1}`--` + ${c2}+sssssy+` + ${c2}`.::-` EOF ;; "PCBSD"* | "TrueOS"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} .. + s. + +y + yN + -MN `. + :NMs `m + .yMMm` `No + `-/+++sdMMMNs+-`+Ms + `:oo+-` .yMMMMy` `-+oNMh + -oo- +NMMMM/ oMMh- + .s+` ` oMMMMM/ - oMMMhy. + +s`- :: :MMMMMd -o `mMMMy`s+ + y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y + s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s +-h .NM` `hMMMMMMMMMMMMMMNMMNy: h- +y- hMN` hMMmMMMMMMMMMNsdMNs. -y +m` mMMy` oMMNoNMMMMMMo` sMMMo `m +m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m +h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h +:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: + y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y + `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` + so -NMMMN /mmd+ `dMMMMMMMm- os + :y: `yMMM` `+NMMMMMMNo`:y: + /s+`.omy /NMMMMMNh/.+s: + .+oo:-. /mdhs+::oo+. + -/o+++++++++++/- EOF ;; "PCLinuxOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - + ${c1}mhhhyyyyhhhdN + dyssyhhhhhhhhhhhssyhN + Nysyhhyo/:-.....-/oyhhhssd + Nsshhy+. `/shhysm + dohhy/ -shhsy + dohhs` /hhys +N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy +ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ ++hho ${c2}ymm- /mmy+mms ${c1}:hhod +/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh ++hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m +yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ + ohhy` ${c2}://` -/+++/- ${c1}ohhom + N+hhy- `shhoh + sshho. `+hhyom + dsyhhs/. `:ohhhoy + dysyhhhso///://+syhhhssh + dhyssyhhhhhhyssyyhN + mddhdhdmN EOF ;; "Peppermint"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} 8ZZZZZZ${c2}MMMMM +${c1} .ZZZZZZZZZ${c2}MMMMMMM. +${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ +${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM +${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. +${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI +${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM +${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM +${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM +${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM +${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM +${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M +${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 +${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 +${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 +${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z +${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM +${c1} NZZZZZZZZZZZ${c2}MMMMM +${c1} ZZZZZZZZZ${c2}MM) EOF ;; "Pop!_OS"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} ///////////// + ///////////////////// + ///////${c2}*767${c1}//////////////// + //////${c2}7676767676*${c1}////////////// + /////${c2}76767${c1}//${c2}7676767${c1}////////////// + /////${c2}767676${c1}///${c2}*76767${c1}/////////////// + ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// +/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// +//////////${c2}76767676767${c1}////${c2}76767${c1}///////// +///////////${c2}76767676${c1}//////${c2}7676${c1}////////// +////////////,${c2}7676${c1},///////${c2}767${c1}/////////// +/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// +///////////////${c2}7676${c1}//////////////////// + ///////////////${c2}7676${c1}///${c2}767${c1}//////////// + //////////////////////${c2}'${c1}//////////// + //////${c2}.7676767676767676767,${c1}////// + /////${c2}767676767676767676767${c1}///// + /////////////////////////// + ///////////////////// + ///////////// EOF ;; "Porteus"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} `.-:::-.` + -+ydmNNNNNNNmdy+- + .+dNmdhs+//////+shdmdo. + .smmy+-` ./sdy: + `omdo. `.-/+osssso+/-` `+dy. + `yms. `:shmNmdhsoo++osyyo-``oh. + hm/ .odNmds/.` ``.....:::-+s +/m: `+dNmy:` `./oyhhhhyyooo++so +ys `yNmy- .+hmmho:-.` ``` +s: yNm+` .smNd+. +`` /Nm: +dNd+` + yN+ `smNy. + dm oNNy` + hy -mNm. + +y oNNo + `y` sNN: + `: +NN: + ` .mNo + /mm` + /my` + .sy` + .+: + ` EOF ;; "PostMarketOS"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} ss + `hMMh` + .dMMMMd. + -NMMMMMMN- + /MMMMMMMMMN/ + hMMMMMMMMMMMo + y+`mMMmdNMMMMMMy + `dMM-.-:- .mMMMMMMh` + .mMMMMMMd` `dMMMMMMm. + :NMMMMMMy yMMMMMMN: + /MMMMMMMo oMMMmdmN/ + oMMMMMMM/ /MN.-/:-. + `yMMMMMMN- -:.NMMMMy` + `dMMMMMMM- -/////////////dMMMMMMd` + -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- + :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: ++MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ EOF ;; "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' - +${c1} `-/osyyyysosyhhhhhyys+- + -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ + yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy +.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ +-NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ +.Nm+shddyooo+/smNNNNmmmmNh. :mmd. + NNNNy:` ./hmmmmmmmNNNN: hNMh + NMN- -++- +NNNNNNNNNNm+..-sMMMM- +.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ +.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ + mMM+ .. `sNN+. hMMMMhhMMM- + +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy + yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` + sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` + :mMMMMMMMMMMMmddNMMMMMMMMmh/ + /dMMMMMMMMMMMMMMMMMMNdy/` + .+hNMMMMMMMMMNmdhs/. + .:/+ooo+/:-. EOF ;; "Qubes"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} `..--..` + `.----------.` + `..----------------..` + `.------------------------.`` + `..-------------....-------------..` +.::----------..`` ``..----------:+: +:////:----..` `..---:/ossso +:///////:` `/osssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:////////-` .:sssssssso +:///////////-.` `-/osssssssssso +`//////////////:-```.:+ssssssssssssso- + .-://////////////sssssssssssssso/-` + `.:///////////sssssssssssssso:. + .-:///////ssssssssssssssssss/` + `.:////ssss+/+ssssssssssss. + `--//- `-/osssso/. EOF ;; "Raspbian"*) set_colors 2 1 read -rd '' ascii_data <<'EOF' - +${c1} `.::///+:/-. --///+//-:`` + `+oooooooooooo: `+oooooooooooo: + /oooo++//ooooo: ooooo+//+ooooo. + `+ooooooo:-:oo- +o+::/ooooooo: + `:oooooooo+`` `.oooooooo+- + `:++ooo/. :+ooo+/.` + ${c2}...` `.----.` ``.. + .::::-``:::::::::.`-:::-` + -:::-` .:::::::-` `-:::- + `::. `.--.` `` `.---.``.::` + .::::::::` -::::::::` ` + .::` .:::::::::- `::::::::::``::. +-:::` ::::::::::. ::::::::::.`:::- +:::: -::::::::. `-:::::::: :::: +-::- .-:::-.``....``.-::-. -::- + .. `` .::::::::. `..`.. + -:::-` -::::::::::` .:::::` + :::::::` -::::::::::` :::::::. + .::::::: -::::::::. :::::::: + `-:::::` ..--.` ::::::. + `...` `...--..` `...` + .:::::::::: + `.-::::-` EOF ;; "Red Star"* | "Redstar"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} .. + .oK0l + :0KKKKd. + .xKO0KKKKd + ,Od' .d0000l + .c;. .'''... ..'. +.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: +;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. + .okkkkd,.lko .......',;:cllc:;,,'''''. + .cdo. :xd' cd:. ..';'',,,'',,;;;,'. + . .ddl.;doooc'..;oc;'..';::;,'. + coo;.oooolllllllcccc:'. . + .ool''lllllccccccc:::::;. + ;lll. .':cccc:::::::;;;;' + :lcc:'',..';::::;;;;;;;,,. + :cccc::::;...';;;;;,,,,,,. + ,::::::;;;,'. ..',,,,'''. + ........ ...... EOF ;; "Redhat"* | "Red Hat"* | "rhel"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} `.-..........` + `////////::.`-/. + -: ....-////////. + //:-::///////////` + `--::: `-://////////////: + //////- ``.-:///////// .` + `://////:-.` :///////::///:` + .-/////////:---/////////////: + .-://////////////////////. +${c2} yMN+`.-${c1}::///////////////-` +${c2} .-`:NMMNMs` `..-------..` + MN+/mMMMMMhoooyysshsss +MMM MMMMMMMMMMMMMMyyddMMM+ + MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM + MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM + MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM EOF ;; From e1f478f1d6257435093bb2c17bcab48717ca7c08 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:52:59 +1000 Subject: [PATCH 0279/1133] general: Start inlining ascii. --- neofetch | 609 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 579 insertions(+), 30 deletions(-) diff --git a/neofetch b/neofetch index 8a5eeb91e..0098fbc64 100755 --- a/neofetch +++ b/neofetch @@ -6756,203 +6756,684 @@ EOF "Refracted Devuan"*) set_colors 8 7 read -rd '' ascii_data <<'EOF' - +${c2} A + VW + VVW\\ + .yWWW\\ + ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ + *WWWWWWWWWWWWWWWW/ $VWWWWw , + ^*%WWWWWWVWWX $WWWW** ,yy + , "**WWW/' **' ,yy/WWW*` + &WWWWwy `*` <,ywWW%VWWW* + yWWWWWWWWWW* ., "**WW%W + ,&WWWWWM*"` ,y/ &WWWww ^* + XWWX*^ ,yWWWW09 .WWWWWWWWwy, + *` &WWWWWM WWWWWWWWWWWWWww, + (WWWWW` /#####WWW*********** + ^WWWW + VWW + Wh. + V/ EOF ;; "Rosa"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ROSAROSAROSAROSAR + ROSA AROS + ROS SAROSAROSAROSAR AROS + RO ROSAROSAROSAROSAROSAR RO + ARO AROSAROSAROSARO AROS ROS + ARO ROSAROS OSAR ROSA ROS + RO AROSA ROSAROSAROSA ROSAR RO +RO ROSAR ROSAROSAROSAR R ROSARO RO +RO ROSA AROSAROSAROSA AR ROSARO AR +RO AROS ROSAROSAROSA ROS AROSARO AR +RO AROS ROSAROSARO ROSARO ROSARO AR +RO ROS AROSAROS ROSAROSA AROSAR AR +RO ROSA ROS ROSAROSAR ROSARO RO + RO ROS AROSAROSAROSA ROSARO AR + ARO ROSA ROSAROSAROS AROSAR ARO + ARO OROSA R ROSAROS ROS + RO AROSAROS AROSAROSAR RO + AROS AROSAROSAROSARO AROS + ROSA SARO + ROSAROSAROSAROSAR EOF ;; "sabotage"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' +${c2} .|'''.| | '||''|. ..|''|| + ||.. ' ||| || || .|' || + ''|||. | || ||'''|. || || +. '|| .''''|. || || '|. || +|'....|' .|. .||. .||...|' ''|...|' +|''||''| | ..|'''.| '||''''| + || ||| .|' ' || . + || | || || .... ||''| + || .''''|. '|. || || + .||. .|. .||. ''|...'| .||.....| EOF ;; "Sabayon"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ........... + .. .. + .. .. + .. ${c2}o ${c1}.. + .. ${c2}:W' ${c1}.. + .. ${c2}.d. ${c1}.. +:. ${c2}.KNO ${c1}.: +:. ${c2}cNNN. ${c1}.: +: ${c2}dXXX, ${c1}: +: ${c2}. dXXX, .cd, ${c1}: +: ${c2}'kc .. dKKK. ,ll;:' ${c1}: +: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: +:. ${c2}.,cdddddddddddddo:. ${c1}.: + .. ${c2}:lllllll: ${c1}.. + .. ${c2}',,,,, ${c1}.. + .. .. + .. .. + ............... EOF ;; "SailfishOS"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c1} .+eWWW + .+ee+++eee e. + .ee++eeeeeeee +e. + .e++ee++eeeeeee+eee+e+ + ee.e+.ee+eee++eeeeee+ + W.+e.e+.e++ee+eee + W.+e.W.ee.W++ee' + +e.W W.e+.W.W+ + W.e.+e.W W W. + e e e +e.W.W + .W W W. + W.+e.W. + W++e.ee+. + ++ +ee++eeeee++. + ' '+++e 'ee. + ee + ee + e EOF ;; "SalentOS"*) set_colors 2 1 3 7 read -rd '' ascii_data <<'EOF' - +${c1} ``..`` + .-:+oshdNMMMMMMNdhyo+:-.` + -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ +${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` +${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- +${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` +${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` +${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd +${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy +${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo +${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ +${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- +${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` +${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm +${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy +${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: +${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. +${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: +${c2} `:smMM${c4}yy${c3}MMNy/` + ${c2}.- ${c4}`${c3}:. EOF ;; "Scientific"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} =/;;/- + +: // + /; /; + -X H. +.//;;;:;;-, X= :+ .-;:=;:;#;. +M- ,=;;;#:, ,:#;;:=, ,@ +:# :#.=/++++/=.$= #= + ,#; #/:+/;,,/++:+/ ;+. + ,+/. ,;@+, ,#H;, ,/+, + ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; + ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. + ,;: :@#= =$H: .+#- + ,#= #;-///==///-// =#, +;+ :#-;;;:;;;;-X- +: +@- .-;;;;M- =M/;;;-. -X + :;;::;;-. #- :+ ,-;;-;:== + ,X H. + ;/ #= + // +; + '////' EOF ;; "Siduction"*) set_colors 4 4 read -rd '' ascii_data <<'EOF' - +${c1} _aass, + jQh: =$w + QWmwawQW + )$QQQQ@( .. + _a_a. ~??^ syDY?Sa, + _mW>-<$c jWmi imm. + ]QQwayQE 4QQmgwmQQ` + ?WWQWP' -9QQQQQ@'._aas, + _a%is. .adYYs,. -"?!` aQB*~^3$c +_Qh;.nm .QWc. {QL ]QQp;..vmQ/ +"QQmmQ@ -QQQggmQP ]QQWmggmQQ( + -???" "$WQQQY` __, ?QQQQQQW! + _yZ!?q, - .yWY!!Sw, "???^ + .QQa_=qQ mQm>..vmm + $QQWQQP $QQQgmQQ@ + "???" _aa, -9WWQQWY` + _mB>~)$a -~~ + mQms_vmQ. + ]WQQQQQP + -?T??" EOF ;; "Slackware"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} ::::::: + ::::::::::::::::::: + ::::::::::::::::::::::::: + ::::::::${c2}cllcccccllllllll${c1}:::::: + :::::::::${c2}lc dc${c1}::::::: + ::::::::${c2}cl clllccllll oc${c1}::::::::: + :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: + ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: + :::::::::::${c2}lc cclccclc${c1}::::::::::::: +::::::::::::::${c2}lcclcc lc${c1}:::::::::::: +::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: +::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: + :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: + :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: + ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: + :::${c2}oclcccccccccccccllllllllllllll${c1}::::: + ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: + :::::::::::::::::::::::::::::::: + :::::::::::::::::::::::::::: + :::::::::::::::::::::: + :::::::::::: EOF ;; "SliTaz"*) set_colors 3 3 read -rd '' ascii_data <<'EOF' - +${c1} @ @( @ + @@ @@ @ @/ + @@ @@ @@ @@ + @@ %@@ @@ @@ + @@ %@@@ @@@@@. @@@@ @@ + @@@ @@@@ @@@@@@@ &@@@ @@@ + @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ + ,@@@@@@@@@@@@@@@@@@@@@@@@@ + .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ +@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ +@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ +@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. +@@ ,@@ @@@@@@@@@@@@@ @@@ @@ +@ @@. @@@@@@@@@@@@@ @@@ *@ +@ @@ @@@@@@@@@@@@ @@ @ + @ @@@@@@@@@. #@ + @ ,@@@@@ @ EOF ;; "SmartOS"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyys oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyy syyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy yyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy EOF ;; "Solus"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} -``````````` + `-+/------------.` + .---:mNo---------------. + .-----yMMMy:---------------. + `------oMMMMMm/----------------` + .------/MMMMMMMN+----------------. + .------/NMMMMMMMMm-+/--------------. +`------/NMMMMMMMMMN-:mh/-------------` +.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. +-----/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- +----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. +.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` +`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. +`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ + .------------:://+-/++++++${c1}oshddys: + -hhhhyyyyyyyyyyyhhhhddddhysssso- + `:ossssssyysssssssssssssssso:` + `:+ssssssssssssssssssss+- + `-/+ssssssssssso+/-` + `.-----..` EOF ;; "Source Mage"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} :ymNMNho. +.+sdmNMMMMMMMMMMy` +.-::/yMMMMMMMMMMMm- + sMMMMMMMMMMMm/ + /NMMMMMMMMMMMMMm: + .MMMMMMMMMMMMMMMMM: + `MMMMMMMMMMMMMMMMMN. + NMMMMMMMMMMMMMMMMMd + mMMMMMMMMMMMMMMMMMMo + hhMMMMMMMMMMMMMMMMMM. + .`/MMMMMMMMMMMMMMMMMs + :mMMMMMMMMMMMMMMMN` + `sMMMMMMMMMMMMMMM+ + /NMMMMMMMMMMMMMN` + oMMMMMMMMMMMMM+ + ./sd.-hMMMMMMMMmmN` + ./+oyyyh- `MMMMMMMMMmNh + sMMMMMMMMMmmo + `NMMMMMMMMMd: + -dMMMMMMMMMo + -shmNMMms. EOF ;; "Sparky"*) set_colors 1 7 read -rd '' ascii_data <<'EOF' - +${c1} + . `-:-` + .o` .-///-` + `oo` .:/++:. + os+` -/+++:` ``.........``` + /ys+`./+++/-.-::::::----......`` + `syyo`++o+--::::-::/+++/-`` + -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` +::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` +`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` + -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- + .sdddy::syo--/:. `.:dy+-ohhho ./: + :yddds/:+oo+//:-`- /+ +hy+.shhy: `` + `:ydmmdysooooooo-.ss`/yss--oyyo + `./ossyyyyo+:-/oo:.osso- .oys + ``..-------::////.-oooo/ :so + `...----::::::::--.`/oooo: .o: + ``````` ++o+:` `:` + ./+/-` ` + `-:-. + `` EOF ;; "SteamOS"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} .,,,,. + .,'onNMMMMMNNnn',. + .'oNMANKMMMMMMMMMMMNNn'. + .'ANMMMMMMMXKNNWWWPFFWNNMNn. + ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, + ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, +,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, +'${c2}+#############, +. ,+' ${c1}+NMMM +${c2} '*#########*' '*,,*' ${c1}.+NMMMM. +${c2} `'*###*' ,.,;###${c1}+WNM, +${c2} .,;;, .;##########${c1}+W +${c2},',. '; ,+##############' + '###+. :,. .,; ,###############' + '####.. `'' .,###############' + '#####+++################' + '*##################*' + ''*##########*'' + '''''' EOF ;; "SunOS" | "Solaris") set_colors 3 7 read -rd '' ascii_data <<'EOF' - +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. EOF ;; "openSUSE Tumbleweed"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c2} ...... + .,cdxxxoc,. .:kKMMMNWMMMNk:. + cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. + ;WMK;. .lKMMNM, :NMK, .OMW; + cMW; 'WMMMN ,XMK, oMM' +.MMc ..;l. xMN: KM0 +'MM. 'NMO oMM +.MM, .kMMl xMN + KM0 .kMM0. .dl:,.. .WMd + .XM0. ,OMMK, OMMMK. .XMK + oWMO:. .;xNMMk, NNNMKl. .xWMx + :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, + ..... .:dOOXXKOxl, EOF ;; "openSUSE"* | "open SUSE"* | "SUSE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c2} .;ldkO0000Okdl;. + .;d00xl:^''''''^:ok00d;. + .d00l' 'o00d. + .d0Kd'${c1} Okxol:;,. ${c2}:O0d. + .OK${c1}KKK0kOKKKKKKKKKKOxo:, ${c2}lKO. + ,0K${c1}KKKKKKKKKKKKKKK0P^${c2},,,${c1}^dx:${c2} ;00, +.OK${c1}KKKKKKKKKKKKKKKk'${c2}.oOPPb.${c1}'0k.${c2} cKO. +:KK${c1}KKKKKKKKKKKKKKK: ${c2}kKx..dd ${c1}lKd${c2} 'OK: +dKK${c1}KKKKKKKKKOx0KKKd ${c2}^0KKKO' ${c1}kKKc${c2} dKd +dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd +:KK${c1}KKKKKKKKKK0o;...^cdxxOK0O/^^' ${c2}.0K: + kKK${c1}KKKKKKKKKKKKK0x;,,......,;od ${c2}lKk + '0K${c1}KKKKKKKKKKKKKKKKKKKK00KKOo^ ${c2}c00' + 'kK${c1}KKOxddxkOO00000Okxoc;'' ${c2}.dKk' + l0Ko. .c00l' + 'l0Kk:. .;xK0l' + 'lkK0xl:;,,,,;:ldO0kl' + '^:ldxkkkkxdl:^' EOF ;; "SwagArch"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} .;ldkOKXXNNNNXXK0Oxoc,. + ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; + 'K0xo ..,;:c:. `'lKMMMMM0 + .lONMMMMMM' `lNMk' +${c2} ;WMMMMMMMMMO. ${c1}....::... +${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, +${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. +${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. +${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: +${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. +${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: +${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. +${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. + :ccc:' `cccccccc:, + '' EOF ;; "Tails"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' - +${c1} `` + ./yhNh +syy/Nshh `:o/ +N:dsNshh █ `ohNMMd +N-/+Nshh `yMMMMd +N-yhMshh yMMMMd +N-s:hshh █ yMMMMd so//. +N-oyNsyh yMMMMd d Mms. +N:hohhhd:. yMMMMd syMMM+ +Nsyh+-..+y+- yMMMMd :mMM+ ++hy- -ss/`yMMMM `+d+ + :sy/. ./yNMMMMm `` + .+ys- `:+hNMMMMMMy/` + `hNmmMMMMMMMMMMMMdo. + dMMMMMMMMMMMMMMMMMNh: + +hMMMMMMMMMMMMMMMMMmy. + -oNMMMMMMMMMMmy+.` + `:yNMMMds/.` + .//` EOF ;; "Trisquel"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' - +${c1} ▄▄▄▄▄▄ + ▄█████████▄ + ▄▄▄▄▄▄ ████▀ ▀████ + ▄██████████▄ ████▀ ▄▄ ▀███ + ▄███▀▀ ▀▀████ ███▄ ▄█ ███ +▄███ ▄▄▄ ████▄ ▀██████ ▄███ +███ █▀▀██▄ █████▄ ▀▀ ▄████ +▀███ ███ ███████▄▄ ▄▄██████ +${c1} ▀███▄ ▄███ █████████████${c2}████▀ +${c1} ▀█████████ ███████${c2}███▀▀▀ + ▀▀███▀▀ ██████▀▀ + ██████▀ ▄▄▄▄ + █████▀ ████████ + █████ ███▀ ▀███ + ████▄ ██▄▄▄ ███ + █████▄ ▀▀ ▄██ + ██████▄▄▄████ + ▀▀█████▀▀ EOF ;; "Ubuntu-Budgie"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c2} ./oydmMMMMMMmdyo/. + :smMMMMMMMMMMMhs+:++yhs: + `omMMMMMMMMMMMN+` `odo` + /NMMMMMMMMMMMMN- `sN/ + `hMMMMmhhmMMMMMMh sMh` + .mMmo- /yMMMMm` `MMm. + mN/ yMMMMMMMd- MMMm +oN- oMMMMMMMMMms+//+o+: :MMMMo +m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm +M` .NMMMMMMMMMMMMMMMNodMMMMMMM +M- sMMMMMMMMMMMMMMMMMMMMMMMMM +mm` mMMMMMMMMMNdhhdNMMMMMMMMMm +oMm/ .dMMMMMMMMh: :dMMMMMMMo + mMMNyo/:/sdMMMMMMMMM+ sMMMMMm + .mMMMMMMMMMMMMMMMMMs `NMMMm. + `hMMMMMMMMMMM.oo+. `MMMh` + /NMMMMMMMMMo sMN/ + `omMMMMMMMMy. :dmo` + :smMMMMMMMh+-` `.:ohs: + ./oydmMMMMMMdhyo/. EOF ;; "Ubuntu-GNOME"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - +${c3} ./o. + .oooooooo + .oooo```soooo + .oooo` `soooo + .ooo` ${c4}.o.${c3} `\/ooo. + :ooo ${c4}:oooo.${c3} `\/ooo. + sooo ${c4}`ooooo${c3} \/oooo + \/ooo ${c4}`soooo${c3} `ooooo + `soooo ${c4}`\/ooo${c3} `soooo +${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo +${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` +${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` +${c4} `ooooo ${c3}`` ${c4}.oooo +${c4} `soooo. .oooo` + `\/oooooooooo` + ``\/oo`` EOF ;; "Ubuntu-MATE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' - +${c1} `:+shmNNMMNNmhs+:` + .odMMMMMMMMMMMMMMMMMMdo. + /dMMMMMMMMMMMMMMMmMMMMMMMMd/ + :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: + `yMMMMMMMMMms:..-::oM: -omMMMMMy` + `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` + hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh +/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ +hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh +/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ + hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh + `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` + yMMMMMMMMMms/..-::oM: .+dMMMMMy + :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: + /dMMMMMMMMMMMMMMMdNMMMMMMMd/ + .odMMMMMMMMMMMMMMMMMMdo. + `:+shmNNMMNNmhs+:` EOF ;; "ubuntu_old") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} ./+o+- +${c2} yyyyy- ${c1}-yyyyyy+ +${c2} ${c2}://+//////${c1}-yyyyyyo +${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` +${c3} .:++o: ${c2}/++++++++/:--:/- +${c3} o:+o+:++.${c2}`..```.-/oo+++++/ +${c3} .:+o:+o/.${c2} `+sssoo+/ +${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. +${c2}/+++//+:${c3}`oo+o${c2} /::--:. +${c2}+/+o+++${c3}`o++o${c1} ++////. +${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. +${c3} .+.o+oo:.${c1} `oddhhhh+ +${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ +${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: +${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` +${c1} /osyyyyyyo${c3}++ooo+++/ +${c1} ````` ${c3}+oo+++o: +${c3} `oo++. EOF ;; "Ubuntu-Studio") set_colors 6 7 read -rd '' ascii_data <<'EOF' - +${c1} ..-::::::-.` + `.:+++++++++++${c2}ooo${c1}++:.` + ./+++++++++++++${c2}sMMMNdyo${c1}+/. + .++++++++++++++++${c2}oyhmMMMMms${c1}++. + `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` + `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` + +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` + :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: + ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. + ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ + :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: + +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ + `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` + `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ + ./+++++++++++++++${c2}oyhdNMMMms${c1}++. + ./+++++++++++++${c2}hMMMNdyo${c1}+/. + `.:+++++++++++${c2}sso${c1}++:. + ..-::::::-.. EOF ;; "Ubuntu"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - +${c1} .-/+oossssoo+/-. + `:+ssssssssssssssssss+:` + -+ssssssssssssssssssyyssss+- + .ossssssssssssssssss${c2}dMMMNy${c1}sssso. + /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ + +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ +.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. ++ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ +oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso +oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso ++ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ +.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ + +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ + /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ + .ossssssssssssssssss${c2}dMMMNy${c1}sssso. + -+sssssssssssssssss${c2}yyy${c1}ssss+- + `:+ssssssssssssssssss+:` + .-/+oossssoo+/-. EOF ;; "void_small") set_colors 2 8 read -rd '' ascii_data <<'EOF' - +${c1} _______ + _ \______ - +| \ ___ \ | +| | / \ | | +| | \___/ | | +| \______ \_| + -_______\ EOF ;; "Void"*) set_colors 2 8 read -rd '' ascii_data <<'EOF' - +${c1} __.;=====;.__ + _.=+==++=++=+=+===;. + -=+++=+===+=+=+++++=_ + . -=:`` `--==+=++==. + _vi, ` --+=++++: + .uvnvi. _._ -==+==+. + .vvnvnI` .;==|==;. :|=||=|. +${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL +${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE +${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' +${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! +${c1} -1vvnvv. `~+++` ++|+++ + +vnvnnv, `-|=== + +vnvnvns. . :=- + -Invnvvnsi..___..=sv=. ` + +Invnvnvnnnnnnnnvvnn;. + ~|Invnvnvvnvvvnnv}+` + -~|{*l}*|~ EOF ;; @@ -6960,28 +7441,96 @@ EOF "Windows 10"* | "windows10" | "windows8" ) set_colors 6 7 read -rd '' ascii_data <<'EOF' +${c1} .., + ....,,:;+ccllll + ...,,+:; cllllllllllllllllll +,cclllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +`'ccllllllllll lllllllllllllllllll + `' \\*:: :ccllllllllllllllll + ````''*::cll + `` EOF ;; "Windows"*) set_colors 1 2 4 3 read -rd '' ascii_data <<'EOF' - +${c1} ,.=:!!t3Z3z., + :tt:::tt333EE3 +${c1} Et:::ztt33EEEL${c2} @Ee., .., +${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# +${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL +${c1} it::::tt333EEF${c2} @EEEEEEttttt33F +${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. +${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF +${c3} ;::::::::zt33)${c2} "4EEEtttji3P* +${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. +${c3} i::::::::zt33F${c4} AEEEtttt::::ztF +${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 +${c3} E::::::::zt33L${c4} @EEEtttt::::z3F +${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` +${c3} `${c4} :EEEEtttt::::z7 + "VEzjt:;;z>*` EOF ;; "Xubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - +${c1} `-/osyhddddhyso/-` + .+yddddddddddddddddddy+. + :yddddddddddddddddddddddddy: + -yddddddddddddddddddddhdddddddy- + odddddddddddyshdddddddh`dddd+ydddo + `yddddddhshdd- ydddddd+`ddh.:dddddy` + sddddddy /d. :dddddd-:dy`-ddddddds +:ddddddds /+ .dddddd`yy`:ddddddddd: +sdddddddd` . .-:/+ssdyodddddddddds +ddddddddy `:ohddddddddd +dddddddd. +dddddddd +sddddddy ydddddds +:dddddd+ .oddddddd: + sdddddo ./ydddddddds + `yddddd. `:ohddddddddddy` + oddddh/` `.:+shdddddddddddddo + -ydddddhyssyhdddddddddddddddddy- + :yddddddddddddddddddddddddy: + .+yddddddddddddddddddy+. + `-/osyhddddhyso/-` EOF ;; "Zorin"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' +${c1} `osssssssssssssssssssso` + .osssssssssssssssssssssso. + .+oooooooooooooooooooooooo+. + + + `::::::::::::::::::::::. .:` + `+ssssssssssssssssss+:.` `.:+ssso` +.ossssssssssssssso/. `-+ossssssso. +ssssssssssssso/-` `-/osssssssssssss +.ossssssso/-` .-/ossssssssssssssso. + `+sss+:. `.:+ssssssssssssssssss+` + `:. .::::::::::::::::::::::` + + .+oooooooooooooooooooooooo+. + -osssssssssssssssssssssso- + `osssssssssssssssssssso` EOF ;; From 2f50cf2071ea76ad425e43e5d7c17bcdbae823fc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:55:34 +1000 Subject: [PATCH 0280/1133] general: Start inlining ascii. --- neofetch | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 105 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 0098fbc64..77960085a 100755 --- a/neofetch +++ b/neofetch @@ -7538,32 +7538,131 @@ EOF case "$kernel_name" in *"BSD") set_colors 1 7 4 3 6 - ascii_file="bsd" + read -rd '' ascii_data <<'EOF' +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) +EOF ;; "Darwin") set_colors 2 3 1 1 5 4 - ascii_file="mac" + read -rd '' ascii_data <<'EOF' +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. +EOF ;; "GNU"*) set_colors fg 7 - ascii_file="gnu" + read -rd '' ascii_data <<'EOF' +${c1} _-`````-, ,- '- . + .' .- - | | - -. `. + /.' / `. \ +:/ : _... ..._ `` : +:: : /._ .`:'_.._\. || : +:: `._ ./ ,` : \ . _.'' . +`:. / | -. \-. \\_ / + \:._ _/ .' .@) \@) ` `\ ,.' + _/,--' .- .\,-.`--`. + ,'/'' (( \ ` ) + /'/' \ `-' ( + '/'' `._,-----' + ''/' .,---' + ''/' ;: + ''/'' ''/ + ''/''/'' + '/'/' + `; +EOF ;; "Linux") set_colors fg 8 3 - ascii_file="linux" + read -rd '' ascii_data <<'EOF' +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### +EOF ;; "SunOS") set_colors 3 7 - ascii_file="solaris" + read -rd '' ascii_data <<'EOF' +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. +EOF ;; "IRIX"*) set_colors 4 7 - ascii_file="irix" + read -rd '' ascii_data <<'EOF' +${c1} ./ohmNd/ +dNmho/- + `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. + `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` + -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. + `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` ++mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ +dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd +oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ +.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. + hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh + /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: + `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd + `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` + `yNMMNho-yMMMM` NMMMm.+hNMMNh` + -MMMMd: oMMMM. NMMMh :hMMMM- + -yNMMMmooMMMM- NMMMyomMMMNy- + .omMMMMMMMM-`NMMMMMMMmo. + `:hMMMMMM. NMMMMMh/` + .odNm+ /dNms. +EOF ;; esac ;; From 1d3a4478f6e38b6f8e1854eacd50fdaf7460f194 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 14:59:37 +1000 Subject: [PATCH 0281/1133] general: Start inlining ascii. --- neofetch | 62 +++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 14 deletions(-) diff --git a/neofetch b/neofetch index 77960085a..8ea185e9f 100755 --- a/neofetch +++ b/neofetch @@ -4794,20 +4794,6 @@ EOF "ChaletOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - -EOF - ;; - - "Chapeau"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' - -EOF - ;; - - "Chrom"*) - set_colors 2 1 3 4 7 - read -rd '' ascii_data <<'EOF' ${c1} `.//+osso+/:`` `/sdNNmhyssssydmNNdo:` :hNmy+-` .-+hNNs- @@ -4831,6 +4817,54 @@ ${c1} `.//+osso+/:`` EOF ;; + "Chapeau"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} .-/-. + ////////. + ////////${c2}y+${c1}//. + ////////${c2}mMN${c1}/////. + ////////${c2}mMN+${c1}////////. + ////////////////////////. + /////////+${c2}shhddhyo${c1}+////////. + ////////${c2}ymMNmdhhdmNNdo${c1}///////. +///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. +///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// +//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// +//////${c2}+MMmssssssssssssss+${c1}/////// +`//////${c2}yMMy${c1}//////////////////// + `//////${c2}smMNhso++oydNm${c1}//////// + `///////${c2}ohmNMMMNNdy+${c1}/////// + `//////////${c2}++${c1}////////// + `////////////////. + -////////- +EOF + ;; + + "Chrom"*) + set_colors 2 1 3 4 7 + read -rd '' ascii_data <<'EOF' +${c2} .,:loool:,. + .,coooooooooooooc,. + .,lllllllllllllllllllll,. + ;ccccccccccccccccccccccccc; +${c1} '${c2}ccccccccccccccccccccccccccccc. +${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: +${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. +${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d +${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 +${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 +${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d +${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. +${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; +${c1} .:ccccccccllllllllo${c3}O0000000OOO, +${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. +${c1} '::ccccccccc${c3}dOOOOOOOkx:. +${c1} ..,::cccc${c3}xOOOkkko;. +${c1} ..,:${c3}dOkxl:. +EOF + ;; + "Clover"*) set_colors 2 6 read -rd '' ascii_data <<'EOF' From 64fa49c0f11dc10fc4ce932e64aae29cf55c4633 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:04:15 +1000 Subject: [PATCH 0282/1133] general: Remove old files --- ascii/distro/aix | 20 ------------ ascii/distro/alpine | 20 ------------ ascii/distro/alpine_small | 6 ---- ascii/distro/amazon | 19 ----------- ascii/distro/anarchy | 28 ---------------- ascii/distro/android | 18 ----------- ascii/distro/antergos | 19 ----------- ascii/distro/antix | 13 -------- ascii/distro/aosc | 20 ------------ ascii/distro/apricity | 18 ----------- ascii/distro/arch | 19 ----------- ascii/distro/arch_old | 16 --------- ascii/distro/arch_small | 7 ---- ascii/distro/arch_xferience | 19 ----------- ascii/distro/archbox | 19 ----------- ascii/distro/archlabs | 21 ------------ ascii/distro/archmerge | 20 ------------ ascii/distro/arcolinux | 20 ------------ ascii/distro/artix | 19 ----------- ascii/distro/arya | 15 --------- ascii/distro/bitrig | 18 ----------- ascii/distro/blag | 17 ---------- ascii/distro/blankon | 17 ---------- ascii/distro/bsd | 19 ----------- ascii/distro/bunsenlabs | 20 ------------ ascii/distro/calculate | 20 ------------ ascii/distro/centos | 19 ----------- ascii/distro/chakra | 18 ----------- ascii/distro/chaletos | 20 ------------ ascii/distro/chapeau | 18 ----------- ascii/distro/chrome | 18 ----------- ascii/distro/cloveros | 20 ------------ ascii/distro/coreos | 20 ------------ ascii/distro/crux | 18 ----------- ascii/distro/crux_small | 7 ---- ascii/distro/debian | 17 ---------- ascii/distro/debian_small | 6 ---- ascii/distro/deepin | 18 ----------- ascii/distro/desaos | 16 --------- ascii/distro/devuan | 15 --------- ascii/distro/dracos | 13 -------- ascii/distro/dragonflybsd | 15 --------- ascii/distro/dragonflybsd_old | 18 ----------- ascii/distro/dragonflybsd_small | 4 --- ascii/distro/elementary | 17 ---------- ascii/distro/endless | 21 ------------ ascii/distro/exherbo | 22 ------------- ascii/distro/fedora | 17 ---------- ascii/distro/freebsd | 15 --------- ascii/distro/freebsd_small | 7 ---- ascii/distro/frugalware | 23 ------------- ascii/distro/funtoo | 11 ------- ascii/distro/galliumos | 19 ----------- ascii/distro/gem | 15 --------- ascii/distro/gentoo | 18 ----------- ascii/distro/gentoo_small | 7 ---- ascii/distro/gnewsense | 12 ------- ascii/distro/gnu | 18 ----------- ascii/distro/gobolinux | 6 ---- ascii/distro/grombyang | 18 ----------- ascii/distro/guixsd | 10 ------ ascii/distro/haiku | 17 ---------- ascii/distro/hyperbola | 16 --------- ascii/distro/irix | 19 ----------- ascii/distro/kali | 21 ------------ ascii/distro/kaos | 16 --------- ascii/distro/kde | 19 ----------- ascii/distro/kogaion | 20 ------------ ascii/distro/korora | 16 --------- ascii/distro/kslinux | 11 ------- ascii/distro/kubuntu | 20 ------------ ascii/distro/lede | 9 ------ ascii/distro/linux | 12 ------- ascii/distro/lmde | 17 ---------- ascii/distro/lubuntu | 20 ------------ ascii/distro/lunar | 13 -------- ascii/distro/mac | 18 ----------- ascii/distro/mac_small | 8 ----- ascii/distro/mageia | 19 ----------- ascii/distro/magpieos | 20 ------------ ascii/distro/manjaro | 14 -------- ascii/distro/maui | 20 ------------ ascii/distro/mer | 27 ---------------- ascii/distro/minix | 17 ---------- ascii/distro/mint | 16 --------- ascii/distro/mx | 17 ---------- ascii/distro/netbsd | 17 ---------- ascii/distro/netrunner | 20 ------------ ascii/distro/nitrux | 18 ----------- ascii/distro/nixos | 19 ----------- ascii/distro/nixos_small | 7 ---- ascii/distro/nurunner | 19 ----------- ascii/distro/nutyx | 23 ------------- ascii/distro/obrevenge | 18 ----------- ascii/distro/openbsd | 23 ------------- ascii/distro/openbsd_small | 7 ---- ascii/distro/openindiana | 16 --------- ascii/distro/openmandriva | 15 --------- ascii/distro/openwrt | 9 ------ ascii/distro/oracle | 12 ------- ascii/distro/osmc | 20 ------------ ascii/distro/pacbsd | 24 -------------- ascii/distro/parabola | 16 --------- ascii/distro/pardus | 18 ----------- ascii/distro/parrot | 24 -------------- ascii/distro/parsix | 21 ------------ ascii/distro/pclinuxos | 19 ----------- ascii/distro/peppermint | 19 ----------- ascii/distro/pop_os | 21 ------------ ascii/distro/porteus | 23 ------------- ascii/distro/postmarketos | 17 ---------- ascii/distro/puppy | 18 ----------- ascii/distro/qubes | 21 ------------ ascii/distro/raspbian | 23 ------------- ascii/distro/redhat | 16 --------- ascii/distro/redstar | 18 ----------- ascii/distro/refracta | 19 ----------- ascii/distro/rosa | 20 ------------ ascii/distro/sabayon | 18 ----------- ascii/distro/sabotage | 12 ------- ascii/distro/sailfishos | 18 ----------- ascii/distro/salentos | 20 ------------ ascii/distro/scientific | 20 ------------ ascii/distro/siduction | 21 ------------ ascii/distro/slackware | 21 ------------ ascii/distro/slitaz | 17 ---------- ascii/distro/smartos | 17 ---------- ascii/distro/solaris | 8 ----- ascii/distro/solus | 20 ------------ ascii/distro/source_mage | 21 ------------ ascii/distro/sparky | 21 ------------ ascii/distro/steamos | 18 ----------- ascii/distro/suse | 18 ----------- ascii/distro/swagarch | 15 --------- ascii/distro/tails | 19 ----------- ascii/distro/trisquel | 18 ----------- ascii/distro/trueos | 27 ---------------- ascii/distro/tumbleweed | 13 -------- ascii/distro/ubuntu | 20 ------------ ascii/distro/ubuntu-budgie | 20 ------------ ascii/distro/ubuntu-gnome | 16 --------- ascii/distro/ubuntu-mate | 20 ------------ ascii/distro/ubuntu-studio | 20 ------------ ascii/distro/ubuntu_old | 19 ----------- ascii/distro/void | 18 ----------- ascii/distro/void_small | 7 ---- ascii/distro/windows | 16 --------- ascii/distro/windows10 | 19 ----------- ascii/distro/xubuntu | 20 ------------ ascii/distro/zorin | 17 ---------- config/travis.conf | 55 ------------------------------- neofetch | 57 +++++++++++++++++++++++++++++++++ 152 files changed, 57 insertions(+), 2634 deletions(-) delete mode 100644 ascii/distro/aix delete mode 100644 ascii/distro/alpine delete mode 100644 ascii/distro/alpine_small delete mode 100644 ascii/distro/amazon delete mode 100644 ascii/distro/anarchy delete mode 100644 ascii/distro/android delete mode 100644 ascii/distro/antergos delete mode 100644 ascii/distro/antix delete mode 100644 ascii/distro/aosc delete mode 100644 ascii/distro/apricity delete mode 100644 ascii/distro/arch delete mode 100644 ascii/distro/arch_old delete mode 100644 ascii/distro/arch_small delete mode 100644 ascii/distro/arch_xferience delete mode 100644 ascii/distro/archbox delete mode 100644 ascii/distro/archlabs delete mode 100644 ascii/distro/archmerge delete mode 100644 ascii/distro/arcolinux delete mode 100644 ascii/distro/artix delete mode 100644 ascii/distro/arya delete mode 100644 ascii/distro/bitrig delete mode 100644 ascii/distro/blag delete mode 100644 ascii/distro/blankon delete mode 100644 ascii/distro/bsd delete mode 100644 ascii/distro/bunsenlabs delete mode 100644 ascii/distro/calculate delete mode 100644 ascii/distro/centos delete mode 100644 ascii/distro/chakra delete mode 100644 ascii/distro/chaletos delete mode 100644 ascii/distro/chapeau delete mode 100644 ascii/distro/chrome delete mode 100644 ascii/distro/cloveros delete mode 100644 ascii/distro/coreos delete mode 100644 ascii/distro/crux delete mode 100644 ascii/distro/crux_small delete mode 100644 ascii/distro/debian delete mode 100644 ascii/distro/debian_small delete mode 100644 ascii/distro/deepin delete mode 100644 ascii/distro/desaos delete mode 100644 ascii/distro/devuan delete mode 100644 ascii/distro/dracos delete mode 100644 ascii/distro/dragonflybsd delete mode 100644 ascii/distro/dragonflybsd_old delete mode 100644 ascii/distro/dragonflybsd_small delete mode 100644 ascii/distro/elementary delete mode 100644 ascii/distro/endless delete mode 100644 ascii/distro/exherbo delete mode 100644 ascii/distro/fedora delete mode 100644 ascii/distro/freebsd delete mode 100644 ascii/distro/freebsd_small delete mode 100644 ascii/distro/frugalware delete mode 100644 ascii/distro/funtoo delete mode 100644 ascii/distro/galliumos delete mode 100644 ascii/distro/gem delete mode 100644 ascii/distro/gentoo delete mode 100644 ascii/distro/gentoo_small delete mode 100644 ascii/distro/gnewsense delete mode 100644 ascii/distro/gnu delete mode 100644 ascii/distro/gobolinux delete mode 100644 ascii/distro/grombyang delete mode 100644 ascii/distro/guixsd delete mode 100644 ascii/distro/haiku delete mode 100644 ascii/distro/hyperbola delete mode 100644 ascii/distro/irix delete mode 100644 ascii/distro/kali delete mode 100644 ascii/distro/kaos delete mode 100644 ascii/distro/kde delete mode 100644 ascii/distro/kogaion delete mode 100644 ascii/distro/korora delete mode 100644 ascii/distro/kslinux delete mode 100644 ascii/distro/kubuntu delete mode 100644 ascii/distro/lede delete mode 100644 ascii/distro/linux delete mode 100644 ascii/distro/lmde delete mode 100644 ascii/distro/lubuntu delete mode 100644 ascii/distro/lunar delete mode 100644 ascii/distro/mac delete mode 100644 ascii/distro/mac_small delete mode 100644 ascii/distro/mageia delete mode 100644 ascii/distro/magpieos delete mode 100644 ascii/distro/manjaro delete mode 100644 ascii/distro/maui delete mode 100644 ascii/distro/mer delete mode 100644 ascii/distro/minix delete mode 100644 ascii/distro/mint delete mode 100644 ascii/distro/mx delete mode 100644 ascii/distro/netbsd delete mode 100644 ascii/distro/netrunner delete mode 100644 ascii/distro/nitrux delete mode 100644 ascii/distro/nixos delete mode 100644 ascii/distro/nixos_small delete mode 100644 ascii/distro/nurunner delete mode 100644 ascii/distro/nutyx delete mode 100644 ascii/distro/obrevenge delete mode 100644 ascii/distro/openbsd delete mode 100644 ascii/distro/openbsd_small delete mode 100644 ascii/distro/openindiana delete mode 100644 ascii/distro/openmandriva delete mode 100644 ascii/distro/openwrt delete mode 100644 ascii/distro/oracle delete mode 100644 ascii/distro/osmc delete mode 100644 ascii/distro/pacbsd delete mode 100644 ascii/distro/parabola delete mode 100644 ascii/distro/pardus delete mode 100644 ascii/distro/parrot delete mode 100644 ascii/distro/parsix delete mode 100644 ascii/distro/pclinuxos delete mode 100644 ascii/distro/peppermint delete mode 100644 ascii/distro/pop_os delete mode 100644 ascii/distro/porteus delete mode 100644 ascii/distro/postmarketos delete mode 100644 ascii/distro/puppy delete mode 100644 ascii/distro/qubes delete mode 100644 ascii/distro/raspbian delete mode 100644 ascii/distro/redhat delete mode 100644 ascii/distro/redstar delete mode 100644 ascii/distro/refracta delete mode 100644 ascii/distro/rosa delete mode 100644 ascii/distro/sabayon delete mode 100644 ascii/distro/sabotage delete mode 100644 ascii/distro/sailfishos delete mode 100644 ascii/distro/salentos delete mode 100644 ascii/distro/scientific delete mode 100644 ascii/distro/siduction delete mode 100644 ascii/distro/slackware delete mode 100644 ascii/distro/slitaz delete mode 100644 ascii/distro/smartos delete mode 100644 ascii/distro/solaris delete mode 100644 ascii/distro/solus delete mode 100644 ascii/distro/source_mage delete mode 100644 ascii/distro/sparky delete mode 100644 ascii/distro/steamos delete mode 100644 ascii/distro/suse delete mode 100644 ascii/distro/swagarch delete mode 100644 ascii/distro/tails delete mode 100644 ascii/distro/trisquel delete mode 100644 ascii/distro/trueos delete mode 100644 ascii/distro/tumbleweed delete mode 100644 ascii/distro/ubuntu delete mode 100644 ascii/distro/ubuntu-budgie delete mode 100644 ascii/distro/ubuntu-gnome delete mode 100644 ascii/distro/ubuntu-mate delete mode 100644 ascii/distro/ubuntu-studio delete mode 100644 ascii/distro/ubuntu_old delete mode 100644 ascii/distro/void delete mode 100644 ascii/distro/void_small delete mode 100644 ascii/distro/windows delete mode 100644 ascii/distro/windows10 delete mode 100644 ascii/distro/xubuntu delete mode 100644 ascii/distro/zorin delete mode 100644 config/travis.conf diff --git a/ascii/distro/aix b/ascii/distro/aix deleted file mode 100644 index 8526b7c6a..000000000 --- a/ascii/distro/aix +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `:+ssssossossss+-` - .oys///oyhddddhyo///sy+. - /yo:+hNNNNNNNNNNNNNNNNh+:oy/ - :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: - `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh - h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy -/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: -h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y -N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m -N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m -h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y -:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- - yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy - sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo - :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- - :ys:/yNNNNNNNNNNNNNNNmy/:sy: - .+ys///osyhhhhys+///sy+. - -/osssossossso/- diff --git a/ascii/distro/alpine b/ascii/distro/alpine deleted file mode 100644 index 8f9b8771d..000000000 --- a/ascii/distro/alpine +++ /dev/null @@ -1,20 +0,0 @@ -${c1} .hddddddddddddddddddddddh. - :dddddddddddddddddddddddddd: - /dddddddddddddddddddddddddddd/ - +dddddddddddddddddddddddddddddd+ - `sdddddddddddddddddddddddddddddddds` - `ydddddddddddd++hdddddddddddddddddddy` -.hddddddddddd+` `+ddddh:-sdddddddddddh. -hdddddddddd+` `+y: .sddddddddddh -ddddddddh+` `//` `.` -sddddddddd -ddddddh+` `/hddh/` `:s- -sddddddd -ddddh+` `/+/dddddh/` `+s- -sddddd -ddd+` `/o` :dddddddh/` `oy- .yddd -hdddyo+ohddyosdddddddddho+oydddy++ohdddh -.hddddddddddddddddddddddddddddddddddddh. - `yddddddddddddddddddddddddddddddddddy` - `sdddddddddddddddddddddddddddddddds` - +dddddddddddddddddddddddddddddd+ - /dddddddddddddddddddddddddddd/ - :dddddddddddddddddddddddddd: - .hddddddddddddddddddddddh. diff --git a/ascii/distro/alpine_small b/ascii/distro/alpine_small deleted file mode 100644 index 9949011c4..000000000 --- a/ascii/distro/alpine_small +++ /dev/null @@ -1,6 +0,0 @@ -${c1} /\\ /\\ - /${c2}/ ${c1}\\ \\ - /${c2}/ ${c1}\\ \\ -/${c2}// ${c1}\\ \\ -${c2}// ${c1}\\ \\ - \\ diff --git a/ascii/distro/amazon b/ascii/distro/amazon deleted file mode 100644 index 050c5b3aa..000000000 --- a/ascii/distro/amazon +++ /dev/null @@ -1,19 +0,0 @@ -${c1} `-/oydNNdyo:.` - `.:+shmMMMMMMMMMMMMMMmhs+:.` - -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- -.`` -/+shmNNMMMMMMNNmhs+/- ``. -dNmhs+:. `.:/oo/:.` .:+shmNd -dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd -dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. - `.:+shNMMMMMh yMMMMMNhs+:`` - `-+shy shs+:` diff --git a/ascii/distro/anarchy b/ascii/distro/anarchy deleted file mode 100644 index d0f5a1402..000000000 --- a/ascii/distro/anarchy +++ /dev/null @@ -1,28 +0,0 @@ - ${c2}..${c1} - ${c2}..${c1} - ${c2}:..${c1} - ${c2}:+++.${c1} - .:::++${c2}++++${c1}+::. - .:+######${c2}++++${c1}######+:. - .+#########${c2}+++++${c1}##########:. - .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. - +###########${c2}+++++++++${c1}############: - +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ - +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ - :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: - ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ -.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. -.##########${c2}+++++++++++++++++++${c1}###########. - #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ - :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: - +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ - +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ - :##${c2}++++++${c1}############${c2}++++++++++${c1}##: - .${c2}++++++${c1}#############${c2}++++++++++${c1}+. - :${c2}++++${c1}###############${c2}+++++++${c1}:: - .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. - ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. - ${c2}.${c1} ${c2}.:+++${c1}. - ${c2}.:${c1}: - ${c2}..${c1} - ${c2}..${c1} \ No newline at end of file diff --git a/ascii/distro/android b/ascii/distro/android deleted file mode 100644 index 610622ddd..000000000 --- a/ascii/distro/android +++ /dev/null @@ -1,18 +0,0 @@ -${c1} -o o- - +hydNNNNdyh+ - +mMMMMMMMMMMMMm+ - `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` - hMMMMMMMMMMMMMMMMMMh - .. yyyyyyyyyyyyyyyyyyyy .. -.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: --MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- - +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ - mMMMMMMMMMMMMMMMMMMm - `/++MMMMh++hMMMM++/` - MMMMo oMMMM - MMMMo oMMMM - oNMm- -mMNs diff --git a/ascii/distro/antergos b/ascii/distro/antergos deleted file mode 100644 index 023af9bd8..000000000 --- a/ascii/distro/antergos +++ /dev/null @@ -1,19 +0,0 @@ -${c2} `.-/::/-`` - .-/osssssssso/. - :osyysssssssyyys+- - `.+yyyysssssssssyyyyy+. - `/syyyyyssssssssssyyyyys-` - `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` - .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. - .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. - -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: - -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- - .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` -`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo -.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. -ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy -dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh --dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- -.smmmmddddddddhhhhhhhhhdddddddddmmmms. - `+ydmmmdddddddddddddddddddmmmmdy/. - `.:+ooyyddddddddddddyyso+:.` diff --git a/ascii/distro/antix b/ascii/distro/antix deleted file mode 100644 index c383774ee..000000000 --- a/ascii/distro/antix +++ /dev/null @@ -1,13 +0,0 @@ -${c1} - \ - , - ~ ^ ~ - \ / - , ' \ ' , / - , \ '/ - , \ / , - ,___, \/ , - / | _ _ _|_ o /\ , -|, | / |/ | | | / \ , - \,_/\_/ | |_/|_/|_/_/ \, - , / ,\ - , / , ' \ - ' - , _ _ _ , ' diff --git a/ascii/distro/aosc b/ascii/distro/aosc deleted file mode 100644 index 785ba7d93..000000000 --- a/ascii/distro/aosc +++ /dev/null @@ -1,20 +0,0 @@ -${c2} .:+syhhhhys+:. - .ohNMMMMMMMMMMMMMMNho. - `+mMMMMMMMMMMmdmNMMMMMMMMm+` - +NMMMMMMMMMMMM/ `./smMMMMMN+ - .mMMMMMMMMMMMMMMo -yMMMMMm. - :NMMMMMMMMMMMMMMMs .hMMMMN: - .NMMMMhmMMMMMMMMMMm+/- oMMMMN. - dMMMMs ./ymMMMMMMMMMMNy. sMMMMd --MMMMN` oMMMMMMMMMMMN: `NMMMM- -/MMMMh NMMMMMMMMMMMMm hMMMM/ -/MMMMh NMMMMMMMMMMMMm hMMMM/ --MMMMN` :MMMMMMMMMMMMy. `NMMMM- - dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd - .NMMMMo -/+sMMMMMMMMMMMmMMMMN. - :NMMMMh. .MMMMMMMMMMMMMMMN: - .mMMMMMy- NMMMMMMMMMMMMMm. - +NMMMMMms/.` mMMMMMMMMMMMN+ - `+mMMMMMMMMNmddMMMMMMMMMMm+` - .ohNMMMMMMMMMMMMMMNho. - .:+syhhhhys+:. diff --git a/ascii/distro/apricity b/ascii/distro/apricity deleted file mode 100644 index eada9d6df..000000000 --- a/ascii/distro/apricity +++ /dev/null @@ -1,18 +0,0 @@ -${c2} ./o- - ``...`` `:. -/: - `-+ymNMMMMMNmho-` :sdNNm/ - `+dMMMMMMMMMMMMMMMmo` sh:.:::- - /mMMMMMMMMMMMMMMMMMMMm/`sNd/ - oMMMMMMMMMMMMMMMMMMMMMMMs -` -:MMMMMMMMMMMMMMMMMMMMMMMMM/ -NMMMMMMMMMMMMMMMMMMMMMMMMMd -MMMMMMMmdmMMMMMMMMMMMMMMMMd -MMMMMMy` .mMMMMMMMMMMMmho:` -MMMMMMNo/sMMMMMMMNdy+-.`-/ -MMMMMMMMMMMMNdy+:.`.:ohmm: -MMMMMMMmhs+-.`.:+ymNMMMy. -MMMMMM/`.-/ohmNMMMMMMy- -MMMMMMNmNNMMMMMMMMmo. -MMMMMMMMMMMMMMMms:` -MMMMMMMMMMNds/. -dhhyys+/-` diff --git a/ascii/distro/arch b/ascii/distro/arch deleted file mode 100644 index 3de103bb0..000000000 --- a/ascii/distro/arch +++ /dev/null @@ -1,19 +0,0 @@ -${c1} -` - .o+` - `ooo/ - `+oooo: - `+oooooo: - -+oooooo+: - `/:-:++oooo+: - `/++++/+++++++: - `/++++++++++++++: - `/+++o${c2}oooooooo${c1}oooo/` -${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` -${c2} .oossssso-````/ossssss+` - -osssssso. :ssssssso. - :osssssss/ osssso+++. - /ossssssss/ +ssssooo/- - `/ossssso+/:- -:/+osssso+- - `+sso+:-` `.-/+oso: - `++:. `-/+/ - .` `/ diff --git a/ascii/distro/arch_old b/ascii/distro/arch_old deleted file mode 100644 index dbd6cefae..000000000 --- a/ascii/distro/arch_old +++ /dev/null @@ -1,16 +0,0 @@ -${c1} __ - _=(SDGJT=_ - _GTDJHGGFCVS) - ,GTDJGGDTDFBGX0 -${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ -${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL -${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, -${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], -${c1} SDDFDFH' !YEWD,${c2} )HDROD -${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' -${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' -${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' -${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) -${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF -'EHTI !H - `0F' '! diff --git a/ascii/distro/arch_small b/ascii/distro/arch_small deleted file mode 100644 index 267576179..000000000 --- a/ascii/distro/arch_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} /\ - /^^\ - /\ \ - /${c2} __ \ - / ( ) \ - / __| |__\\\ -/// \\\\\ diff --git a/ascii/distro/arch_xferience b/ascii/distro/arch_xferience deleted file mode 100644 index f1757f924..000000000 --- a/ascii/distro/arch_xferience +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ``--:::::::-.` - .-/+++ooooooooo+++:-` - `-/+oooooooooooooooooo++:. - -/+oooooo/+ooooooooo+/ooo++:` - `/+oo++oo. .+oooooo+.-: +:-o+- - `/+o/. -o. :oooooo+ ```:.+oo+- -`:+oo- -/` :oooooo+ .`-`+oooo/. -.+ooo+. .` `://///+-+..oooooo+:` --+ooo:` ``.-+oooooo+/` --+oo/` :+oooo/. -.+oo: ..-/. . -+oo+/` -`/++- -:::++::/. -+oo+- - ./o: `:///+- `./ooo+:` - .++- `` /-` -:/+oooo+:` - .:+/:`` `-:ooooooo++- - ./+o+//:...../+oooooooo++:` - `:/++ooooooooooooo++/-` - `.-//++++++//:-.` - `````` diff --git a/ascii/distro/archbox b/ascii/distro/archbox deleted file mode 100644 index a35a15c65..000000000 --- a/ascii/distro/archbox +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ...:+oh/:::.. - ..-/oshhhhhh` `::::-. - .:/ohhhhhhhhhhhh` `-::::. - .+shhhhhhhhhhhhhhhhh` `.::-. - /`-:+shhhhhhhhhhhhhh` .-/+shh - / .:/ohhhhhhhhh` .:/ohhhhhhhh - / `-:+shhh` ..:+shhhhhhhhhhhh - / .:ohhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / .+o+ `hhhhhhhhhhhhhhhhhhhh - / -hhhhh `hhhhhhhhhhhhhhhhhhhh - / ohhhhho `hhhhhhhhhhhhhhhhhhhh - /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` - `--/:` /: `hhhhhhhhhhhho/- - -/:. `hhhhhhs+:-` - ::::/ho/-` diff --git a/ascii/distro/archlabs b/ascii/distro/archlabs deleted file mode 100644 index 74f8a026c..000000000 --- a/ascii/distro/archlabs +++ /dev/null @@ -1,21 +0,0 @@ -${c1} 'c' - 'kKk, - .dKKKx. - .oKXKXKd. - .l0XXXXKKo. - c0KXXXXKX0l. - :0XKKOxxOKX0l. - :OXKOc. .c0XX0l. - :OK0o. ${c4}...${c1}'dKKX0l. - :OX0c ${c4};xOx'${c1}'dKXX0l. - :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. - c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. - .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. - .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. - .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. - .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. - .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' - 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' - 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, - ,xko:'. ${c4}.. ${c1} .':okx; - .,'. .',. diff --git a/ascii/distro/archmerge b/ascii/distro/archmerge deleted file mode 100644 index c849851ec..000000000 --- a/ascii/distro/archmerge +++ /dev/null @@ -1,20 +0,0 @@ -${c1} y: - sMN- - +MMMm` - /MMMMMd` - :NMMMMMMy - -NMMMMMMMMs - .NMMMMMMMMMM+ - .mMMMMMMMMMMMM+ - oNMMMMMMMMMMMMM+ - `+:-+NMMMMMMMMMMMM+ - .sNMNhNMMMMMMMMMMMM/ - `hho/sNMMMMMMMMMMMMMMM/ - `.`omMMmMMMMMMMMMMMMMMMM+ - .mMNdshMMMMd+::oNMMMMMMMMMo - .mMMMMMMMMM+ `yMMMMMMMMMs - .NMMMMMMMMM/ yMMMMMMMMMy - -NMMMMMMMMMh `mNMMMMMMMMd` - /NMMMNds+:.` `-/oymMMMm. - +Mmy/. `:smN: -/+. -o. diff --git a/ascii/distro/arcolinux b/ascii/distro/arcolinux deleted file mode 100644 index 0a42c6ad4..000000000 --- a/ascii/distro/arcolinux +++ /dev/null @@ -1,20 +0,0 @@ -${c2} /- - ooo: - yoooo/ - yooooooo - yooooooooo - yooooooooooo - .yooooooooooooo - .oooooooooooooooo - .oooooooarcoooooooo - .ooooooooo-oooooooooo - .ooooooooo- oooooooooo - :ooooooooo. :ooooooooo - :ooooooooo. :ooooooooo - :oooarcooo .oooarcooo - :ooooooooy .ooooooooo - :ooooooooo ${c1}/ooooooooooooooooooo${c2} - :ooooooooo ${c1}.-ooooooooooooooooo.${c2} - ooooooooo- ${c1}-ooooooooooooo.${c2} - ooooooooo- ${c1}.-oooooooooo.${c2} -ooooooooo. ${c1}-ooooooooo${c2} \ No newline at end of file diff --git a/ascii/distro/artix b/ascii/distro/artix deleted file mode 100644 index 3ac30d3d6..000000000 --- a/ascii/distro/artix +++ /dev/null @@ -1,19 +0,0 @@ -${c1} d${c2}c. -${c1} x${c2}dc. -${c1} '.${c4}.${c1} d${c2}dlc. -${c1} c${c2}0d:${c1}o${c2}xllc; -${c1} :${c2}0ddlolc,lc, -${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. -${c1} ;${c1}K${c2}kxoOddollc' cllc. -${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: -${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: -${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, -${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. -${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; -${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, -${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. -${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. -${c1} 0${c2}Okd''dc. .cll; -${c1} k${c2}Okd' .llc, -${c1} d${c2}Od, 'lc. -${c1} :,${c4}. ${c2}... diff --git a/ascii/distro/arya b/ascii/distro/arya deleted file mode 100644 index 7d603e20d..000000000 --- a/ascii/distro/arya +++ /dev/null @@ -1,15 +0,0 @@ -${c1} `oyyy/${c2}-yyyyyy+ -${c1} -syyyy/${c2}-yyyyyy+ -${c1} .syyyyy/${c2}-yyyyyy+ -${c1} :yyyyyy/${c2}-yyyyyy+ -${c1} `/ :yyyyyy/${c2}-yyyyyy+ -${c1} .+s :yyyyyy/${c2}-yyyyyy+ -${c1} .oys :yyyyyy/${c2}-yyyyyy+ -${c1} -oyys :yyyyyy/${c2}-yyyyyy+ -${c1} :syyys :yyyyyy/${c2}-yyyyyy+ -${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ -${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ -${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- -${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy -${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy -${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy diff --git a/ascii/distro/bitrig b/ascii/distro/bitrig deleted file mode 100644 index 8daebf5f3..000000000 --- a/ascii/distro/bitrig +++ /dev/null @@ -1,18 +0,0 @@ -${c1} `hMMMMN+ - -MMo-dMd` - oMN- oMN` - yMd /NM: - .mMmyyhMMs - :NMMMhsmMh - +MNhNNoyMm- - hMd.-hMNMN: - mMmsssmMMMo - .MMdyyhNMMMd - oMN.`/dMddMN` - yMm/hNm+./MM/ -.dMMMmo.``.NMo -:NMMMNmmmmmMMh -/MN/-------oNN: -hMd. .dMh -sm/ /ms - diff --git a/ascii/distro/blag b/ascii/distro/blag deleted file mode 100644 index 047444cce..000000000 --- a/ascii/distro/blag +++ /dev/null @@ -1,17 +0,0 @@ -${c1} d - ,MK: - xMMMX: - .NMMMMMX; - lMMMMMMMM0clodkO0KXWW: - KMMMMMMMMMMMMMMMMMMX' - .;d0NMMMMMMMMMMMMMMMMMMK. - .;dONMMMMMMMMMMMMMMMMMMMMMMx -'dKMMMMMMMMMMMMMMMMMMMMMMMMl - .:xKWMMMMMMMMMMMMMMMMMMM0. - .:xNMMMMMMMMMMMMMMMMMK. - lMMMMMMMMMMMMMMMMMMK. - ,MMMMMMMMWkOXWMMMMMM0 - .NMMMMMNd. `':ldko - OMMMK: - oWk, - ;: diff --git a/ascii/distro/blankon b/ascii/distro/blankon deleted file mode 100644 index 43bbd7865..000000000 --- a/ascii/distro/blankon +++ /dev/null @@ -1,17 +0,0 @@ -${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` -${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ -${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys -${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys -${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys -${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys -${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys -${c2}NMMMMMN: .NMMMMMN${c1}yyyyys -${c2}MMMMMMm. NMMMMMN${c1}yyyyys -${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys -${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys -${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys -${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys -${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys -${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys -${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo -${c2} `.:/++++/:.` ${c1}:oys+. diff --git a/ascii/distro/bsd b/ascii/distro/bsd deleted file mode 100644 index 91c9a7ae2..000000000 --- a/ascii/distro/bsd +++ /dev/null @@ -1,19 +0,0 @@ -${c1} , , - /( )` - \ \___ / | - /- _ `-/ ' - (${c2}/\/ \ ${c1}\ /\ - ${c2}/ / | ` ${c1}\ - ${c3}O O ${c2}) ${c1}/ | - ${c2}`-^--'${c1}`< ' - (_.) _ ) / - `.___/` / - `-----' / -${c4}<----. __ / __ \ -${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| -<----' ${c1}`--' `.__,' \ - | | - \ / /\ - ${c5}______${c1}( (_ / \______/ - ${c5},' ,-----' | - `--{__________) diff --git a/ascii/distro/bunsenlabs b/ascii/distro/bunsenlabs deleted file mode 100644 index 937968233..000000000 --- a/ascii/distro/bunsenlabs +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `++ - -yMMs - `yMMMMN` - -NMMMMMMm. - :MMMMMMMMMN- - .NMMMMMMMMMMM/ - yMMMMMMMMMMMMM/ -`MMMMMMNMMMMMMMN. --MMMMN+ /mMMMMMMy --MMMm` `dMMMMMM -`MMN. .NMMMMM. - hMy yMMMMM` - -Mo +MMMMN - /o +MMMMs - +MMMN` - hMMM: - `NMM/ - +MN: - mh. - -/ diff --git a/ascii/distro/calculate b/ascii/distro/calculate deleted file mode 100644 index a6b256c4b..000000000 --- a/ascii/distro/calculate +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ...... - ,,+++++++,. - .,,,....,,,${c2}+**+,,.${c1} - ............,${c2}++++,,,${c1} - ............... - ......,,,........ - .....+*#####+,,,*+. - .....,*###############,..,,,,,,.. - ......,*#################*..,,,,,..,,,.. - .,,....*####################+***+,,,,...,++, - .,,..,..*#####################*, - ,+,.+*..*#######################. - ,+,,+*+..,########################* -.,++++++. ..+##**###################+ -..... ..+##***#################*. - .,.*#*****##############*. - ..,,*********#####****+. - ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} - ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} - ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} \ No newline at end of file diff --git a/ascii/distro/centos b/ascii/distro/centos deleted file mode 100644 index e56aa5dd1..000000000 --- a/ascii/distro/centos +++ /dev/null @@ -1,19 +0,0 @@ -${c1} .. - .PLTJ. - <><><><> - ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK - ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK - ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V - ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. -${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. -${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. -${c4} -${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV -${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' - ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' - ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 - ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK - ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK -${c2} <><><><> - 'MKKM' - '' diff --git a/ascii/distro/chakra b/ascii/distro/chakra deleted file mode 100644 index 28227b920..000000000 --- a/ascii/distro/chakra +++ /dev/null @@ -1,18 +0,0 @@ -${c1} _ _ _ "kkkkkkkk. - ,kkkkkkkk., 'kkkkkkkkk, - ,kkkkkkkkkkkk., 'kkkkkkkkk. - ,kkkkkkkkkkkkkkkk,'kkkkkkkk, - ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. - "''"''',;::,,"''kkk''kkkkk; __ - ,kkkkkkkkkk, "k''kkkkk' ,kkkk - ,kkkkkkk' ., ' .: 'kkkk',kkkkkk - ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk - ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk -.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' -;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' -'kkkkkkk; 'kkkkkkkk.,""''"''"" - ''kkkk; 'kkkkkkkkkk., - ';' 'kkkkkkkkkkkk., - ';kkkkkkkkkk' - ';kkkkkk' - "''" diff --git a/ascii/distro/chaletos b/ascii/distro/chaletos deleted file mode 100644 index 6473a5ccd..000000000 --- a/ascii/distro/chaletos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `.//+osso+/:`` - `/sdNNmhyssssydmNNdo:` - :hNmy+-` .-+hNNs- - /mMh/` `+:` `+dMd: - .hMd- -sNNMNo. /yyy /mMs` - -NM+ `/dMd/--omNh::dMM `yMd` - .NN+ .sNNs:/dMNy:/hNmo/s yMd` - hMs `/hNd+-smMMMMMMd+:omNy- `dMo -:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` -/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: -/Md` MMMMMMMMMMMMMMMMMMMN .MN: -:NN. MMMMMMm....--NMMMMMN -Mm. -`dMo MMMMMMd mMMMMMN hMs - -MN: MMMMMMd mMMMMMN oMm` - :NM: MMMMMMd mMMMMMN +Mm- - -mMy. mmmmmmh dmmmmmh -hMh. - oNNs- :yMm/ - .+mMdo:` `:smMd/` - -ohNNmhsoo++osshmNNh+. - `./+syyhhyys+:`` diff --git a/ascii/distro/chapeau b/ascii/distro/chapeau deleted file mode 100644 index 6107817c2..000000000 --- a/ascii/distro/chapeau +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .-/-. - ////////. - ////////${c2}y+${c1}//. - ////////${c2}mMN${c1}/////. - ////////${c2}mMN+${c1}////////. - ////////////////////////. - /////////+${c2}shhddhyo${c1}+////////. - ////////${c2}ymMNmdhhdmNNdo${c1}///////. -///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. -///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// -//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// -//////${c2}+MMmssssssssssssss+${c1}/////// -`//////${c2}yMMy${c1}//////////////////// - `//////${c2}smMNhso++oydNm${c1}//////// - `///////${c2}ohmNMMMNNdy+${c1}/////// - `//////////${c2}++${c1}////////// - `////////////////. - -////////- diff --git a/ascii/distro/chrome b/ascii/distro/chrome deleted file mode 100644 index 951bf1906..000000000 --- a/ascii/distro/chrome +++ /dev/null @@ -1,18 +0,0 @@ -${c2} .,:loool:,. - .,coooooooooooooc,. - .,lllllllllllllllllllll,. - ;ccccccccccccccccccccccccc; -${c1} '${c2}ccccccccccccccccccccccccccccc. -${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: -${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. -${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d -${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 -${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 -${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d -${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. -${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; -${c1} .:ccccccccllllllllo${c3}O0000000OOO, -${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. -${c1} '::ccccccccc${c3}dOOOOOOOkx:. -${c1} ..,::cccc${c3}xOOOkkko;. -${c1} ..,:${c3}dOkxl:. diff --git a/ascii/distro/cloveros b/ascii/distro/cloveros deleted file mode 100644 index 9996c77c9..000000000 --- a/ascii/distro/cloveros +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `omo``omo` - `oNMMMNNMMMNo` - `oNMMMMMMMMMMMMNo` - oNMMMMMMMMMMMMMMMMNo - `sNMMMMMMMMMMMMMMNs` - `omo` `sNMMMMMMMMMMNs` `omo` - `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` - `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` -oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo -`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` -`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` -oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo - `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` - `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` - `oNs` `sNMMMMMMMMMMNs` `oNs` - `sNMMMMMMMMMMMMMMNs` - +NMMMMMMMMMMMMMMMMNo - `oNMMMMMMMMMMMMNo` - `oNMMMNNMMMNs` - `omo``oNs` diff --git a/ascii/distro/coreos b/ascii/distro/coreos deleted file mode 100644 index 605d50506..000000000 --- a/ascii/distro/coreos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ..... - .';:cccccccc:;'. - ':ccccclc${c3}lllllllll${c1}cc:. - .;cccccccc${c3}lllllllllllllll${c1}c, - ;clllccccc${c3}llllllllllllllllll${c1}c, - .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: - ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: - :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, -.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c -.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. -.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. -.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc - :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; - .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc - .cllllllllllclcccclccclccllllcllc - :cllllllllccclcllllllllllllcc; - .cccccccccccccclcccccccccc:. - .;cccclccccccllllllccc,. - .';ccccclllccc:;.. - ..... diff --git a/ascii/distro/crux b/ascii/distro/crux deleted file mode 100644 index b5af7baab..000000000 --- a/ascii/distro/crux +++ /dev/null @@ -1,18 +0,0 @@ -${c1} odddd - oddxkkkxxdoo - ddcoddxxxdoool - xdclodod olol - xoc xdd olol - xdc ${c2}k00${c1}Okdlol - xxd${c2}kOKKKOkd${c1}ldd - xdco${c2}xOkdlo${c1}dldd - ddc:cl${c2}lll${c1}oooodo - odxxdd${c3}xkO000kx${c1}ooxdo - oxdd${c3}x0NMMMMMMWW0od${c1}kkxo - oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx -docldkXW${c3}MMMMMMMWWN${c1}Odolco -xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c -${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l -${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd -${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo -${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo diff --git a/ascii/distro/crux_small b/ascii/distro/crux_small deleted file mode 100644 index 4b64001dc..000000000 --- a/ascii/distro/crux_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} ___ - (${c3}.· ${c1}| - (${c2}<> ${c1}| - / ${c3}__ ${c1}\\ - ( ${c3}/ \\ ${c1}/| -${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) -${c2}\/${c1}-____${c2}\/ diff --git a/ascii/distro/debian b/ascii/distro/debian deleted file mode 100644 index df88d0792..000000000 --- a/ascii/distro/debian +++ /dev/null @@ -1,17 +0,0 @@ -${c2} _,met$$$$$gg. - ,g$$$$$$$$$$$$$$$P. - ,g$$P" """Y$$.". - ,$$P' `$$$. -',$$P ,ggs. `$$b: -`d$$' ,$P"' ${c1}.${c2} $$$ - $$P d$' ${c1},${c2} $$P - $$: $$. ${c1}-${c2} ,d$$' - $$; Y$b._ _,d$P' - Y$$. ${c1}`.${c2}`"Y$$$$P"' -${c2} `$$b ${c1}"-.__ -${c2} `Y$$ - `Y$$. - `$$b. - `Y$$b. - `"Y$b._ - `""" diff --git a/ascii/distro/debian_small b/ascii/distro/debian_small deleted file mode 100644 index 64cbb56c1..000000000 --- a/ascii/distro/debian_small +++ /dev/null @@ -1,6 +0,0 @@ - ${c1}_____ - / __ \\ -| / | -| \\___- --_ - --_ diff --git a/ascii/distro/deepin b/ascii/distro/deepin deleted file mode 100644 index a44f4dad9..000000000 --- a/ascii/distro/deepin +++ /dev/null @@ -1,18 +0,0 @@ -${c1} ............ - .';;;;;. .,;,. - .,;;;;;;;. ';;;;;;;. - .;::::::::' .,::;;,''''',. - ,'.:::::::: .;;'. '; - ;' 'cccccc, ,' :: '.. .: - ,, :ccccc. ;: .c, '' :. ,; -.l. cllll' ., .lc :; .l' l. -.c :lllc ;cl: .l' .ll. :' -.l 'looc. . ,o: 'oo' c, -.o. .:ool::coc' .ooo' o. - :: ..... .;dddo ;c - l:... .';lddddo. ,o - lxxxxxdoolllodxxxxxxxxxc :l - ,dxxxxxxxxxxxxxxxxxxl. 'o, - ,dkkkkkkkkkkkkko;. .;o; - .;okkkkkdl;. .,cl:. - .,:cccccccc:,. diff --git a/ascii/distro/desaos b/ascii/distro/desaos deleted file mode 100644 index 81d8b55e5..000000000 --- a/ascii/distro/desaos +++ /dev/null @@ -1,16 +0,0 @@ -${c1}███████████████████████ -███████████████████████ -███████████████████████ -███████████████████████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -██████████████████████████████ -██████████████████████████████ -████████████████████████ -████████████████████████ -████████████████████████ diff --git a/ascii/distro/devuan b/ascii/distro/devuan deleted file mode 100644 index 4173782f9..000000000 --- a/ascii/distro/devuan +++ /dev/null @@ -1,15 +0,0 @@ -${c1} ..,,;;;::;,.. - `':ddd;:,. - `'dPPd:,. - `:b$$b`. - 'P$$$d` - .$$$$$` - ;$$$$$P - .:P$$$$$$` - .,:b$$$$$$$;' - .,:dP$$$$$$$$b:' - .,:;db$$$$$$$$$$Pd'` - ,db$$$$$$$$$$$$$$b:'` -:$$$$$$$$$$$$b:'` - `$$$$$bd:''` - `'''` diff --git a/ascii/distro/dracos b/ascii/distro/dracos deleted file mode 100644 index 3eb2a70b5..000000000 --- a/ascii/distro/dracos +++ /dev/null @@ -1,13 +0,0 @@ -${c1} `-:/- - -os: - -os/` - :sy+-` - `/yyyy+. - `+yyyyo- - `/yyyys: -`:osssoooo++- +yyyyyy/` - ./yyyyyyo yo`:syyyy+. - -oyyy+ +- :yyyyyo- - `:sy: `. `/yyyyys: - ./o/.` .oyyso+oo:` - :+oo+//::::///:-.` `.` diff --git a/ascii/distro/dragonflybsd b/ascii/distro/dragonflybsd deleted file mode 100644 index 7ccc14bc3..000000000 --- a/ascii/distro/dragonflybsd +++ /dev/null @@ -1,15 +0,0 @@ -${c2},--, ${c1}| ${c2},--, -${c2}| `-, ${c1},^, ${c2},-' | -${c2} `, `-, ${c3}(/ \) ${c2},-' ,' -${c2} `-, `-,${c1}/ \${c2},-' ,-' -${c2} `------${c1}( )${c2}------' -${c2} ,----------${c1}( )${c2}----------, -${c2} | _,-${c1}( )${c2}-,_ | -${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' -${c1} | | - | | - | | - | | - | | - | | - `|' diff --git a/ascii/distro/dragonflybsd_old b/ascii/distro/dragonflybsd_old deleted file mode 100644 index 3276d4f05..000000000 --- a/ascii/distro/dragonflybsd_old +++ /dev/null @@ -1,18 +0,0 @@ - ${c1} | - .-. - ${c3} ()${c1}I${c3}() - ${c1} "==.__:-:__.==" - "==.__/~|~\__.==" - "==._( Y )_.==" - ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. -( ..=${c1}\\=${c1}/${c2}=.. ) - `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` - `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` - .-~` /${c1}|=|${c2}\ `~-. - .~` / ${c1}|=|${c2} \ `~. - .-~` .' ${c1}|=|${c2} `. `~-. - (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) - `~"~"` ${c1} |=|${c2} `"~"~` - ${c1} /=\\ - \\=/ - ^ diff --git a/ascii/distro/dragonflybsd_small b/ascii/distro/dragonflybsd_small deleted file mode 100644 index 3a48a9250..000000000 --- a/ascii/distro/dragonflybsd_small +++ /dev/null @@ -1,4 +0,0 @@ -${c2}(\${c3}"${c2}/) -${c2}(/${c1}|${c2}\) -${c1} | - | diff --git a/ascii/distro/elementary b/ascii/distro/elementary deleted file mode 100644 index 8614c746f..000000000 --- a/ascii/distro/elementary +++ /dev/null @@ -1,17 +0,0 @@ -${c2} eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee eeeeeeeeeeee eeeee - eeee eeeee eee eeee - eeee eeee eee eeee -eee eee eee eee -eee eee eee eee -ee eee eeee eeee -ee eee eeeee eeeeee -ee eee eeeee eeeee ee -eee eeee eeeeee eeeee eee -eee eeeeeeeeee eeeeee eee - eeeeeeeeeeeeeeeeeeeeeeee eeeee - eeeeeeee eeeeeeeeeeee eeee - eeeee eeeee - eeeeeee eeeeeee - eeeeeeeeeeeeeeeee diff --git a/ascii/distro/endless b/ascii/distro/endless deleted file mode 100644 index fbff54b95..000000000 --- a/ascii/distro/endless +++ /dev/null @@ -1,21 +0,0 @@ -${c1} `:+yhmNMMMMNmhy+:` - -odMMNhso//////oshNMMdo- - /dMMh+. .+hMMd/ - /mMNo` `oNMm: - `yMMo` `oMMy` - `dMN- -NMd` - hMN. .NMh -/MM/ -os` /MM/ -dMm `smNmmhs/- `:sNMd+ `` mMd -MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM -MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM -dMm `/++/-``/yNNh+/sdNMNddMm- mMd -/MM/ `dNy: `-::- /MM/ - hMN. .NMh - `dMN- -NMd` - `yMMo` `oMMy` - /mMNo` `oNMm/ - /dMMh+. .+hMMd/ - -odMMNhso//////oshNMMdo- - `:+yhmNMMMMNmhy+:` - diff --git a/ascii/distro/exherbo b/ascii/distro/exherbo deleted file mode 100644 index edacf81a9..000000000 --- a/ascii/distro/exherbo +++ /dev/null @@ -1,22 +0,0 @@ -${c2} , -OXo. -NXdX0: .cok0KXNNXXK0ko:. -KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... -'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. - cNMk NK .oXM. OMMMMO. 0MMNo kW. - lMc o: ., .oKNk; ;NMMWlxW' - ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO - XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk -.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl -,M: ,XMMWx::,''oOK0x; NM. -'Ml ,kNKOxxxxxkkO0XXKOd:. oMk - NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW - ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW - ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO - 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' - xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd - 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO - :XMNxl,';:lodxkOO000Oxc. .oWMMo - 'dXMMXkl;,. .,o0MMNo' - ':d0XWMMMMWNNNNMMMNOl' - ':okKXWNKkl' diff --git a/ascii/distro/fedora b/ascii/distro/fedora deleted file mode 100644 index f0ba391bb..000000000 --- a/ascii/distro/fedora +++ /dev/null @@ -1,17 +0,0 @@ -${c1} /:-------------:\\ - :-------------------:: - :-----------${c2}/shhOHbmp${c1}---:\\ - /-----------${c2}omMMMNNNMMD ${c1}---: - :-----------${c2}sMMMMNMNMP${c1}. ---: - :-----------${c2}:MMMdP${c1}------- ---\\ -,------------${c2}:MMMd${c1}-------- ---: -:------------${c2}:MMMd${c1}------- .---: -:---- ${c2}oNMMMMMMMMMNho${c1} .----: -:-- .${c2}+shhhMMMmhhy++${c1} .------/ -:- -------${c2}:MMMd${c1}--------------: -:- --------${c2}/MMMd${c1}-------------; -:- ------${c2}/hMMMy${c1}------------: -:--${c2} :dMNdhhdNMMNo${c1}------------; -:---${c2}:sdNMMMMNds:${c1}------------: -:------${c2}:://:${c1}-------------:: -:---------------------:// diff --git a/ascii/distro/freebsd b/ascii/distro/freebsd deleted file mode 100644 index 6ef677826..000000000 --- a/ascii/distro/freebsd +++ /dev/null @@ -1,15 +0,0 @@ - ${c2}``` ${c1}` - ${c2}` `.....---...${c1}....--.``` -/ - ${c2}+o .--` ${c1}/y:` +. - ${c2} yo`:. ${c1}:o `+- - ${c2}y/ ${c1}-/` -o/ - ${c2}.- ${c1}::/sy+:. - ${c2}/ ${c1}`-- / - ${c2}`: ${c1}:` - ${c2}`: ${c1}:` - ${c2}/ ${c1}/ - ${c2}.- ${c1}-. - ${c2}-- ${c1}-. - ${c2}`:` ${c1}`:` - .-- `--. - .---.....----. diff --git a/ascii/distro/freebsd_small b/ascii/distro/freebsd_small deleted file mode 100644 index 943c147ee..000000000 --- a/ascii/distro/freebsd_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} /\\ _____ /\\ - \\_) (_/ - / \ -| | -| | - \ / - --_____-- diff --git a/ascii/distro/frugalware b/ascii/distro/frugalware deleted file mode 100644 index b11961ba2..000000000 --- a/ascii/distro/frugalware +++ /dev/null @@ -1,23 +0,0 @@ -${c1} `++/::-.` - /o+++++++++/::-.` - `o+++++++++++++++o++/::-.` - /+++++++++++++++++++++++oo++/:-.`` - .o+ooooooooooooooooooosssssssso++oo++/:-` - ++osoooooooooooosssssssssssssyyo+++++++o: - -o+ssoooooooooooosssssssssssssyyo+++++++s` - o++ssoooooo++++++++++++++sssyyyyo++++++o: - :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo - `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: - /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss - .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- - ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso - -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. - sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ - :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` - yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ --ysooooooydhhhhhhhhhhhddddddddddddddddssy - .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: - ``.-/+oosysssssssssssssssssssssss - ``.:/+osyysssssssssssssh. - `-:/+osyyssssyo - .-:+++` diff --git a/ascii/distro/funtoo b/ascii/distro/funtoo deleted file mode 100644 index 13079091f..000000000 --- a/ascii/distro/funtoo +++ /dev/null @@ -1,11 +0,0 @@ -${c2} _______ ____ - /MMMMMMM/ /MMMM| _____ _____ - __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ -|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ -|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| -|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| - |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ - |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ diff --git a/ascii/distro/galliumos b/ascii/distro/galliumos deleted file mode 100644 index ae9681d5c..000000000 --- a/ascii/distro/galliumos +++ /dev/null @@ -1,19 +0,0 @@ -${c1}sooooooooooooooooooooooooooooooooooooo+: -yyooooooooooooooooooooooooooooooooo+/::: -yyysoooooooooooooooooooooooooooo+/:::::: -yyyyyoooooooooooooooooooooooo+/::::::::: -yyyyyysoooooooooooooooooo++/:::::::::::: -yyyyyyysoooooooooooooo++/::::::::::::::: -yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: -yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: -yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: -yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: -yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: -yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: -yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: -yyyyyyyyyyyyyyys+:--...........-///::::: -yyyyyyyyyyyys+:--................://:::: -yyyyyyyyyo+:-.....................-//::: -yyyyyyo+:-..........................://: -yyyo+:-..............................-// -o/:-...................................: diff --git a/ascii/distro/gem b/ascii/distro/gem deleted file mode 100644 index 49c8849d8..000000000 --- a/ascii/distro/gem +++ /dev/null @@ -1,15 +0,0 @@ -${c1} ## - ## ######### - #### ## - #### #### ## -#### #### ## ## - #### #### ## ## - #### #### ## ## ## - #### ###### - ###### ## ## #### - #### ################ - #### ## #### - ## #### ###### - ## ## #### #### - ## ## ## ## ## #### - #### ## ## ## diff --git a/ascii/distro/gentoo b/ascii/distro/gentoo deleted file mode 100644 index 3bec6daa6..000000000 --- a/ascii/distro/gentoo +++ /dev/null @@ -1,18 +0,0 @@ -${c1} -/oyddmdhs+:. - -o${c2}dNMMMMMMMMNNmhy+${c1}-` - -y${c2}NMMMMMMMMMMMNNNmmdhy${c1}+- - `o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/` - om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o` -.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+` - oy${c2}hdmNMMMMMMMN${c1}dyooy${c2}dmddddhhhhyhN${c1}d. - :o${c2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${c1}Mh - .:${c2}+sydNMMMMMNNNmmmdddhhhhhhmM${c1}my - /m${c2}MMMMMMNNNmmmdddhhhhhmMNh${c1}s: - `o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+` - `s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. - /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:` -+M${c2}MMMMMMNNNNNmmmmdmNMNdso${c1}/- -yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` -/h${c2}MMNNNNNNNNMNdhs++/${c1}-` -`/${c2}ohdmmddhys+++/:${c1}.` - `-//////:--. diff --git a/ascii/distro/gentoo_small b/ascii/distro/gentoo_small deleted file mode 100644 index a1e7a0ba1..000000000 --- a/ascii/distro/gentoo_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} _-----_ -( \\ -\ 0 \\ -${c2} \ ) - / _/ -( _- -\____- diff --git a/ascii/distro/gnewsense b/ascii/distro/gnewsense deleted file mode 100644 index b98b859b5..000000000 --- a/ascii/distro/gnewsense +++ /dev/null @@ -1,12 +0,0 @@ -${c1} ..,,,,.. - .oocchhhhhhhhhhccoo. - .ochhlllllllc hhhhhh ollllllhhco. - ochlllllllllll hhhllllllhhh lllllllllllhco - .cllllllllllllll hlllllo +hllh llllllllllllllc. -ollllllllllhco'' hlllllo +hllh ``ochllllllllllo -hllllllllc' hllllllllllllh `cllllllllh -ollllllh +llllllllllll+ hllllllo - `cllllh. ohllllllho .hllllc' - ochllc. ++++ .cllhco - `+occooo+. .+ooocco+' - `+oo++++ ++++oo+' diff --git a/ascii/distro/gnu b/ascii/distro/gnu deleted file mode 100644 index e4b4c017e..000000000 --- a/ascii/distro/gnu +++ /dev/null @@ -1,18 +0,0 @@ -${c1} _-`````-, ,- '- . - .' .- - | | - -. `. - /.' / `. \ -:/ : _... ..._ `` : -:: : /._ .`:'_.._\. || : -:: `._ ./ ,` : \ . _.'' . -`:. / | -. \-. \\_ / - \:._ _/ .' .@) \@) ` `\ ,.' - _/,--' .- .\,-.`--`. - ,'/'' (( \ ` ) - /'/' \ `-' ( - '/'' `._,-----' - ''/' .,---' - ''/' ;: - ''/'' ''/ - ''/''/'' - '/'/' - `; diff --git a/ascii/distro/gobolinux b/ascii/distro/gobolinux deleted file mode 100644 index 443cfbca8..000000000 --- a/ascii/distro/gobolinux +++ /dev/null @@ -1,6 +0,0 @@ -${c1}_____ _ -/ ____| | | -| | __ ___ | |__ ___ -| | |_ |/ _ \| '_ \ / _ \ -| |__| | (_) | |_) | (_) | - \_____|\___/|_.__/ \___/ diff --git a/ascii/distro/grombyang b/ascii/distro/grombyang deleted file mode 100644 index 6dfbea9b6..000000000 --- a/ascii/distro/grombyang +++ /dev/null @@ -1,18 +0,0 @@ -${c1} eeeeeeeeeeee - eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee ${c2}.o+ ${c1}eeee - eeee ${c2}`ooo/ ${c1}eeee - eeee ${c2}`+oooo: ${c1}eeee -eee ${c2}`+oooooo: ${c1}eee -eee ${c2}-+oooooo+: ${c1}eee -ee ${c2}`/:oooooooo+: ${c1}ee -ee ${c2}`/+ +++ +: ${c1}ee -ee ${c2}+o+\ ${c1}ee -eee ${c2}+o+\ ${c1}eee -eee ${c2}// \\ooo/ \\\ ${c1}eee - eee ${c2}//++++oooo++++\\\ ${c1}eee - eeee ${c2}::::++oooo+::::: ${c1}eeee - eeeee ${c3}Grombyang OS ${c1} eeee - eeeeeeeeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeee diff --git a/ascii/distro/guixsd b/ascii/distro/guixsd deleted file mode 100644 index 6d6345ec1..000000000 --- a/ascii/distro/guixsd +++ /dev/null @@ -1,10 +0,0 @@ -${c1} .. `. - `--..```..` `..```..--` - .-:///-:::. `-:::///:-. - ````.:::` `:::.```` - -//:` -::- - ://: -::- - `///- .:::` - -+++-:::. - :+/:::- - `-....` diff --git a/ascii/distro/haiku b/ascii/distro/haiku deleted file mode 100644 index 56a7feb4b..000000000 --- a/ascii/distro/haiku +++ /dev/null @@ -1,17 +0,0 @@ -${c2} :dc' - 'l:;'${c1},${c2}'ck. .;dc:. - co ${c1}..${c2}k. .;; ':o. - co ${c1}..${c2}k. ol ${c1}.${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. -.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. - ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; - ..${c1}oOolllllccccccc:::::${c2}od; - cx:ooc${c1}:::::::;${c2}cooolcX. - cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. - cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. - .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. - '::c'${c1}...${c2}do${c1}..... .${c2}K, - cd,.${c1}....:${c2}O,${c1} - ':clod:'${c1} - ${c1} diff --git a/ascii/distro/hyperbola b/ascii/distro/hyperbola deleted file mode 100644 index 5e0133591..000000000 --- a/ascii/distro/hyperbola +++ /dev/null @@ -1,16 +0,0 @@ -${c1} WW - KX W - WO0W NX0O - NOO0NW WNXK0OOKW - W0OOOOOOOOOOOOKN - N0OOOOOOO0KXW - WNXXXNW - NXK00000KN - WNK0OOOOOOOOOO0W - NK0OOOOOOOOOOOOOO0W - X0OOOOOOO00KK00OOOOOK - X0OOOO0KNWW WX0OO0W - X0OO0XNW KOOW - N00KNW KOW - NKXN W0W -WW W diff --git a/ascii/distro/irix b/ascii/distro/irix deleted file mode 100644 index 57ce2121c..000000000 --- a/ascii/distro/irix +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ./ohmNd/ +dNmho/- - `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. - `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` - -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. - `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` -+mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ -dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd -oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ -.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. - hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh - /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: - `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd - `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` - `yNMMNho-yMMMM` NMMMm.+hNMMNh` - -MMMMd: oMMMM. NMMMh :hMMMM- - -yNMMMmooMMMM- NMMMyomMMMNy- - .omMMMMMMMM-`NMMMMMMMmo. - `:hMMMMMM. NMMMMMh/` - .odNm+ /dNms. diff --git a/ascii/distro/kali b/ascii/distro/kali deleted file mode 100644 index d1e01da67..000000000 --- a/ascii/distro/kali +++ /dev/null @@ -1,21 +0,0 @@ -${c1}.............. - ..,;:ccc,. - ......''';lxO. -.....''''..........,:ld; - .';;;:::;,,.x, - ..'''. 0Xxoc:,. ... - .... ,ONkc;,;cokOdc',. - . OMo ':${c2}dd${c1}o. - dMc :OO; - 0M. .:o. - ;Wd - ;XO, - ,d0Odlc;,.. - ..',;:cdOOd::,. - .:d;.':;. - 'd, .' - ;l .. - .o - c - .' - . diff --git a/ascii/distro/kaos b/ascii/distro/kaos deleted file mode 100644 index 830835e47..000000000 --- a/ascii/distro/kaos +++ /dev/null @@ -1,16 +0,0 @@ -${c1} .. - ..... ..OSSAAAAAAA.. - .KKKKSS. .SSAAAAAAAAAAA. -.KKKKKSO. .SAAAAAAAAAA... -KKKKKKS. .OAAAAAAAA. -KKKKKKS. .OAAAAAA. -KKKKKKS. .SSAA.. -.KKKKKS..OAAAAAAAAAAAA........ - DKKKKO.=AA=========A===AASSSO.. - AKKKS.==========AASSSSAAAAAASS. - .=KKO..========ASS.....SSSSASSSS. - .KK. .ASS..O.. =SSSSAOSS: - .OK. .ASSSSSSSO...=A.SSA. - .K ..SSSASSSS.. ..SSA. - .SSS.AAKAKSSKA. - .SSS....S.. diff --git a/ascii/distro/kde b/ascii/distro/kde deleted file mode 100644 index 168097004..000000000 --- a/ascii/distro/kde +++ /dev/null @@ -1,19 +0,0 @@ -${c1} `..---+/---..` - `---.`` `` `.---.` - .--.` `` `-:-. - `:/: `.----//----.` :/- - .:. `---` `--.` .:` - .:` `--` .:- `:. - `/ `:. `.-::-.` -:` `/` - /. /. `:++++++++:` .: .: -`/ .: `+++++++++++/ /` `+` -/+` -- .++++++++++++` :. .+: -`/ .: `+++++++++++/ /` `+` - /` /. `:++++++++:` .: .: - ./ `:. `.:::-.` -:` `/` - .:` `--` .:- `:. - .:. `---` `--.` .:` - `:/: `.----//----.` :/- - .-:.` `` `-:-. - `---.`` `` `.---.` - `..---+/---..` diff --git a/ascii/distro/kogaion b/ascii/distro/kogaion deleted file mode 100644 index 47ed962e4..000000000 --- a/ascii/distro/kogaion +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ;; ,; - ;;; ,;; - ,;;;; ;;;; - ,;;;;;;;; ;;;; - ;;;;;;;;;;; ;;;;; - ,;;;;;;;;;;;; ';;;;;, - ;;;;;;;;;;;;;;, ';;;;;;; - ;;;;;;;;;;;;;;;;;, ';;;;; -; ';;;;;;;;;;;;;;;;;;, ;;; -;;;, ';;;;;;;;;;;;;;;;;;;,;; -;;;;;, ';;;;;;;;;;;;;;;;;;, -;;;;;;;;, ';;;;;;;;;;;;;;;;, -;;;;;;;;;;;;, ';;;;;;;;;;;;;; -';;;;;;;;;;;;; ';;;;;;;;;;;;; - ';;;;;;;;;;;;;, ';;;;;;;;;;; - ';;;;;;;;;;;;; ;;;;;;;;;; - ';;;;;;;;;;;; ;;;;;;;; - ';;;;;;;; ;;;;;; - ';;;;; ;;;; - ';;; ;; diff --git a/ascii/distro/korora b/ascii/distro/korora deleted file mode 100644 index 709289afd..000000000 --- a/ascii/distro/korora +++ /dev/null @@ -1,16 +0,0 @@ -${c2} ____________ - _add55555555554${c1}: - _w?'${c1}``````````'${c2})k${c1}: - _Z'${c1}`${c2} ]k${c1}: - m(${c1}`${c2} )k${c1}: - _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: - .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` - jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` - jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` -.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` -:#${c1}:${c2} ${c1}`${c2})e${c1}``` -:m${c1}:${c2} ,#'${c1}` -:#${c1}:${c2} .s2'${c1}` -:m,________.aa7^${c1}` -:#baaaaaaas!J'${c1}` - ``````````` diff --git a/ascii/distro/kslinux b/ascii/distro/kslinux deleted file mode 100644 index 53385bd80..000000000 --- a/ascii/distro/kslinux +++ /dev/null @@ -1,11 +0,0 @@ -${c1} K K U U RRRR ooo - K K U U R R o o - KKK U U RRRR o o - K K U U R R o o - K K UUU R R ooo - -${c2} SSS AAA W W AAA - S A A W W A A - SSS AAAAA W W W AAAAA - S A A WW WW A A - SSS A A W W A A diff --git a/ascii/distro/kubuntu b/ascii/distro/kubuntu deleted file mode 100644 index 6302ff0f7..000000000 --- a/ascii/distro/kubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `.:/ossyyyysso/:. - .:oyyyyyyyyyyyyyyyyyyo:` - -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- - -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- - oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo - `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` - oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- -oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy -oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- - oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo - `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo - oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo - -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- - -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- - ./oyyyyyyyyyyyyyyyyyyo/. - `.:/oosyyyysso/:.` diff --git a/ascii/distro/lede b/ascii/distro/lede deleted file mode 100644 index b1af94951..000000000 --- a/ascii/distro/lede +++ /dev/null @@ -1,9 +0,0 @@ - ${c1} _________ - / /\ - / LE / \ - / DE / \ - /________/ LE \ - \ \ DE / - \ LE \ / - \ DE \ / - \________\/ diff --git a/ascii/distro/linux b/ascii/distro/linux deleted file mode 100644 index f31dd29ff..000000000 --- a/ascii/distro/linux +++ /dev/null @@ -1,12 +0,0 @@ -${c2} ##### -${c2} ####### -${c2} ##${c1}O${c2}#${c1}O${c2}## -${c2} #${c3}#####${c2}# -${c2} ##${c1}##${c3}###${c1}##${c2}## -${c2} #${c1}##########${c2}## -${c2} #${c1}############${c2}## -${c2} #${c1}############${c2}### -${c3} ##${c2}#${c1}###########${c2}##${c3}# -${c3}######${c2}#${c1}#######${c2}#${c3}###### -${c3}#######${c2}#${c1}#####${c2}#${c3}####### -${c3} #####${c2}#######${c3}##### diff --git a/ascii/distro/lmde b/ascii/distro/lmde deleted file mode 100644 index 5161881e9..000000000 --- a/ascii/distro/lmde +++ /dev/null @@ -1,17 +0,0 @@ - ${c2}`.-::---.. -${c1} .:++++ooooosssoo:. - .+o++::. `.:oos+. -${c1} :oo:.` -+oo${c2}: -${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` -${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` -${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: -${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` -${c1}`s: `oo s m Myy+-o:` -`oo :+sdoohyoydyso/. - :o. .:////////++: -${c1} `/++ ${c2}-:::::- -${c1} ${c2}`${c1}++- -${c1} ${c2}`${c1}/+- -${c1} ${c2}.${c1}+/. -${c1} ${c2}.${c1}:+-. - `--.`` diff --git a/ascii/distro/lubuntu b/ascii/distro/lubuntu deleted file mode 100644 index 9731cb3ef..000000000 --- a/ascii/distro/lubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `-/+oyyhhhhyyo+/-` - ./shhhhhhhhhhhhhhhhhhs/. - `:shhhhhhhhhhhhhhhhhhhhhhhhs:` - :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: - `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` - `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` - shhhhhhhhy+. .ohhhhhhhhhhhhhs -:hhhhhhy/. /hhhhhhhhhhhhh: -shhhy/. :hhhhhhhhhhhhs -hy+. ` `+yhs/` +hhhhhhhhhhhh --.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh -shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs -:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: - shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs - `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` - +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` - :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: - :shhhhhhhhhhhhhhhhhhhhhy`+s:` - .+shhhhhhhhhhhhhhhhhhs:` - `-/+oyyhhhhyys+/-` diff --git a/ascii/distro/lunar b/ascii/distro/lunar deleted file mode 100644 index 26bd295c3..000000000 --- a/ascii/distro/lunar +++ /dev/null @@ -1,13 +0,0 @@ -${c1}`-. `-. - -ohys/-` `:+shy/` - -omNNdyo/` :+shmNNy/` - ${c3} - - /mMmo - hMMMN` - .NMMs - ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` - /:.` ${c3}/${c1} `.:/` -${c3} __ - | | _ _ ___ ___ ___ - | |__| | | | .'| _| - |_____|___|_|_|__,|_| diff --git a/ascii/distro/mac b/ascii/distro/mac deleted file mode 100644 index 3ca5ea313..000000000 --- a/ascii/distro/mac +++ /dev/null @@ -1,18 +0,0 @@ -${c1} 'c. - ,xNMM. - .OMMMMo - OMMM0, - .;loddo:' loolloddol;. - cKMMMMMMMMMMNWMMMMMMMMMM0: -${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. - XMMMMMMMMMMMMMMMMMMMMMMMX. -${c3};MMMMMMMMMMMMMMMMMMMMMMMM: -:MMMMMMMMMMMMMMMMMMMMMMMM: -${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. - kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. - ${c6}kMMMMMMMMMMMMMMMMMMMMMMd - ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. - diff --git a/ascii/distro/mac_small b/ascii/distro/mac_small deleted file mode 100644 index 24852ff12..000000000 --- a/ascii/distro/mac_small +++ /dev/null @@ -1,8 +0,0 @@ -${c1} .:' - _ :'_ -${c2} .'`_`-'_``. -:________.-' -${c3}:_______: -:_______: -${c4} :_______`-; -${c5} `._.-._.' diff --git a/ascii/distro/mageia b/ascii/distro/mageia deleted file mode 100644 index af01caba2..000000000 --- a/ascii/distro/mageia +++ /dev/null @@ -1,19 +0,0 @@ -${c1} .°°. - °° .°°. - .°°°. °° - . . - °°° .°°°. - .°°°. '___' -${c2} .${c1}'___' ${c2} . - :dkxc;'. ..,cxkd; - .dkk. kkkkkkkkkk .kkd. -.dkk. ';cloolc;. .kkd -ckk. .kk; -xO: cOd -xO: lOd -lOO. .OO: -.k00. .00x - .k00; ;00O. - .lO0Kc;,,,,,,;c0KOc. - ;d00KKKKKK00d; - .,KKKK,. diff --git a/ascii/distro/magpieos b/ascii/distro/magpieos deleted file mode 100644 index 6859d96b2..000000000 --- a/ascii/distro/magpieos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ;00000 :000Ol - .x00kk00: O0kk00k; - l00: :00. o0k :O0k. - .k0k. x${c2}d$dddd${c1}k' .d00; - k0k. ${c2}.dddddl ${c1}o00, - o00. ${c2}':cc:. ${c1}d0O -.00l ,00. -l00. d0x -k0O .:k0o -O0k ;dO0000d. -k0O .O0O${c2}xxxxk${c1}00: -o00. k0O${c2}dddddd${c1}occ -'00l x0O${c2}dddddo${c3};..${c1} - x00. .x00${c2}kxxd${c3}:..${c1} - .O0x .:oxxx${c4}Okl.${c1} - .x0d ${c4},xx,${c1} - .:o. ${c4}.xd ckd${c1} - .. ${c4}dxl .xx; - :xxolldxd' - ;oxdl. diff --git a/ascii/distro/manjaro b/ascii/distro/manjaro deleted file mode 100644 index 89fa7a2f2..000000000 --- a/ascii/distro/manjaro +++ /dev/null @@ -1,14 +0,0 @@ -${c1}██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ diff --git a/ascii/distro/maui b/ascii/distro/maui deleted file mode 100644 index 1ab9c07d4..000000000 --- a/ascii/distro/maui +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `.-://////:--` - .:/oooooooooooooooo+:. - `:+ooooooooooooooooooooooo:` - `:oooooooooooooooooooooooooooo/` - ..```-oooooo/-`` `:oooooo+:.` `-- - :. +oo+-` /ooo/` -/ - -o. `o+- +o/` -o: -`oo` ::` :o/ `+. .+o` /oo. -/o+ . -+oo- ` /oo/ `ooo/ -+o- /ooo+` .+ooo. :ooo+ -++ .+oooo: -oooo+ `oooo+ -:. .oooooo` :ooooo- :oooo: -` .oooooo: :ooooo+ `ooo+-` - .+oooooo` -oooooo: `o/- - +oooooo: .ooooooo. - /ooooooo` /ooooooo/ .. - `:oooooooo/:::/ooooooooo+:--:/:` - `:+oooooooooooooooooooooo+:` - .:+oooooooooooooooo+:. - `.-://////:-.` diff --git a/ascii/distro/mer b/ascii/distro/mer deleted file mode 100644 index a98f3eb10..000000000 --- a/ascii/distro/mer +++ /dev/null @@ -1,27 +0,0 @@ -${c1} dMs - .-` - `y`-o+` - ``NMMy - .--`:++. - .hNNNNs - /MMMMMN - `ommmd/ +/ - ```` +/ - `:+sssso/-` - .-::. `-::-` `smNMNmdmNMNd/ .://-` -.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo -dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- -MMm yMM- :MMs NMN` `:::::--sMMh dMM` -MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` -NNd sNN- -NNs -mMNs-.--..:dMMh` dNN ---- .--` `--. .smMMmdddmMNdo` .-- - ./ohddds+:` - +h- `.:-. - ./`.dMMMN+ - +MMMMMd - `+dmmy- - ``` .+` - .dMNo-y. - `hmm/ - .:` - dMs diff --git a/ascii/distro/minix b/ascii/distro/minix deleted file mode 100644 index a0ff143ca..000000000 --- a/ascii/distro/minix +++ /dev/null @@ -1,17 +0,0 @@ -${c2} -sdhyo+:-` -/syymm: - sdyooymmNNy. `` .smNmmdysNd - odyoso+syNNmysoyhhdhsoomNmm+/osdm/ - :hhy+-/syNNmddhddddddmNMNo:sdNd: - `smNNdNmmNmddddddddddmmmmmmmy` - `ohhhhdddddmmNNdmddNmNNmdddddmdh- - odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: - `+mNho:` smmd/ sNNh :dmms` -+ymmo. --od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: -+sms -.` :so: .NN+ :os/ .-`mNh: -.-hyh+:////- -sNNd:` .--://ohNs- - `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ - -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: - //oydNMMMMydMMNysNMMmsMMMMMNyo/` - ../-yNMMy--/::/-.sMMmos+.` - -+oyhNsooo+omy/``` - `::ohdmds-` diff --git a/ascii/distro/mint b/ascii/distro/mint deleted file mode 100644 index c7e59d99a..000000000 --- a/ascii/distro/mint +++ /dev/null @@ -1,16 +0,0 @@ -${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. -MMm----::-://////////////oymNMd+` -MMd ${c2}/++ ${c1}-sNMd: -MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: -ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm - NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM - NMm ${c2}dMM` ..` ... ydm. ${c1}dMM - hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM - -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM - -dMNs-${c2}``-::::-------.`` ${c1}dMM - `/dMNmy+/:-------------:/yMMM - ./ydNMMMMMMMMMMMMMMMMMMMMM - .MMMMMMMMMMMMMMMMMMM diff --git a/ascii/distro/mx b/ascii/distro/mx deleted file mode 100644 index 9fc44075a..000000000 --- a/ascii/distro/mx +++ /dev/null @@ -1,17 +0,0 @@ -${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM -MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM -MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM -MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM -MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM -MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM -MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM -MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM -MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM -MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM -MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM -MMMMMMMNo` :mMMN+` `-hMMMMMMMM -MMMMMMh. `oNMMd: `/mMMMMMM -MMMMm/ -hMd- `sNMMMM -MMNs` - :dMMM -Mm: `oMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM diff --git a/ascii/distro/netbsd b/ascii/distro/netbsd deleted file mode 100644 index 6048ee3a3..000000000 --- a/ascii/distro/netbsd +++ /dev/null @@ -1,17 +0,0 @@ -${c1} `-/oshdmNMNdhyo+:-` -${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` -${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` - ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` - ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` - ${c2}-N/${c1}hMMMMMMMMMmho:` - ${c2}-N/${c1}-:/++/:.` -${c2} :M+ - :Mo - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms diff --git a/ascii/distro/netrunner b/ascii/distro/netrunner deleted file mode 100644 index 4230bc09c..000000000 --- a/ascii/distro/netrunner +++ /dev/null @@ -1,20 +0,0 @@ -${c1} .:oydmMMMMMMmdyo:` - -smMMMMMMMMMMMMMMMMMMds- - +mMMMMMMMMMMMMMMMMMMMMMMMMd+ - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ - `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` - .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` - dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh -+MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ -mMMMMMMMMd+:.` `mMMMMMMMMMMMMd -MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM -mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd -+MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ - dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh - `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` - `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: - +dMMMMMMMMMMMMMMMMMMMMMMMMd/ - -odMMMMMMMMMMMMMMMMMMdo- - `:+ydmNMMMMNmhy+-` diff --git a/ascii/distro/nitrux b/ascii/distro/nitrux deleted file mode 100644 index 2f49d638f..000000000 --- a/ascii/distro/nitrux +++ /dev/null @@ -1,18 +0,0 @@ -${c1}`:/. -`/yo -`/yo -`/yo .+:. -`/yo .sys+:.` -`/yo `-/sys+:.` -`/yo ./sss+:.` -`/yo .:oss+:-` -`/yo ./o///:-` -`/yo `.-:///////:` -`/yo `.://///++//-`` -`/yo `.-:////++++/-` -`/yo `-://///++o+/-` -`/yo `-/+o+++ooo+/-` -`/s+:+oooossso/.` -`//+sssssso:. -`+syyyy+:` -:+s+- diff --git a/ascii/distro/nixos b/ascii/distro/nixos deleted file mode 100644 index d1a35bd27..000000000 --- a/ascii/distro/nixos +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ::::. ${c2}'::::: ::::' -${c1} '::::: ${c2}':::::. ::::' -${c1} ::::: ${c2}'::::.::::: -${c1} .......:::::..... ${c2}:::::::: -${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. - ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' -${c2} ..... ::::' ${c1}:::::' -${c2} ::::: '::' ${c1}:::::' -${c2} ........::::: ' ${c1}:::::::::::. -${c2}::::::::::::: ${c1}::::::::::::: -${c2} ::::::::::: ${c1}.. ${c1}::::: -${c2} .::::: ${c1}.::: ${c1}::::: -${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... - ::::: ${c1}':::::. ${c2}......:::::::::::::' - ::: ${c1}::::::. ${c2}':::::::::::::::::' -${c1} .:::::::: ${c2}':::::::::: -${c1} .::::''::::. ${c2}'::::. -${c1} .::::' ::::. ${c2}'::::. -${c1} .:::: :::: ${c2}'::::. diff --git a/ascii/distro/nixos_small b/ascii/distro/nixos_small deleted file mode 100644 index 0917ff8ea..000000000 --- a/ascii/distro/nixos_small +++ /dev/null @@ -1,7 +0,0 @@ - ${c1}\\\\ \\\\ // - ==\\\\__\\\\/ // - // \\\\// -==// //== - //\\\\___// -// /\\\\ \\\\== - // \\\\ \\\\ diff --git a/ascii/distro/nurunner b/ascii/distro/nurunner deleted file mode 100644 index e5529673c..000000000 --- a/ascii/distro/nurunner +++ /dev/null @@ -1,19 +0,0 @@ -${c1} ,xc - ;00cxXl - ;K0, .xNo. - :KO' .lXx. - cXk. ;xl cXk. - cXk. ;k:.,xo. cXk. - .lXx. :x::0MNl,dd. :KO, - .xNx. cx;:KMMMMMNo'dx. ;KK; - .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: -;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO - 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: - .kNo .xo'xWMMMMMM0;:O: ;KK; - .dXd. .do,oNMMO;ck: ;00, - oNd. .dx,;'cO; ;K0, - oNx. okk; ;K0, - lXx. :KO' - cKk' cXk. - ;00:lXx. - ,kd. diff --git a/ascii/distro/nutyx b/ascii/distro/nutyx deleted file mode 100644 index 84a6cc5a9..000000000 --- a/ascii/distro/nutyx +++ /dev/null @@ -1,23 +0,0 @@ -${c1} . - . - ... - ... - .... .........--. - ..-++-----....--++++++---. - .-++++++-. .-++++++++++++-----.. - .--... .++..-+++--.....-++++++++++--.. - . .-+-. .**- .... ..-+----.. - .+++. .*+. + -++-----. - .+++++- ++. .*+. .....-+++-----. - -+++-++. .+. .-+***++***++--++++. . - -+-. -- -. -*- ...... ..--. -.-. .+- . -+. -. .+- +. - -- -- - -+----. .- - -++-.+. . - .++. -- - +. ----. - . .+. .. - - . - . \ No newline at end of file diff --git a/ascii/distro/obrevenge b/ascii/distro/obrevenge deleted file mode 100644 index 87b50f40c..000000000 --- a/ascii/distro/obrevenge +++ /dev/null @@ -1,18 +0,0 @@ -${c1} __ __ - _@@@@ @@@g_ - _@@@@@@ @@@@@@ - _@@@@@@M W@@@@@@_ - j@@@@P ^W@@@@ - @@@@L____ _____Q@@@@ -Q@@@@@@@@@@j@@@@@@@@@@ -@@@@@ T@j@ T@@@@@ -@@@@@ ___Q@J@ _@@@@@ -@@@@@fMMM@@j@jggg@@@@@@ -@@@@@ j@j@^MW@P @@@@ -Q@@@@@ggg@@f@ @@@@@@L -^@@@@WWMMP ^ Q@@@@ - @@@@@_ _@@@@l - W@@@@@g_____g@@@@@P - @@@@@@@@@@@@@@@@l - ^W@@@@@@@@@@@P - ^TMMMMTll diff --git a/ascii/distro/openbsd b/ascii/distro/openbsd deleted file mode 100644 index d3812019a..000000000 --- a/ascii/distro/openbsd +++ /dev/null @@ -1,23 +0,0 @@ - ${c3} _ - (_) -${c1} | . -${c1} . |L /| . ${c3} _ -${c1} _ . |\ _| \--+._/| . ${c3}(_) -${c1} / ||\| Y J ) / |/| ./ - J |)'( | ` F`.'/ ${c3} _ -${c1} -<| F __ .-< ${c3}(_) -${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ - J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ -${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) -${c1} '-F -<_. \\ .-' `-' L__ -__J _ _. >-' ${c1})${c4}._. ${c1}|-' -${c1} `-|.' /_. ${c4}\_| ${c1} F - /.- . _.< - /' /.' .' `\\ - /L /' |/ _.-'-\\ - /'J ___.---'\| - |\ .--' V | `. ` - |/`. `-. `._) - / .-.\\ - \\ ( `\\ - `.\ diff --git a/ascii/distro/openbsd_small b/ascii/distro/openbsd_small deleted file mode 100644 index bb6e646ac..000000000 --- a/ascii/distro/openbsd_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} _____ - \\- -/ - \\_/ \\ - | ${c2}O O${c1} | - |_ < ) 3 ) - / \\ / - /-_____-\\ diff --git a/ascii/distro/openindiana b/ascii/distro/openindiana deleted file mode 100644 index c76d8f7ba..000000000 --- a/ascii/distro/openindiana +++ /dev/null @@ -1,16 +0,0 @@ -${c2} .sy/ - .yh+ - - ${c1}-+syyyo+- ${c2} /+. - ${c1}+ddo/---/sdh/ ${c2} ym- - ${c1}`hm+ `sms${c2} ym-```````.-. - ${c1}sm+ sm/ ${c2} ym- +s - ${c1}hm. /mo ${c2} ym- /h - ${c1}omo ym: ${c2} ym- `os` - ${c1}smo` .ym+ ${c2} ym- .os- - `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. - ..` ${c1}`:+oo+/-` ${c2} -//oyo- - -:` .:oys/. -+- `./oyys/. -h+` `.-:+oyyyo/-` -`/ossssysso+/-.` diff --git a/ascii/distro/openmandriva b/ascii/distro/openmandriva deleted file mode 100644 index ef3e84390..000000000 --- a/ascii/distro/openmandriva +++ /dev/null @@ -1,15 +0,0 @@ -${c2} `` - `-. -${c1} ` ${c2}.--- -${c1} -/ ${c2}-::--` -${c1} `++ ${c2}`----...```-:::::. -${c1} `os. ${c2}.::::::::::::::-``` ` ` -${c1} +s+ ${c2}.::::::::::::::::---...--` -${c1}-ss: ${c2}`-::::::::::::::::-.``.`` -${c1}/ss- ${c2}.::::::::::::-.`` ` -${c1}+ss: ${c2}.::::::::::::- -${c1}/sso ${c2}.::::::-::::::- -${c1}.sss/ ${c2}-:::-.` .::::: -${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: -${c1} -ossso+/:://+/-` ${c2}.:` -${c1} -/+ooo+/-. ${c2}` diff --git a/ascii/distro/openwrt b/ascii/distro/openwrt deleted file mode 100644 index 903068b00..000000000 --- a/ascii/distro/openwrt +++ /dev/null @@ -1,9 +0,0 @@ -${c1} _______ -| |.-----.-----.-----. -| - || _ | -__| | -|_______|| __|_____|__|__| - |__| - ________ __ -| | | |.----.| |_ -| | | || _|| _| -|________||__| |____| diff --git a/ascii/distro/oracle b/ascii/distro/oracle deleted file mode 100644 index cdd61c551..000000000 --- a/ascii/distro/oracle +++ /dev/null @@ -1,12 +0,0 @@ -${c1} - `-/+++++++++++++++++/-.` - `/syyyyyyyyyyyyyyyyyyyyyyys/. - :yyyyo/-...............-/oyyyy/ - /yyys- .oyyy+ -.yyyy` `syyy- -:yyyo /yyy/ -.yyyy` `syyy- - /yyys. .oyyyo - /yyyyo:-...............-:oyyyy/` - `/syyyyyyyyyyyyyyyyyyyyyyys+. - `.:/+ooooooooooooooo+/:.` diff --git a/ascii/distro/osmc b/ascii/distro/osmc deleted file mode 100644 index f18c2e990..000000000 --- a/ascii/distro/osmc +++ /dev/null @@ -1,20 +0,0 @@ -${c1} -+shdmNNNNmdhs+- - .+hMNho/:..``..:/ohNMh+. - :hMdo. .odMh: - -dMy- -yMd- - sMd- -dMs - hMy +. .+ yMh - yMy dMs. .sMd yMy -:Mm dMNMs` `sMNMd `mM: -yM+ dM//mNs``sNm//Md +My -mM- dM: +NNNN+ :Md -Mm -mM- dM: `oNN+ :Md -Mm -yM+ dM/+NNo` :Md +My -:Mm` dMMNs` :Md `mM: - yMy dMs` -ms yMy - hMy +. yMh - sMd- -dMs - -dMy- -yMd- - :hMdo. .odMh: - .+hMNho/:..``..:/ohNMh+. - -+shdmNNNNmdhs+- diff --git a/ascii/distro/pacbsd b/ascii/distro/pacbsd deleted file mode 100644 index 000e93a09..000000000 --- a/ascii/distro/pacbsd +++ /dev/null @@ -1,24 +0,0 @@ -${c1} :+sMs. - `:ddNMd- -o--` - -sMMMMh: `+N+`` - yMMMMMs` .....-/-... `mNh/ - yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm - yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm - :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd - +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- - :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. - .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- - /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` -.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- -:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` -/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. -:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` -:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` - sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. - :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// - /dMMMMMMMMMMMMMs- ````````..`` - .oMMMMMMMMMMMMNs` ./y:` - +dNMMNMMMMMMMmy` ``./ys. - `/hMMMMMMMMMMMNo-`` `.+yy+-` - `-/hmNMNMMMMMMmmddddhhy/-` - `-+oooyMMMdsoo+/:. diff --git a/ascii/distro/parabola b/ascii/distro/parabola deleted file mode 100644 index 33c38bd53..000000000 --- a/ascii/distro/parabola +++ /dev/null @@ -1,16 +0,0 @@ -${c1} `.-. `. - `.` `:++. `-+o+. - `` `:+/. `:+/. `-+oooo+ - ``-::-.:+/. `:+/. `-+oooooo+ - `.-:///- ..` .-. `-+oooooooo- - `..-..` `+ooooooooo: -`` :oooooooo/ - `ooooooo: - `oooooo: - -oooo+. - +ooo/` - -ooo- - `+o/. - /+- - //` - -. diff --git a/ascii/distro/pardus b/ascii/distro/pardus deleted file mode 100644 index ae817579f..000000000 --- a/ascii/distro/pardus +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. -/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ -mN. oMdyy- -y `-dMo .Nm -.mN+` sMy hN+ -: yMs `+Nm. - `yMMddMs.dy `+` sMddMMy` - +MMMo .` . oMMM+ - `NM/ `````.` `.````` +MN` - yM+ `.-:yhomy ymohy:-.` +My - yM: yo oy :My - +Ms .N` `N. +h sM+ - `MN - -::::::- : :o:+`NM` - yM/ sh -dMMMMd- ho +y+My - .dNhsohMh-//: /mm/ ://-yMyoshNd` - `-ommNMm+:/. oo ./:+mMNmmo:` - `/o+.-somNh- :yy: -hNmos-.+o/` - ./` .s/`s+sMdd+``+ddMs+s`/s. `/. - : -y. -hNmddmNy. .y- : - -+ `..` +- diff --git a/ascii/distro/parrot b/ascii/distro/parrot deleted file mode 100644 index af98994df..000000000 --- a/ascii/distro/parrot +++ /dev/null @@ -1,24 +0,0 @@ -${c1} `:oho/-` -`mMMMMMMMMMMMNmmdhy- - dMMMMMMMMMMMMMMMMMMs` - +MMsohNMMMMMMMMMMMMMm/ - .My .+dMMMMMMMMMMMMMh. - + :NMMMMMMMMMMMMNo - `yMMMMMMMMMMMMMm: - /NMMMMMMMMMMMMMy` - .hMMMMMMMMMMMMMN+ - ``-NMMMMMMMMMd- - /MMMMMMMMMMMs` - mMMMMMMMsyNMN/ - +MMMMMMMo :sNh. - `NMMMMMMm -o/ - oMMMMMMM. - `NMMMMMM+ - +MMd/NMh - mMm -mN` - /MM `h: - dM` . - :M- - d: - -+ - - diff --git a/ascii/distro/parsix b/ascii/distro/parsix deleted file mode 100644 index 2753a461a..000000000 --- a/ascii/distro/parsix +++ /dev/null @@ -1,21 +0,0 @@ - ${c2}-/+/:. - ${c2}.syssssys. - ${c1}.--. ${c2}ssssssssso${c1} ..--. - :++++++: ${c2}+ssssssss+${c1} ./++/+++: - /+++++++++.${c2}.yssooooy`${c1}-+///////o- - /++++++++++.${c2}+soooos:${c1}:+////////+- - :+++++////o-${c2}oooooo-${c1}+/////////- - `-/++//++-${c4}.-----.-${c1}:+/////:- - ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. -${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- -${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ -${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- - `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` - ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. - ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: - ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ - ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: - ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- - ${c1}`--` ${c2}+sssssssso ${c1}`--` - ${c2}+sssssy+` - ${c2}`.::-` diff --git a/ascii/distro/pclinuxos b/ascii/distro/pclinuxos deleted file mode 100644 index 963d39294..000000000 --- a/ascii/distro/pclinuxos +++ /dev/null @@ -1,19 +0,0 @@ - ${c1}mhhhyyyyhhhdN - dyssyhhhhhhhhhhhssyhN - Nysyhhyo/:-.....-/oyhhhssd - Nsshhy+. `/shhysm - dohhy/ -shhsy - dohhs` /hhys -N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy -ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ -+hho ${c2}ymm- /mmy+mms ${c1}:hhod -/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh -+hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m -yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ - ohhy` ${c2}://` -/+++/- ${c1}ohhom - N+hhy- `shhoh - sshho. `+hhyom - dsyhhs/. `:ohhhoy - dysyhhhso///://+syhhhssh - dhyssyhhhhhhyssyyhN - mddhdhdmN diff --git a/ascii/distro/peppermint b/ascii/distro/peppermint deleted file mode 100644 index be0a953b9..000000000 --- a/ascii/distro/peppermint +++ /dev/null @@ -1,19 +0,0 @@ -${c1} 8ZZZZZZ${c2}MMMMM -${c1} .ZZZZZZZZZ${c2}MMMMMMM. -${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ -${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM -${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. -${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI -${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM -${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM -${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM -${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM -${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM -${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M -${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 -${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 -${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 -${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z -${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM -${c1} NZZZZZZZZZZZ${c2}MMMMM -${c1} ZZZZZZZZZ${c2}MM) diff --git a/ascii/distro/pop_os b/ascii/distro/pop_os deleted file mode 100644 index a399f18f2..000000000 --- a/ascii/distro/pop_os +++ /dev/null @@ -1,21 +0,0 @@ -${c1} ///////////// - ///////////////////// - ///////${c2}*767${c1}//////////////// - //////${c2}7676767676*${c1}////////////// - /////${c2}76767${c1}//${c2}7676767${c1}////////////// - /////${c2}767676${c1}///${c2}*76767${c1}/////////////// - ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// -/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// -//////////${c2}76767676767${c1}////${c2}76767${c1}///////// -///////////${c2}76767676${c1}//////${c2}7676${c1}////////// -////////////,${c2}7676${c1},///////${c2}767${c1}/////////// -/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// -///////////////${c2}7676${c1}//////////////////// - ///////////////${c2}7676${c1}///${c2}767${c1}//////////// - //////////////////////${c2}'${c1}//////////// - //////${c2}.7676767676767676767,${c1}////// - /////${c2}767676767676767676767${c1}///// - /////////////////////////// - ///////////////////// - ///////////// - diff --git a/ascii/distro/porteus b/ascii/distro/porteus deleted file mode 100644 index 82cc7aa90..000000000 --- a/ascii/distro/porteus +++ /dev/null @@ -1,23 +0,0 @@ -${c1} `.-:::-.` - -+ydmNNNNNNNmdy+- - .+dNmdhs+//////+shdmdo. - .smmy+-` ./sdy: - `omdo. `.-/+osssso+/-` `+dy. - `yms. `:shmNmdhsoo++osyyo-``oh. - hm/ .odNmds/.` ``.....:::-+s -/m: `+dNmy:` `./oyhhhhyyooo++so -ys `yNmy- .+hmmho:-.` ``` -s: yNm+` .smNd+. -`` /Nm: +dNd+` - yN+ `smNy. - dm oNNy` - hy -mNm. - +y oNNo - `y` sNN: - `: +NN: - ` .mNo - /mm` - /my` - .sy` - .+: - ` diff --git a/ascii/distro/postmarketos b/ascii/distro/postmarketos deleted file mode 100644 index a2ebc838f..000000000 --- a/ascii/distro/postmarketos +++ /dev/null @@ -1,17 +0,0 @@ -${c1} ss - `hMMh` - .dMMMMd. - -NMMMMMMN- - /MMMMMMMMMN/ - hMMMMMMMMMMMo - y+`mMMmdNMMMMMMy - `dMM-.-:- .mMMMMMMh` - .mMMMMMMd` `dMMMMMMm. - :NMMMMMMy yMMMMMMN: - /MMMMMMMo oMMMmdmN/ - oMMMMMMM/ /MN.-/:-. - `yMMMMMMN- -:.NMMMMy` - `dMMMMMMM- -/////////////dMMMMMMd` - -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- - :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: -+MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ diff --git a/ascii/distro/puppy b/ascii/distro/puppy deleted file mode 100644 index 7cdc1c2d6..000000000 --- a/ascii/distro/puppy +++ /dev/null @@ -1,18 +0,0 @@ -${c1} `-/osyyyysosyhhhhhyys+- - -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ - yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy -.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ --NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ -.Nm+shddyooo+/smNNNNmmmmNh. :mmd. - NNNNy:` ./hmmmmmmmNNNN: hNMh - NMN- -++- +NNNNNNNNNNm+..-sMMMM- -.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ -.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ - mMM+ .. `sNN+. hMMMMhhMMM- - +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy - yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` - sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` - :mMMMMMMMMMMMmddNMMMMMMMMmh/ - /dMMMMMMMMMMMMMMMMMMNdy/` - .+hNMMMMMMMMMNmdhs/. - .:/+ooo+/:-. diff --git a/ascii/distro/qubes b/ascii/distro/qubes deleted file mode 100644 index 3867fa6fc..000000000 --- a/ascii/distro/qubes +++ /dev/null @@ -1,21 +0,0 @@ -${c1} `..--..` - `.----------.` - `..----------------..` - `.------------------------.`` - `..-------------....-------------..` -.::----------..`` ``..----------:+: -:////:----..` `..---:/ossso -:///////:` `/osssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:////////-` .:sssssssso -:///////////-.` `-/osssssssssso -`//////////////:-```.:+ssssssssssssso- - .-://////////////sssssssssssssso/-` - `.:///////////sssssssssssssso:. - .-:///////ssssssssssssssssss/` - `.:////ssss+/+ssssssssssss. - `--//- `-/osssso/. diff --git a/ascii/distro/raspbian b/ascii/distro/raspbian deleted file mode 100644 index 472b74eb0..000000000 --- a/ascii/distro/raspbian +++ /dev/null @@ -1,23 +0,0 @@ -${c1} `.::///+:/-. --///+//-:`` - `+oooooooooooo: `+oooooooooooo: - /oooo++//ooooo: ooooo+//+ooooo. - `+ooooooo:-:oo- +o+::/ooooooo: - `:oooooooo+`` `.oooooooo+- - `:++ooo/. :+ooo+/.` - ${c2}...` `.----.` ``.. - .::::-``:::::::::.`-:::-` - -:::-` .:::::::-` `-:::- - `::. `.--.` `` `.---.``.::` - .::::::::` -::::::::` ` - .::` .:::::::::- `::::::::::``::. --:::` ::::::::::. ::::::::::.`:::- -:::: -::::::::. `-:::::::: :::: --::- .-:::-.``....``.-::-. -::- - .. `` .::::::::. `..`.. - -:::-` -::::::::::` .:::::` - :::::::` -::::::::::` :::::::. - .::::::: -::::::::. :::::::: - `-:::::` ..--.` ::::::. - `...` `...--..` `...` - .:::::::::: - `.-::::-` diff --git a/ascii/distro/redhat b/ascii/distro/redhat deleted file mode 100644 index 868521f4f..000000000 --- a/ascii/distro/redhat +++ /dev/null @@ -1,16 +0,0 @@ -${c1} `.-..........` - `////////::.`-/. - -: ....-////////. - //:-::///////////` - `--::: `-://////////////: - //////- ``.-:///////// .` - `://////:-.` :///////::///:` - .-/////////:---/////////////: - .-://////////////////////. -${c2} yMN+`.-${c1}::///////////////-` -${c2} .-`:NMMNMs` `..-------..` - MN+/mMMMMMhoooyysshsss -MMM MMMMMMMMMMMMMMyyddMMM+ - MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM - MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM - MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM diff --git a/ascii/distro/redstar b/ascii/distro/redstar deleted file mode 100644 index 6c15233fd..000000000 --- a/ascii/distro/redstar +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .. - .oK0l - :0KKKKd. - .xKO0KKKKd - ,Od' .d0000l - .c;. .'''... ..'. -.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: -;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. - .okkkkd,.lko .......',;:cllc:;,,'''''. - .cdo. :xd' cd:. ..';'',,,'',,;;;,'. - . .ddl.;doooc'..;oc;'..';::;,'. - coo;.oooolllllllcccc:'. . - .ool''lllllccccccc:::::;. - ;lll. .':cccc:::::::;;;;' - :lcc:'',..';::::;;;;;;;,,. - :cccc::::;...';;;;;,,,,,,. - ,::::::;;;,'. ..',,,,'''. - ........ ...... diff --git a/ascii/distro/refracta b/ascii/distro/refracta deleted file mode 100644 index 396474b5d..000000000 --- a/ascii/distro/refracta +++ /dev/null @@ -1,19 +0,0 @@ -${c2} A - VW - VVW\\ - .yWWW\\ - ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ - *WWWWWWWWWWWWWWWW/ $VWWWWw , - ^*%WWWWWWVWWX $WWWW** ,yy - , "**WWW/' **' ,yy/WWW*` - &WWWWwy `*` <,ywWW%VWWW* - yWWWWWWWWWW* ., "**WW%W - ,&WWWWWM*"` ,y/ &WWWww ^* - XWWX*^ ,yWWWW09 .WWWWWWWWwy, - *` &WWWWWM WWWWWWWWWWWWWww, - (WWWWW` /#####WWW*********** - ^WWWW - VWW - Wh. - V/ - diff --git a/ascii/distro/rosa b/ascii/distro/rosa deleted file mode 100644 index fcbad876e..000000000 --- a/ascii/distro/rosa +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ROSAROSAROSAROSAR - ROSA AROS - ROS SAROSAROSAROSAR AROS - RO ROSAROSAROSAROSAROSAR RO - ARO AROSAROSAROSARO AROS ROS - ARO ROSAROS OSAR ROSA ROS - RO AROSA ROSAROSAROSA ROSAR RO -RO ROSAR ROSAROSAROSAR R ROSARO RO -RO ROSA AROSAROSAROSA AR ROSARO AR -RO AROS ROSAROSAROSA ROS AROSARO AR -RO AROS ROSAROSARO ROSARO ROSARO AR -RO ROS AROSAROS ROSAROSA AROSAR AR -RO ROSA ROS ROSAROSAR ROSARO RO - RO ROS AROSAROSAROSA ROSARO AR - ARO ROSA ROSAROSAROS AROSAR ARO - ARO OROSA R ROSAROS ROS - RO AROSAROS AROSAROSAR RO - AROS AROSAROSAROSARO AROS - ROSA SARO - ROSAROSAROSAROSAR diff --git a/ascii/distro/sabayon b/ascii/distro/sabayon deleted file mode 100644 index bfd51eeda..000000000 --- a/ascii/distro/sabayon +++ /dev/null @@ -1,18 +0,0 @@ -${c1} ........... - .. .. - .. .. - .. ${c2}o ${c1}.. - .. ${c2}:W' ${c1}.. - .. ${c2}.d. ${c1}.. -:. ${c2}.KNO ${c1}.: -:. ${c2}cNNN. ${c1}.: -: ${c2}dXXX, ${c1}: -: ${c2}. dXXX, .cd, ${c1}: -: ${c2}'kc .. dKKK. ,ll;:' ${c1}: -: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: -:. ${c2}.,cdddddddddddddo:. ${c1}.: - .. ${c2}:lllllll: ${c1}.. - .. ${c2}',,,,, ${c1}.. - .. .. - .. .. - ............... diff --git a/ascii/distro/sabotage b/ascii/distro/sabotage deleted file mode 100644 index d4490fc89..000000000 --- a/ascii/distro/sabotage +++ /dev/null @@ -1,12 +0,0 @@ - -${c2} .|'''.| | '||''|. ..|''|| - ||.. ' ||| || || .|' || - ''|||. | || ||'''|. || || -. '|| .''''|. || || '|. || -|'....|' .|. .||. .||...|' ''|...|' - -|''||''| | ..|'''.| '||''''| - || ||| .|' ' || . - || | || || .... ||''| - || .''''|. '|. || || - .||. .|. .||. ''|...'| .||.....| diff --git a/ascii/distro/sailfishos b/ascii/distro/sailfishos deleted file mode 100644 index a7dd91b43..000000000 --- a/ascii/distro/sailfishos +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .+eWWW - .+ee+++eee e. - .ee++eeeeeeee +e. - .e++ee++eeeeeee+eee+e+ - ee.e+.ee+eee++eeeeee+ - W.+e.e+.e++ee+eee - W.+e.W.ee.W++ee' - +e.W W.e+.W.W+ - W.e.+e.W W W. - e e e +e.W.W - .W W W. - W.+e.W. - W++e.ee+. - ++ +ee++eeeee++. - ' '+++e 'ee. - ee - ee - e diff --git a/ascii/distro/salentos b/ascii/distro/salentos deleted file mode 100644 index f41ee747b..000000000 --- a/ascii/distro/salentos +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ``..`` - .-:+oshdNMMMMMMNdhyo+:-.` - -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ -${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` -${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- -${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` -${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` -${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd -${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy -${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo -${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ -${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- -${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` -${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm -${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy -${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: -${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. -${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: -${c2} `:smMM${c4}yy${c3}MMNy/` - ${c2}.- ${c4}`${c3}:. diff --git a/ascii/distro/scientific b/ascii/distro/scientific deleted file mode 100644 index 82e9553f0..000000000 --- a/ascii/distro/scientific +++ /dev/null @@ -1,20 +0,0 @@ -${c1} =/;;/- - +: // - /; /; - -X H. -.//;;;:;;-, X= :+ .-;:=;:;#;. -M- ,=;;;#:, ,:#;;:=, ,@ -:# :#.=/++++/=.$= #= - ,#; #/:+/;,,/++:+/ ;+. - ,+/. ,;@+, ,#H;, ,/+, - ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; - ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. - ,;: :@#= =$H: .+#- - ,#= #;-///==///-// =#, -;+ :#-;;;:;;;;-X- +: -@- .-;;;;M- =M/;;;-. -X - :;;::;;-. #- :+ ,-;;-;:== - ,X H. - ;/ #= - // +; - '////' diff --git a/ascii/distro/siduction b/ascii/distro/siduction deleted file mode 100644 index c9720a606..000000000 --- a/ascii/distro/siduction +++ /dev/null @@ -1,21 +0,0 @@ -${c1} _aass, - jQh: =$w - QWmwawQW - )$QQQQ@( .. - _a_a. ~??^ syDY?Sa, - _mW>-<$c jWmi imm. - ]QQwayQE 4QQmgwmQQ` - ?WWQWP' -9QQQQQ@'._aas, - _a%is. .adYYs,. -"?!` aQB*~^3$c -_Qh;.nm .QWc. {QL ]QQp;..vmQ/ -"QQmmQ@ -QQQggmQP ]QQWmggmQQ( - -???" "$WQQQY` __, ?QQQQQQW! - _yZ!?q, - .yWY!!Sw, "???^ - .QQa_=qQ mQm>..vmm - $QQWQQP $QQQgmQQ@ - "???" _aa, -9WWQQWY` - _mB>~)$a -~~ - mQms_vmQ. - ]WQQQQQP - -?T??" - diff --git a/ascii/distro/slackware b/ascii/distro/slackware deleted file mode 100644 index 9ffde3dcd..000000000 --- a/ascii/distro/slackware +++ /dev/null @@ -1,21 +0,0 @@ -${c1} ::::::: - ::::::::::::::::::: - ::::::::::::::::::::::::: - ::::::::${c2}cllcccccllllllll${c1}:::::: - :::::::::${c2}lc dc${c1}::::::: - ::::::::${c2}cl clllccllll oc${c1}::::::::: - :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: - ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: - :::::::::::${c2}lc cclccclc${c1}::::::::::::: -::::::::::::::${c2}lcclcc lc${c1}:::::::::::: -::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: -::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: - :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: - :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: - ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: - :::${c2}oclcccccccccccccllllllllllllll${c1}::::: - ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: - :::::::::::::::::::::::::::::::: - :::::::::::::::::::::::::::: - :::::::::::::::::::::: - :::::::::::: diff --git a/ascii/distro/slitaz b/ascii/distro/slitaz deleted file mode 100644 index 5ee527061..000000000 --- a/ascii/distro/slitaz +++ /dev/null @@ -1,17 +0,0 @@ -${c1} @ @( @ - @@ @@ @ @/ - @@ @@ @@ @@ - @@ %@@ @@ @@ - @@ %@@@ @@@@@. @@@@ @@ - @@@ @@@@ @@@@@@@ &@@@ @@@ - @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ - ,@@@@@@@@@@@@@@@@@@@@@@@@@ - .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ -@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ -@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ -@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. -@@ ,@@ @@@@@@@@@@@@@ @@@ @@ -@ @@. @@@@@@@@@@@@@ @@@ *@ -@ @@ @@@@@@@@@@@@ @@ @ - @ @@@@@@@@@. #@ - @ ,@@@@@ @ diff --git a/ascii/distro/smartos b/ascii/distro/smartos deleted file mode 100644 index 59cea6932..000000000 --- a/ascii/distro/smartos +++ /dev/null @@ -1,17 +0,0 @@ -${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyys oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyy syyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy yyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy diff --git a/ascii/distro/solaris b/ascii/distro/solaris deleted file mode 100644 index 95a7f1a1e..000000000 --- a/ascii/distro/solaris +++ /dev/null @@ -1,8 +0,0 @@ -${c1} `- ` - `-- `+- .: - .+: `++: -/+- . - `.::` -++/``:::`./+/ `.-/. - `++/-`.` ` /++:` - `` ./:` .: `..`.- -``./+/:- -+++:- - -/+` :. diff --git a/ascii/distro/solus b/ascii/distro/solus deleted file mode 100644 index 75637543b..000000000 --- a/ascii/distro/solus +++ /dev/null @@ -1,20 +0,0 @@ -${c2} -``````````` - `-+/------------.` - .---:mNo---------------. - .-----yMMMy:---------------. - `------oMMMMMm/----------------` - .------/MMMMMMMN+----------------. - .------/NMMMMMMMMm-+/--------------. -`------/NMMMMMMMMMN-:mh/-------------` -.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. ------/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- -----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. -.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` -`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. -`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ - .------------:://+-/++++++${c1}oshddys: - -hhhhyyyyyyyyyyyhhhhddddhysssso- - `:ossssssyysssssssssssssssso:` - `:+ssssssssssssssssssss+- - `-/+ssssssssssso+/-` - `.-----..` diff --git a/ascii/distro/source_mage b/ascii/distro/source_mage deleted file mode 100644 index 39a440e82..000000000 --- a/ascii/distro/source_mage +++ /dev/null @@ -1,21 +0,0 @@ -${c2} :ymNMNho. -.+sdmNMMMMMMMMMMy` -.-::/yMMMMMMMMMMMm- - sMMMMMMMMMMMm/ - /NMMMMMMMMMMMMMm: - .MMMMMMMMMMMMMMMMM: - `MMMMMMMMMMMMMMMMMN. - NMMMMMMMMMMMMMMMMMd - mMMMMMMMMMMMMMMMMMMo - hhMMMMMMMMMMMMMMMMMM. - .`/MMMMMMMMMMMMMMMMMs - :mMMMMMMMMMMMMMMMN` - `sMMMMMMMMMMMMMMM+ - /NMMMMMMMMMMMMMN` - oMMMMMMMMMMMMM+ - ./sd.-hMMMMMMMMmmN` - ./+oyyyh- `MMMMMMMMMmNh - sMMMMMMMMMmmo - `NMMMMMMMMMd: - -dMMMMMMMMMo - -shmNMMms. diff --git a/ascii/distro/sparky b/ascii/distro/sparky deleted file mode 100644 index 82acb5a0a..000000000 --- a/ascii/distro/sparky +++ /dev/null @@ -1,21 +0,0 @@ -${c1} - . `-:-` - .o` .-///-` - `oo` .:/++:. - os+` -/+++:` ``.........``` - /ys+`./+++/-.-::::::----......`` - `syyo`++o+--::::-::/+++/-`` - -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` -::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` -`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` - -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- - .sdddy::syo--/:. `.:dy+-ohhho ./: - :yddds/:+oo+//:-`- /+ +hy+.shhy: `` - `:ydmmdysooooooo-.ss`/yss--oyyo - `./ossyyyyo+:-/oo:.osso- .oys - ``..-------::////.-oooo/ :so - `...----::::::::--.`/oooo: .o: - ``````` ++o+:` `:` - ./+/-` ` - `-:-. - `` diff --git a/ascii/distro/steamos b/ascii/distro/steamos deleted file mode 100644 index c17b16b69..000000000 --- a/ascii/distro/steamos +++ /dev/null @@ -1,18 +0,0 @@ -${c1} .,,,,. - .,'onNMMMMMNNnn',. - .'oNMANKMMMMMMMMMMMNNn'. - .'ANMMMMMMMXKNNWWWPFFWNNMNn. - ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, - ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, -,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, -'${c2}+#############, +. ,+' ${c1}+NMMM -${c2} '*#########*' '*,,*' ${c1}.+NMMMM. -${c2} `'*###*' ,.,;###${c1}+WNM, -${c2} .,;;, .;##########${c1}+W -${c2},',. '; ,+##############' - '###+. :,. .,; ,###############' - '####.. `'' .,###############' - '#####+++################' - '*##################*' - ''*##########*'' - '''''' diff --git a/ascii/distro/suse b/ascii/distro/suse deleted file mode 100644 index 6cc0433c0..000000000 --- a/ascii/distro/suse +++ /dev/null @@ -1,18 +0,0 @@ -${c2} .;ldkO0000Okdl;. - .;d00xl:^''''''^:ok00d;. - .d00l' 'o00d. - .d0Kd'${c1} Okxol:;,. ${c2}:O0d. - .OK${c1}KKK0kOKKKKKKKKKKOxo:, ${c2}lKO. - ,0K${c1}KKKKKKKKKKKKKKK0P^${c2},,,${c1}^dx:${c2} ;00, -.OK${c1}KKKKKKKKKKKKKKKk'${c2}.oOPPb.${c1}'0k.${c2} cKO. -:KK${c1}KKKKKKKKKKKKKKK: ${c2}kKx..dd ${c1}lKd${c2} 'OK: -dKK${c1}KKKKKKKKKOx0KKKd ${c2}^0KKKO' ${c1}kKKc${c2} dKd -dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd -:KK${c1}KKKKKKKKKK0o;...^cdxxOK0O/^^' ${c2}.0K: - kKK${c1}KKKKKKKKKKKKK0x;,,......,;od ${c2}lKk - '0K${c1}KKKKKKKKKKKKKKKKKKKK00KKOo^ ${c2}c00' - 'kK${c1}KKOxddxkOO00000Okxoc;'' ${c2}.dKk' - l0Ko. .c00l' - 'l0Kk:. .;xK0l' - 'lkK0xl:;,,,,;:ldO0kl' - '^:ldxkkkkxdl:^' diff --git a/ascii/distro/swagarch b/ascii/distro/swagarch deleted file mode 100644 index e3884f158..000000000 --- a/ascii/distro/swagarch +++ /dev/null @@ -1,15 +0,0 @@ -${c2} .;ldkOKXXNNNNXXK0Oxoc,. - ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; - 'K0xo ..,;:c:. `'lKMMMMM0 - .lONMMMMMM' `lNMk' -${c2} ;WMMMMMMMMMO. ${c1}....::... -${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, -${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. -${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. -${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: -${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. -${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: -${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. -${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. - :ccc:' `cccccccc:, - '' diff --git a/ascii/distro/tails b/ascii/distro/tails deleted file mode 100644 index a0512bc65..000000000 --- a/ascii/distro/tails +++ /dev/null @@ -1,19 +0,0 @@ -${c1} `` - ./yhNh -syy/Nshh `:o/ -N:dsNshh █ `ohNMMd -N-/+Nshh `yMMMMd -N-yhMshh yMMMMd -N-s:hshh █ yMMMMd so//. -N-oyNsyh yMMMMd d Mms. -N:hohhhd:. yMMMMd syMMM+ -Nsyh+-..+y+- yMMMMd :mMM+ -+hy- -ss/`yMMMM `+d+ - :sy/. ./yNMMMMm `` - .+ys- `:+hNMMMMMMy/` - `hNmmMMMMMMMMMMMMdo. - dMMMMMMMMMMMMMMMMMNh: - +hMMMMMMMMMMMMMMMMMmy. - -oNMMMMMMMMMMmy+.` - `:yNMMMds/.` - .//` diff --git a/ascii/distro/trisquel b/ascii/distro/trisquel deleted file mode 100644 index 07634b834..000000000 --- a/ascii/distro/trisquel +++ /dev/null @@ -1,18 +0,0 @@ -${c1} ▄▄▄▄▄▄ - ▄█████████▄ - ▄▄▄▄▄▄ ████▀ ▀████ - ▄██████████▄ ████▀ ▄▄ ▀███ - ▄███▀▀ ▀▀████ ███▄ ▄█ ███ -▄███ ▄▄▄ ████▄ ▀██████ ▄███ -███ █▀▀██▄ █████▄ ▀▀ ▄████ -▀███ ███ ███████▄▄ ▄▄██████ -${c1} ▀███▄ ▄███ █████████████${c2}████▀ -${c1} ▀█████████ ███████${c2}███▀▀▀ - ▀▀███▀▀ ██████▀▀ - ██████▀ ▄▄▄▄ - █████▀ ████████ - █████ ███▀ ▀███ - ████▄ ██▄▄▄ ███ - █████▄ ▀▀ ▄██ - ██████▄▄▄████ - ▀▀█████▀▀ diff --git a/ascii/distro/trueos b/ascii/distro/trueos deleted file mode 100644 index 84bc618a8..000000000 --- a/ascii/distro/trueos +++ /dev/null @@ -1,27 +0,0 @@ -${c1} .. - s. - +y - yN - -MN `. - :NMs `m - .yMMm` `No - `-/+++sdMMMNs+-`+Ms - `:oo+-` .yMMMMy` `-+oNMh - -oo- +NMMMM/ oMMh- - .s+` ` oMMMMM/ - oMMMhy. - +s`- :: :MMMMMd -o `mMMMy`s+ - y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y - s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s --h .NM` `hMMMMMMMMMMMMMMNMMNy: h- -y- hMN` hMMmMMMMMMMMMNsdMNs. -y -m` mMMy` oMMNoNMMMMMMo` sMMMo `m -m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m -h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h -:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: - y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y - `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` - so -NMMMN /mmd+ `dMMMMMMMm- os - :y: `yMMM` `+NMMMMMMNo`:y: - /s+`.omy /NMMMMMNh/.+s: - .+oo:-. /mdhs+::oo+. - -/o+++++++++++/- diff --git a/ascii/distro/tumbleweed b/ascii/distro/tumbleweed deleted file mode 100644 index 37ee33ad4..000000000 --- a/ascii/distro/tumbleweed +++ /dev/null @@ -1,13 +0,0 @@ -${c2} ...... - .,cdxxxoc,. .:kKMMMNWMMMNk:. - cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. - ;WMK;. .lKMMNM, :NMK, .OMW; - cMW; 'WMMMN ,XMK, oMM' -.MMc ..;l. xMN: KM0 -'MM. 'NMO oMM -.MM, .kMMl xMN - KM0 .kMM0. .dl:,.. .WMd - .XM0. ,OMMK, OMMMK. .XMK - oWMO:. .;xNMMk, NNNMKl. .xWMx - :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, - ..... .:dOOXXKOxl, diff --git a/ascii/distro/ubuntu b/ascii/distro/ubuntu deleted file mode 100644 index db5df090c..000000000 --- a/ascii/distro/ubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} .-/+oossssoo+/-. - `:+ssssssssssssssssss+:` - -+ssssssssssssssssssyyssss+- - .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ - +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ -.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. -+ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ -oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso -oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso -+ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ -.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ - +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ - /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ - .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - -+sssssssssssssssss${c2}yyy${c1}ssss+- - `:+ssssssssssssssssss+:` - .-/+oossssoo+/-. diff --git a/ascii/distro/ubuntu-budgie b/ascii/distro/ubuntu-budgie deleted file mode 100644 index 1faec715e..000000000 --- a/ascii/distro/ubuntu-budgie +++ /dev/null @@ -1,20 +0,0 @@ -${c2} ./oydmMMMMMMmdyo/. - :smMMMMMMMMMMMhs+:++yhs: - `omMMMMMMMMMMMN+` `odo` - /NMMMMMMMMMMMMN- `sN/ - `hMMMMmhhmMMMMMMh sMh` - .mMmo- /yMMMMm` `MMm. - mN/ yMMMMMMMd- MMMm -oN- oMMMMMMMMMms+//+o+: :MMMMo -m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm -M` .NMMMMMMMMMMMMMMMNodMMMMMMM -M- sMMMMMMMMMMMMMMMMMMMMMMMMM -mm` mMMMMMMMMMNdhhdNMMMMMMMMMm -oMm/ .dMMMMMMMMh: :dMMMMMMMo - mMMNyo/:/sdMMMMMMMMM+ sMMMMMm - .mMMMMMMMMMMMMMMMMMs `NMMMm. - `hMMMMMMMMMMM.oo+. `MMMh` - /NMMMMMMMMMo sMN/ - `omMMMMMMMMy. :dmo` - :smMMMMMMMh+-` `.:ohs: - ./oydmMMMMMMdhyo/. diff --git a/ascii/distro/ubuntu-gnome b/ascii/distro/ubuntu-gnome deleted file mode 100644 index 096dca3d0..000000000 --- a/ascii/distro/ubuntu-gnome +++ /dev/null @@ -1,16 +0,0 @@ -${c3} ./o. - .oooooooo - .oooo```soooo - .oooo` `soooo - .ooo` ${c4}.o.${c3} `\/ooo. - :ooo ${c4}:oooo.${c3} `\/ooo. - sooo ${c4}`ooooo${c3} \/oooo - \/ooo ${c4}`soooo${c3} `ooooo - `soooo ${c4}`\/ooo${c3} `soooo -${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo -${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` -${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` -${c4} `ooooo ${c3}`` ${c4}.oooo -${c4} `soooo. .oooo` - `\/oooooooooo` - ``\/oo`` diff --git a/ascii/distro/ubuntu-mate b/ascii/distro/ubuntu-mate deleted file mode 100644 index 893389fe3..000000000 --- a/ascii/distro/ubuntu-mate +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `:+shmNNMMNNmhs+:` - .odMMMMMMMMMMMMMMMMMMdo. - /dMMMMMMMMMMMMMMMmMMMMMMMMd/ - :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: - `yMMMMMMMMMms:..-::oM: -omMMMMMy` - `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` - hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh -/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ -hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh -/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ - hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh - `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` - yMMMMMMMMMms/..-::oM: .+dMMMMMy - :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: - /dMMMMMMMMMMMMMMMdNMMMMMMMd/ - .odMMMMMMMMMMMMMMMMMMdo. - `:+shmNNMMNNmhs+:` diff --git a/ascii/distro/ubuntu-studio b/ascii/distro/ubuntu-studio deleted file mode 100644 index 2deb270ec..000000000 --- a/ascii/distro/ubuntu-studio +++ /dev/null @@ -1,20 +0,0 @@ -${c1} ..-::::::-.` - `.:+++++++++++${c2}ooo${c1}++:.` - ./+++++++++++++${c2}sMMMNdyo${c1}+/. - .++++++++++++++++${c2}oyhmMMMMms${c1}++. - `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` - `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` - +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` - :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: - ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. - ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ - :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: - +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ - `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` - `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ - ./+++++++++++++++${c2}oyhdNMMMms${c1}++. - ./+++++++++++++${c2}hMMMNdyo${c1}+/. - `.:+++++++++++${c2}sso${c1}++:. - ..-::::::-.. diff --git a/ascii/distro/ubuntu_old b/ascii/distro/ubuntu_old deleted file mode 100644 index 4e3664b6b..000000000 --- a/ascii/distro/ubuntu_old +++ /dev/null @@ -1,19 +0,0 @@ - -${c1} ./+o+- -${c2} yyyyy- ${c1}-yyyyyy+ -${c2} ${c2}://+//////${c1}-yyyyyyo -${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` -${c3} .:++o: ${c2}/++++++++/:--:/- -${c3} o:+o+:++.${c2}`..```.-/oo+++++/ -${c3} .:+o:+o/.${c2} `+sssoo+/ -${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. -${c2}/+++//+:${c3}`oo+o${c2} /::--:. -${c2}+/+o+++${c3}`o++o${c1} ++////. -${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. -${c3} .+.o+oo:.${c1} `oddhhhh+ -${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ -${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: -${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` -${c1} /osyyyyyyo${c3}++ooo+++/ -${c1} ````` ${c3}+oo+++o: -${c3} `oo++. diff --git a/ascii/distro/void b/ascii/distro/void deleted file mode 100644 index 2a089e633..000000000 --- a/ascii/distro/void +++ /dev/null @@ -1,18 +0,0 @@ -${c1} __.;=====;.__ - _.=+==++=++=+=+===;. - -=+++=+===+=+=+++++=_ - . -=:`` `--==+=++==. - _vi, ` --+=++++: - .uvnvi. _._ -==+==+. - .vvnvnI` .;==|==;. :|=||=|. -${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL -${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE -${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' -${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! -${c1} -1vvnvv. `~+++` ++|+++ - +vnvnnv, `-|=== - +vnvnvns. . :=- - -Invnvvnsi..___..=sv=. ` - +Invnvnvnnnnnnnnvvnn;. - ~|Invnvnvvnvvvnnv}+` - -~|{*l}*|~ diff --git a/ascii/distro/void_small b/ascii/distro/void_small deleted file mode 100644 index adfae49bd..000000000 --- a/ascii/distro/void_small +++ /dev/null @@ -1,7 +0,0 @@ -${c1} _______ - _ \______ - -| \ ___ \ | -| | / \ | | -| | \___/ | | -| \______ \_| - -_______\ diff --git a/ascii/distro/windows b/ascii/distro/windows deleted file mode 100644 index 31564309b..000000000 --- a/ascii/distro/windows +++ /dev/null @@ -1,16 +0,0 @@ -${c1} ,.=:!!t3Z3z., - :tt:::tt333EE3 -${c1} Et:::ztt33EEEL${c2} @Ee., .., -${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# -${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL -${c1} it::::tt333EEF${c2} @EEEEEEttttt33F -${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. -${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF -${c3} ;::::::::zt33)${c2} "4EEEtttji3P* -${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. -${c3} i::::::::zt33F${c4} AEEEtttt::::ztF -${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 -${c3} E::::::::zt33L${c4} @EEEtttt::::z3F -${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` -${c3} `${c4} :EEEEtttt::::z7 - "VEzjt:;;z>*` diff --git a/ascii/distro/windows10 b/ascii/distro/windows10 deleted file mode 100644 index 625961294..000000000 --- a/ascii/distro/windows10 +++ /dev/null @@ -1,19 +0,0 @@ -${c1} .., - ....,,:;+ccllll - ...,,+:; cllllllllllllllllll -,cclllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll - -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -`'ccllllllllll lllllllllllllllllll - `' \\*:: :ccllllllllllllllll - ````''*::cll - `` diff --git a/ascii/distro/xubuntu b/ascii/distro/xubuntu deleted file mode 100644 index b872562b0..000000000 --- a/ascii/distro/xubuntu +++ /dev/null @@ -1,20 +0,0 @@ -${c1} `-/osyhddddhyso/-` - .+yddddddddddddddddddy+. - :yddddddddddddddddddddddddy: - -yddddddddddddddddddddhdddddddy- - odddddddddddyshdddddddh`dddd+ydddo - `yddddddhshdd- ydddddd+`ddh.:dddddy` - sddddddy /d. :dddddd-:dy`-ddddddds -:ddddddds /+ .dddddd`yy`:ddddddddd: -sdddddddd` . .-:/+ssdyodddddddddds -ddddddddy `:ohddddddddd -dddddddd. +dddddddd -sddddddy ydddddds -:dddddd+ .oddddddd: - sdddddo ./ydddddddds - `yddddd. `:ohddddddddddy` - oddddh/` `.:+shdddddddddddddo - -ydddddhyssyhdddddddddddddddddy- - :yddddddddddddddddddddddddy: - .+yddddddddddddddddddy+. - `-/osyhddddhyso/-` diff --git a/ascii/distro/zorin b/ascii/distro/zorin deleted file mode 100644 index bb0516695..000000000 --- a/ascii/distro/zorin +++ /dev/null @@ -1,17 +0,0 @@ -${c1} `osssssssssssssssssssso` - .osssssssssssssssssssssso. - .+oooooooooooooooooooooooo+. - - - `::::::::::::::::::::::. .:` - `+ssssssssssssssssss+:.` `.:+ssso` -.ossssssssssssssso/. `-+ossssssso. -ssssssssssssso/-` `-/osssssssssssss -.ossssssso/-` .-/ossssssssssssssso. - `+sss+:. `.:+ssssssssssssssssss+` - `:. .::::::::::::::::::::::` - - - .+oooooooooooooooooooooooo+. - -osssssssssssssssssssssso- - `osssssssssssssssssssso` diff --git a/config/travis.conf b/config/travis.conf deleted file mode 100644 index 0dada093f..000000000 --- a/config/travis.conf +++ /dev/null @@ -1,55 +0,0 @@ -# Neofetch config file for travis.ci -# https://github.com/dylanaraps/neofetch - -print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "GPU Driver" gpu_driver - info "Memory" memory - - info "CPU Usage" cpu_usage - info "Disk" disk - info "Battery" battery - info "Font" font - info "Song" song - info "Local IP" local_ip - info "Public IP" public_ip - info "Users" users - info "Install Date" install_date - - info line_break - info cols - info line_break - - # Testing. - prin "prin" - prin "prin" "prin" - - # Testing no subtitles. - info uptime - info disk -} - -refresh_rate="on" -shell_version="on" -cpu_display="infobar" -memory_display="infobar" -disk_display="infobar" -cpu_temp="C" diff --git a/neofetch b/neofetch index 8ea185e9f..195cb6f1f 100755 --- a/neofetch +++ b/neofetch @@ -3460,6 +3460,8 @@ get_ascii() { # Fallback to distro ascii mode if source is an image. [[ "$image_source" =~ \.(png|jpg|jpe|jpeg|gif)$ ]] && \ err "Image: Source is image file but ascii backend was selected. Using distro ascii." + else + ascii_data="$(< "$image_source")" fi # Set locale to get correct padding. @@ -8557,6 +8559,61 @@ get_args() { -N ./neofetch -o neofetch.1 exit 1 ;; + + "--travis") + print_info() { + info title + info underline + + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "GPU Driver" gpu_driver + info "Memory" memory + + info "CPU Usage" cpu_usage + info "Disk" disk + info "Battery" battery + info "Font" font + info "Song" song + info "Local IP" local_ip + info "Public IP" public_ip + info "Users" users + info "Install Date" install_date + + info line_break + info cols + info line_break + + # Testing. + prin "prin" + prin "prin" "prin" + + # Testing no subtitles. + info uptime + info disk + } + + refresh_rate="on" + shell_version="on" + cpu_display="infobar" + memory_display="infobar" + disk_display="infobar" + cpu_temp="C" + ;; esac shift From f6d93420f83b39a368584f1360505e87c31d9640 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:05:42 +1000 Subject: [PATCH 0283/1133] general: Adjust makefile --- Makefile | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 99ec43b22..7870d4566 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,4 @@ PREFIX ?= /usr -SYSCONFDIR ?= /etc MANDIR ?= $(PREFIX)/share/man all: @@ -8,22 +7,15 @@ all: install: @echo 'Making directories...' @mkdir -p $(DESTDIR)$(PREFIX)/bin - @mkdir -p $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro @mkdir -p $(DESTDIR)$(MANDIR)/man1 - @mkdir -p $(DESTDIR)$(SYSCONFDIR)/neofetch @echo 'Installing binaries...' - @sed "s|ASCIIDIR|$(PREFIX)/share/neofetch/ascii/distro|g;s|CONFDIR|$(SYSCONFDIR)/neofetch|g" < neofetch > $(DESTDIR)$(PREFIX)/bin/neofetch @chmod 755 $(DESTDIR)$(PREFIX)/bin/neofetch - @echo 'Installing ASCII files, man page and config file...' - @cp -p ascii/distro/* $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro + @echo 'Installing man page...' @cp -p neofetch.1 $(DESTDIR)$(MANDIR)/man1 - @cp -p config/config.conf $(DESTDIR)$(SYSCONFDIR)/neofetch/config.conf uninstall: @echo 'Removing files...' @rm -rf $(DESTDIR)$(PREFIX)/bin/neofetch @rm -rf $(DESTDIR)$(MANDIR)/man1/neofetch.1* - @rm -rf $(DESTDIR)$(PREFIX)/share/neofetch - @rm -rf $(DESTDIR)$(SYSCONFDIR)/neofetch From 8793fdbe6b082f71d726c2c0c205334b3c0240c4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:12:42 +1000 Subject: [PATCH 0284/1133] theme: Fixes for bash3 --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 195cb6f1f..e3c3d92e1 100755 --- a/neofetch +++ b/neofetch @@ -32,7 +32,7 @@ shopt -s nocasematch reset="\e[0m" # Neofetch default config. -readarray -t config <<'EOM' +read -rd '' config <<'EOF' # See this wiki page for more info: # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info print_info() { @@ -801,7 +801,7 @@ stdout="off" # NOTE: Don't change this value, neofetch reads this to determine # how to handle backwards compatibility. config_version="3.4.1-git" -EOM +EOF # DETECT INFORMATION @@ -7842,7 +7842,7 @@ get_user_config() { config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" # The config file doesn't exist, create it. - printf "%s\n" "${config[@]}" > "$config_file" + printf "%s\n" "$config" > "$config_file" fi source "$config_file" @@ -8625,7 +8625,7 @@ main() { get_os # Load default config. - source /dev/stdin < <(printf "%s\\n" "${config[@]}") + source /dev/stdin < <(printf "%s\n" "$config") get_args "$@" [[ "$verbose" != "on" ]] && exec 2>/dev/null From a5a850c3665f58ab6dd7a4539e15b5f682b80ad6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:17:43 +1000 Subject: [PATCH 0285/1133] ascii: Update android ascii --- neofetch | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/neofetch b/neofetch index e3c3d92e1..3c6f2bead 100755 --- a/neofetch +++ b/neofetch @@ -4272,21 +4272,25 @@ EOF "Android"*) set_colors 2 7 - ascii_length_force=19 - read -rd '' ascii_data <<'EOF' -${c1} ╲ ▁▂▂▂▁ ╱ - ▄███████▄ - ▄██${c2} ${c1}███${c2} ${c1}██▄ - ▄███████████▄ -▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄ █▄ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ -██ █████████████ ██ - █████████████ - ███████████ - ██ ██ - ██ ██ + read -rd '' ascii_data <<'EOF' +${c1} -o o- + +hydNNNNdyh+ + +mMMMMMMMMMMMMm+ + `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` + hMMMMMMMMMMMMMMMMMMh + .. yyyyyyyyyyyyyyyyyyyy .. +.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +-MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- + +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ + mMMMMMMMMMMMMMMMMMMm + `/++MMMMh++hMMMM++/` + MMMMo oMMMM + MMMMo oMMMM + oNMm- -mMNs EOF ;; From 75807e0711a9e8e41cf1540a72cdaf37d1039de1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:21:33 +1000 Subject: [PATCH 0286/1133] travis: Added another exclude. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f96df785f..af3a372ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,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,SC1117; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1091,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 b8c2db973dcdd0ca945d3bb9dbfb235a5bfddb66 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 15:22:25 +1000 Subject: [PATCH 0287/1133] travis: Remove line limit. Will still be enforced by hand. --- .travis.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index af3a372ea..532ca462e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,3 @@ script: # 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,SC1091,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. - - if grep '.\{101\}' neofetch; then (exit 1); else (exit 0); fi From 97bd3902955d5f15a1febec05f1eea1639126fbb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 16:09:04 +1000 Subject: [PATCH 0288/1133] General: Move ascii art to the bottom of the script. --- neofetch | 8052 +++++++++++++++++++++++++++--------------------------- 1 file changed, 4026 insertions(+), 4026 deletions(-) diff --git a/neofetch b/neofetch index 3c6f2bead..ee0bf7088 100755 --- a/neofetch +++ b/neofetch @@ -4141,3492 +4141,2194 @@ uppercase() { # COLORS -get_distro_colors() { - # This function sets the text colors according - # to your OS/Distro's logo colors. - # - # $ascii_distro is the same as $distro. - case "$ascii_distro" in - "AIX"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} `:+ssssossossss+-` - .oys///oyhddddhyo///sy+. - /yo:+hNNNNNNNNNNNNNNNNh+:oy/ - :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: - `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh - h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy -/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: -h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y -N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m -N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m -h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y -:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- - yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy - sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo - :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- - :ys:/yNNNNNNNNNNNNNNNmy/:sy: - .+ys///osyhhhhys+///sy+. - -/osssossossso/- -EOF - ;; +set_colors() { + c1="$(color "$1")${ascii_bold}" + c2="$(color "$2")${ascii_bold}" + c3="$(color "$3")${ascii_bold}" + c4="$(color "$4")${ascii_bold}" + c5="$(color "$5")${ascii_bold}" + c6="$(color "$6")${ascii_bold}" - "alpine_small") - set_colors 4 7 - read -rd '' ascii_data <<'EOF' -${c1} /\\ /\\ - /${c2}/ ${c1}\\ \\ - /${c2}/ ${c1}\\ \\ -/${c2}// ${c1}\\ \\ -${c2}// ${c1}\\ \\ - \\ -EOF - ;; + [[ "$color_text" != "off" ]] && set_text_colors "$@" +} - "Alpine"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} .hddddddddddddddddddddddh. - :dddddddddddddddddddddddddd: - /dddddddddddddddddddddddddddd/ - +dddddddddddddddddddddddddddddd+ - `sdddddddddddddddddddddddddddddddds` - `ydddddddddddd++hdddddddddddddddddddy` -.hddddddddddd+` `+ddddh:-sdddddddddddh. -hdddddddddd+` `+y: .sddddddddddh -ddddddddh+` `//` `.` -sddddddddd -ddddddh+` `/hddh/` `:s- -sddddddd -ddddh+` `/+/dddddh/` `+s- -sddddd -ddd+` `/o` :dddddddh/` `oy- .yddd -hdddyo+ohddyosdddddddddho+oydddy++ohdddh -.hddddddddddddddddddddddddddddddddddddh. - `yddddddddddddddddddddddddddddddddddy` - `sdddddddddddddddddddddddddddddddds` - +dddddddddddddddddddddddddddddd+ - /dddddddddddddddddddddddddddd/ - :dddddddddddddddddddddddddd: - .hddddddddddddddddddddddh. -EOF - ;; +set_text_colors() { + if [[ "${colors[0]}" == "distro" ]]; then + title_color="$(color "$1")" + at_color="$reset" + underline_color="$reset" + subtitle_color="$(color "$2")" + colon_color="$reset" + info_color="$reset" - "Amazon"*) - set_colors 3 7 - read -rd '' ascii_data <<'EOF' -${c1} `-/oydNNdyo:.` - `.:+shmMMMMMMMMMMMMMMmhs+:.` - -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- -.`` -/+shmNNMMMMMMNNmhs+/- ``. -dNmhs+:. `.:/oo/:.` .:+shmNd -dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd -dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. - `.:+shNMMMMMh yMMMMMNhs+:`` - `-+shy shs+:` -EOF - ;; + # If the ascii art uses 8 as a color, make the text the fg. + ((${1:-1} == 8)) && title_color="$reset" + ((${2:-7} == 8)) && subtitle_color="$reset" - "Anarchy"*) - set_colors 7 4 - read -rd '' ascii_data <<'EOF' - ${c2}..${c1} - ${c2}..${c1} - ${c2}:..${c1} - ${c2}:+++.${c1} - .:::++${c2}++++${c1}+::. - .:+######${c2}++++${c1}######+:. - .+#########${c2}+++++${c1}##########:. - .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. - +###########${c2}+++++++++${c1}############: - +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ - +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ - :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: - ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ -.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. -.##########${c2}+++++++++++++++++++${c1}###########. - #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ - :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: - +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ - +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ - :##${c2}++++++${c1}############${c2}++++++++++${c1}##: - .${c2}++++++${c1}#############${c2}++++++++++${c1}+. - :${c2}++++${c1}###############${c2}+++++++${c1}:: - .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. - ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. - ${c2}.${c1} ${c2}.:+++${c1}. - ${c2}.:${c1}: - ${c2}..${c1} - ${c2}..${c1} -EOF - ;; + # If the second color is white use the first for the subtitle. + ((${2:-7} == 7)) && subtitle_color="$(color "$1")" + ((${1:-1} == 7)) && title_color="$reset" + else + title_color="$(color "${colors[0]}")" + at_color="$(color "${colors[1]}")" + underline_color="$(color "${colors[2]}")" + subtitle_color="$(color "${colors[3]}")" + colon_color="$(color "${colors[4]}")" + info_color="$(color "${colors[5]}")" + fi - "Android"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} -o o- - +hydNNNNdyh+ - +mMMMMMMMMMMMMm+ - `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` - hMMMMMMMMMMMMMMMMMMh - .. yyyyyyyyyyyyyyyyyyyy .. -.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: --MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- - +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ - mMMMMMMMMMMMMMMMMMMm - `/++MMMMh++hMMMM++/` - MMMMo oMMMM - MMMMo oMMMM - oNMm- -mMNs -EOF - ;; + # Bar colors. + if [[ "$bar_color_elapsed" == "distro" ]]; then + bar_color_elapsed="$(color fg)" + else + bar_color_elapsed="$(color "$bar_color_elapsed")" + fi - "Antergos"*) - set_colors 4 6 - read -rd '' ascii_data <<'EOF' -${c2} `.-/::/-`` - .-/osssssssso/. - :osyysssssssyyys+- - `.+yyyysssssssssyyyyy+. - `/syyyyyssssssssssyyyyys-` - `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` - .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. - .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. - -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: - -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- - .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` -`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo -.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. -ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy -dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh --dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- -.smmmmddddddddhhhhhhhhhdddddddddmmmms. - `+ydmmmdddddddddddddddddddmmmmdy/. - `.:+ooyyddddddddddddyyso+:.` -EOF - ;; + case "$bar_color_total $1" in + "distro "[736]) bar_color_total="$(color "$1")" ;; + "distro "[0-9]) bar_color_total="$(color "$2")" ;; + *) bar_color_total="$(color "$bar_color_total")" ;; + esac +} - "antiX"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} - \ - , - ~ ^ ~ - \ / - , ' \ ' , / - , \ '/ - , \ / , - ,___, \/ , - / | _ _ _|_ o /\ , -|, | / |/ | | | / \ , - \,_/\_/ | |_/|_/|_/_/ \, - , / ,\ - , / , ' \ - ' - , _ _ _ , ' -EOF - ;; +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" ;; + esac +} - "AOSC"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} .:+syhhhhys+:. - .ohNMMMMMMMMMMMMMMNho. - `+mMMMMMMMMMMmdmNMMMMMMMMm+` - +NMMMMMMMMMMMM/ `./smMMMMMN+ - .mMMMMMMMMMMMMMMo -yMMMMMm. - :NMMMMMMMMMMMMMMMs .hMMMMN: - .NMMMMhmMMMMMMMMMMm+/- oMMMMN. - dMMMMs ./ymMMMMMMMMMMNy. sMMMMd --MMMMN` oMMMMMMMMMMMN: `NMMMM- -/MMMMh NMMMMMMMMMMMMm hMMMM/ -/MMMMh NMMMMMMMMMMMMm hMMMM/ --MMMMN` :MMMMMMMMMMMMy. `NMMMM- - dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd - .NMMMMo -/+sMMMMMMMMMMMmMMMMN. - :NMMMMh. .MMMMMMMMMMMMMMMN: - .mMMMMMy- NMMMMMMMMMMMMMm. - +NMMMMMms/.` mMMMMMMMMMMMN+ - `+mMMMMMMMMNmddMMMMMMMMMMm+` - .ohNMMMMMMMMMMMMMMNho. - .:+syhhhhys+:. -EOF - ;; - - "Apricity"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} ./o- - ``...`` `:. -/: - `-+ymNMMMMMNmho-` :sdNNm/ - `+dMMMMMMMMMMMMMMMmo` sh:.:::- - /mMMMMMMMMMMMMMMMMMMMm/`sNd/ - oMMMMMMMMMMMMMMMMMMMMMMMs -` -:MMMMMMMMMMMMMMMMMMMMMMMMM/ -NMMMMMMMMMMMMMMMMMMMMMMMMMd -MMMMMMMmdmMMMMMMMMMMMMMMMMd -MMMMMMy` .mMMMMMMMMMMMmho:` -MMMMMMNo/sMMMMMMMNdy+-.`-/ -MMMMMMMMMMMMNdy+:.`.:ohmm: -MMMMMMMmhs+-.`.:+ymNMMMy. -MMMMMM/`.-/ohmNMMMMMMy- -MMMMMMNmNNMMMMMMMMmo. -MMMMMMMMMMMMMMMms:` -MMMMMMMMMMNds/. -dhhyys+/-` -EOF - ;; +# OTHER - "ArcoLinux"*) - set_colors 7 4 - ascii_file="arcolinux" - ;; +stdout() { + image_backend="off" + unset subtitle_color + unset colon_color + unset info_color + unset underline_color + unset bold + unset title_color + unset at_color + unset text_padding + unset zws + unset reset + unset color_blocks + unset get_line_break +} - "arch_small") - set_colors 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} /\ - /^^\ - /\ \ - /${c2} __ \ - / ( ) \ - / __| |__\\\ -/// \\\\\ -EOF - ;; +err() { + err+="$(color 1)[!]\e[0m $1\n" +} - "arch_old") - set_colors 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} __ - _=(SDGJT=_ - _GTDJHGGFCVS) - ,GTDJGGDTDFBGX0 -${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ -${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL -${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, -${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], -${c1} SDDFDFH' !YEWD,${c2} )HDROD -${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' -${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' -${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' -${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) -${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF -'EHTI !H - `0F' '! -EOF - ;; +get_full_path() { + # This function finds the absolute path from a relative one. + # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" - "ArchBox"*) - set_colors 2 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ...:+oh/:::.. - ..-/oshhhhhh` `::::-. - .:/ohhhhhhhhhhhh` `-::::. - .+shhhhhhhhhhhhhhhhh` `.::-. - /`-:+shhhhhhhhhhhhhh` .-/+shh - / .:/ohhhhhhhhh` .:/ohhhhhhhh - / `-:+shhh` ..:+shhhhhhhhhhhh - / .:ohhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / .+o+ `hhhhhhhhhhhhhhhhhhhh - / -hhhhh `hhhhhhhhhhhhhhhhhhhh - / ohhhhho `hhhhhhhhhhhhhhhhhhhh - /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` - `--/:` /: `hhhhhhhhhhhho/- - -/:. `hhhhhhs+:-` - ::::/ho/-` -EOF - ;; + # If the file exists in the current directory, stop here. + [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - "ARCHlabs"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} 'c' - 'kKk, - .dKKKx. - .oKXKXKd. - .l0XXXXKKo. - c0KXXXXKX0l. - :0XKKOxxOKX0l. - :OXKOc. .c0XX0l. - :OK0o. ${c4}...${c1}'dKKX0l. - :OX0c ${c4};xOx'${c1}'dKXX0l. - :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. - c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. - .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. - .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. - .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. - .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. - .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' - 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' - 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, - ,xko:'. ${c4}.. ${c1} .':okx; - .,'. .',. -EOF - ;; + if ! cd "${1%/*}"; then + err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" + err " Check that the directory exists or try another directory." + exit 1 + fi - *"XFerience"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ``--:::::::-.` - .-/+++ooooooooo+++:-` - `-/+oooooooooooooooooo++:. - -/+oooooo/+ooooooooo+/ooo++:` - `/+oo++oo. .+oooooo+.-: +:-o+- - `/+o/. -o. :oooooo+ ```:.+oo+- -`:+oo- -/` :oooooo+ .`-`+oooo/. -.+ooo+. .` `://///+-+..oooooo+:` --+ooo:` ``.-+oooooo+/` --+oo/` :+oooo/. -.+oo: ..-/. . -+oo+/` -`/++- -:::++::/. -+oo+- - ./o: `:///+- `./ooo+:` - .++- `` /-` -:/+oooo+:` - .:+/:`` `-:ooooooo++- - ./+o+//:...../+oooooooo++:` - `:/++ooooooooooooo++/-` - `.-//++++++//:-.` - `````` -EOF - ;; + local full_dir="${1##*/}" - "ArchMerge"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} y: - sMN- - +MMMm` - /MMMMMd` - :NMMMMMMy - -NMMMMMMMMs - .NMMMMMMMMMM+ - .mMMMMMMMMMMMM+ - oNMMMMMMMMMMMMM+ - `+:-+NMMMMMMMMMMMM+ - .sNMNhNMMMMMMMMMMMM/ - `hho/sNMMMMMMMMMMMMMMM/ - `.`omMMmMMMMMMMMMMMMMMMM+ - .mMNdshMMMMd+::oNMMMMMMMMMo - .mMMMMMMMMM+ `yMMMMMMMMMs - .NMMMMMMMMM/ yMMMMMMMMMy - -NMMMMMMMMMh `mNMMMMMMMMd` - /NMMMNds+:.` `-/oymMMMm. - +Mmy/. `:smN: -/+. -o. -EOF - ;; + # Iterate down a (possible) chain of symlinks. + while [[ -L "$full_dir" ]]; do + full_dir="$(readlink "$full_dir")" + cd "${full_dir%/*}" || exit + full_dir="${full_dir##*/}" + done - "Arch"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} -` - .o+` - `ooo/ - `+oooo: - `+oooooo: - -+oooooo+: - `/:-:++oooo+: - `/++++/+++++++: - `/++++++++++++++: - `/+++o${c2}oooooooo${c1}oooo/` -${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` -${c2} .oossssso-````/ossssss+` - -osssssso. :ssssssso. - :osssssss/ osssso+++. - /ossssssss/ +ssssooo/- - `/ossssso+/:- -:/+osssso+- - `+sso+:-` `.-/+oso: - `++:. `-/+/ - .` `/ -EOF - ;; + # Final directory. + full_dir="$(pwd -P)/${1/*\/}" - "Artix"*) - set_colors 6 4 2 7 - read -rd '' ascii_data <<'EOF' -${c1} d${c2}c. -${c1} x${c2}dc. -${c1} '.${c4}.${c1} d${c2}dlc. -${c1} c${c2}0d:${c1}o${c2}xllc; -${c1} :${c2}0ddlolc,lc, -${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. -${c1} ;${c1}K${c2}kxoOddollc' cllc. -${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: -${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: -${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, -${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. -${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; -${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, -${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. -${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. -${c1} 0${c2}Okd''dc. .cll; -${c1} k${c2}Okd' .llc, -${c1} d${c2}Od, 'lc. -${c1} :,${c4}. ${c2}... -EOF - ;; + [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" +} - "Arya"*) - set_colors 2 1 - read -rd '' ascii_data <<'EOF' -${c1} `oyyy/${c2}-yyyyyy+ -${c1} -syyyy/${c2}-yyyyyy+ -${c1} .syyyyy/${c2}-yyyyyy+ -${c1} :yyyyyy/${c2}-yyyyyy+ -${c1} `/ :yyyyyy/${c2}-yyyyyy+ -${c1} .+s :yyyyyy/${c2}-yyyyyy+ -${c1} .oys :yyyyyy/${c2}-yyyyyy+ -${c1} -oyys :yyyyyy/${c2}-yyyyyy+ -${c1} :syyys :yyyyyy/${c2}-yyyyyy+ -${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ -${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ -${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- -${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy -${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy -${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy -EOF - ;; +get_user_config() { + # Check $config_file. + if [[ -f "$config_file" ]]; then + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options + return + fi + mkdir -p "${XDG_CONFIG_HOME}/neofetch/" - "Bitrig"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} `hMMMMN+ - -MMo-dMd` - oMN- oMN` - yMd /NM: - .mMmyyhMMs - :NMMMhsmMh - +MNhNNoyMm- - hMd.-hMNMN: - mMmsssmMMMo - .MMdyyhNMMMd - oMN.`/dMddMN` - yMm/hNm+./MM/ -.dMMMmo.``.NMo -:NMMMNmmmmmMMh -/MN/-------oNN: -hMd. .dMh -sm/ /ms -EOF - ;; + # Check ${XDG_CONFIG_HOME}/neofetch and create the + # dir/files if they don't exist. + if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config" - "BLAG"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} d - ,MK: - xMMMX: - .NMMMMMX; - lMMMMMMMM0clodkO0KXWW: - KMMMMMMMMMMMMMMMMMMX' - .;d0NMMMMMMMMMMMMMMMMMMK. - .;dONMMMMMMMMMMMMMMMMMMMMMMx -'dKMMMMMMMMMMMMMMMMMMMMMMMMl - .:xKWMMMMMMMMMMMMMMMMMMM0. - .:xNMMMMMMMMMMMMMMMMMK. - lMMMMMMMMMMMMMMMMMMK. - ,MMMMMMMMWkOXWMMMMMM0 - .NMMMMMNd. `':ldko - OMMMK: - oWk, - ;: -EOF - ;; + elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - "BlankOn"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` -${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ -${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys -${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys -${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys -${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys -${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys -${c2}NMMMMMN: .NMMMMMN${c1}yyyyys -${c2}MMMMMMm. NMMMMMN${c1}yyyyys -${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys -${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys -${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys -${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys -${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys -${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys -${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo -${c2} `.:/++++/:.` ${c1}:oys+. -EOF - ;; + else + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - "BSD") - set_colors 1 7 4 3 6 - read -rd '' ascii_data <<'EOF' -${c1} , , - /( )` - \ \___ / | - /- _ `-/ ' - (${c2}/\/ \ ${c1}\ /\ - ${c2}/ / | ` ${c1}\ - ${c3}O O ${c2}) ${c1}/ | - ${c2}`-^--'${c1}`< ' - (_.) _ ) / - `.___/` / - `-----' / -${c4}<----. __ / __ \ -${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| -<----' ${c1}`--' `.__,' \ - | | - \ / /\ - ${c5}______${c1}( (_ / \______/ - ${c5},' ,-----' | - `--{__________) -EOF - ;; + # The config file doesn't exist, create it. + printf "%s\n" "$config" > "$config_file" + fi - "BunsenLabs"*) - set_colors fg 7 - read -rd '' ascii_data <<'EOF' -${c1} `++ - -yMMs - `yMMMMN` - -NMMMMMMm. - :MMMMMMMMMN- - .NMMMMMMMMMMM/ - yMMMMMMMMMMMMM/ -`MMMMMMNMMMMMMMN. --MMMMN+ /mMMMMMMy --MMMm` `dMMMMMM -`MMN. .NMMMMM. - hMy yMMMMM` - -Mo +MMMMN - /o +MMMMs - +MMMN` - hMMM: - `NMM/ - +MN: - mh. - -/ -EOF - ;; + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options +} - "Calculate"*) - set_colors 7 3 - read -rd '' ascii_data <<'EOF' -${c1} ...... - ,,+++++++,. - .,,,....,,,${c2}+**+,,.${c1} - ............,${c2}++++,,,${c1} - ............... - ......,,,........ - .....+*#####+,,,*+. - .....,*###############,..,,,,,,.. - ......,*#################*..,,,,,..,,,.. - .,,....*####################+***+,,,,...,++, - .,,..,..*#####################*, - ,+,.+*..*#######################. - ,+,,+*+..,########################* -.,++++++. ..+##**###################+ -..... ..+##***#################*. - .,.*#*****##############*. - ..,,*********#####****+. - ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} - ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} - ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} -EOF - ;; +bar() { + # Get the values. + elapsed="$(($1 * bar_length / $2))" - "CentOS"*) - set_colors 3 2 4 5 7 - read -rd '' ascii_data <<'EOF' -${c1} .. - .PLTJ. - <><><><> - ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK - ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK - ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V - ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. -${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. -${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. -${c4} -${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV -${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' - ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' - ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 - ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK - ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK -${c2} <><><><> - 'MKKM' - '' -EOF - ;; + # Create the bar with spaces. + printf -v prog "%${elapsed}s" + printf -v total "%$((bar_length - elapsed))s" - "Chakra"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} _ _ _ "kkkkkkkk. - ,kkkkkkkk., 'kkkkkkkkk, - ,kkkkkkkkkkkk., 'kkkkkkkkk. - ,kkkkkkkkkkkkkkkk,'kkkkkkkk, - ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. - "''"''',;::,,"''kkk''kkkkk; __ - ,kkkkkkkkkk, "k''kkkkk' ,kkkk - ,kkkkkkk' ., ' .: 'kkkk',kkkkkk - ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk - ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk -.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' -;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' -'kkkkkkk; 'kkkkkkkk.,""''"''"" - ''kkkk; 'kkkkkkkkkk., - ';' 'kkkkkkkkkkkk., - ';kkkkkkkkkk' - ';kkkkkk' - "''" -EOF - ;; + # Set the colors and swap the spaces for $bar_char_. + bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" + bar+="${bar_color_total}${total// /${bar_char_total}}" - "ChaletOS"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `.//+osso+/:`` - `/sdNNmhyssssydmNNdo:` - :hNmy+-` .-+hNNs- - /mMh/` `+:` `+dMd: - .hMd- -sNNMNo. /yyy /mMs` - -NM+ `/dMd/--omNh::dMM `yMd` - .NN+ .sNNs:/dMNy:/hNmo/s yMd` - hMs `/hNd+-smMMMMMMd+:omNy- `dMo -:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` -/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: -/Md` MMMMMMMMMMMMMMMMMMMN .MN: -:NN. MMMMMMm....--NMMMMMN -Mm. -`dMo MMMMMMd mMMMMMN hMs - -MN: MMMMMMd mMMMMMN oMm` - :NM: MMMMMMd mMMMMMN +Mm- - -mMy. mmmmmmh dmmmmmh -hMh. - oNNs- :yMm/ - .+mMdo:` `:smMd/` - -ohNNmhsoo++osshmNNh+. - `./+syyhhyys+:`` -EOF - ;; + # Borders. + [[ "$bar_border" == "on" ]] && \ + bar="$(color fg)[${bar}$(color fg)]" - "Chapeau"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} .-/-. - ////////. - ////////${c2}y+${c1}//. - ////////${c2}mMN${c1}/////. - ////////${c2}mMN+${c1}////////. - ////////////////////////. - /////////+${c2}shhddhyo${c1}+////////. - ////////${c2}ymMNmdhhdmNNdo${c1}///////. -///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. -///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// -//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// -//////${c2}+MMmssssssssssssss+${c1}/////// -`//////${c2}yMMy${c1}//////////////////// - `//////${c2}smMNhso++oydNm${c1}//////// - `///////${c2}ohmNMMMNNdy+${c1}/////// - `//////////${c2}++${c1}////////// - `////////////////. - -////////- -EOF - ;; + printf "%b" "${bar}${info_color}" +} - "Chrom"*) - set_colors 2 1 3 4 7 - read -rd '' ascii_data <<'EOF' -${c2} .,:loool:,. - .,coooooooooooooc,. - .,lllllllllllllllllllll,. - ;ccccccccccccccccccccccccc; -${c1} '${c2}ccccccccccccccccccccccccccccc. -${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: -${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. -${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d -${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 -${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 -${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d -${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. -${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; -${c1} .:ccccccccllllllllo${c3}O0000000OOO, -${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. -${c1} '::ccccccccc${c3}dOOOOOOOkx:. -${c1} ..,::cccc${c3}xOOOkkko;. -${c1} ..,:${c3}dOkxl:. -EOF - ;; +cache() { + if [[ "$2" ]]; then + mkdir -p "${cache_dir}/neofetch" + printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" + fi +} - "Clover"*) - set_colors 2 6 - read -rd '' ascii_data <<'EOF' -${c1} `omo``omo` - `oNMMMNNMMMNo` - `oNMMMMMMMMMMMMNo` - oNMMMMMMMMMMMMMMMMNo - `sNMMMMMMMMMMMMMMNs` - `omo` `sNMMMMMMMMMMNs` `omo` - `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` - `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` -oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo -`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` -`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` -oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo - `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` - `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` - `oNs` `sNMMMMMMMMMMNs` `oNs` - `sNMMMMMMMMMMMMMMNs` - +NMMMMMMMMMMMMMMMMNo - `oNMMMMMMMMMMMMNo` - `oNMMMNNMMMNs` - `omo``oNs` -EOF - ;; +get_cache_dir() { + case "$os" in + "Mac OS X") cache_dir="/Library/Caches" ;; + *) cache_dir="/tmp" ;; + esac +} - "Container Linux by CoreOS"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ..... - .';:cccccccc:;'. - ':ccccclc${c3}lllllllll${c1}cc:. - .;cccccccc${c3}lllllllllllllll${c1}c, - ;clllccccc${c3}llllllllllllllllll${c1}c, - .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: - ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: - :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, -.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c -.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. -.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. -.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc - :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; - .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc - .cllllllllllclcccclccclccllllcllc - :cllllllllccclcllllllllllllcc; - .cccccccccccccclcccccccccc:. - .;cccclccccccllllllccc,. - .';ccccclllccc:;.. - ..... -EOF - ;; +kde_config_dir() { + # If the user is using KDE get the KDE + # configuration directory. + if [[ "$kde_config_dir" ]]; then + return - "crux_small") - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} ___ - (${c3}.· ${c1}| - (${c2}<> ${c1}| - / ${c3}__ ${c1}\\ - ( ${c3}/ \\ ${c1}/| -${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) -${c2}\/${c1}-____${c2}\/ -EOF - ;; + elif type -p kf5-config >/dev/null 2>&1; then + kde_config_dir="$(kf5-config --path config)" - "CRUX"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} odddd - oddxkkkxxdoo - ddcoddxxxdoool - xdclodod olol - xoc xdd olol - xdc ${c2}k00${c1}Okdlol - xxd${c2}kOKKKOkd${c1}ldd - xdco${c2}xOkdlo${c1}dldd - ddc:cl${c2}lll${c1}oooodo - odxxdd${c3}xkO000kx${c1}ooxdo - oxdd${c3}x0NMMMMMMWW0od${c1}kkxo - oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx -docldkXW${c3}MMMMMMMWWN${c1}Odolco -xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c -${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l -${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd -${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo -${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo -EOF - ;; + elif type -p kde4-config >/dev/null 2>&1; then + kde_config_dir="$(kde4-config --path config)" - "debian_small") - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' - ${c1}_____ - / __ \\ -| / | -| \\___- --_ - --_ -EOF - ;; + elif type -p kde-config >/dev/null 2>&1; then + kde_config_dir="$(kde-config --path config)" - "Debian"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2} _,met$$$$$gg. - ,g$$$$$$$$$$$$$$$P. - ,g$$P" """Y$$.". - ,$$P' `$$$. -',$$P ,ggs. `$$b: -`d$$' ,$P"' ${c1}.${c2} $$$ - $$P d$' ${c1},${c2} $$P - $$: $$. ${c1}-${c2} ,d$$' - $$; Y$b._ _,d$P' - Y$$. ${c1}`.${c2}`"Y$$$$P"' -${c2} `$$b ${c1}"-.__ -${c2} `Y$$ - `Y$$. - `$$b. - `Y$$b. - `"Y$b._ - `""" -EOF - ;; + elif [[ -d "${HOME}/.kde4" ]]; then + kde_config_dir="${HOME}/.kde4/share/config" - "Deepin"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} ............ - .';;;;;. .,;,. - .,;;;;;;;. ';;;;;;;. - .;::::::::' .,::;;,''''',. - ,'.:::::::: .;;'. '; - ;' 'cccccc, ,' :: '.. .: - ,, :ccccc. ;: .c, '' :. ,; -.l. cllll' ., .lc :; .l' l. -.c :lllc ;cl: .l' .ll. :' -.l 'looc. . ,o: 'oo' c, -.o. .:ool::coc' .ooo' o. - :: ..... .;dddo ;c - l:... .';lddddo. ,o - lxxxxxdoolllodxxxxxxxxxc :l - ,dxxxxxxxxxxxxxxxxxxl. 'o, - ,dkkkkkkkkkkkkko;. .;o; - .;okkkkkdl;. .,cl:. - .,:cccccccc:,. -EOF - ;; + elif [[ -d "${HOME}/.kde3" ]]; then + kde_config_dir="${HOME}/.kde3/share/config" + fi - "DesaOS") - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1}███████████████████████ -███████████████████████ -███████████████████████ -███████████████████████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -██████████████████████████████ -██████████████████████████████ -████████████████████████ -████████████████████████ -████████████████████████ -EOF - ;; + kde_config_dir="${kde_config_dir/$'/:'*}" +} - "Devuan"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} ..,,;;;::;,.. - `':ddd;:,. - `'dPPd:,. - `:b$$b`. - 'P$$$d` - .$$$$$` - ;$$$$$P - .:P$$$$$$` - .,:b$$$$$$$;' - .,:dP$$$$$$$$b:' - .,:;db$$$$$$$$$$Pd'` - ,db$$$$$$$$$$$$$$b:'` -:$$$$$$$$$$$$b:'` - `$$$$$bd:''` - `'''` -EOF - ;; - - "DracOS"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} `-:/- - -os: - -os/` - :sy+-` - `/yyyy+. - `+yyyyo- - `/yyyys: -`:osssoooo++- +yyyyyy/` - ./yyyyyyo yo`:syyyy+. - -oyyy+ +- :yyyyyo- - `:sy: `. `/yyyyys: - ./o/.` .oyyso+oo:` - :+oo+//::::///:-.` `.` -EOF - ;; +get_term_padding() { + # Terminal info. + # + # Parse terminal config files to get + # info about padding. Due to how w3m-img + # works padding around the terminal throws + # off the cursor placement calculation in + # specific terminals. + # + # Note: This issue only seems to affect + # URxvt. + ((term_run != 1)) && get_term - "dragonfly_old"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' - ${c1} | - .-. - ${c3} ()${c1}I${c3}() - ${c1} "==.__:-:__.==" - "==.__/~|~\__.==" - "==._( Y )_.==" - ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. -( ..=${c1}\\=${c1}/${c2}=.. ) - `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` - `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` - .-~` /${c1}|=|${c2}\ `~-. - .~` / ${c1}|=|${c2} \ `~. - .-~` .' ${c1}|=|${c2} `. `~-. - (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) - `~"~"` ${c1} |=|${c2} `"~"~` - ${c1} /=\\ - \\=/ - ^ -EOF + case "$term" in + "URxvt"*) + border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" ;; + esac +} - "dragonfly_small"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2}(\${c3}"${c2}/) -${c2}(/${c1}|${c2}\) -${c1} | - | -EOF +dynamic_prompt() { + case "$image_backend" in + "ascii") printf "\n" ;; + "off") return ;; + *) + get_term_padding + lines="$(((border + height + yoffset) / font_height))" + image_prompt="on" ;; + esac - "DragonFly"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2},--, ${c1}| ${c2},--, -${c2}| `-, ${c1},^, ${c2},-' | -${c2} `, `-, ${c3}(/ \) ${c2},-' ,' -${c2} `-, `-,${c1}/ \${c2},-' ,-' -${c2} `------${c1}( )${c2}------' -${c2} ,----------${c1}( )${c2}----------, -${c2} | _,-${c1}( )${c2}-,_ | -${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' -${c1} | | - | | - | | - | | - | | - | | - `|' -EOF - ;; + # If the info is higher than the ascii/image place the prompt + # based on the info height instead of the ascii/image height. + if ((lines < info_height)); then + [[ "$image_prompt" ]] && printf "\n" + return + else + [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" + lines="$((lines - info_height + 1))" + fi - "Elementary"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee eeeeeeeeeeee eeeee - eeee eeeee eee eeee - eeee eeee eee eeee -eee eee eee eee -eee eee eee eee -ee eee eeee eeee -ee eee eeeee eeeeee -ee eee eeeee eeeee ee -eee eeee eeeeee eeeee eee -eee eeeeeeeeee eeeeee eee - eeeeeeeeeeeeeeeeeeeeeeee eeeee - eeeeeeee eeeeeeeeeeee eeee - eeeee eeeee - eeeeeee eeeeeee - eeeeeeeeeeeeeeeee -EOF - ;; + # Set the prompt location. + if ((lines > 1)); then + case "$kernel_name" in + "OpenBSD") tput cud "$lines" ;; + *) printf "%b" "\e[${lines}B" ;; + esac + fi +} - "Endless"*) - set_colors 1 7 - read -rd '' ascii_data <<'EOF' -${c1} `:+yhmNMMMMNmhy+:` - -odMMNhso//////oshNMMdo- - /dMMh+. .+hMMd/ - /mMNo` `oNMm: - `yMMo` `oMMy` - `dMN- -NMd` - hMN. .NMh -/MM/ -os` /MM/ -dMm `smNmmhs/- `:sNMd+ `` mMd -MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM -MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM -dMm `/++/-``/yNNh+/sdNMNddMm- mMd -/MM/ `dNy: `-::- /MM/ - hMN. .NMh - `dMN- -NMd` - `yMMo` `oMMy` - /mMNo` `oNMm/ - /dMMh+. .+hMMd/ - -odMMNhso//////oshNMMdo- - `:+yhmNMMMMNmhy+:` -EOF - ;; +old_functions() { + # Deprecated functions. + # Neofetch 2.0 changed the names of a few variables. + # This function adds backwards compatibility for the + # old variable names. + if type printinfo >/dev/null 2>&1; then + print_info() { printinfo ; } + get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } + get_termfont() { get_term_font; termfont="$term_font"; } + get_localip() { get_local_ip; localip="$local_ip"; } + get_publicip() { get_public_ip; publicip="$public_ip"; } + get_linebreak() { get_line_break; linebreak="$line_break"; } + fi - "Exherbo"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} , -OXo. -NXdX0: .cok0KXNNXXK0ko:. -KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... -'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. - cNMk NK .oXM. OMMMMO. 0MMNo kW. - lMc o: ., .oKNk; ;NMMWlxW' - ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO - XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk -.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl -,M: ,XMMWx::,''oOK0x; NM. -'Ml ,kNKOxxxxxkkO0XXKOd:. oMk - NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW - ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW - ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO - 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' - xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd - 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO - :XMNxl,';:lodxkOO000Oxc. .oWMMo - 'dXMMXkl;,. .,o0MMNo' - ':d0XWMMMMWNNNNMMMNOl' - ':okKXWNKkl' -EOF - ;; + get_birthday() { get_install_date; birthday="$install_date"; } +} - "Fedora"* | "RFRemix"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} /:-------------:\\ - :-------------------:: - :-----------${c2}/shhOHbmp${c1}---:\\ - /-----------${c2}omMMMNNNMMD ${c1}---: - :-----------${c2}sMMMMNMNMP${c1}. ---: - :-----------${c2}:MMMdP${c1}------- ---\\ -,------------${c2}:MMMd${c1}-------- ---: -:------------${c2}:MMMd${c1}------- .---: -:---- ${c2}oNMMMMMMMMMNho${c1} .----: -:-- .${c2}+shhhMMMmhhy++${c1} .------/ -:- -------${c2}:MMMd${c1}--------------: -:- --------${c2}/MMMd${c1}-------------; -:- ------${c2}/hMMMy${c1}------------: -:--${c2} :dMNdhhdNMMNo${c1}------------; -:---${c2}:sdNMMMMNds:${c1}------------: -:------${c2}:://:${c1}-------------:: -:---------------------:// -EOF - ;; +old_options() { + [[ -n "$osx_buildversion" ]] && \ + err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." + [[ -n "$osx_codename" ]] && \ + err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." + [[ "$cpu_cores" == "on" ]] && \ + err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." + [[ -n "$image" ]] && \ + { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } - "freebsd_small") - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} /\\ _____ /\\ - \\_) (_/ - / \ -| | -| | - \ / - --_____-- -EOF - ;; + # All progress_ variables were changed to bar_. + [[ -n "$progress_char" ]] && \ + err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." + [[ -n "$progress_border" ]] && \ + { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ + bar_border="$progress_border"; } + [[ -n "$progress_length" ]] && \ + { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ + bar_length="$progress_length"; } + [[ -n "$progress_color_elapsed" ]] && \ + { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ + bar_color_elapsed="$progress_color_elapsed"; } + [[ -n "$progress_color_total" ]] && \ + { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ + bar_color_total="$progress_color_total"; } - "FreeBSD"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' - ${c2}``` ${c1}` - ${c2}` `.....---...${c1}....--.``` -/ - ${c2}+o .--` ${c1}/y:` +. - ${c2} yo`:. ${c1}:o `+- - ${c2}y/ ${c1}-/` -o/ - ${c2}.- ${c1}::/sy+:. - ${c2}/ ${c1}`-- / - ${c2}`: ${c1}:` - ${c2}`: ${c1}:` - ${c2}/ ${c1}/ - ${c2}.- ${c1}-. - ${c2}-- ${c1}-. - ${c2}`:` ${c1}`:` - .-- `--. - .---.....----. -EOF - ;; + # All cpufreq values were changed in 3.0. + [[ "$speed_type" == "current" ]] && \ + err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." + [[ "$speed_type" == "min" ]] && \ + err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." + [[ "$speed_type" == "max" ]] && \ + err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." + [[ "$speed_type" == "bios" ]] && \ + err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." - "FreeMiNT"*) - # Don't explicitly set colors since - # TosWin2 doesn't reset well. - read -rd '' ascii_data <<'EOF' -${c1} ## - ## ######### - #### ## - #### #### ## -#### #### ## ## - #### #### ## ## - #### #### ## ## ## - #### ###### - ###### ## ## #### - #### ################ - #### ## #### - ## #### ###### - ## ## #### #### - ## ## ## ## ## #### - #### ## ## ## -EOF - ;; + # Ascii_logo_size was removed in 3.0. + [[ "$ascii_logo_size" ]] && \ + err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." - "Frugalware"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `++/::-.` - /o+++++++++/::-.` - `o+++++++++++++++o++/::-.` - /+++++++++++++++++++++++oo++/:-.`` - .o+ooooooooooooooooooosssssssso++oo++/:-` - ++osoooooooooooosssssssssssssyyo+++++++o: - -o+ssoooooooooooosssssssssssssyyo+++++++s` - o++ssoooooo++++++++++++++sssyyyyo++++++o: - :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo - `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: - /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss - .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- - ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso - -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. - sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ - :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` - yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ --ysooooooydhhhhhhhhhhhddddddddddddddddssy - .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: - ``.-/+oosysssssssssssssssssssssss - ``.:/+osyysssssssssssssh. - `-:/+osyyssssyo - .-:+++` -EOF - ;; + # $start and $end were replaced with ${block_range[@]} in 3.0. + [[ "$start" && "$end" ]] && \ + { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ + block_range=("$start" "$end"); } - "Funtoo"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c2} _______ ____ - /MMMMMMM/ /MMMM| _____ _____ - __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ -|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ -|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| -|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| - |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ - |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ -EOF - ;; + # Fahrenheit support was added to CPU so the options were changed. + [[ "$cpu_temp" == "on" ]] && \ + { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; + cpu_temp="C"; } - "GalliumOS"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1}sooooooooooooooooooooooooooooooooooooo+: -yyooooooooooooooooooooooooooooooooo+/::: -yyysoooooooooooooooooooooooooooo+/:::::: -yyyyyoooooooooooooooooooooooo+/::::::::: -yyyyyysoooooooooooooooooo++/:::::::::::: -yyyyyyysoooooooooooooo++/::::::::::::::: -yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: -yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: -yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: -yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: -yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: -yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: -yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: -yyyyyyyyyyyyyyys+:--...........-///::::: -yyyyyyyyyyyys+:--................://:::: -yyyyyyyyyo+:-.....................-//::: -yyyyyyo+:-..........................://: -yyyo+:-..............................-// -o/:-...................................: -EOF - ;; + # Birthday was renamed to Install Date in 3.0 + [[ -n "$birthday_time" ]] && \ + { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ + install_time="$birthday_time"; } - "gentoo_small") - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} _-----_ -( \\ -\ 0 \\ -${c2} \ ) - / _/ -( _- -\____- -EOF - ;; + # Scrot dir was removed in 3.1.0. + [[ -n "$scrot_dir" ]] && scrot_dir= - "Gentoo"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} -/oyddmdhs+:. - -o${c2}dNMMMMMMMMNNmhy+${c1}-` - -y${c2}NMMMMMMMMMMMNNNmmdhy${c1}+- - `o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/` - om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o` -.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+` - oy${c2}hdmNMMMMMMMN${c1}dyooy${c2}dmddddhhhhyhN${c1}d. - :o${c2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${c1}Mh - .:${c2}+sydNMMMMMNNNmmmdddhhhhhhmM${c1}my - /m${c2}MMMMMMNNNmmmdddhhhhhmMNh${c1}s: - `o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+` - `s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. - /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:` -+M${c2}MMMMMMNNNNNmmmmdmNMNdso${c1}/- -yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` -/h${c2}MMNNNNNNNNMNdhs++/${c1}-` -`/${c2}ohdmmddhys+++/:${c1}.` - `-//////:--. -EOF - ;; + # cpu_shorthand was deprecated in 3.3.0 + [[ -n "$cpu_shorthand" ]] && \ + { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and + \$cpu_speed instead."; } +} - "gNewSense"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} ..,,,,.. - .oocchhhhhhhhhhccoo. - .ochhlllllllc hhhhhh ollllllhhco. - ochlllllllllll hhhllllllhhh lllllllllllhco - .cllllllllllllll hlllllo +hllh llllllllllllllc. -ollllllllllhco'' hlllllo +hllh ``ochllllllllllo -hllllllllc' hllllllllllllh `cllllllllh -ollllllh +llllllllllll+ hllllllo - `cllllh. ohllllllho .hllllc' - ochllc. ++++ .cllhco - `+occooo+. .+ooocco+' - `+oo++++ ++++oo+' -EOF - ;; +cache_uname() { + # Cache the output of uname so we don't + # have to spawn it multiple times. + IFS=" " read -ra uname <<< "$(uname -sr)" - "GNU") - set_colors fg 7 - read -rd '' ascii_data <<'EOF' -${c1} _-`````-, ,- '- . - .' .- - | | - -. `. - /.' / `. \ -:/ : _... ..._ `` : -:: : /._ .`:'_.._\. || : -:: `._ ./ ,` : \ . _.'' . -`:. / | -. \-. \\_ / - \:._ _/ .' .@) \@) ` `\ ,.' - _/,--' .- .\,-.`--`. - ,'/'' (( \ ` ) - /'/' \ `-' ( - '/'' `._,-----' - ''/' .,---' - ''/' ;: - ''/'' ''/ - ''/''/'' - '/'/' - `; -EOF - ;; + kernel_name="${uname[0]}" + kernel_version="${uname[1]}" +} - "GoboLinux"*) - set_colors 5 4 6 2 - read -rd '' ascii_data <<'EOF' -${c1}_____ _ -/ ____| | | -| | __ ___ | |__ ___ -| | |_ |/ _ \| '_ \ / _ \ -| |__| | (_) | |_) | (_) | - \_____|\___/|_.__/ \___/ -EOF - ;; +convert_time() { + # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. + year="$1" + day="${3#0}" - "Grombyang"*) - set_colors 4 2 1 - read -rd '' ascii_data <<'EOF' -${c1} eeeeeeeeeeee - eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee ${c2}.o+ ${c1}eeee - eeee ${c2}`ooo/ ${c1}eeee - eeee ${c2}`+oooo: ${c1}eeee -eee ${c2}`+oooooo: ${c1}eee -eee ${c2}-+oooooo+: ${c1}eee -ee ${c2}`/:oooooooo+: ${c1}ee -ee ${c2}`/+ +++ +: ${c1}ee -ee ${c2}+o+\ ${c1}ee -eee ${c2}+o+\ ${c1}eee -eee ${c2}// \\ooo/ \\\ ${c1}eee - eee ${c2}//++++oooo++++\\\ ${c1}eee - eeee ${c2}::::++oooo+::::: ${c1}eeee - eeeee ${c3}Grombyang OS ${c1} eeee - eeeeeeeeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeee -EOF - ;; + # Split time into hours/minutes. + hour="${4/:*}" + min="${4/${hour}}" - "GuixSD"*) - set_colors 3 7 6 1 8 - read -rd '' ascii_data <<'EOF' -${c1} .. `. - `--..```..` `..```..--` - .-:///-:::. `-:::///:-. - ````.:::` `:::.```` - -//:` -::- - ://: -::- - `///- .:::` - -+++-:::. - :+/:::- - `-....` -EOF + # Get month. (Month code is used for day of week) + # Due to different versions of 'ls', the month can be 1, 01 or Jan. + case "$2" in + 1 | 01 | "Jan") month="Jan"; month_code=0 ;; + 2 | 02 | "Feb") month="Feb"; month_code=3 ;; + 3 | 03 | "Mar") month="Mar"; month_code=3 ;; + 4 | 04 | "Apr") month="Apr"; month_code=6 ;; + 5 | 05 | "May") month="May"; month_code=1 ;; + 6 | 06 | "Jun") month="Jun"; month_code=4 ;; + 7 | 07 | "Jul") month="Jul"; month_code=6 ;; + 8 | 08 | "Aug") month="Aug"; month_code=2 ;; + 9 | 09 | "Sep") month="Sep"; month_code=5 ;; + 10 | "Oct") month="Oct"; month_code=0 ;; + 11 | "Nov") month="Nov"; month_code=3 ;; + 12 | "Dec") month="Dec"; month_code=5 ;; + esac + + # Get leap year. + # Source: http://stackoverflow.com/questions/725098/leap-year-calculation + [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ + [[ "$month" =~ (Jan|Feb) ]] && \ + leap_code=1 + + # Calculate day of week. + # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html + year_code="$((${year/??} + (${year/??} / 4) % 7))" + week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" + + case "$week_day" in + 0) week_day="Sun" ;; + 1) week_day="Mon" ;; + 2) week_day="Tue" ;; + 3) week_day="Wed" ;; + 4) week_day="Thu" ;; + 5) week_day="Fri" ;; + 6) week_day="Sat" ;; + esac + + # Convert 24 hour time to 12 hour time + AM/PM. + case "$install_time_format" in + "12h") + case "$hour" in + [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; + *) time="$((hour - 12))${min} PM" ;; + esac ;; + *) time="$4" ;; + esac - "Haiku"*) - set_colors 2 8 - read -rd '' ascii_data <<'EOF' -${c2} :dc' - 'l:;'${c1},${c2}'ck. .;dc:. - co ${c1}..${c2}k. .;; ':o. - co ${c1}..${c2}k. ol ${c1}.${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. -.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. - ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; - ..${c1}oOolllllccccccc:::::${c2}od; - cx:ooc${c1}:::::::;${c2}cooolcX. - cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. - cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. - .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. - '::c'${c1}...${c2}do${c1}..... .${c2}K, - cd,.${c1}....:${c2}O,${c1} - ':clod:'${c1} - ${c1} -EOF + # Toggle showing the time. + [[ "$install_time" == "off" ]] && unset time + + # Print the install date. + printf "%s" "$week_day $day $month $year $time" +} + +get_ppid() { + # Get parent process ID of PID. + case "$os" in + "Windows") + ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" + ppid="${ppid/'PPID'}" ;; - "Hyperbola"*) - set_colors 8 - read -rd '' ascii_data <<'EOF' -${c1} WW - KX W - WO0W NX0O - NOO0NW WNXK0OOKW - W0OOOOOOOOOOOOKN - N0OOOOOOO0KXW - WNXXXNW - NXK00000KN - WNK0OOOOOOOOOO0W - NK0OOOOOOOOOOOOOO0W - X0OOOOOOO00KK00OOOOOK - X0OOOO0KNWW WX0OO0W - X0OO0XNW KOOW - N00KNW KOW - NKXN W0W -WW W -EOF + "Linux") + ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" + ppid="$(trim "${ppid/PPid:}")" ;; - "Kali"*) - set_colors 4 8 - read -rd '' ascii_data <<'EOF' -${c1}.............. - ..,;:ccc,. - ......''';lxO. -.....''''..........,:ld; - .';;;:::;,,.x, - ..'''. 0Xxoc:,. ... - .... ,ONkc;,;cokOdc',. - . OMo ':${c2}dd${c1}o. - dMc :OO; - 0M. .:o. - ;Wd - ;XO, - ,d0Odlc;,.. - ..',;:cdOOd::,. - .:d;.':;. - 'd, .' - ;l .. - .o - c - .' - . -EOF + *) + ppid="$(ps -p "${1:-$PPID}" -o ppid=)" ;; + esac - "KaOS"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} .. - ..... ..OSSAAAAAAA.. - .KKKKSS. .SSAAAAAAAAAAA. -.KKKKKSO. .SAAAAAAAAAA... -KKKKKKS. .OAAAAAAAA. -KKKKKKS. .OAAAAAA. -KKKKKKS. .SSAA.. -.KKKKKS..OAAAAAAAAAAAA........ - DKKKKO.=AA=========A===AASSSO.. - AKKKS.==========AASSSSAAAAAASS. - .=KKO..========ASS.....SSSSASSSS. - .KK. .ASS..O.. =SSSSAOSS: - .OK. .ASSSSSSSO...=A.SSA. - .K ..SSSASSSS.. ..SSA. - .SSS.AAKAKSSKA. - .SSS....S.. -EOF + printf "%s" "$ppid" +} + +get_process_name() { + # Get PID name. + case "$os" in + "Windows") + name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" + name="${name/'COMMAND'}" + name="${name/*\/}" ;; - "KDE"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} `..---+/---..` - `---.`` `` `.---.` - .--.` `` `-:-. - `:/: `.----//----.` :/- - .:. `---` `--.` .:` - .:` `--` .:- `:. - `/ `:. `.-::-.` -:` `/` - /. /. `:++++++++:` .: .: -`/ .: `+++++++++++/ /` `+` -/+` -- .++++++++++++` :. .+: -`/ .: `+++++++++++/ /` `+` - /` /. `:++++++++:` .: .: - ./ `:. `.:::-.` -:` `/` - .:` `--` .:- `:. - .:. `---` `--.` .:` - `:/: `.----//----.` :/- - .-:.` `` `-:-. - `---.`` `` `.---.` - `..---+/---..` -EOF + "Linux") + name="$(< "/proc/${1:-$PPID}/comm")" ;; - "Kogaion"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ;; ,; - ;;; ,;; - ,;;;; ;;;; - ,;;;;;;;; ;;;; - ;;;;;;;;;;; ;;;;; - ,;;;;;;;;;;;; ';;;;;, - ;;;;;;;;;;;;;;, ';;;;;;; - ;;;;;;;;;;;;;;;;;, ';;;;; -; ';;;;;;;;;;;;;;;;;;, ;;; -;;;, ';;;;;;;;;;;;;;;;;;;,;; -;;;;;, ';;;;;;;;;;;;;;;;;;, -;;;;;;;;, ';;;;;;;;;;;;;;;;, -;;;;;;;;;;;;, ';;;;;;;;;;;;;; -';;;;;;;;;;;;; ';;;;;;;;;;;;; - ';;;;;;;;;;;;;, ';;;;;;;;;;; - ';;;;;;;;;;;;; ;;;;;;;;;; - ';;;;;;;;;;;; ;;;;;;;; - ';;;;;;;; ;;;;;; - ';;;;; ;;;; - ';;; ;; -EOF + *) + name="$(ps -p "${1:-$PPID}" -o comm=)" ;; + esac - "Korora"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} ____________ - _add55555555554${c1}: - _w?'${c1}``````````'${c2})k${c1}: - _Z'${c1}`${c2} ]k${c1}: - m(${c1}`${c2} )k${c1}: - _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: - .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` - jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` - jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` -.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` -:#${c1}:${c2} ${c1}`${c2})e${c1}``` -:m${c1}:${c2} ,#'${c1}` -:#${c1}:${c2} .s2'${c1}` -:m,________.aa7^${c1}` -:#baaaaaaas!J'${c1}` - ``````````` -EOF - ;; + printf "%s" "$name" +} - "KSLinux"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} K K U U RRRR ooo - K K U U R R o o - KKK U U RRRR o o - K K U U R R o o - K K UUU R R ooo +decode_url() { + decode="${1//+/ }" + printf "%b" "${decode//%/\\x}" +} -${c2} SSS AAA W W AAA - S A A W W A A - SSS AAAAA W W W AAAAA - S A A WW WW A A - SSS A A W W A A -EOF - ;; +# FINISH UP - "Kubuntu"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `.:/ossyyyysso/:. - .:oyyyyyyyyyyyyyyyyyyo:` - -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- - -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- - oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo - `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` - oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- -oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy -oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- - oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo - `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo - oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo - -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- - -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- - ./oyyyyyyyyyyyyyyyyyyo/. - `.:/oosyyyysso/:.` -EOF - ;; +usage() { printf "%s" "\ +Usage: neofetch --option \"value\" --option \"value\" - "LEDE"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' - ${c1} _________ - / /\ - / LE / \ - / DE / \ - /________/ LE \ - \ \ DE / - \ LE \ / - \ DE \ / - \________\/ -EOF - ;; +Neofetch is a CLI system information tool written in BASH. Neofetch +displays information about your system next to an image, your OS logo, +or any ASCII file of your choice. - "Linux") - set_colors fg 8 3 - read -rd '' ascii_data <<'EOF' -${c2} ##### -${c2} ####### -${c2} ##${c1}O${c2}#${c1}O${c2}## -${c2} #${c3}#####${c2}# -${c2} ##${c1}##${c3}###${c1}##${c2}## -${c2} #${c1}##########${c2}## -${c2} #${c1}############${c2}## -${c2} #${c1}############${c2}### -${c3} ##${c2}#${c1}###########${c2}##${c3}# -${c3}######${c2}#${c1}#######${c2}#${c3}###### -${c3}#######${c2}#${c1}#####${c2}#${c3}####### -${c3} #####${c2}#######${c3}##### -EOF - ;; +NOTE: Every launch flag has a config option. - "LMDE"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' - ${c2}`.-::---.. -${c1} .:++++ooooosssoo:. - .+o++::. `.:oos+. -${c1} :oo:.` -+oo${c2}: -${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` -${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` -${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: -${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` -${c1}`s: `oo s m Myy+-o:` -`oo :+sdoohyoydyso/. - :o. .:////////++: -${c1} `/++ ${c2}-:::::- -${c1} ${c2}`${c1}++- -${c1} ${c2}`${c1}/+- -${c1} ${c2}.${c1}+/. -${c1} ${c2}.${c1}:+-. - `--.`` -EOF - ;; +Options: - "Lubuntu"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `-/+oyyhhhhyyo+/-` - ./shhhhhhhhhhhhhhhhhhs/. - `:shhhhhhhhhhhhhhhhhhhhhhhhs:` - :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: - `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` - `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` - shhhhhhhhy+. .ohhhhhhhhhhhhhs -:hhhhhhy/. /hhhhhhhhhhhhh: -shhhy/. :hhhhhhhhhhhhs -hy+. ` `+yhs/` +hhhhhhhhhhhh --.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh -shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs -:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: - shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs - `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` - +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` - :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: - :shhhhhhhhhhhhhhhhhhhhhy`+s:` - .+shhhhhhhhhhhhhhhhhhs:` - `-/+oyyhhhhyys+/-` -EOF - ;; +INFO: + --disable infoname Allows you to disable an info line from appearing + in the output. - "Lunar"*) - set_colors 4 7 3 - read -rd '' ascii_data <<'EOF' -${c1}`-. `-. - -ohys/-` `:+shy/` - -omNNdyo/` :+shmNNy/` - ${c3} - - /mMmo - hMMMN` - .NMMs - ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` - /:.` ${c3}/${c1} `.:/` -${c3} __ - | | _ _ ___ ___ ___ - | |__| | | | .'| _| - |_____|___|_|_|__,|_| -EOF - ;; + NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - "mac"*"_small") - set_colors 2 3 1 5 4 - read -rd '' ascii_data <<'EOF' -${c1} .:' - _ :'_ -${c2} .'`_`-'_``. -:________.-' -${c3}:_______: -:_______: -${c4} :_______`-; -${c5} `._.-._.' -EOF - ;; + --os_arch on/off Hide/Show OS architecture. + --speed_type type Change the type of cpu speed to display. + Possible values: current, min, max, bios, + scaling_current, scaling_min, scaling_max - "mac" | "Darwin") - set_colors 2 3 1 1 5 4 - read -rd '' ascii_data <<'EOF' -${c1} 'c. - ,xNMM. - .OMMMMo - OMMM0, - .;loddo:' loolloddol;. - cKMMMMMMMMMMNWMMMMMMMMMM0: -${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. - XMMMMMMMMMMMMMMMMMMMMMMMX. -${c3};MMMMMMMMMMMMMMMMMMMMMMMM: -:MMMMMMMMMMMMMMMMMMMMMMMM: -${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. - kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. - ${c6}kMMMMMMMMMMMMMMMMMMMMMMd - ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. -EOF - ;; + NOTE: This only supports Linux with cpufreq. - "Mageia"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} .°°. - °° .°°. - .°°°. °° - . . - °°° .°°°. - .°°°. '___' -${c2} .${c1}'___' ${c2} . - :dkxc;'. ..,cxkd; - .dkk. kkkkkkkkkk .kkd. -.dkk. ';cloolc;. .kkd -ckk. .kk; -xO: cOd -xO: lOd -lOO. .OO: -.k00. .00x - .k00; ;00O. - .lO0Kc;,,,,,,;c0KOc. - ;d00KKKKKK00d; - .,KKKK,. -EOF - ;; + --speed_shorthand on/off Whether or not to show decimals in CPU speed. - "MagpieOS"*) - set_colors 2 1 3 5 - read -rd '' ascii_data <<'EOF' -${c1} ;00000 :000Ol - .x00kk00: O0kk00k; - l00: :00. o0k :O0k. - .k0k. x${c2}d$dddd${c1}k' .d00; - k0k. ${c2}.dddddl ${c1}o00, - o00. ${c2}':cc:. ${c1}d0O -.00l ,00. -l00. d0x -k0O .:k0o -O0k ;dO0000d. -k0O .O0O${c2}xxxxk${c1}00: -o00. k0O${c2}dddddd${c1}occ -'00l x0O${c2}dddddo${c3};..${c1} - x00. .x00${c2}kxxd${c3}:..${c1} - .O0x .:oxxx${c4}Okl.${c1} - .x0d ${c4},xx,${c1} - .:o. ${c4}.xd ckd${c1} - .. ${c4}dxl .xx; - :xxolldxd' - ;oxdl. -EOF - ;; + NOTE: This flag is not supported in systems with CPU speed less than + 1 GHz. - "Manjaro"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1}██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -EOF - ;; + --cpu_brand on/off Enable/Disable CPU brand in output. + --cpu_cores type Whether or not to display the number of CPU cores + Possible values: logical, physical, off - "Maui"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} `.-://////:--` - .:/oooooooooooooooo+:. - `:+ooooooooooooooooooooooo:` - `:oooooooooooooooooooooooooooo/` - ..```-oooooo/-`` `:oooooo+:.` `-- - :. +oo+-` /ooo/` -/ - -o. `o+- +o/` -o: -`oo` ::` :o/ `+. .+o` /oo. -/o+ . -+oo- ` /oo/ `ooo/ -+o- /ooo+` .+ooo. :ooo+ -++ .+oooo: -oooo+ `oooo+ -:. .oooooo` :ooooo- :oooo: -` .oooooo: :ooooo+ `ooo+-` - .+oooooo` -oooooo: `o/- - +oooooo: .ooooooo. - /ooooooo` /ooooooo/ .. - `:oooooooo/:::/ooooooooo+:--:/:` - `:+oooooooooooooooooooooo+:` - .:+oooooooooooooooo+:. - `.-://////:-.` -EOF - ;; + NOTE: 'physical' doesn't work on BSD. - "Mer"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} dMs - .-` - `y`-o+` - ``NMMy - .--`:++. - .hNNNNs - /MMMMMN - `ommmd/ +/ - ```` +/ - `:+sssso/-` - .-::. `-::-` `smNMNmdmNMNd/ .://-` -.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo -dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- -MMm yMM- :MMs NMN` `:::::--sMMh dMM` -MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` -NNd sNN- -NNs -mMNs-.--..:dMMh` dNN ---- .--` `--. .smMMmdddmMNdo` .-- - ./ohddds+:` - +h- `.:-. - ./`.dMMMN+ - +MMMMMd - `+dmmy- - ``` .+` - .dMNo-y. - `hmm/ - .:` - dMs -EOF - ;; + --cpu_speed on/off Hide/Show cpu speed. + --cpu_temp C/F/off Hide/Show cpu temperature. - "Minix"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2} -sdhyo+:-` -/syymm: - sdyooymmNNy. `` .smNmmdysNd - odyoso+syNNmysoyhhdhsoomNmm+/osdm/ - :hhy+-/syNNmddhddddddmNMNo:sdNd: - `smNNdNmmNmddddddddddmmmmmmmy` - `ohhhhdddddmmNNdmddNmNNmdddddmdh- - odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: - `+mNho:` smmd/ sNNh :dmms` -+ymmo. --od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: -+sms -.` :so: .NN+ :os/ .-`mNh: -.-hyh+:////- -sNNd:` .--://ohNs- - `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ - -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: - //oydNMMMMydMMNysNMMmsMMMMMNyo/` - ../-yNMMy--/::/-.sMMmos+.` - -+oyhNsooo+omy/``` - `::ohdmds-` -EOF - ;; + NOTE: This only works on Linux and BSD. + + NOTE: For FreeBSD and NetBSD-based systems, you need to enable + coretemp kernel module. This only supports newer Intel processors. + + --distro_shorthand on/off Shorten the output of distro (tiny, on, off) + + NOTE: This option won't work in Windows (Cygwin) + + --kernel_shorthand on/off Shorten the output of kernel + + NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) + + --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) + --refresh_rate on/off Whether to display the refresh rate of each monitor + Unsupported on Windows + --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) + --gpu_type type Which GPU to display. (all, dedicated, integrated) + + NOTE: This only supports Linux. + + --gtk_shorthand on/off Shorten output of gtk theme/icons + --gtk2 on/off Enable/Disable gtk2 theme/font/icons output + --gtk3 on/off Enable/Disable gtk3 theme/font/icons output + --shell_path on/off Enable/Disable showing \$SHELL path + --shell_version on/off Enable/Disable showing \$SHELL version + --disk_show value Which disks to display. + Possible values: '/', '/dev/sdXX', '/path/to/mount point' + + NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') + + --disk_subtitle type What information to append to the Disk subtitle. + Takes: name, mount, dir + + 'name' shows the disk's name (sda1, sda2, etc) + + 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) + + 'dir' shows the basename of the disks's path. (/, Local Disk, etc) + + --ip_host url URL to query for public IP + --song_shorthand on/off Print the Artist/Title on separate lines + --music_player player-name Manually specify a player to use. + Available values are listed in the config file + --install_time on/off Enable/Disable showing the time in Install Date output. + --install_time_format 12h/24h + Set time format in Install Date to be 12 hour or 24 hour. + +TEXT FORMATTING: + --colors x x x x x x Changes the text colors in this order: + title, @, underline, subtitle, colon, info + --underline on/off Enable/Disable the underline. + --underline_char char Character to use when underlining title + --bold on/off Enable/Disable bold text + +COLOR BLOCKS: + --color_blocks on/off Enable/Disable the color blocks + --block_width num Width of color blocks in spaces + --block_height num Height of color blocks in lines + --block_range num num Range of colors to print as blocks + +BARS: + --bar_char 'elapsed char' 'total char' + Characters to use when drawing bars. + --bar_border on/off Whether or not to surround the bar with '[]' + --bar_length num Length in spaces to make the bars. + --bar_colors num num Colors to make the bar. + Set in this order: elapsed, total + --cpu_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --memory_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --battery_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --disk_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + +IMAGE BACKEND: + --backend backend Which image backend to use. + Possible values: 'ascii', 'caca', 'catimg', '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/' + --ascii source Shortcut to use 'ascii' backend. + --caca source Shortcut to use 'caca' backend. + --catimg source Shortcut to use 'catimg' backend. + --iterm2 source Shortcut to use 'iterm2' backend. + --jp2a source Shortcut to use 'jp2a' backend. + --kitty source Shortcut to use 'kitty' backend. + --pixterm source Shortcut to use 'pixterm' backend. + --sixel source Shortcut to use 'sixel' backend. + --termpix source Shortcut to use 'termpix' backend. + --tycat source Shortcut to use 'tycat' backend. + --w3m source Shortcut to use 'w3m' backend. + --off Shortcut to use 'off' backend. + + NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', + '/path/to/ascii', '/path/to/dir/' + +ASCII: + --ascii_colors x x x x x x Colors to print the ascii art + --ascii_distro distro Which Distro's ascii art to print + + NOTE: Arch and Ubuntu have 'old' logo variants. + + NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. + + NOTE: Ubuntu has flavor variants. + + NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', + 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. + + NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, + OpenBSD, and Void have a smaller logo variant. + + NOTE: Use '{distro name}_small' to use the small variants. + + --ascii_bold on/off Whether or not to bold the ascii logo. + -L, --logo Hide the info text and only show the ascii logo. + + Possible values: bar, infobar, barinfo, off + +IMAGE: + --loop Redraw the image constantly until Ctrl+C is used. This fixes issues + in some terminals emulators when using image mode. + --size 00px | --size 00% How to size the image. + Possible values: auto, 00px, 00%, none + --crop_mode mode Which crop mode to use + Takes the values: normal, fit, fill + --crop_offset value Change the crop offset for normal mode. + Possible values: northwest, north, northeast, + west, center, east, southwest, south, southeast + + --xoffset px How close the image will be to the left edge of the + window. This only works with w3m. + --yoffset px How close the image will be to the top edge of the + window. This only works with w3m. + --bg_color color Background color to display behind transparent image. + This only works with w3m. + --gap num Gap between image and text. + + NOTE: --gap can take a negative value which will move the text + closer to the left side. + + --clean Delete cached files and thumbnails. + +SCREENSHOT: + -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- + shot function will use \$scrot_dir and \$scrot_name. + -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. + --image_host imgur/teknik Website to upload scrots to. + --scrot_cmd cmd Screenshot program to launch + +OTHER: + --config /path/to/config Specify a path to a custom config file + --config none Launch the script without a config file + --stdout Turn off all colors and disables any ASCII/image backend. + --help Print this text and exit + --version Show neofetch version + -v Display error messages. + -vv Display a verbose log for error reporting. + +DEVELOPER: + --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) + + +Report bugs to https://github.com/dylanaraps/neofetch/issues + +" +exit 1 +} + +get_args() { + # Check the commandline flags early for '--config'. + [[ "$*" != *--config* ]] && get_user_config + + while [[ "$1" ]]; do + case "$1" in + # Info + "--os_arch") os_arch="$2" ;; + "--cpu_cores") cpu_cores="$2" ;; + "--cpu_speed") cpu_speed="$2" ;; + "--speed_type") speed_type="$2" ;; + "--speed_shorthand") speed_shorthand="$2" ;; + "--distro_shorthand") distro_shorthand="$2" ;; + "--kernel_shorthand") kernel_shorthand="$2" ;; + "--uptime_shorthand") uptime_shorthand="$2" ;; + "--cpu_brand") cpu_brand="$2" ;; + "--gpu_brand") gpu_brand="$2" ;; + "--gpu_type") gpu_type="$2" ;; + "--refresh_rate") refresh_rate="$2" ;; + "--gtk_shorthand") gtk_shorthand="$2" ;; + "--gtk2") gtk2="$2" ;; + "--gtk3") gtk3="$2" ;; + "--shell_path") shell_path="$2" ;; + "--shell_version") shell_version="$2" ;; + "--ip_host") public_ip_host="$2" ;; + "--song_shorthand") song_shorthand="$2" ;; + "--music_player") music_player="$2" ;; + "--install_time") install_time="$2" ;; + "--install_time_format") install_time_format="$2" ;; + "--cpu_temp") + cpu_temp="$2" + [[ "$cpu_temp" == "on" ]] && cpu_temp="C" + ;; + + "--disk_subtitle") disk_subtitle="$2" ;; + "--disk_show") + unset disk_show + for arg in "$@"; do + case "$arg" in + "--disk_show") ;; + "-"*) break ;; + *) disk_show+=("$arg") ;; + esac + done + ;; + + "--disable") + for func in "$@"; do + case "$func" in + "--disable") continue ;; + "-"*) break ;; + *) + ((bash_version >= 4)) && func="${func,,}" + unset -f "get_$func" + ;; + esac + done + ;; + + # Text Colors + "--colors") + unset colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) colors+=("$arg") ;; + esac + done + colors+=(7 7 7 7 7 7) + ;; + + # Text Formatting + "--underline") underline_enabled="$2" ;; + "--underline_char") underline_char="$2" ;; + "--bold") bold="$2" ;; + + # Color Blocks + "--color_blocks") color_blocks="$2" ;; + "--block_range") block_range=("$2" "$3") ;; + "--block_width") block_width="$2" ;; + "--block_height") block_height="$2" ;; + + # Bars + "--bar_char") + bar_char_elapsed="$2" + bar_char_total="$3" + ;; - "Linux Mint"* | "LinuxMint"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. -MMm----::-://////////////oymNMd+` -MMd ${c2}/++ ${c1}-sNMd: -MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: -ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm - NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM - NMm ${c2}dMM` ..` ... ydm. ${c1}dMM - hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM - -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM - -dMNs-${c2}``-::::-------.`` ${c1}dMM - `/dMNmy+/:-------------:/yMMM - ./ydNMMMMMMMMMMMMMMMMMMMMM - .MMMMMMMMMMMMMMMMMMM -EOF - ;; + "--bar_border") bar_border="$2" ;; + "--bar_length") bar_length="$2" ;; + "--bar_colors") + bar_color_elapsed="$2" + bar_color_total="$3" + ;; - "MX"*) - set_colors 4 6 7 - read -rd '' ascii_data <<'EOF' -${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM -MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM -MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM -MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM -MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM -MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM -MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM -MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM -MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM -MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM -MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM -MMMMMMMNo` :mMMN+` `-hMMMMMMMM -MMMMMMh. `oNMMd: `/mMMMMMM -MMMMm/ -hMd- `sNMMMM -MMNs` - :dMMM -Mm: `oMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM -EOF - ;; + "--cpu_display") cpu_display="$2" ;; + "--memory_display") memory_display="$2" ;; + "--battery_display") battery_display="$2" ;; + "--disk_display") disk_display="$2" ;; - "NetBSD"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} `-/oshdmNMNdhyo+:-` -${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` -${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` - ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` - ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` - ${c2}-N/${c1}hMMMMMMMMMmho:` - ${c2}-N/${c1}-:/++/:.` -${c2} :M+ - :Mo - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms -EOF - ;; + # Image backend + "--backend") image_backend="$2" ;; + "--source") image_source="$2" ;; + "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + image_backend="${1/--}" + case "$2" in + "-"* | "") ;; + *) image_source="$2" ;; + esac + ;; - "Netrunner"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} .:oydmMMMMMMmdyo:` - -smMMMMMMMMMMMMMMMMMMds- - +mMMMMMMMMMMMMMMMMMMMMMMMMd+ - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ - `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` - .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` - dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh -+MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ -mMMMMMMMMd+:.` `mMMMMMMMMMMMMd -MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM -mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd -+MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ - dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh - `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` - `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: - +dMMMMMMMMMMMMMMMMMMMMMMMMd/ - -odMMMMMMMMMMMMMMMMMMdo- - `:+ydmNMMMMNmhy+-` -EOF - ;; + # Image options + "--loop") image_loop="on" ;; + "--image_size" | "--size") image_size="$2" ;; + "--crop_mode") crop_mode="$2" ;; + "--crop_offset") crop_offset="$2" ;; + "--xoffset") xoffset="$2" ;; + "--yoffset") yoffset="$2" ;; + "--background_color" | "--bg_color") background_color="$2" ;; + "--gap") gap="$2" ;; + "--clean") + [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" + rm -rf "/Library/Caches/neofetch/" + rm -rf "/tmp/neofetch/" + exit + ;; - "Nitrux"*) - set_colors 4 - read -rd '' ascii_data <<'EOF' -${c1}`:/. -`/yo -`/yo -`/yo .+:. -`/yo .sys+:.` -`/yo `-/sys+:.` -`/yo ./sss+:.` -`/yo .:oss+:-` -`/yo ./o///:-` -`/yo `.-:///////:` -`/yo `.://///++//-`` -`/yo `.-:////++++/-` -`/yo `-://///++o+/-` -`/yo `-/+o+++ooo+/-` -`/s+:+oooossso/.` -`//+sssssso:. -`+syyyy+:` -:+s+- -EOF - ;; + "--ascii_colors") + unset ascii_colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) ascii_colors+=("$arg") + esac + done + ascii_colors+=(7 7 7 7 7 7) + ;; - "nixos_small") - set_colors 4 6 - read -rd '' ascii_data <<'EOF' - ${c1}\\\\ \\\\ // - ==\\\\__\\\\/ // - // \\\\// -==// //== - //\\\\___// -// /\\\\ \\\\== - // \\\\ \\\\ -EOF - ;; + "--ascii_distro") + image_backend="ascii" + ascii_distro="$2" + case "$2" in "-"* | "") ascii_distro="$distro" ;; esac + ;; - "NixOS"*) - set_colors 4 6 - read -rd '' ascii_data <<'EOF' -${c1} ::::. ${c2}'::::: ::::' -${c1} '::::: ${c2}':::::. ::::' -${c1} ::::: ${c2}'::::.::::: -${c1} .......:::::..... ${c2}:::::::: -${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. - ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' -${c2} ..... ::::' ${c1}:::::' -${c2} ::::: '::' ${c1}:::::' -${c2} ........::::: ' ${c1}:::::::::::. -${c2}::::::::::::: ${c1}::::::::::::: -${c2} ::::::::::: ${c1}.. ${c1}::::: -${c2} .::::: ${c1}.::: ${c1}::::: -${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... - ::::: ${c1}':::::. ${c2}......:::::::::::::' - ::: ${c1}::::::. ${c2}':::::::::::::::::' -${c1} .:::::::: ${c2}':::::::::: -${c1} .::::''::::. ${c2}'::::. -${c1} .::::' ::::. ${c2}'::::. -${c1} .:::: :::: ${c2}'::::. -EOF - ;; + "--ascii_bold") ascii_bold="$2" ;; + "--logo" | "-L") + image_backend="ascii" + print_info() { info line_break; } + ;; - "Nurunner"*) - set_colors 4 - read -rd '' ascii_data <<'EOF' -${c1} ,xc - ;00cxXl - ;K0, .xNo. - :KO' .lXx. - cXk. ;xl cXk. - cXk. ;k:.,xo. cXk. - .lXx. :x::0MNl,dd. :KO, - .xNx. cx;:KMMMMMNo'dx. ;KK; - .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: -;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO - 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: - .kNo .xo'xWMMMMMM0;:O: ;KK; - .dXd. .do,oNMMO;ck: ;00, - oNd. .dx,;'cO; ;K0, - oNx. okk; ;K0, - lXx. :KO' - cKk' cXk. - ;00:lXx. - ,kd. -EOF - ;; + # Screenshot + "--scrot" | "-s") + scrot_args "$@" + ;; + "--upload" | "-su") + scrot_upload="on" + scrot_args "$@" + ;; + + "--image_host") image_host="$2" ;; + "--scrot_cmd") scrot_cmd="$2" ;; + + # Other + "--config") + case "$2" in + "none" | "off" | "") ;; + *) + config_file="$(get_full_path "$2")" + get_user_config + ;; + esac + ;; + "--stdout") stdout="on" ;; + "-v") verbose="on" ;; + "-vv") set -x; verbose="on" ;; + "--help") usage ;; + "--version") + printf "%s\\n" "Neofetch $version" + exit 1 + ;; + "--gen-man") + help2man -n "A fast, highly customizable system info script" \ + -N ./neofetch -o neofetch.1 + exit 1 + ;; - "NuTyX"*) - set_colors 4 1 - read -rd '' ascii_data <<'EOF' -${c1} . - . - ... - ... - .... .........--. - ..-++-----....--++++++---. - .-++++++-. .-++++++++++++-----.. - .--... .++..-+++--.....-++++++++++--.. - . .-+-. .**- .... ..-+----.. - .+++. .*+. + -++-----. - .+++++- ++. .*+. .....-+++-----. - -+++-++. .+. .-+***++***++--++++. . - -+-. -- -. -*- ...... ..--. -.-. .+- . -+. -. .+- +. - -- -- - -+----. .- - -++-.+. . - .++. -- - +. ----. - . .+. .. - - . - . -EOF - ;; + "--travis") + print_info() { + info title + info underline - "OBRevenge"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} __ __ - _@@@@ @@@g_ - _@@@@@@ @@@@@@ - _@@@@@@M W@@@@@@_ - j@@@@P ^W@@@@ - @@@@L____ _____Q@@@@ -Q@@@@@@@@@@j@@@@@@@@@@ -@@@@@ T@j@ T@@@@@ -@@@@@ ___Q@J@ _@@@@@ -@@@@@fMMM@@j@jggg@@@@@@ -@@@@@ j@j@^MW@P @@@@ -Q@@@@@ggg@@f@ @@@@@@L -^@@@@WWMMP ^ Q@@@@ - @@@@@_ _@@@@l - W@@@@@g_____g@@@@@P - @@@@@@@@@@@@@@@@l - ^W@@@@@@@@@@@P - ^TMMMMTll -EOF - ;; + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "GPU Driver" gpu_driver + info "Memory" memory - "openbsd_small") - set_colors 3 7 6 1 8 - read -rd '' ascii_data <<'EOF' -${c1} _____ - \\- -/ - \\_/ \\ - | ${c2}O O${c1} | - |_ < ) 3 ) - / \\ / - /-_____-\\ -EOF - ;; + info "CPU Usage" cpu_usage + info "Disk" disk + info "Battery" battery + info "Font" font + info "Song" song + info "Local IP" local_ip + info "Public IP" public_ip + info "Users" users + info "Install Date" install_date - "OpenBSD"*) - set_colors 3 7 6 1 8 - read -rd '' ascii_data <<'EOF' - ${c3} _ - (_) -${c1} | . -${c1} . |L /| . ${c3} _ -${c1} _ . |\ _| \--+._/| . ${c3}(_) -${c1} / ||\| Y J ) / |/| ./ - J |)'( | ` F`.'/ ${c3} _ -${c1} -<| F __ .-< ${c3}(_) -${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ - J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ -${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) -${c1} '-F -<_. \\ .-' `-' L__ -__J _ _. >-' ${c1})${c4}._. ${c1}|-' -${c1} `-|.' /_. ${c4}\_| ${c1} F - /.- . _.< - /' /.' .' `\\ - /L /' |/ _.-'-\\ - /'J ___.---'\| - |\ .--' V | `. ` - |/`. `-. `._) - / .-.\\ - \\ ( `\\ - `.\ -EOF - ;; + info line_break + info cols + info line_break - "OpenIndiana"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} .sy/ - .yh+ + # Testing. + prin "prin" + prin "prin" "prin" - ${c1}-+syyyo+- ${c2} /+. - ${c1}+ddo/---/sdh/ ${c2} ym- - ${c1}`hm+ `sms${c2} ym-```````.-. - ${c1}sm+ sm/ ${c2} ym- +s - ${c1}hm. /mo ${c2} ym- /h - ${c1}omo ym: ${c2} ym- `os` - ${c1}smo` .ym+ ${c2} ym- .os- - `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. - ..` ${c1}`:+oo+/-` ${c2} -//oyo- - -:` .:oys/. -+- `./oyys/. -h+` `.-:+oyyyo/-` -`/ossssysso+/-.` -EOF - ;; + # Testing no subtitles. + info uptime + info disk + } - "OpenMandriva"*) - set_colors 4 3 - read -rd '' ascii_data <<'EOF' -${c2} `` - `-. -${c1} ` ${c2}.--- -${c1} -/ ${c2}-::--` -${c1} `++ ${c2}`----...```-:::::. -${c1} `os. ${c2}.::::::::::::::-``` ` ` -${c1} +s+ ${c2}.::::::::::::::::---...--` -${c1}-ss: ${c2}`-::::::::::::::::-.``.`` -${c1}/ss- ${c2}.::::::::::::-.`` ` -${c1}+ss: ${c2}.::::::::::::- -${c1}/sso ${c2}.::::::-::::::- -${c1}.sss/ ${c2}-:::-.` .::::: -${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: -${c1} -ossso+/:://+/-` ${c2}.:` -${c1} -/+ooo+/-. ${c2}` -EOF - ;; + refresh_rate="on" + shell_version="on" + cpu_display="infobar" + memory_display="infobar" + disk_display="infobar" + cpu_temp="C" + ;; + esac - "OpenWrt"*) - set_colors 4 7 1 + shift + done +} + +get_distro_colors() { + # This function sets the text colors according + # to your OS/Distro's logo colors. + # + # $ascii_distro is the same as $distro. + case "$ascii_distro" in + "AIX"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} _______ -| |.-----.-----.-----. -| - || _ | -__| | -|_______|| __|_____|__|__| - |__| - ________ __ -| | | |.----.| |_ -| | | || _|| _| -|________||__| |____| +${c1} `:+ssssossossss+-` + .oys///oyhddddhyo///sy+. + /yo:+hNNNNNNNNNNNNNNNNh+:oy/ + :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: + `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh + h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy +/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: +h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y +N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m +N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m +h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y +:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- + yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy + sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo + :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- + :ys:/yNNNNNNNNNNNNNNNmy/:sy: + .+ys///osyhhhhys+///sy+. + -/osssossossso/- EOF ;; - "Open Source Media Center"* | "osmc") - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} -+shdmNNNNmdhs+- - .+hMNho/:..``..:/ohNMh+. - :hMdo. .odMh: - -dMy- -yMd- - sMd- -dMs - hMy +. .+ yMh - yMy dMs. .sMd yMy -:Mm dMNMs` `sMNMd `mM: -yM+ dM//mNs``sNm//Md +My -mM- dM: +NNNN+ :Md -Mm -mM- dM: `oNN+ :Md -Mm -yM+ dM/+NNo` :Md +My -:Mm` dMMNs` :Md `mM: - yMy dMs` -ms yMy - hMy +. yMh - sMd- -dMs - -dMy- -yMd- - :hMdo. .odMh: - .+hMNho/:..``..:/ohNMh+. - -+shdmNNNNmdhs+- + "alpine_small") + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} /\\ /\\ + /${c2}/ ${c1}\\ \\ + /${c2}/ ${c1}\\ \\ +/${c2}// ${c1}\\ \\ +${c2}// ${c1}\\ \\ + \\ EOF ;; - "Oracle"*) - set_colors 1 7 3 + "Alpine"*) + set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c1} - `-/+++++++++++++++++/-.` - `/syyyyyyyyyyyyyyyyyyyyyyys/. - :yyyyo/-...............-/oyyyy/ - /yyys- .oyyy+ -.yyyy` `syyy- -:yyyo /yyy/ -.yyyy` `syyy- - /yyys. .oyyyo - /yyyyo:-...............-:oyyyy/` - `/syyyyyyyyyyyyyyyyyyyyyyys+. - `.:/+ooooooooooooooo+/:.` +${c1} .hddddddddddddddddddddddh. + :dddddddddddddddddddddddddd: + /dddddddddddddddddddddddddddd/ + +dddddddddddddddddddddddddddddd+ + `sdddddddddddddddddddddddddddddddds` + `ydddddddddddd++hdddddddddddddddddddy` +.hddddddddddd+` `+ddddh:-sdddddddddddh. +hdddddddddd+` `+y: .sddddddddddh +ddddddddh+` `//` `.` -sddddddddd +ddddddh+` `/hddh/` `:s- -sddddddd +ddddh+` `/+/dddddh/` `+s- -sddddd +ddd+` `/o` :dddddddh/` `oy- .yddd +hdddyo+ohddyosdddddddddho+oydddy++ohdddh +.hddddddddddddddddddddddddddddddddddddh. + `yddddddddddddddddddddddddddddddddddy` + `sdddddddddddddddddddddddddddddddds` + +dddddddddddddddddddddddddddddd+ + /dddddddddddddddddddddddddddd/ + :dddddddddddddddddddddddddd: + .hddddddddddddddddddddddh. EOF ;; - "PacBSD"*) - set_colors 1 7 3 + "Amazon"*) + set_colors 3 7 read -rd '' ascii_data <<'EOF' -${c1} :+sMs. - `:ddNMd- -o--` - -sMMMMh: `+N+`` - yMMMMMs` .....-/-... `mNh/ - yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm - yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm - :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd - +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- - :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. - .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- - /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` -.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- -:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` -/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. -:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` -:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` - sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. - :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// - /dMMMMMMMMMMMMMs- ````````..`` - .oMMMMMMMMMMMMNs` ./y:` - +dNMMNMMMMMMMmy` ``./ys. - `/hMMMMMMMMMMMNo-`` `.+yy+-` - `-/hmNMNMMMMMMmmddddhhy/-` - `-+oooyMMMdsoo+/:. +${c1} `-/oydNNdyo:.` + `.:+shmMMMMMMMMMMMMMMmhs+:.` + -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- +.`` -/+shmNNMMMMMMNNmhs+/- ``. +dNmhs+:. `.:/oo/:.` .:+shmNd +dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd +dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. + `.:+shNMMMMMh yMMMMMNhs+:`` + `-+shy shs+:` EOF ;; - "Parabola"*) - set_colors 5 7 + "Anarchy"*) + set_colors 7 4 read -rd '' ascii_data <<'EOF' -${c1} `.-. `. - `.` `:++. `-+o+. - `` `:+/. `:+/. `-+oooo+ - ``-::-.:+/. `:+/. `-+oooooo+ - `.-:///- ..` .-. `-+oooooooo- - `..-..` `+ooooooooo: -`` :oooooooo/ - `ooooooo: - `oooooo: - -oooo+. - +ooo/` - -ooo- - `+o/. - /+- - //` - -. + ${c2}..${c1} + ${c2}..${c1} + ${c2}:..${c1} + ${c2}:+++.${c1} + .:::++${c2}++++${c1}+::. + .:+######${c2}++++${c1}######+:. + .+#########${c2}+++++${c1}##########:. + .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. + +###########${c2}+++++++++${c1}############: + +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ + +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ + :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: + ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ +.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. +.##########${c2}+++++++++++++++++++${c1}###########. + #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ + :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: + +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ + +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ + :##${c2}++++++${c1}############${c2}++++++++++${c1}##: + .${c2}++++++${c1}#############${c2}++++++++++${c1}+. + :${c2}++++${c1}###############${c2}+++++++${c1}:: + .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. + ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. + ${c2}.${c1} ${c2}.:+++${c1}. + ${c2}.:${c1}: + ${c2}..${c1} + ${c2}..${c1} EOF ;; - "Pardus"*) - set_colors 3 7 6 1 8 + "Android"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. -/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ -mN. oMdyy- -y `-dMo .Nm -.mN+` sMy hN+ -: yMs `+Nm. - `yMMddMs.dy `+` sMddMMy` - +MMMo .` . oMMM+ - `NM/ `````.` `.````` +MN` - yM+ `.-:yhomy ymohy:-.` +My - yM: yo oy :My - +Ms .N` `N. +h sM+ - `MN - -::::::- : :o:+`NM` - yM/ sh -dMMMMd- ho +y+My - .dNhsohMh-//: /mm/ ://-yMyoshNd` - `-ommNMm+:/. oo ./:+mMNmmo:` - `/o+.-somNh- :yy: -hNmos-.+o/` - ./` .s/`s+sMdd+``+ddMs+s`/s. `/. - : -y. -hNmddmNy. .y- : - -+ `..` +- +${c1} -o o- + +hydNNNNdyh+ + +mMMMMMMMMMMMMm+ + `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` + hMMMMMMMMMMMMMMMMMMh + .. yyyyyyyyyyyyyyyyyyyy .. +.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +-MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- + +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ + mMMMMMMMMMMMMMMMMMMm + `/++MMMMh++hMMMM++/` + MMMMo oMMMM + MMMMo oMMMM + oNMm- -mMNs EOF ;; - "Parrot"*) - set_colors 6 7 + "Antergos"*) + set_colors 4 6 read -rd '' ascii_data <<'EOF' -${c1} `:oho/-` -`mMMMMMMMMMMMNmmdhy- - dMMMMMMMMMMMMMMMMMMs` - +MMsohNMMMMMMMMMMMMMm/ - .My .+dMMMMMMMMMMMMMh. - + :NMMMMMMMMMMMMNo - `yMMMMMMMMMMMMMm: - /NMMMMMMMMMMMMMy` - .hMMMMMMMMMMMMMN+ - ``-NMMMMMMMMMd- - /MMMMMMMMMMMs` - mMMMMMMMsyNMN/ - +MMMMMMMo :sNh. - `NMMMMMMm -o/ - oMMMMMMM. - `NMMMMMM+ - +MMd/NMh - mMm -mN` - /MM `h: - dM` . - :M- - d: - -+ - - +${c2} `.-/::/-`` + .-/osssssssso/. + :osyysssssssyyys+- + `.+yyyysssssssssyyyyy+. + `/syyyyyssssssssssyyyyys-` + `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` + .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. + .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. + -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: + -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- + .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` +`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo +.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. +ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy +dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh +-dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- +.smmmmddddddddhhhhhhhhhdddddddddmmmms. + `+ydmmmdddddddddddddddddddmmmmdy/. + `.:+ooyyddddddddddddyyso+:.` EOF ;; - "Parsix"*) - set_colors 3 1 7 8 + "antiX"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - ${c2}-/+/:. - ${c2}.syssssys. - ${c1}.--. ${c2}ssssssssso${c1} ..--. - :++++++: ${c2}+ssssssss+${c1} ./++/+++: - /+++++++++.${c2}.yssooooy`${c1}-+///////o- - /++++++++++.${c2}+soooos:${c1}:+////////+- - :+++++////o-${c2}oooooo-${c1}+/////////- - `-/++//++-${c4}.-----.-${c1}:+/////:- - ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. -${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- -${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ -${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- - `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` - ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. - ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: - ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ - ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: - ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- - ${c1}`--` ${c2}+sssssssso ${c1}`--` - ${c2}+sssssy+` - ${c2}`.::-` +${c1} + \ + , - ~ ^ ~ - \ / + , ' \ ' , / + , \ '/ + , \ / , + ,___, \/ , + / | _ _ _|_ o /\ , +|, | / |/ | | | / \ , + \,_/\_/ | |_/|_/|_/_/ \, + , / ,\ + , / , ' \ + ' - , _ _ _ , ' EOF ;; - "PCBSD"* | "TrueOS"*) - set_colors 1 7 3 + "AOSC"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} .. - s. - +y - yN - -MN `. - :NMs `m - .yMMm` `No - `-/+++sdMMMNs+-`+Ms - `:oo+-` .yMMMMy` `-+oNMh - -oo- +NMMMM/ oMMh- - .s+` ` oMMMMM/ - oMMMhy. - +s`- :: :MMMMMd -o `mMMMy`s+ - y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y - s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s --h .NM` `hMMMMMMMMMMMMMMNMMNy: h- -y- hMN` hMMmMMMMMMMMMNsdMNs. -y -m` mMMy` oMMNoNMMMMMMo` sMMMo `m -m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m -h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h -:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: - y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y - `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` - so -NMMMN /mmd+ `dMMMMMMMm- os - :y: `yMMM` `+NMMMMMMNo`:y: - /s+`.omy /NMMMMMNh/.+s: - .+oo:-. /mdhs+::oo+. - -/o+++++++++++/- +${c2} .:+syhhhhys+:. + .ohNMMMMMMMMMMMMMMNho. + `+mMMMMMMMMMMmdmNMMMMMMMMm+` + +NMMMMMMMMMMMM/ `./smMMMMMN+ + .mMMMMMMMMMMMMMMo -yMMMMMm. + :NMMMMMMMMMMMMMMMs .hMMMMN: + .NMMMMhmMMMMMMMMMMm+/- oMMMMN. + dMMMMs ./ymMMMMMMMMMMNy. sMMMMd +-MMMMN` oMMMMMMMMMMMN: `NMMMM- +/MMMMh NMMMMMMMMMMMMm hMMMM/ +/MMMMh NMMMMMMMMMMMMm hMMMM/ +-MMMMN` :MMMMMMMMMMMMy. `NMMMM- + dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd + .NMMMMo -/+sMMMMMMMMMMMmMMMMN. + :NMMMMh. .MMMMMMMMMMMMMMMN: + .mMMMMMy- NMMMMMMMMMMMMMm. + +NMMMMMms/.` mMMMMMMMMMMMN+ + `+mMMMMMMMMNmddMMMMMMMMMMm+` + .ohNMMMMMMMMMMMMMMNho. + .:+syhhhhys+:. EOF ;; - "PCLinuxOS"*) + "Apricity"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - ${c1}mhhhyyyyhhhdN - dyssyhhhhhhhhhhhssyhN - Nysyhhyo/:-.....-/oyhhhssd - Nsshhy+. `/shhysm - dohhy/ -shhsy - dohhs` /hhys -N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy -ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ -+hho ${c2}ymm- /mmy+mms ${c1}:hhod -/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh -+hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m -yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ - ohhy` ${c2}://` -/+++/- ${c1}ohhom - N+hhy- `shhoh - sshho. `+hhyom - dsyhhs/. `:ohhhoy - dysyhhhso///://+syhhhssh - dhyssyhhhhhhyssyyhN - mddhdhdmN +${c2} ./o- + ``...`` `:. -/: + `-+ymNMMMMMNmho-` :sdNNm/ + `+dMMMMMMMMMMMMMMMmo` sh:.:::- + /mMMMMMMMMMMMMMMMMMMMm/`sNd/ + oMMMMMMMMMMMMMMMMMMMMMMMs -` +:MMMMMMMMMMMMMMMMMMMMMMMMM/ +NMMMMMMMMMMMMMMMMMMMMMMMMMd +MMMMMMMmdmMMMMMMMMMMMMMMMMd +MMMMMMy` .mMMMMMMMMMMMmho:` +MMMMMMNo/sMMMMMMMNdy+-.`-/ +MMMMMMMMMMMMNdy+:.`.:ohmm: +MMMMMMMmhs+-.`.:+ymNMMMy. +MMMMMM/`.-/ohmNMMMMMMy- +MMMMMMNmNNMMMMMMMMmo. +MMMMMMMMMMMMMMMms:` +MMMMMMMMMMNds/. +dhhyys+/-` EOF ;; - "Peppermint"*) - set_colors 1 7 3 + "ArcoLinux"*) + set_colors 7 4 + ascii_file="arcolinux" + ;; + + "arch_small") + set_colors 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} 8ZZZZZZ${c2}MMMMM -${c1} .ZZZZZZZZZ${c2}MMMMMMM. -${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ -${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM -${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. -${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI -${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM -${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM -${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM -${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM -${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM -${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M -${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 -${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 -${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 -${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z -${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM -${c1} NZZZZZZZZZZZ${c2}MMMMM -${c1} ZZZZZZZZZ${c2}MM) +${c1} /\ + /^^\ + /\ \ + /${c2} __ \ + / ( ) \ + / __| |__\\\ +/// \\\\\ EOF ;; - "Pop!_OS"*) - set_colors 6 7 + "arch_old") + set_colors 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} ///////////// - ///////////////////// - ///////${c2}*767${c1}//////////////// - //////${c2}7676767676*${c1}////////////// - /////${c2}76767${c1}//${c2}7676767${c1}////////////// - /////${c2}767676${c1}///${c2}*76767${c1}/////////////// - ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// -/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// -//////////${c2}76767676767${c1}////${c2}76767${c1}///////// -///////////${c2}76767676${c1}//////${c2}7676${c1}////////// -////////////,${c2}7676${c1},///////${c2}767${c1}/////////// -/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// -///////////////${c2}7676${c1}//////////////////// - ///////////////${c2}7676${c1}///${c2}767${c1}//////////// - //////////////////////${c2}'${c1}//////////// - //////${c2}.7676767676767676767,${c1}////// - /////${c2}767676767676767676767${c1}///// - /////////////////////////// - ///////////////////// - ///////////// +${c1} __ + _=(SDGJT=_ + _GTDJHGGFCVS) + ,GTDJGGDTDFBGX0 +${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ +${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL +${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, +${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], +${c1} SDDFDFH' !YEWD,${c2} )HDROD +${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' +${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' +${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' +${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) +${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF +'EHTI !H + `0F' '! EOF ;; - "Porteus"*) - set_colors 6 7 + "ArchBox"*) + set_colors 2 7 1 read -rd '' ascii_data <<'EOF' -${c1} `.-:::-.` - -+ydmNNNNNNNmdy+- - .+dNmdhs+//////+shdmdo. - .smmy+-` ./sdy: - `omdo. `.-/+osssso+/-` `+dy. - `yms. `:shmNmdhsoo++osyyo-``oh. - hm/ .odNmds/.` ``.....:::-+s -/m: `+dNmy:` `./oyhhhhyyooo++so -ys `yNmy- .+hmmho:-.` ``` -s: yNm+` .smNd+. -`` /Nm: +dNd+` - yN+ `smNy. - dm oNNy` - hy -mNm. - +y oNNo - `y` sNN: - `: +NN: - ` .mNo - /mm` - /my` - .sy` - .+: - ` +${c1} ...:+oh/:::.. + ..-/oshhhhhh` `::::-. + .:/ohhhhhhhhhhhh` `-::::. + .+shhhhhhhhhhhhhhhhh` `.::-. + /`-:+shhhhhhhhhhhhhh` .-/+shh + / .:/ohhhhhhhhh` .:/ohhhhhhhh + / `-:+shhh` ..:+shhhhhhhhhhhh + / .:ohhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / .+o+ `hhhhhhhhhhhhhhhhhhhh + / -hhhhh `hhhhhhhhhhhhhhhhhhhh + / ohhhhho `hhhhhhhhhhhhhhhhhhhh + /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` + `--/:` /: `hhhhhhhhhhhho/- + -/:. `hhhhhhs+:-` + ::::/ho/-` EOF ;; - "PostMarketOS"*) - set_colors 2 7 + "ARCHlabs"*) + set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} ss - `hMMh` - .dMMMMd. - -NMMMMMMN- - /MMMMMMMMMN/ - hMMMMMMMMMMMo - y+`mMMmdNMMMMMMy - `dMM-.-:- .mMMMMMMh` - .mMMMMMMd` `dMMMMMMm. - :NMMMMMMy yMMMMMMN: - /MMMMMMMo oMMMmdmN/ - oMMMMMMM/ /MN.-/:-. - `yMMMMMMN- -:.NMMMMy` - `dMMMMMMM- -/////////////dMMMMMMd` - -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- - :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: -+MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ +${c1} 'c' + 'kKk, + .dKKKx. + .oKXKXKd. + .l0XXXXKKo. + c0KXXXXKX0l. + :0XKKOxxOKX0l. + :OXKOc. .c0XX0l. + :OK0o. ${c4}...${c1}'dKKX0l. + :OX0c ${c4};xOx'${c1}'dKXX0l. + :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. + c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. + .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. + .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. + .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. + .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. + .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' + 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' + 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, + ,xko:'. ${c4}.. ${c1} .':okx; + .,'. .',. EOF ;; - "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) - set_colors 4 7 + *"XFerience"*) + set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} `-/osyyyysosyhhhhhyys+- - -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ - yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy -.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ --NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ -.Nm+shddyooo+/smNNNNmmmmNh. :mmd. - NNNNy:` ./hmmmmmmmNNNN: hNMh - NMN- -++- +NNNNNNNNNNm+..-sMMMM- -.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ -.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ - mMM+ .. `sNN+. hMMMMhhMMM- - +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy - yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` - sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` - :mMMMMMMMMMMMmddNMMMMMMMMmh/ - /dMMMMMMMMMMMMMMMMMMNdy/` - .+hNMMMMMMMMMNmdhs/. - .:/+ooo+/:-. +${c1} ``--:::::::-.` + .-/+++ooooooooo+++:-` + `-/+oooooooooooooooooo++:. + -/+oooooo/+ooooooooo+/ooo++:` + `/+oo++oo. .+oooooo+.-: +:-o+- + `/+o/. -o. :oooooo+ ```:.+oo+- +`:+oo- -/` :oooooo+ .`-`+oooo/. +.+ooo+. .` `://///+-+..oooooo+:` +-+ooo:` ``.-+oooooo+/` +-+oo/` :+oooo/. +.+oo: ..-/. . -+oo+/` +`/++- -:::++::/. -+oo+- + ./o: `:///+- `./ooo+:` + .++- `` /-` -:/+oooo+:` + .:+/:`` `-:ooooooo++- + ./+o+//:...../+oooooooo++:` + `:/++ooooooooooooo++/-` + `.-//++++++//:-.` + `````` EOF ;; - "Qubes"*) - set_colors 4 5 7 6 + "ArchMerge"*) + set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} `..--..` - `.----------.` - `..----------------..` - `.------------------------.`` - `..-------------....-------------..` -.::----------..`` ``..----------:+: -:////:----..` `..---:/ossso -:///////:` `/osssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:////////-` .:sssssssso -:///////////-.` `-/osssssssssso -`//////////////:-```.:+ssssssssssssso- - .-://////////////sssssssssssssso/-` - `.:///////////sssssssssssssso:. - .-:///////ssssssssssssssssss/` - `.:////ssss+/+ssssssssssss. - `--//- `-/osssso/. +${c1} y: + sMN- + +MMMm` + /MMMMMd` + :NMMMMMMy + -NMMMMMMMMs + .NMMMMMMMMMM+ + .mMMMMMMMMMMMM+ + oNMMMMMMMMMMMMM+ + `+:-+NMMMMMMMMMMMM+ + .sNMNhNMMMMMMMMMMMM/ + `hho/sNMMMMMMMMMMMMMMM/ + `.`omMMmMMMMMMMMMMMMMMMM+ + .mMNdshMMMMd+::oNMMMMMMMMMo + .mMMMMMMMMM+ `yMMMMMMMMMs + .NMMMMMMMMM/ yMMMMMMMMMy + -NMMMMMMMMMh `mNMMMMMMMMd` + /NMMMNds+:.` `-/oymMMMm. + +Mmy/. `:smN: +/+. -o. EOF ;; - "Raspbian"*) - set_colors 2 1 + "Arch"*) + set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} `.::///+:/-. --///+//-:`` - `+oooooooooooo: `+oooooooooooo: - /oooo++//ooooo: ooooo+//+ooooo. - `+ooooooo:-:oo- +o+::/ooooooo: - `:oooooooo+`` `.oooooooo+- - `:++ooo/. :+ooo+/.` - ${c2}...` `.----.` ``.. - .::::-``:::::::::.`-:::-` - -:::-` .:::::::-` `-:::- - `::. `.--.` `` `.---.``.::` - .::::::::` -::::::::` ` - .::` .:::::::::- `::::::::::``::. --:::` ::::::::::. ::::::::::.`:::- -:::: -::::::::. `-:::::::: :::: --::- .-:::-.``....``.-::-. -::- - .. `` .::::::::. `..`.. - -:::-` -::::::::::` .:::::` - :::::::` -::::::::::` :::::::. - .::::::: -::::::::. :::::::: - `-:::::` ..--.` ::::::. - `...` `...--..` `...` - .:::::::::: - `.-::::-` +${c1} -` + .o+` + `ooo/ + `+oooo: + `+oooooo: + -+oooooo+: + `/:-:++oooo+: + `/++++/+++++++: + `/++++++++++++++: + `/+++o${c2}oooooooo${c1}oooo/` +${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` +${c2} .oossssso-````/ossssss+` + -osssssso. :ssssssso. + :osssssss/ osssso+++. + /ossssssss/ +ssssooo/- + `/ossssso+/:- -:/+osssso+- + `+sso+:-` `.-/+oso: + `++:. `-/+/ + .` `/ EOF ;; - "Red Star"* | "Redstar"*) - set_colors 1 7 3 + "Artix"*) + set_colors 6 4 2 7 read -rd '' ascii_data <<'EOF' -${c1} .. - .oK0l - :0KKKKd. - .xKO0KKKKd - ,Od' .d0000l - .c;. .'''... ..'. -.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: -;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. - .okkkkd,.lko .......',;:cllc:;,,'''''. - .cdo. :xd' cd:. ..';'',,,'',,;;;,'. - . .ddl.;doooc'..;oc;'..';::;,'. - coo;.oooolllllllcccc:'. . - .ool''lllllccccccc:::::;. - ;lll. .':cccc:::::::;;;;' - :lcc:'',..';::::;;;;;;;,,. - :cccc::::;...';;;;;,,,,,,. - ,::::::;;;,'. ..',,,,'''. - ........ ...... +${c1} d${c2}c. +${c1} x${c2}dc. +${c1} '.${c4}.${c1} d${c2}dlc. +${c1} c${c2}0d:${c1}o${c2}xllc; +${c1} :${c2}0ddlolc,lc, +${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. +${c1} ;${c1}K${c2}kxoOddollc' cllc. +${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: +${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: +${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, +${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. +${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; +${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, +${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. +${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. +${c1} 0${c2}Okd''dc. .cll; +${c1} k${c2}Okd' .llc, +${c1} d${c2}Od, 'lc. +${c1} :,${c4}. ${c2}... EOF ;; - "Redhat"* | "Red Hat"* | "rhel"*) - set_colors 1 7 3 + "Arya"*) + set_colors 2 1 read -rd '' ascii_data <<'EOF' -${c1} `.-..........` - `////////::.`-/. - -: ....-////////. - //:-::///////////` - `--::: `-://////////////: - //////- ``.-:///////// .` - `://////:-.` :///////::///:` - .-/////////:---/////////////: - .-://////////////////////. -${c2} yMN+`.-${c1}::///////////////-` -${c2} .-`:NMMNMs` `..-------..` - MN+/mMMMMMhoooyysshsss -MMM MMMMMMMMMMMMMMyyddMMM+ - MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM - MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM - MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM +${c1} `oyyy/${c2}-yyyyyy+ +${c1} -syyyy/${c2}-yyyyyy+ +${c1} .syyyyy/${c2}-yyyyyy+ +${c1} :yyyyyy/${c2}-yyyyyy+ +${c1} `/ :yyyyyy/${c2}-yyyyyy+ +${c1} .+s :yyyyyy/${c2}-yyyyyy+ +${c1} .oys :yyyyyy/${c2}-yyyyyy+ +${c1} -oyys :yyyyyy/${c2}-yyyyyy+ +${c1} :syyys :yyyyyy/${c2}-yyyyyy+ +${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ +${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ +${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- +${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy +${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy +${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy EOF ;; - "Refracted Devuan"*) - set_colors 8 7 + "Bitrig"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c2} A - VW - VVW\\ - .yWWW\\ - ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ - *WWWWWWWWWWWWWWWW/ $VWWWWw , - ^*%WWWWWWVWWX $WWWW** ,yy - , "**WWW/' **' ,yy/WWW*` - &WWWWwy `*` <,ywWW%VWWW* - yWWWWWWWWWW* ., "**WW%W - ,&WWWWWM*"` ,y/ &WWWww ^* - XWWX*^ ,yWWWW09 .WWWWWWWWwy, - *` &WWWWWM WWWWWWWWWWWWWww, - (WWWWW` /#####WWW*********** - ^WWWW - VWW - Wh. - V/ +${c1} `hMMMMN+ + -MMo-dMd` + oMN- oMN` + yMd /NM: + .mMmyyhMMs + :NMMMhsmMh + +MNhNNoyMm- + hMd.-hMNMN: + mMmsssmMMMo + .MMdyyhNMMMd + oMN.`/dMddMN` + yMm/hNm+./MM/ +.dMMMmo.``.NMo +:NMMMNmmmmmMMh +/MN/-------oNN: +hMd. .dMh +sm/ /ms +EOF + ;; + + "BLAG"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} d + ,MK: + xMMMX: + .NMMMMMX; + lMMMMMMMM0clodkO0KXWW: + KMMMMMMMMMMMMMMMMMMX' + .;d0NMMMMMMMMMMMMMMMMMMK. + .;dONMMMMMMMMMMMMMMMMMMMMMMx +'dKMMMMMMMMMMMMMMMMMMMMMMMMl + .:xKWMMMMMMMMMMMMMMMMMMM0. + .:xNMMMMMMMMMMMMMMMMMK. + lMMMMMMMMMMMMMMMMMMK. + ,MMMMMMMMWkOXWMMMMMM0 + .NMMMMMNd. `':ldko + OMMMK: + oWk, + ;: EOF ;; - "Rosa"*) - set_colors 4 7 1 + "BlankOn"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} ROSAROSAROSAROSAR - ROSA AROS - ROS SAROSAROSAROSAR AROS - RO ROSAROSAROSAROSAROSAR RO - ARO AROSAROSAROSARO AROS ROS - ARO ROSAROS OSAR ROSA ROS - RO AROSA ROSAROSAROSA ROSAR RO -RO ROSAR ROSAROSAROSAR R ROSARO RO -RO ROSA AROSAROSAROSA AR ROSARO AR -RO AROS ROSAROSAROSA ROS AROSARO AR -RO AROS ROSAROSARO ROSARO ROSARO AR -RO ROS AROSAROS ROSAROSA AROSAR AR -RO ROSA ROS ROSAROSAR ROSARO RO - RO ROS AROSAROSAROSA ROSARO AR - ARO ROSA ROSAROSAROS AROSAR ARO - ARO OROSA R ROSAROS ROS - RO AROSAROS AROSAROSAR RO - AROS AROSAROSAROSARO AROS - ROSA SARO - ROSAROSAROSAROSAR +${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` +${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ +${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys +${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys +${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys +${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys +${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys +${c2}NMMMMMN: .NMMMMMN${c1}yyyyys +${c2}MMMMMMm. NMMMMMN${c1}yyyyys +${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys +${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys +${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys +${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys +${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys +${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys +${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo +${c2} `.:/++++/:.` ${c1}:oys+. EOF ;; - "sabotage"*) - set_colors 4 7 1 + "BSD") + set_colors 1 7 4 3 6 read -rd '' ascii_data <<'EOF' -${c2} .|'''.| | '||''|. ..|''|| - ||.. ' ||| || || .|' || - ''|||. | || ||'''|. || || -. '|| .''''|. || || '|. || -|'....|' .|. .||. .||...|' ''|...|' - -|''||''| | ..|'''.| '||''''| - || ||| .|' ' || . - || | || || .... ||''| - || .''''|. '|. || || - .||. .|. .||. ''|...'| .||.....| +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) EOF ;; - "Sabayon"*) - set_colors 4 7 1 + "BunsenLabs"*) + set_colors fg 7 read -rd '' ascii_data <<'EOF' -${c1} ........... - .. .. - .. .. - .. ${c2}o ${c1}.. - .. ${c2}:W' ${c1}.. - .. ${c2}.d. ${c1}.. -:. ${c2}.KNO ${c1}.: -:. ${c2}cNNN. ${c1}.: -: ${c2}dXXX, ${c1}: -: ${c2}. dXXX, .cd, ${c1}: -: ${c2}'kc .. dKKK. ,ll;:' ${c1}: -: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: -:. ${c2}.,cdddddddddddddo:. ${c1}.: - .. ${c2}:lllllll: ${c1}.. - .. ${c2}',,,,, ${c1}.. - .. .. - .. .. - ............... +${c1} `++ + -yMMs + `yMMMMN` + -NMMMMMMm. + :MMMMMMMMMN- + .NMMMMMMMMMMM/ + yMMMMMMMMMMMMM/ +`MMMMMMNMMMMMMMN. +-MMMMN+ /mMMMMMMy +-MMMm` `dMMMMMM +`MMN. .NMMMMM. + hMy yMMMMM` + -Mo +MMMMN + /o +MMMMs + +MMMN` + hMMM: + `NMM/ + +MN: + mh. + -/ EOF ;; - "SailfishOS"*) - set_colors 4 5 7 6 + "Calculate"*) + set_colors 7 3 read -rd '' ascii_data <<'EOF' -${c1} .+eWWW - .+ee+++eee e. - .ee++eeeeeeee +e. - .e++ee++eeeeeee+eee+e+ - ee.e+.ee+eee++eeeeee+ - W.+e.e+.e++ee+eee - W.+e.W.ee.W++ee' - +e.W W.e+.W.W+ - W.e.+e.W W W. - e e e +e.W.W - .W W W. - W.+e.W. - W++e.ee+. - ++ +ee++eeeee++. - ' '+++e 'ee. - ee - ee - e +${c1} ...... + ,,+++++++,. + .,,,....,,,${c2}+**+,,.${c1} + ............,${c2}++++,,,${c1} + ............... + ......,,,........ + .....+*#####+,,,*+. + .....,*###############,..,,,,,,.. + ......,*#################*..,,,,,..,,,.. + .,,....*####################+***+,,,,...,++, + .,,..,..*#####################*, + ,+,.+*..*#######################. + ,+,,+*+..,########################* +.,++++++. ..+##**###################+ +..... ..+##***#################*. + .,.*#*****##############*. + ..,,*********#####****+. + ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} + ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} + ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} EOF ;; - "SalentOS"*) - set_colors 2 1 3 7 + "CentOS"*) + set_colors 3 2 4 5 7 read -rd '' ascii_data <<'EOF' -${c1} ``..`` - .-:+oshdNMMMMMMNdhyo+:-.` - -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ -${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` -${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- -${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` -${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` -${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd -${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy -${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo -${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ -${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- -${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` -${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm -${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy -${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: -${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. -${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: -${c2} `:smMM${c4}yy${c3}MMNy/` - ${c2}.- ${c4}`${c3}:. +${c1} .. + .PLTJ. + <><><><> + ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK + ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK + ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V + ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. +${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. +${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. +${c4} +${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV +${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' + ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' + ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 + ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK + ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK +${c2} <><><><> + 'MKKM' + '' EOF ;; - "Scientific"*) - set_colors 4 7 1 + "Chakra"*) + set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c1} =/;;/- - +: // - /; /; - -X H. -.//;;;:;;-, X= :+ .-;:=;:;#;. -M- ,=;;;#:, ,:#;;:=, ,@ -:# :#.=/++++/=.$= #= - ,#; #/:+/;,,/++:+/ ;+. - ,+/. ,;@+, ,#H;, ,/+, - ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; - ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. - ,;: :@#= =$H: .+#- - ,#= #;-///==///-// =#, -;+ :#-;;;:;;;;-X- +: -@- .-;;;;M- =M/;;;-. -X - :;;::;;-. #- :+ ,-;;-;:== - ,X H. - ;/ #= - // +; - '////' +${c1} _ _ _ "kkkkkkkk. + ,kkkkkkkk., 'kkkkkkkkk, + ,kkkkkkkkkkkk., 'kkkkkkkkk. + ,kkkkkkkkkkkkkkkk,'kkkkkkkk, + ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. + "''"''',;::,,"''kkk''kkkkk; __ + ,kkkkkkkkkk, "k''kkkkk' ,kkkk + ,kkkkkkk' ., ' .: 'kkkk',kkkkkk + ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk + ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk +.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' +;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' +'kkkkkkk; 'kkkkkkkk.,""''"''"" + ''kkkk; 'kkkkkkkkkk., + ';' 'kkkkkkkkkkkk., + ';kkkkkkkkkk' + ';kkkkkk' + "''" EOF ;; - "Siduction"*) - set_colors 4 4 + "ChaletOS"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} _aass, - jQh: =$w - QWmwawQW - )$QQQQ@( .. - _a_a. ~??^ syDY?Sa, - _mW>-<$c jWmi imm. - ]QQwayQE 4QQmgwmQQ` - ?WWQWP' -9QQQQQ@'._aas, - _a%is. .adYYs,. -"?!` aQB*~^3$c -_Qh;.nm .QWc. {QL ]QQp;..vmQ/ -"QQmmQ@ -QQQggmQP ]QQWmggmQQ( - -???" "$WQQQY` __, ?QQQQQQW! - _yZ!?q, - .yWY!!Sw, "???^ - .QQa_=qQ mQm>..vmm - $QQWQQP $QQQgmQQ@ - "???" _aa, -9WWQQWY` - _mB>~)$a -~~ - mQms_vmQ. - ]WQQQQQP - -?T??" +${c1} `.//+osso+/:`` + `/sdNNmhyssssydmNNdo:` + :hNmy+-` .-+hNNs- + /mMh/` `+:` `+dMd: + .hMd- -sNNMNo. /yyy /mMs` + -NM+ `/dMd/--omNh::dMM `yMd` + .NN+ .sNNs:/dMNy:/hNmo/s yMd` + hMs `/hNd+-smMMMMMMd+:omNy- `dMo +:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` +/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: +/Md` MMMMMMMMMMMMMMMMMMMN .MN: +:NN. MMMMMMm....--NMMMMMN -Mm. +`dMo MMMMMMd mMMMMMN hMs + -MN: MMMMMMd mMMMMMN oMm` + :NM: MMMMMMd mMMMMMN +Mm- + -mMy. mmmmmmh dmmmmmh -hMh. + oNNs- :yMm/ + .+mMdo:` `:smMd/` + -ohNNmhsoo++osshmNNh+. + `./+syyhhyys+:`` EOF ;; - "Slackware"*) - set_colors 4 7 1 + "Chapeau"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} ::::::: - ::::::::::::::::::: - ::::::::::::::::::::::::: - ::::::::${c2}cllcccccllllllll${c1}:::::: - :::::::::${c2}lc dc${c1}::::::: - ::::::::${c2}cl clllccllll oc${c1}::::::::: - :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: - ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: - :::::::::::${c2}lc cclccclc${c1}::::::::::::: -::::::::::::::${c2}lcclcc lc${c1}:::::::::::: -::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: -::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: - :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: - :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: - ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: - :::${c2}oclcccccccccccccllllllllllllll${c1}::::: - ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: - :::::::::::::::::::::::::::::::: - :::::::::::::::::::::::::::: - :::::::::::::::::::::: - :::::::::::: +${c1} .-/-. + ////////. + ////////${c2}y+${c1}//. + ////////${c2}mMN${c1}/////. + ////////${c2}mMN+${c1}////////. + ////////////////////////. + /////////+${c2}shhddhyo${c1}+////////. + ////////${c2}ymMNmdhhdmNNdo${c1}///////. +///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. +///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// +//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// +//////${c2}+MMmssssssssssssss+${c1}/////// +`//////${c2}yMMy${c1}//////////////////// + `//////${c2}smMNhso++oydNm${c1}//////// + `///////${c2}ohmNMMMNNdy+${c1}/////// + `//////////${c2}++${c1}////////// + `////////////////. + -////////- EOF ;; - "SliTaz"*) - set_colors 3 3 + "Chrom"*) + set_colors 2 1 3 4 7 read -rd '' ascii_data <<'EOF' -${c1} @ @( @ - @@ @@ @ @/ - @@ @@ @@ @@ - @@ %@@ @@ @@ - @@ %@@@ @@@@@. @@@@ @@ - @@@ @@@@ @@@@@@@ &@@@ @@@ - @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ - ,@@@@@@@@@@@@@@@@@@@@@@@@@ - .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ -@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ -@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ -@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. -@@ ,@@ @@@@@@@@@@@@@ @@@ @@ -@ @@. @@@@@@@@@@@@@ @@@ *@ -@ @@ @@@@@@@@@@@@ @@ @ - @ @@@@@@@@@. #@ - @ ,@@@@@ @ +${c2} .,:loool:,. + .,coooooooooooooc,. + .,lllllllllllllllllllll,. + ;ccccccccccccccccccccccccc; +${c1} '${c2}ccccccccccccccccccccccccccccc. +${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: +${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. +${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d +${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 +${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 +${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d +${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. +${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; +${c1} .:ccccccccllllllllo${c3}O0000000OOO, +${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. +${c1} '::ccccccccc${c3}dOOOOOOOkx:. +${c1} ..,::cccc${c3}xOOOkkko;. +${c1} ..,:${c3}dOkxl:. EOF ;; - "SmartOS"*) - set_colors 6 7 + "Clover"*) + set_colors 2 6 read -rd '' ascii_data <<'EOF' -${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyys oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyy syyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy yyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +${c1} `omo``omo` + `oNMMMNNMMMNo` + `oNMMMMMMMMMMMMNo` + oNMMMMMMMMMMMMMMMMNo + `sNMMMMMMMMMMMMMMNs` + `omo` `sNMMMMMMMMMMNs` `omo` + `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` + `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` +oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo +`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` +`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` +oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo + `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` + `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` + `oNs` `sNMMMMMMMMMMNs` `oNs` + `sNMMMMMMMMMMMMMMNs` + +NMMMMMMMMMMMMMMMMNo + `oNMMMMMMMMMMMMNo` + `oNMMMNNMMMNs` + `omo``oNs` EOF ;; - "Solus"*) + "Container Linux by CoreOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c2} -``````````` - `-+/------------.` - .---:mNo---------------. - .-----yMMMy:---------------. - `------oMMMMMm/----------------` - .------/MMMMMMMN+----------------. - .------/NMMMMMMMMm-+/--------------. -`------/NMMMMMMMMMN-:mh/-------------` -.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. ------/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- -----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. -.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` -`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. -`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ - .------------:://+-/++++++${c1}oshddys: - -hhhhyyyyyyyyyyyhhhhddddhysssso- - `:ossssssyysssssssssssssssso:` - `:+ssssssssssssssssssss+- - `-/+ssssssssssso+/-` - `.-----..` +${c1} ..... + .';:cccccccc:;'. + ':ccccclc${c3}lllllllll${c1}cc:. + .;cccccccc${c3}lllllllllllllll${c1}c, + ;clllccccc${c3}llllllllllllllllll${c1}c, + .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: + ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: + :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, +.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c +.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. +.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. +.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc + :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; + .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc + .cllllllllllclcccclccclccllllcllc + :cllllllllccclcllllllllllllcc; + .cccccccccccccclcccccccccc:. + .;cccclccccccllllllccc,. + .';ccccclllccc:;.. + ..... EOF ;; - "Source Mage"*) - set_colors 4 7 1 + "crux_small") + set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c2} :ymNMNho. -.+sdmNMMMMMMMMMMy` -.-::/yMMMMMMMMMMMm- - sMMMMMMMMMMMm/ - /NMMMMMMMMMMMMMm: - .MMMMMMMMMMMMMMMMM: - `MMMMMMMMMMMMMMMMMN. - NMMMMMMMMMMMMMMMMMd - mMMMMMMMMMMMMMMMMMMo - hhMMMMMMMMMMMMMMMMMM. - .`/MMMMMMMMMMMMMMMMMs - :mMMMMMMMMMMMMMMMN` - `sMMMMMMMMMMMMMMM+ - /NMMMMMMMMMMMMMN` - oMMMMMMMMMMMMM+ - ./sd.-hMMMMMMMMmmN` - ./+oyyyh- `MMMMMMMMMmNh - sMMMMMMMMMmmo - `NMMMMMMMMMd: - -dMMMMMMMMMo - -shmNMMms. +${c1} ___ + (${c3}.· ${c1}| + (${c2}<> ${c1}| + / ${c3}__ ${c1}\\ + ( ${c3}/ \\ ${c1}/| +${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) +${c2}\/${c1}-____${c2}\/ +EOF + ;; + + "CRUX"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} odddd + oddxkkkxxdoo + ddcoddxxxdoool + xdclodod olol + xoc xdd olol + xdc ${c2}k00${c1}Okdlol + xxd${c2}kOKKKOkd${c1}ldd + xdco${c2}xOkdlo${c1}dldd + ddc:cl${c2}lll${c1}oooodo + odxxdd${c3}xkO000kx${c1}ooxdo + oxdd${c3}x0NMMMMMMWW0od${c1}kkxo + oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx +docldkXW${c3}MMMMMMMWWN${c1}Odolco +xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c +${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l +${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd +${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo +${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; - "Sparky"*) - set_colors 1 7 + "debian_small") + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} - . `-:-` - .o` .-///-` - `oo` .:/++:. - os+` -/+++:` ``.........``` - /ys+`./+++/-.-::::::----......`` - `syyo`++o+--::::-::/+++/-`` - -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` -::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` -`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` - -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- - .sdddy::syo--/:. `.:dy+-ohhho ./: - :yddds/:+oo+//:-`- /+ +hy+.shhy: `` - `:ydmmdysooooooo-.ss`/yss--oyyo - `./ossyyyyo+:-/oo:.osso- .oys - ``..-------::////.-oooo/ :so - `...----::::::::--.`/oooo: .o: - ``````` ++o+:` `:` - ./+/-` ` - `-:-. - `` + ${c1}_____ + / __ \\ +| / | +| \\___- +-_ + --_ EOF ;; - "SteamOS"*) - set_colors 5 7 + "Debian"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} .,,,,. - .,'onNMMMMMNNnn',. - .'oNMANKMMMMMMMMMMMNNn'. - .'ANMMMMMMMXKNNWWWPFFWNNMNn. - ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, - ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, -,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, -'${c2}+#############, +. ,+' ${c1}+NMMM -${c2} '*#########*' '*,,*' ${c1}.+NMMMM. -${c2} `'*###*' ,.,;###${c1}+WNM, -${c2} .,;;, .;##########${c1}+W -${c2},',. '; ,+##############' - '###+. :,. .,; ,###############' - '####.. `'' .,###############' - '#####+++################' - '*##################*' - ''*##########*'' - '''''' +${c2} _,met$$$$$gg. + ,g$$$$$$$$$$$$$$$P. + ,g$$P" """Y$$.". + ,$$P' `$$$. +',$$P ,ggs. `$$b: +`d$$' ,$P"' ${c1}.${c2} $$$ + $$P d$' ${c1},${c2} $$P + $$: $$. ${c1}-${c2} ,d$$' + $$; Y$b._ _,d$P' + Y$$. ${c1}`.${c2}`"Y$$$$P"' +${c2} `$$b ${c1}"-.__ +${c2} `Y$$ + `Y$$. + `$$b. + `Y$$b. + `"Y$b._ + `""" EOF ;; - "SunOS" | "Solaris") - set_colors 3 7 + "Deepin"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} `- ` - `-- `+- .: - .+: `++: -/+- . - `.::` -++/``:::`./+/ `.-/. - `++/-`.` ` /++:` - `` ./:` .: `..`.- -``./+/:- -+++:- - -/+` :. +${c1} ............ + .';;;;;. .,;,. + .,;;;;;;;. ';;;;;;;. + .;::::::::' .,::;;,''''',. + ,'.:::::::: .;;'. '; + ;' 'cccccc, ,' :: '.. .: + ,, :ccccc. ;: .c, '' :. ,; +.l. cllll' ., .lc :; .l' l. +.c :lllc ;cl: .l' .ll. :' +.l 'looc. . ,o: 'oo' c, +.o. .:ool::coc' .ooo' o. + :: ..... .;dddo ;c + l:... .';lddddo. ,o + lxxxxxdoolllodxxxxxxxxxc :l + ,dxxxxxxxxxxxxxxxxxxl. 'o, + ,dkkkkkkkkkkkkko;. .;o; + .;okkkkkdl;. .,cl:. + .,:cccccccc:,. EOF ;; - "openSUSE Tumbleweed"*) + "DesaOS") set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c2} ...... - .,cdxxxoc,. .:kKMMMNWMMMNk:. - cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. - ;WMK;. .lKMMNM, :NMK, .OMW; - cMW; 'WMMMN ,XMK, oMM' -.MMc ..;l. xMN: KM0 -'MM. 'NMO oMM -.MM, .kMMl xMN - KM0 .kMM0. .dl:,.. .WMd - .XM0. ,OMMK, OMMMK. .XMK - oWMO:. .;xNMMk, NNNMKl. .xWMx - :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, - ..... .:dOOXXKOxl, +${c1}███████████████████████ +███████████████████████ +███████████████████████ +███████████████████████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +██████████████████████████████ +██████████████████████████████ +████████████████████████ +████████████████████████ +████████████████████████ EOF ;; - "openSUSE"* | "open SUSE"* | "SUSE"*) - set_colors 2 7 + "Devuan"*) + set_colors 5 7 read -rd '' ascii_data <<'EOF' -${c2} .;ldkO0000Okdl;. - .;d00xl:^''''''^:ok00d;. - .d00l' 'o00d. - .d0Kd'${c1} Okxol:;,. ${c2}:O0d. - .OK${c1}KKK0kOKKKKKKKKKKOxo:, ${c2}lKO. - ,0K${c1}KKKKKKKKKKKKKKK0P^${c2},,,${c1}^dx:${c2} ;00, -.OK${c1}KKKKKKKKKKKKKKKk'${c2}.oOPPb.${c1}'0k.${c2} cKO. -:KK${c1}KKKKKKKKKKKKKKK: ${c2}kKx..dd ${c1}lKd${c2} 'OK: -dKK${c1}KKKKKKKKKOx0KKKd ${c2}^0KKKO' ${c1}kKKc${c2} dKd -dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd -:KK${c1}KKKKKKKKKK0o;...^cdxxOK0O/^^' ${c2}.0K: - kKK${c1}KKKKKKKKKKKKK0x;,,......,;od ${c2}lKk - '0K${c1}KKKKKKKKKKKKKKKKKKKK00KKOo^ ${c2}c00' - 'kK${c1}KKOxddxkOO00000Okxoc;'' ${c2}.dKk' - l0Ko. .c00l' - 'l0Kk:. .;xK0l' - 'lkK0xl:;,,,,;:ldO0kl' - '^:ldxkkkkxdl:^' +${c1} ..,,;;;::;,.. + `':ddd;:,. + `'dPPd:,. + `:b$$b`. + 'P$$$d` + .$$$$$` + ;$$$$$P + .:P$$$$$$` + .,:b$$$$$$$;' + .,:dP$$$$$$$$b:' + .,:;db$$$$$$$$$$Pd'` + ,db$$$$$$$$$$$$$$b:'` +:$$$$$$$$$$$$b:'` + `$$$$$bd:''` + `'''` EOF ;; - "SwagArch"*) - set_colors 4 7 1 + "DracOS"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c2} .;ldkOKXXNNNNXXK0Oxoc,. - ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; - 'K0xo ..,;:c:. `'lKMMMMM0 - .lONMMMMMM' `lNMk' -${c2} ;WMMMMMMMMMO. ${c1}....::... -${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, -${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. -${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. -${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: -${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. -${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: -${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. -${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. - :ccc:' `cccccccc:, - '' +${c1} `-:/- + -os: + -os/` + :sy+-` + `/yyyy+. + `+yyyyo- + `/yyyys: +`:osssoooo++- +yyyyyy/` + ./yyyyyyo yo`:syyyy+. + -oyyy+ +- :yyyyyo- + `:sy: `. `/yyyyys: + ./o/.` .oyyso+oo:` + :+oo+//::::///:-.` `.` EOF ;; - "Tails"*) - set_colors 5 7 + "dragonfly_old"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} `` - ./yhNh -syy/Nshh `:o/ -N:dsNshh █ `ohNMMd -N-/+Nshh `yMMMMd -N-yhMshh yMMMMd -N-s:hshh █ yMMMMd so//. -N-oyNsyh yMMMMd d Mms. -N:hohhhd:. yMMMMd syMMM+ -Nsyh+-..+y+- yMMMMd :mMM+ -+hy- -ss/`yMMMM `+d+ - :sy/. ./yNMMMMm `` - .+ys- `:+hNMMMMMMy/` - `hNmmMMMMMMMMMMMMdo. - dMMMMMMMMMMMMMMMMMNh: - +hMMMMMMMMMMMMMMMMMmy. - -oNMMMMMMMMMMmy+.` - `:yNMMMds/.` - .//` + ${c1} | + .-. + ${c3} ()${c1}I${c3}() + ${c1} "==.__:-:__.==" + "==.__/~|~\__.==" + "==._( Y )_.==" + ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. +( ..=${c1}\\=${c1}/${c2}=.. ) + `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` + `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` + .-~` /${c1}|=|${c2}\ `~-. + .~` / ${c1}|=|${c2} \ `~. + .-~` .' ${c1}|=|${c2} `. `~-. + (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) + `~"~"` ${c1} |=|${c2} `"~"~` + ${c1} /=\\ + \\=/ + ^ EOF ;; - "Trisquel"*) - set_colors 4 6 + "dragonfly_small"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} ▄▄▄▄▄▄ - ▄█████████▄ - ▄▄▄▄▄▄ ████▀ ▀████ - ▄██████████▄ ████▀ ▄▄ ▀███ - ▄███▀▀ ▀▀████ ███▄ ▄█ ███ -▄███ ▄▄▄ ████▄ ▀██████ ▄███ -███ █▀▀██▄ █████▄ ▀▀ ▄████ -▀███ ███ ███████▄▄ ▄▄██████ -${c1} ▀███▄ ▄███ █████████████${c2}████▀ -${c1} ▀█████████ ███████${c2}███▀▀▀ - ▀▀███▀▀ ██████▀▀ - ██████▀ ▄▄▄▄ - █████▀ ████████ - █████ ███▀ ▀███ - ████▄ ██▄▄▄ ███ - █████▄ ▀▀ ▄██ - ██████▄▄▄████ - ▀▀█████▀▀ +${c2}(\${c3}"${c2}/) +${c2}(/${c1}|${c2}\) +${c1} | + | EOF ;; - "Ubuntu-Budgie"*) - set_colors 4 7 1 + "DragonFly"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c2} ./oydmMMMMMMmdyo/. - :smMMMMMMMMMMMhs+:++yhs: - `omMMMMMMMMMMMN+` `odo` - /NMMMMMMMMMMMMN- `sN/ - `hMMMMmhhmMMMMMMh sMh` - .mMmo- /yMMMMm` `MMm. - mN/ yMMMMMMMd- MMMm -oN- oMMMMMMMMMms+//+o+: :MMMMo -m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm -M` .NMMMMMMMMMMMMMMMNodMMMMMMM -M- sMMMMMMMMMMMMMMMMMMMMMMMMM -mm` mMMMMMMMMMNdhhdNMMMMMMMMMm -oMm/ .dMMMMMMMMh: :dMMMMMMMo - mMMNyo/:/sdMMMMMMMMM+ sMMMMMm - .mMMMMMMMMMMMMMMMMMs `NMMMm. - `hMMMMMMMMMMM.oo+. `MMMh` - /NMMMMMMMMMo sMN/ - `omMMMMMMMMy. :dmo` - :smMMMMMMMh+-` `.:ohs: - ./oydmMMMMMMdhyo/. +${c2},--, ${c1}| ${c2},--, +${c2}| `-, ${c1},^, ${c2},-' | +${c2} `, `-, ${c3}(/ \) ${c2},-' ,' +${c2} `-, `-,${c1}/ \${c2},-' ,-' +${c2} `------${c1}( )${c2}------' +${c2} ,----------${c1}( )${c2}----------, +${c2} | _,-${c1}( )${c2}-,_ | +${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' +${c1} | | + | | + | | + | | + | | + | | + `|' EOF ;; - "Ubuntu-GNOME"*) - set_colors 4 5 7 6 + "Elementary"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c3} ./o. - .oooooooo - .oooo```soooo - .oooo` `soooo - .ooo` ${c4}.o.${c3} `\/ooo. - :ooo ${c4}:oooo.${c3} `\/ooo. - sooo ${c4}`ooooo${c3} \/oooo - \/ooo ${c4}`soooo${c3} `ooooo - `soooo ${c4}`\/ooo${c3} `soooo -${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo -${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` -${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` -${c4} `ooooo ${c3}`` ${c4}.oooo -${c4} `soooo. .oooo` - `\/oooooooooo` - ``\/oo`` +${c2} eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee eeeeeeeeeeee eeeee + eeee eeeee eee eeee + eeee eeee eee eeee +eee eee eee eee +eee eee eee eee +ee eee eeee eeee +ee eee eeeee eeeeee +ee eee eeeee eeeee ee +eee eeee eeeeee eeeee eee +eee eeeeeeeeee eeeeee eee + eeeeeeeeeeeeeeeeeeeeeeee eeeee + eeeeeeee eeeeeeeeeeee eeee + eeeee eeeee + eeeeeee eeeeeee + eeeeeeeeeeeeeeeee EOF ;; - "Ubuntu-MATE"*) - set_colors 2 7 + "Endless"*) + set_colors 1 7 read -rd '' ascii_data <<'EOF' -${c1} `:+shmNNMMNNmhs+:` - .odMMMMMMMMMMMMMMMMMMdo. - /dMMMMMMMMMMMMMMMmMMMMMMMMd/ - :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: - `yMMMMMMMMMms:..-::oM: -omMMMMMy` - `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` - hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh -/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ -hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh -/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ - hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh - `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` - yMMMMMMMMMms/..-::oM: .+dMMMMMy - :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: - /dMMMMMMMMMMMMMMMdNMMMMMMMd/ - .odMMMMMMMMMMMMMMMMMMdo. - `:+shmNNMMNNmhs+:` +${c1} `:+yhmNMMMMNmhy+:` + -odMMNhso//////oshNMMdo- + /dMMh+. .+hMMd/ + /mMNo` `oNMm: + `yMMo` `oMMy` + `dMN- -NMd` + hMN. .NMh +/MM/ -os` /MM/ +dMm `smNmmhs/- `:sNMd+ `` mMd +MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM +MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM +dMm `/++/-``/yNNh+/sdNMNddMm- mMd +/MM/ `dNy: `-::- /MM/ + hMN. .NMh + `dMN- -NMd` + `yMMo` `oMMy` + /mMNo` `oNMm/ + /dMMh+. .+hMMd/ + -odMMNhso//////oshNMMdo- + `:+yhmNMMMMNmhy+:` EOF ;; - "ubuntu_old") - set_colors 1 7 3 + "Exherbo"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} ./+o+- -${c2} yyyyy- ${c1}-yyyyyy+ -${c2} ${c2}://+//////${c1}-yyyyyyo -${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` -${c3} .:++o: ${c2}/++++++++/:--:/- -${c3} o:+o+:++.${c2}`..```.-/oo+++++/ -${c3} .:+o:+o/.${c2} `+sssoo+/ -${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. -${c2}/+++//+:${c3}`oo+o${c2} /::--:. -${c2}+/+o+++${c3}`o++o${c1} ++////. -${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. -${c3} .+.o+oo:.${c1} `oddhhhh+ -${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ -${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: -${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` -${c1} /osyyyyyyo${c3}++ooo+++/ -${c1} ````` ${c3}+oo+++o: -${c3} `oo++. +${c2} , +OXo. +NXdX0: .cok0KXNNXXK0ko:. +KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... +'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. + cNMk NK .oXM. OMMMMO. 0MMNo kW. + lMc o: ., .oKNk; ;NMMWlxW' + ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO + XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk +.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl +,M: ,XMMWx::,''oOK0x; NM. +'Ml ,kNKOxxxxxkkO0XXKOd:. oMk + NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW + ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW + ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO + 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' + xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd + 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO + :XMNxl,';:lodxkOO000Oxc. .oWMMo + 'dXMMXkl;,. .,o0MMNo' + ':d0XWMMMMWNNNNMMMNOl' + ':okKXWNKkl' EOF ;; - "Ubuntu-Studio") - set_colors 6 7 + "Fedora"* | "RFRemix"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} ..-::::::-.` - `.:+++++++++++${c2}ooo${c1}++:.` - ./+++++++++++++${c2}sMMMNdyo${c1}+/. - .++++++++++++++++${c2}oyhmMMMMms${c1}++. - `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` - `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` - +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` - :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: - ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. - ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ - :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: - +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ - `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` - `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ - ./+++++++++++++++${c2}oyhdNMMMms${c1}++. - ./+++++++++++++${c2}hMMMNdyo${c1}+/. - `.:+++++++++++${c2}sso${c1}++:. - ..-::::::-.. +${c1} /:-------------:\\ + :-------------------:: + :-----------${c2}/shhOHbmp${c1}---:\\ + /-----------${c2}omMMMNNNMMD ${c1}---: + :-----------${c2}sMMMMNMNMP${c1}. ---: + :-----------${c2}:MMMdP${c1}------- ---\\ +,------------${c2}:MMMd${c1}-------- ---: +:------------${c2}:MMMd${c1}------- .---: +:---- ${c2}oNMMMMMMMMMNho${c1} .----: +:-- .${c2}+shhhMMMmhhy++${c1} .------/ +:- -------${c2}:MMMd${c1}--------------: +:- --------${c2}/MMMd${c1}-------------; +:- ------${c2}/hMMMy${c1}------------: +:--${c2} :dMNdhhdNMMNo${c1}------------; +:---${c2}:sdNMMMMNds:${c1}------------: +:------${c2}:://:${c1}-------------:: +:---------------------:// EOF ;; - "Ubuntu"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} .-/+oossssoo+/-. - `:+ssssssssssssssssss+:` - -+ssssssssssssssssssyyssss+- - .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ - +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ -.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. -+ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ -oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso -oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso -+ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ -.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ - +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ - /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ - .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - -+sssssssssssssssss${c2}yyy${c1}ssss+- - `:+ssssssssssssssssss+:` - .-/+oossssoo+/-. + "freebsd_small") + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} /\\ _____ /\\ + \\_) (_/ + / \ +| | +| | + \ / + --_____-- EOF ;; - "void_small") - set_colors 2 8 + "FreeBSD"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} _______ - _ \______ - -| \ ___ \ | -| | / \ | | -| | \___/ | | -| \______ \_| - -_______\ + ${c2}``` ${c1}` + ${c2}` `.....---...${c1}....--.``` -/ + ${c2}+o .--` ${c1}/y:` +. + ${c2} yo`:. ${c1}:o `+- + ${c2}y/ ${c1}-/` -o/ + ${c2}.- ${c1}::/sy+:. + ${c2}/ ${c1}`-- / + ${c2}`: ${c1}:` + ${c2}`: ${c1}:` + ${c2}/ ${c1}/ + ${c2}.- ${c1}-. + ${c2}-- ${c1}-. + ${c2}`:` ${c1}`:` + .-- `--. + .---.....----. EOF ;; - "Void"*) - set_colors 2 8 + "FreeMiNT"*) + # Don't explicitly set colors since + # TosWin2 doesn't reset well. read -rd '' ascii_data <<'EOF' -${c1} __.;=====;.__ - _.=+==++=++=+=+===;. - -=+++=+===+=+=+++++=_ - . -=:`` `--==+=++==. - _vi, ` --+=++++: - .uvnvi. _._ -==+==+. - .vvnvnI` .;==|==;. :|=||=|. -${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL -${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE -${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' -${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! -${c1} -1vvnvv. `~+++` ++|+++ - +vnvnnv, `-|=== - +vnvnvns. . :=- - -Invnvvnsi..___..=sv=. ` - +Invnvnvnnnnnnnnvvnn;. - ~|Invnvnvvnvvvnnv}+` - -~|{*l}*|~ +${c1} ## + ## ######### + #### ## + #### #### ## +#### #### ## ## + #### #### ## ## + #### #### ## ## ## + #### ###### + ###### ## ## #### + #### ################ + #### ## #### + ## #### ###### + ## ## #### #### + ## ## ## ## ## #### + #### ## ## ## EOF ;; - *"[Windows 10]"* | *"on Windows 10"* | "Windows 8"* |\ - "Windows 10"* | "windows10" | "windows8" ) - set_colors 6 7 + "Frugalware"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} .., - ....,,:;+ccllll - ...,,+:; cllllllllllllllllll -,cclllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll - -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -`'ccllllllllll lllllllllllllllllll - `' \\*:: :ccllllllllllllllll - ````''*::cll - `` +${c1} `++/::-.` + /o+++++++++/::-.` + `o+++++++++++++++o++/::-.` + /+++++++++++++++++++++++oo++/:-.`` + .o+ooooooooooooooooooosssssssso++oo++/:-` + ++osoooooooooooosssssssssssssyyo+++++++o: + -o+ssoooooooooooosssssssssssssyyo+++++++s` + o++ssoooooo++++++++++++++sssyyyyo++++++o: + :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo + `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: + /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss + .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- + ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso + -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. + sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ + :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` + yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ +-ysooooooydhhhhhhhhhhhddddddddddddddddssy + .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: + ``.-/+oosysssssssssssssssssssssss + ``.:/+osyysssssssssssssh. + `-:/+osyyssssyo + .-:+++` EOF ;; - "Windows"*) - set_colors 1 2 4 3 + "Funtoo"*) + set_colors 5 7 read -rd '' ascii_data <<'EOF' -${c1} ,.=:!!t3Z3z., - :tt:::tt333EE3 -${c1} Et:::ztt33EEEL${c2} @Ee., .., -${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# -${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL -${c1} it::::tt333EEF${c2} @EEEEEEttttt33F -${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. -${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF -${c3} ;::::::::zt33)${c2} "4EEEtttji3P* -${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. -${c3} i::::::::zt33F${c4} AEEEtttt::::ztF -${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 -${c3} E::::::::zt33L${c4} @EEEtttt::::z3F -${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` -${c3} `${c4} :EEEEtttt::::z7 - "VEzjt:;;z>*` +${c2} _______ ____ + /MMMMMMM/ /MMMM| _____ _____ + __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ +|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ +|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| +|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| + |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ + |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ EOF ;; - "Xubuntu"*) + "GalliumOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} `-/osyhddddhyso/-` - .+yddddddddddddddddddy+. - :yddddddddddddddddddddddddy: - -yddddddddddddddddddddhdddddddy- - odddddddddddyshdddddddh`dddd+ydddo - `yddddddhshdd- ydddddd+`ddh.:dddddy` - sddddddy /d. :dddddd-:dy`-ddddddds -:ddddddds /+ .dddddd`yy`:ddddddddd: -sdddddddd` . .-:/+ssdyodddddddddds -ddddddddy `:ohddddddddd -dddddddd. +dddddddd -sddddddy ydddddds -:dddddd+ .oddddddd: - sdddddo ./ydddddddds - `yddddd. `:ohddddddddddy` - oddddh/` `.:+shdddddddddddddo - -ydddddhyssyhdddddddddddddddddy- - :yddddddddddddddddddddddddy: - .+yddddddddddddddddddy+. - `-/osyhddddhyso/-` +${c1}sooooooooooooooooooooooooooooooooooooo+: +yyooooooooooooooooooooooooooooooooo+/::: +yyysoooooooooooooooooooooooooooo+/:::::: +yyyyyoooooooooooooooooooooooo+/::::::::: +yyyyyysoooooooooooooooooo++/:::::::::::: +yyyyyyysoooooooooooooo++/::::::::::::::: +yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: +yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: +yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: +yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: +yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: +yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: +yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: +yyyyyyyyyyyyyyys+:--...........-///::::: +yyyyyyyyyyyys+:--................://:::: +yyyyyyyyyo+:-.....................-//::: +yyyyyyo+:-..........................://: +yyyo+:-..............................-// +o/:-...................................: EOF ;; - "Zorin"*) - set_colors 4 6 + "gentoo_small") + set_colors 5 7 read -rd '' ascii_data <<'EOF' -${c1} `osssssssssssssssssssso` - .osssssssssssssssssssssso. - .+oooooooooooooooooooooooo+. - - - `::::::::::::::::::::::. .:` - `+ssssssssssssssssss+:.` `.:+ssso` -.ossssssssssssssso/. `-+ossssssso. -ssssssssssssso/-` `-/osssssssssssss -.ossssssso/-` .-/ossssssssssssssso. - `+sss+:. `.:+ssssssssssssssssss+` - `:. .::::::::::::::::::::::` - - - .+oooooooooooooooooooooooo+. - -osssssssssssssssssssssso- - `osssssssssssssssssssso` +${c1} _-----_ +( \\ +\ 0 \\ +${c2} \ ) + / _/ +( _- +\____- EOF ;; - *) - case "$kernel_name" in - *"BSD") - set_colors 1 7 4 3 6 - read -rd '' ascii_data <<'EOF' -${c1} , , - /( )` - \ \___ / | - /- _ `-/ ' - (${c2}/\/ \ ${c1}\ /\ - ${c2}/ / | ` ${c1}\ - ${c3}O O ${c2}) ${c1}/ | - ${c2}`-^--'${c1}`< ' - (_.) _ ) / - `.___/` / - `-----' / -${c4}<----. __ / __ \ -${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| -<----' ${c1}`--' `.__,' \ - | | - \ / /\ - ${c5}______${c1}( (_ / \______/ - ${c5},' ,-----' | - `--{__________) + "Gentoo"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} -/oyddmdhs+:. + -o${c2}dNMMMMMMMMNNmhy+${c1}-` + -y${c2}NMMMMMMMMMMMNNNmmdhy${c1}+- + `o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/` + om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o` +.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+` + oy${c2}hdmNMMMMMMMN${c1}dyooy${c2}dmddddhhhhyhN${c1}d. + :o${c2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${c1}Mh + .:${c2}+sydNMMMMMNNNmmmdddhhhhhhmM${c1}my + /m${c2}MMMMMMNNNmmmdddhhhhhmMNh${c1}s: + `o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+` + `s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. + /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:` ++M${c2}MMMMMMNNNNNmmmmdmNMNdso${c1}/- +yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` +/h${c2}MMNNNNNNNNMNdhs++/${c1}-` +`/${c2}ohdmmddhys+++/:${c1}.` + `-//////:--. EOF - ;; + ;; - "Darwin") - set_colors 2 3 1 1 5 4 - read -rd '' ascii_data <<'EOF' -${c1} 'c. - ,xNMM. - .OMMMMo - OMMM0, - .;loddo:' loolloddol;. - cKMMMMMMMMMMNWMMMMMMMMMM0: -${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. - XMMMMMMMMMMMMMMMMMMMMMMMX. -${c3};MMMMMMMMMMMMMMMMMMMMMMMM: -:MMMMMMMMMMMMMMMMMMMMMMMM: -${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. - kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. - ${c6}kMMMMMMMMMMMMMMMMMMMMMMd - ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. + "gNewSense"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} ..,,,,.. + .oocchhhhhhhhhhccoo. + .ochhlllllllc hhhhhh ollllllhhco. + ochlllllllllll hhhllllllhhh lllllllllllhco + .cllllllllllllll hlllllo +hllh llllllllllllllc. +ollllllllllhco'' hlllllo +hllh ``ochllllllllllo +hllllllllc' hllllllllllllh `cllllllllh +ollllllh +llllllllllll+ hllllllo + `cllllh. ohllllllho .hllllc' + ochllc. ++++ .cllhco + `+occooo+. .+ooocco+' + `+oo++++ ++++oo+' EOF - ;; + ;; - "GNU"*) - set_colors fg 7 - read -rd '' ascii_data <<'EOF' + "GNU") + set_colors fg 7 + read -rd '' ascii_data <<'EOF' ${c1} _-`````-, ,- '- . .' .- - | | - -. `. /.' / `. \ @@ -7646,982 +6348,2280 @@ ${c1} _-`````-, ,- '- . '/'/' `; EOF - ;; - - "Linux") - set_colors fg 8 3 - read -rd '' ascii_data <<'EOF' -${c2} ##### -${c2} ####### -${c2} ##${c1}O${c2}#${c1}O${c2}## -${c2} #${c3}#####${c2}# -${c2} ##${c1}##${c3}###${c1}##${c2}## -${c2} #${c1}##########${c2}## -${c2} #${c1}############${c2}## -${c2} #${c1}############${c2}### -${c3} ##${c2}#${c1}###########${c2}##${c3}# -${c3}######${c2}#${c1}#######${c2}#${c3}###### -${c3}#######${c2}#${c1}#####${c2}#${c3}####### -${c3} #####${c2}#######${c3}##### -EOF - ;; - - "SunOS") - set_colors 3 7 - read -rd '' ascii_data <<'EOF' -${c1} `- ` - `-- `+- .: - .+: `++: -/+- . - `.::` -++/``:::`./+/ `.-/. - `++/-`.` ` /++:` - `` ./:` .: `..`.- -``./+/:- -+++:- - -/+` :. -EOF - ;; + ;; - "IRIX"*) - set_colors 4 7 - read -rd '' ascii_data <<'EOF' -${c1} ./ohmNd/ +dNmho/- - `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. - `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` - -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. - `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` -+mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ -dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd -oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ -.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. - hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh - /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: - `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd - `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` - `yNMMNho-yMMMM` NMMMm.+hNMMNh` - -MMMMd: oMMMM. NMMMh :hMMMM- - -yNMMMmooMMMM- NMMMyomMMMNy- - .omMMMMMMMM-`NMMMMMMMmo. - `:hMMMMMM. NMMMMMh/` - .odNm+ /dNms. + "GoboLinux"*) + set_colors 5 4 6 2 + read -rd '' ascii_data <<'EOF' +${c1}_____ _ +/ ____| | | +| | __ ___ | |__ ___ +| | |_ |/ _ \| '_ \ / _ \ +| |__| | (_) | |_) | (_) | + \_____|\___/|_.__/ \___/ EOF - ;; - esac ;; - esac - - # Overwrite distro colors if '$ascii_colors' doesn't - # equal 'distro'. - if [[ "${ascii_colors[0]}" != "distro" ]]; then - color_text="off" - set_colors "${ascii_colors[@]}" - fi -} - -set_colors() { - c1="$(color "$1")${ascii_bold}" - c2="$(color "$2")${ascii_bold}" - c3="$(color "$3")${ascii_bold}" - c4="$(color "$4")${ascii_bold}" - c5="$(color "$5")${ascii_bold}" - c6="$(color "$6")${ascii_bold}" - - [[ "$color_text" != "off" ]] && set_text_colors "$@" -} - -set_text_colors() { - if [[ "${colors[0]}" == "distro" ]]; then - title_color="$(color "$1")" - at_color="$reset" - underline_color="$reset" - subtitle_color="$(color "$2")" - colon_color="$reset" - info_color="$reset" - - # If the ascii art uses 8 as a color, make the text the fg. - ((${1:-1} == 8)) && title_color="$reset" - ((${2:-7} == 8)) && subtitle_color="$reset" - - # If the second color is white use the first for the subtitle. - ((${2:-7} == 7)) && subtitle_color="$(color "$1")" - ((${1:-1} == 7)) && title_color="$reset" - else - title_color="$(color "${colors[0]}")" - at_color="$(color "${colors[1]}")" - underline_color="$(color "${colors[2]}")" - subtitle_color="$(color "${colors[3]}")" - colon_color="$(color "${colors[4]}")" - info_color="$(color "${colors[5]}")" - fi - - # Bar colors. - if [[ "$bar_color_elapsed" == "distro" ]]; then - bar_color_elapsed="$(color fg)" - else - bar_color_elapsed="$(color "$bar_color_elapsed")" - fi - - case "$bar_color_total $1" in - "distro "[736]) bar_color_total="$(color "$1")" ;; - "distro "[0-9]) bar_color_total="$(color "$2")" ;; - *) bar_color_total="$(color "$bar_color_total")" ;; - esac -} - -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" ;; - esac -} - -# OTHER - -stdout() { - image_backend="off" - unset subtitle_color - unset colon_color - unset info_color - unset underline_color - unset bold - unset title_color - unset at_color - unset text_padding - unset zws - unset reset - unset color_blocks - unset get_line_break -} - -err() { - err+="$(color 1)[!]\e[0m $1\n" -} - -get_full_path() { - # This function finds the absolute path from a relative one. - # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" - - # If the file exists in the current directory, stop here. - [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - - if ! cd "${1%/*}"; then - err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" - err " Check that the directory exists or try another directory." - exit 1 - fi - - local full_dir="${1##*/}" - - # Iterate down a (possible) chain of symlinks. - while [[ -L "$full_dir" ]]; do - full_dir="$(readlink "$full_dir")" - cd "${full_dir%/*}" || exit - full_dir="${full_dir##*/}" - done - # Final directory. - full_dir="$(pwd -P)/${1/*\/}" + "Grombyang"*) + set_colors 4 2 1 + read -rd '' ascii_data <<'EOF' +${c1} eeeeeeeeeeee + eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee ${c2}.o+ ${c1}eeee + eeee ${c2}`ooo/ ${c1}eeee + eeee ${c2}`+oooo: ${c1}eeee +eee ${c2}`+oooooo: ${c1}eee +eee ${c2}-+oooooo+: ${c1}eee +ee ${c2}`/:oooooooo+: ${c1}ee +ee ${c2}`/+ +++ +: ${c1}ee +ee ${c2}+o+\ ${c1}ee +eee ${c2}+o+\ ${c1}eee +eee ${c2}// \\ooo/ \\\ ${c1}eee + eee ${c2}//++++oooo++++\\\ ${c1}eee + eeee ${c2}::::++oooo+::::: ${c1}eeee + eeeee ${c3}Grombyang OS ${c1} eeee + eeeeeeeeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeee +EOF + ;; - [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" -} + "GuixSD"*) + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1} .. `. + `--..```..` `..```..--` + .-:///-:::. `-:::///:-. + ````.:::` `:::.```` + -//:` -::- + ://: -::- + `///- .:::` + -+++-:::. + :+/:::- + `-....` +EOF + ;; -get_user_config() { - # Check $config_file. - if [[ -f "$config_file" ]]; then - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options - return - fi - mkdir -p "${XDG_CONFIG_HOME}/neofetch/" + "Haiku"*) + set_colors 2 8 + read -rd '' ascii_data <<'EOF' +${c2} :dc' + 'l:;'${c1},${c2}'ck. .;dc:. + co ${c1}..${c2}k. .;; ':o. + co ${c1}..${c2}k. ol ${c1}.${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. +.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. + ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; + ..${c1}oOolllllccccccc:::::${c2}od; + cx:ooc${c1}:::::::;${c2}cooolcX. + cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. + cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. + .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. + '::c'${c1}...${c2}do${c1}..... .${c2}K, + cd,.${c1}....:${c2}O,${c1} + ':clod:'${c1} + ${c1} +EOF + ;; - # Check ${XDG_CONFIG_HOME}/neofetch and create the - # dir/files if they don't exist. - if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config" + "Hyperbola"*) + set_colors 8 + read -rd '' ascii_data <<'EOF' +${c1} WW + KX W + WO0W NX0O + NOO0NW WNXK0OOKW + W0OOOOOOOOOOOOKN + N0OOOOOOO0KXW + WNXXXNW + NXK00000KN + WNK0OOOOOOOOOO0W + NK0OOOOOOOOOOOOOO0W + X0OOOOOOO00KK00OOOOOK + X0OOOO0KNWW WX0OO0W + X0OO0XNW KOOW + N00KNW KOW + NKXN W0W +WW W +EOF + ;; - elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + "Kali"*) + set_colors 4 8 + read -rd '' ascii_data <<'EOF' +${c1}.............. + ..,;:ccc,. + ......''';lxO. +.....''''..........,:ld; + .';;;:::;,,.x, + ..'''. 0Xxoc:,. ... + .... ,ONkc;,;cokOdc',. + . OMo ':${c2}dd${c1}o. + dMc :OO; + 0M. .:o. + ;Wd + ;XO, + ,d0Odlc;,.. + ..',;:cdOOd::,. + .:d;.':;. + 'd, .' + ;l .. + .o + c + .' + . +EOF + ;; - else - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + "KaOS"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} .. + ..... ..OSSAAAAAAA.. + .KKKKSS. .SSAAAAAAAAAAA. +.KKKKKSO. .SAAAAAAAAAA... +KKKKKKS. .OAAAAAAAA. +KKKKKKS. .OAAAAAA. +KKKKKKS. .SSAA.. +.KKKKKS..OAAAAAAAAAAAA........ + DKKKKO.=AA=========A===AASSSO.. + AKKKS.==========AASSSSAAAAAASS. + .=KKO..========ASS.....SSSSASSSS. + .KK. .ASS..O.. =SSSSAOSS: + .OK. .ASSSSSSSO...=A.SSA. + .K ..SSSASSSS.. ..SSA. + .SSS.AAKAKSSKA. + .SSS....S.. +EOF + ;; - # The config file doesn't exist, create it. - printf "%s\n" "$config" > "$config_file" - fi + "KDE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} `..---+/---..` + `---.`` `` `.---.` + .--.` `` `-:-. + `:/: `.----//----.` :/- + .:. `---` `--.` .:` + .:` `--` .:- `:. + `/ `:. `.-::-.` -:` `/` + /. /. `:++++++++:` .: .: +`/ .: `+++++++++++/ /` `+` +/+` -- .++++++++++++` :. .+: +`/ .: `+++++++++++/ /` `+` + /` /. `:++++++++:` .: .: + ./ `:. `.:::-.` -:` `/` + .:` `--` .:- `:. + .:. `---` `--.` .:` + `:/: `.----//----.` :/- + .-:.` `` `-:-. + `---.`` `` `.---.` + `..---+/---..` +EOF + ;; - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options -} + "Kogaion"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ;; ,; + ;;; ,;; + ,;;;; ;;;; + ,;;;;;;;; ;;;; + ;;;;;;;;;;; ;;;;; + ,;;;;;;;;;;;; ';;;;;, + ;;;;;;;;;;;;;;, ';;;;;;; + ;;;;;;;;;;;;;;;;;, ';;;;; +; ';;;;;;;;;;;;;;;;;;, ;;; +;;;, ';;;;;;;;;;;;;;;;;;;,;; +;;;;;, ';;;;;;;;;;;;;;;;;;, +;;;;;;;;, ';;;;;;;;;;;;;;;;, +;;;;;;;;;;;;, ';;;;;;;;;;;;;; +';;;;;;;;;;;;; ';;;;;;;;;;;;; + ';;;;;;;;;;;;;, ';;;;;;;;;;; + ';;;;;;;;;;;;; ;;;;;;;;;; + ';;;;;;;;;;;; ;;;;;;;; + ';;;;;;;; ;;;;;; + ';;;;; ;;;; + ';;; ;; +EOF + ;; -bar() { - # Get the values. - elapsed="$(($1 * bar_length / $2))" + "Korora"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} ____________ + _add55555555554${c1}: + _w?'${c1}``````````'${c2})k${c1}: + _Z'${c1}`${c2} ]k${c1}: + m(${c1}`${c2} )k${c1}: + _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: + .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` + jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` + jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` +.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` +:#${c1}:${c2} ${c1}`${c2})e${c1}``` +:m${c1}:${c2} ,#'${c1}` +:#${c1}:${c2} .s2'${c1}` +:m,________.aa7^${c1}` +:#baaaaaaas!J'${c1}` + ``````````` +EOF + ;; - # Create the bar with spaces. - printf -v prog "%${elapsed}s" - printf -v total "%$((bar_length - elapsed))s" + "KSLinux"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} K K U U RRRR ooo + K K U U R R o o + KKK U U RRRR o o + K K U U R R o o + K K UUU R R ooo - # Set the colors and swap the spaces for $bar_char_. - bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" - bar+="${bar_color_total}${total// /${bar_char_total}}" +${c2} SSS AAA W W AAA + S A A W W A A + SSS AAAAA W W W AAAAA + S A A WW WW A A + SSS A A W W A A +EOF + ;; - # Borders. - [[ "$bar_border" == "on" ]] && \ - bar="$(color fg)[${bar}$(color fg)]" + "Kubuntu"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `.:/ossyyyysso/:. + .:oyyyyyyyyyyyyyyyyyyo:` + -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- + -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- + oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo + `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` + oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- +oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy +oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- + oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo + `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo + oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo + -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- + -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- + ./oyyyyyyyyyyyyyyyyyyo/. + `.:/oosyyyysso/:.` +EOF + ;; - printf "%b" "${bar}${info_color}" -} + "LEDE"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' + ${c1} _________ + / /\ + / LE / \ + / DE / \ + /________/ LE \ + \ \ DE / + \ LE \ / + \ DE \ / + \________\/ +EOF + ;; -cache() { - if [[ "$2" ]]; then - mkdir -p "${cache_dir}/neofetch" - printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" - fi -} + "Linux") + set_colors fg 8 3 + read -rd '' ascii_data <<'EOF' +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### +EOF + ;; -get_cache_dir() { - case "$os" in - "Mac OS X") cache_dir="/Library/Caches" ;; - *) cache_dir="/tmp" ;; - esac -} + "LMDE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' + ${c2}`.-::---.. +${c1} .:++++ooooosssoo:. + .+o++::. `.:oos+. +${c1} :oo:.` -+oo${c2}: +${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` +${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` +${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: +${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` +${c1}`s: `oo s m Myy+-o:` +`oo :+sdoohyoydyso/. + :o. .:////////++: +${c1} `/++ ${c2}-:::::- +${c1} ${c2}`${c1}++- +${c1} ${c2}`${c1}/+- +${c1} ${c2}.${c1}+/. +${c1} ${c2}.${c1}:+-. + `--.`` +EOF + ;; -kde_config_dir() { - # If the user is using KDE get the KDE - # configuration directory. - if [[ "$kde_config_dir" ]]; then - return + "Lubuntu"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `-/+oyyhhhhyyo+/-` + ./shhhhhhhhhhhhhhhhhhs/. + `:shhhhhhhhhhhhhhhhhhhhhhhhs:` + :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: + `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` + `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` + shhhhhhhhy+. .ohhhhhhhhhhhhhs +:hhhhhhy/. /hhhhhhhhhhhhh: +shhhy/. :hhhhhhhhhhhhs +hy+. ` `+yhs/` +hhhhhhhhhhhh +-.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh +shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs +:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: + shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs + `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` + +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` + :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: + :shhhhhhhhhhhhhhhhhhhhhy`+s:` + .+shhhhhhhhhhhhhhhhhhs:` + `-/+oyyhhhhyys+/-` +EOF + ;; - elif type -p kf5-config >/dev/null 2>&1; then - kde_config_dir="$(kf5-config --path config)" + "Lunar"*) + set_colors 4 7 3 + read -rd '' ascii_data <<'EOF' +${c1}`-. `-. + -ohys/-` `:+shy/` + -omNNdyo/` :+shmNNy/` + ${c3} - + /mMmo + hMMMN` + .NMMs + ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` + /:.` ${c3}/${c1} `.:/` +${c3} __ + | | _ _ ___ ___ ___ + | |__| | | | .'| _| + |_____|___|_|_|__,|_| +EOF + ;; - elif type -p kde4-config >/dev/null 2>&1; then - kde_config_dir="$(kde4-config --path config)" + "mac"*"_small") + set_colors 2 3 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} .:' + _ :'_ +${c2} .'`_`-'_``. +:________.-' +${c3}:_______: +:_______: +${c4} :_______`-; +${c5} `._.-._.' +EOF + ;; - elif type -p kde-config >/dev/null 2>&1; then - kde_config_dir="$(kde-config --path config)" + "mac" | "Darwin") + set_colors 2 3 1 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. +EOF + ;; - elif [[ -d "${HOME}/.kde4" ]]; then - kde_config_dir="${HOME}/.kde4/share/config" + "Mageia"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} .°°. + °° .°°. + .°°°. °° + . . + °°° .°°°. + .°°°. '___' +${c2} .${c1}'___' ${c2} . + :dkxc;'. ..,cxkd; + .dkk. kkkkkkkkkk .kkd. +.dkk. ';cloolc;. .kkd +ckk. .kk; +xO: cOd +xO: lOd +lOO. .OO: +.k00. .00x + .k00; ;00O. + .lO0Kc;,,,,,,;c0KOc. + ;d00KKKKKK00d; + .,KKKK,. +EOF + ;; - elif [[ -d "${HOME}/.kde3" ]]; then - kde_config_dir="${HOME}/.kde3/share/config" - fi + "MagpieOS"*) + set_colors 2 1 3 5 + read -rd '' ascii_data <<'EOF' +${c1} ;00000 :000Ol + .x00kk00: O0kk00k; + l00: :00. o0k :O0k. + .k0k. x${c2}d$dddd${c1}k' .d00; + k0k. ${c2}.dddddl ${c1}o00, + o00. ${c2}':cc:. ${c1}d0O +.00l ,00. +l00. d0x +k0O .:k0o +O0k ;dO0000d. +k0O .O0O${c2}xxxxk${c1}00: +o00. k0O${c2}dddddd${c1}occ +'00l x0O${c2}dddddo${c3};..${c1} + x00. .x00${c2}kxxd${c3}:..${c1} + .O0x .:oxxx${c4}Okl.${c1} + .x0d ${c4},xx,${c1} + .:o. ${c4}.xd ckd${c1} + .. ${c4}dxl .xx; + :xxolldxd' + ;oxdl. +EOF + ;; - kde_config_dir="${kde_config_dir/$'/:'*}" -} + "Manjaro"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1}██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +EOF + ;; -get_term_padding() { - # Terminal info. - # - # Parse terminal config files to get - # info about padding. Due to how w3m-img - # works padding around the terminal throws - # off the cursor placement calculation in - # specific terminals. - # - # Note: This issue only seems to affect - # URxvt. - ((term_run != 1)) && get_term + "Maui"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} `.-://////:--` + .:/oooooooooooooooo+:. + `:+ooooooooooooooooooooooo:` + `:oooooooooooooooooooooooooooo/` + ..```-oooooo/-`` `:oooooo+:.` `-- + :. +oo+-` /ooo/` -/ + -o. `o+- +o/` -o: +`oo` ::` :o/ `+. .+o` /oo. +/o+ . -+oo- ` /oo/ `ooo/ ++o- /ooo+` .+ooo. :ooo+ +++ .+oooo: -oooo+ `oooo+ +:. .oooooo` :ooooo- :oooo: +` .oooooo: :ooooo+ `ooo+-` + .+oooooo` -oooooo: `o/- + +oooooo: .ooooooo. + /ooooooo` /ooooooo/ .. + `:oooooooo/:::/ooooooooo+:--:/:` + `:+oooooooooooooooooooooo+:` + .:+oooooooooooooooo+:. + `.-://////:-.` +EOF + ;; - case "$term" in - "URxvt"*) - border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" + "Mer"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} dMs + .-` + `y`-o+` + ``NMMy + .--`:++. + .hNNNNs + /MMMMMN + `ommmd/ +/ + ```` +/ + `:+sssso/-` + .-::. `-::-` `smNMNmdmNMNd/ .://-` +.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo +dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- +MMm yMM- :MMs NMN` `:::::--sMMh dMM` +MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` +NNd sNN- -NNs -mMNs-.--..:dMMh` dNN +--- .--` `--. .smMMmdddmMNdo` .-- + ./ohddds+:` + +h- `.:-. + ./`.dMMMN+ + +MMMMMd + `+dmmy- + ``` .+` + .dMNo-y. + `hmm/ + .:` + dMs +EOF ;; - esac -} -dynamic_prompt() { - case "$image_backend" in - "ascii") printf "\n" ;; - "off") return ;; - *) - get_term_padding - lines="$(((border + height + yoffset) / font_height))" - image_prompt="on" + "Minix"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c2} -sdhyo+:-` -/syymm: + sdyooymmNNy. `` .smNmmdysNd + odyoso+syNNmysoyhhdhsoomNmm+/osdm/ + :hhy+-/syNNmddhddddddmNMNo:sdNd: + `smNNdNmmNmddddddddddmmmmmmmy` + `ohhhhdddddmmNNdmddNmNNmdddddmdh- + odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: + `+mNho:` smmd/ sNNh :dmms` -+ymmo. +-od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: ++sms -.` :so: .NN+ :os/ .-`mNh: +.-hyh+:////- -sNNd:` .--://ohNs- + `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ + -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: + //oydNMMMMydMMNysNMMmsMMMMMNyo/` + ../-yNMMy--/::/-.sMMmos+.` + -+oyhNsooo+omy/``` + `::ohdmds-` +EOF ;; - esac - # If the info is higher than the ascii/image place the prompt - # based on the info height instead of the ascii/image height. - if ((lines < info_height)); then - [[ "$image_prompt" ]] && printf "\n" - return - else - [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" - lines="$((lines - info_height + 1))" - fi + "Linux Mint"* | "LinuxMint"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. +MMm----::-://////////////oymNMd+` +MMd ${c2}/++ ${c1}-sNMd: +MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: +ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm + NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM + NMm ${c2}dMM` ..` ... ydm. ${c1}dMM + hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM + -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM + -dMNs-${c2}``-::::-------.`` ${c1}dMM + `/dMNmy+/:-------------:/yMMM + ./ydNMMMMMMMMMMMMMMMMMMMMM + .MMMMMMMMMMMMMMMMMMM +EOF + ;; - # Set the prompt location. - if ((lines > 1)); then - case "$kernel_name" in - "OpenBSD") tput cud "$lines" ;; - *) printf "%b" "\e[${lines}B" ;; - esac - fi -} + "MX"*) + set_colors 4 6 7 + read -rd '' ascii_data <<'EOF' +${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM +MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM +MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM +MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM +MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM +MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM +MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM +MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM +MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM +MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM +MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM +MMMMMMMNo` :mMMN+` `-hMMMMMMMM +MMMMMMh. `oNMMd: `/mMMMMMM +MMMMm/ -hMd- `sNMMMM +MMNs` - :dMMM +Mm: `oMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM +EOF + ;; -old_functions() { - # Deprecated functions. - # Neofetch 2.0 changed the names of a few variables. - # This function adds backwards compatibility for the - # old variable names. - if type printinfo >/dev/null 2>&1; then - print_info() { printinfo ; } - get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } - get_termfont() { get_term_font; termfont="$term_font"; } - get_localip() { get_local_ip; localip="$local_ip"; } - get_publicip() { get_public_ip; publicip="$public_ip"; } - get_linebreak() { get_line_break; linebreak="$line_break"; } - fi + "NetBSD"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} `-/oshdmNMNdhyo+:-` +${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` +${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` + ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` + ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` + ${c2}-N/${c1}hMMMMMMMMMmho:` + ${c2}-N/${c1}-:/++/:.` +${c2} :M+ + :Mo + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms +EOF + ;; - get_birthday() { get_install_date; birthday="$install_date"; } -} + "Netrunner"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} .:oydmMMMMMMmdyo:` + -smMMMMMMMMMMMMMMMMMMds- + +mMMMMMMMMMMMMMMMMMMMMMMMMd+ + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ + `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` + .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` + dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh ++MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ +mMMMMMMMMd+:.` `mMMMMMMMMMMMMd +MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM +mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd ++MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ + dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh + `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` + `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: + +dMMMMMMMMMMMMMMMMMMMMMMMMd/ + -odMMMMMMMMMMMMMMMMMMdo- + `:+ydmNMMMMNmhy+-` +EOF + ;; -old_options() { - [[ -n "$osx_buildversion" ]] && \ - err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." - [[ -n "$osx_codename" ]] && \ - err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." - [[ "$cpu_cores" == "on" ]] && \ - err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." - [[ -n "$image" ]] && \ - { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } + "Nitrux"*) + set_colors 4 + read -rd '' ascii_data <<'EOF' +${c1}`:/. +`/yo +`/yo +`/yo .+:. +`/yo .sys+:.` +`/yo `-/sys+:.` +`/yo ./sss+:.` +`/yo .:oss+:-` +`/yo ./o///:-` +`/yo `.-:///////:` +`/yo `.://///++//-`` +`/yo `.-:////++++/-` +`/yo `-://///++o+/-` +`/yo `-/+o+++ooo+/-` +`/s+:+oooossso/.` +`//+sssssso:. +`+syyyy+:` +:+s+- +EOF + ;; - # All progress_ variables were changed to bar_. - [[ -n "$progress_char" ]] && \ - err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." - [[ -n "$progress_border" ]] && \ - { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ - bar_border="$progress_border"; } - [[ -n "$progress_length" ]] && \ - { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ - bar_length="$progress_length"; } - [[ -n "$progress_color_elapsed" ]] && \ - { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ - bar_color_elapsed="$progress_color_elapsed"; } - [[ -n "$progress_color_total" ]] && \ - { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ - bar_color_total="$progress_color_total"; } + "nixos_small") + set_colors 4 6 + read -rd '' ascii_data <<'EOF' + ${c1}\\\\ \\\\ // + ==\\\\__\\\\/ // + // \\\\// +==// //== + //\\\\___// +// /\\\\ \\\\== + // \\\\ \\\\ +EOF + ;; - # All cpufreq values were changed in 3.0. - [[ "$speed_type" == "current" ]] && \ - err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." - [[ "$speed_type" == "min" ]] && \ - err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." - [[ "$speed_type" == "max" ]] && \ - err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." - [[ "$speed_type" == "bios" ]] && \ - err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." + "NixOS"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' +${c1} ::::. ${c2}'::::: ::::' +${c1} '::::: ${c2}':::::. ::::' +${c1} ::::: ${c2}'::::.::::: +${c1} .......:::::..... ${c2}:::::::: +${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. + ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' +${c2} ..... ::::' ${c1}:::::' +${c2} ::::: '::' ${c1}:::::' +${c2} ........::::: ' ${c1}:::::::::::. +${c2}::::::::::::: ${c1}::::::::::::: +${c2} ::::::::::: ${c1}.. ${c1}::::: +${c2} .::::: ${c1}.::: ${c1}::::: +${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... + ::::: ${c1}':::::. ${c2}......:::::::::::::' + ::: ${c1}::::::. ${c2}':::::::::::::::::' +${c1} .:::::::: ${c2}':::::::::: +${c1} .::::''::::. ${c2}'::::. +${c1} .::::' ::::. ${c2}'::::. +${c1} .:::: :::: ${c2}'::::. +EOF + ;; - # Ascii_logo_size was removed in 3.0. - [[ "$ascii_logo_size" ]] && \ - err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." + "Nurunner"*) + set_colors 4 + read -rd '' ascii_data <<'EOF' +${c1} ,xc + ;00cxXl + ;K0, .xNo. + :KO' .lXx. + cXk. ;xl cXk. + cXk. ;k:.,xo. cXk. + .lXx. :x::0MNl,dd. :KO, + .xNx. cx;:KMMMMMNo'dx. ;KK; + .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: +;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO + 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: + .kNo .xo'xWMMMMMM0;:O: ;KK; + .dXd. .do,oNMMO;ck: ;00, + oNd. .dx,;'cO; ;K0, + oNx. okk; ;K0, + lXx. :KO' + cKk' cXk. + ;00:lXx. + ,kd. +EOF + ;; - # $start and $end were replaced with ${block_range[@]} in 3.0. - [[ "$start" && "$end" ]] && \ - { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ - block_range=("$start" "$end"); } + "NuTyX"*) + set_colors 4 1 + read -rd '' ascii_data <<'EOF' +${c1} . + . + ... + ... + .... .........--. + ..-++-----....--++++++---. + .-++++++-. .-++++++++++++-----.. + .--... .++..-+++--.....-++++++++++--.. + . .-+-. .**- .... ..-+----.. + .+++. .*+. + -++-----. + .+++++- ++. .*+. .....-+++-----. + -+++-++. .+. .-+***++***++--++++. . + -+-. -- -. -*- ...... ..--. +.-. .+- . -+. +. .+- +. + -- -- + -+----. .- + -++-.+. . + .++. -- + +. ----. + . .+. .. + - . + . +EOF + ;; - # Fahrenheit support was added to CPU so the options were changed. - [[ "$cpu_temp" == "on" ]] && \ - { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; - cpu_temp="C"; } + "OBRevenge"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} __ __ + _@@@@ @@@g_ + _@@@@@@ @@@@@@ + _@@@@@@M W@@@@@@_ + j@@@@P ^W@@@@ + @@@@L____ _____Q@@@@ +Q@@@@@@@@@@j@@@@@@@@@@ +@@@@@ T@j@ T@@@@@ +@@@@@ ___Q@J@ _@@@@@ +@@@@@fMMM@@j@jggg@@@@@@ +@@@@@ j@j@^MW@P @@@@ +Q@@@@@ggg@@f@ @@@@@@L +^@@@@WWMMP ^ Q@@@@ + @@@@@_ _@@@@l + W@@@@@g_____g@@@@@P + @@@@@@@@@@@@@@@@l + ^W@@@@@@@@@@@P + ^TMMMMTll +EOF + ;; - # Birthday was renamed to Install Date in 3.0 - [[ -n "$birthday_time" ]] && \ - { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ - install_time="$birthday_time"; } + "openbsd_small") + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1} _____ + \\- -/ + \\_/ \\ + | ${c2}O O${c1} | + |_ < ) 3 ) + / \\ / + /-_____-\\ +EOF + ;; - # Scrot dir was removed in 3.1.0. - [[ -n "$scrot_dir" ]] && scrot_dir= + "OpenBSD"*) + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' + ${c3} _ + (_) +${c1} | . +${c1} . |L /| . ${c3} _ +${c1} _ . |\ _| \--+._/| . ${c3}(_) +${c1} / ||\| Y J ) / |/| ./ + J |)'( | ` F`.'/ ${c3} _ +${c1} -<| F __ .-< ${c3}(_) +${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ + J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ +${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) +${c1} '-F -<_. \\ .-' `-' L__ +__J _ _. >-' ${c1})${c4}._. ${c1}|-' +${c1} `-|.' /_. ${c4}\_| ${c1} F + /.- . _.< + /' /.' .' `\\ + /L /' |/ _.-'-\\ + /'J ___.---'\| + |\ .--' V | `. ` + |/`. `-. `._) + / .-.\\ + \\ ( `\\ + `.\ +EOF + ;; - # cpu_shorthand was deprecated in 3.3.0 - [[ -n "$cpu_shorthand" ]] && \ - { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and - \$cpu_speed instead."; } -} + "OpenIndiana"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} .sy/ + .yh+ -cache_uname() { - # Cache the output of uname so we don't - # have to spawn it multiple times. - IFS=" " read -ra uname <<< "$(uname -sr)" + ${c1}-+syyyo+- ${c2} /+. + ${c1}+ddo/---/sdh/ ${c2} ym- + ${c1}`hm+ `sms${c2} ym-```````.-. + ${c1}sm+ sm/ ${c2} ym- +s + ${c1}hm. /mo ${c2} ym- /h + ${c1}omo ym: ${c2} ym- `os` + ${c1}smo` .ym+ ${c2} ym- .os- + `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. + ..` ${c1}`:+oo+/-` ${c2} -//oyo- + -:` .:oys/. ++- `./oyys/. +h+` `.-:+oyyyo/-` +`/ossssysso+/-.` +EOF + ;; - kernel_name="${uname[0]}" - kernel_version="${uname[1]}" -} + "OpenMandriva"*) + set_colors 4 3 + read -rd '' ascii_data <<'EOF' +${c2} `` + `-. +${c1} ` ${c2}.--- +${c1} -/ ${c2}-::--` +${c1} `++ ${c2}`----...```-:::::. +${c1} `os. ${c2}.::::::::::::::-``` ` ` +${c1} +s+ ${c2}.::::::::::::::::---...--` +${c1}-ss: ${c2}`-::::::::::::::::-.``.`` +${c1}/ss- ${c2}.::::::::::::-.`` ` +${c1}+ss: ${c2}.::::::::::::- +${c1}/sso ${c2}.::::::-::::::- +${c1}.sss/ ${c2}-:::-.` .::::: +${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: +${c1} -ossso+/:://+/-` ${c2}.:` +${c1} -/+ooo+/-. ${c2}` +EOF + ;; -convert_time() { - # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. - year="$1" - day="${3#0}" + "OpenWrt"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} _______ +| |.-----.-----.-----. +| - || _ | -__| | +|_______|| __|_____|__|__| + |__| + ________ __ +| | | |.----.| |_ +| | | || _|| _| +|________||__| |____| +EOF + ;; - # Split time into hours/minutes. - hour="${4/:*}" - min="${4/${hour}}" + "Open Source Media Center"* | "osmc") + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} -+shdmNNNNmdhs+- + .+hMNho/:..``..:/ohNMh+. + :hMdo. .odMh: + -dMy- -yMd- + sMd- -dMs + hMy +. .+ yMh + yMy dMs. .sMd yMy +:Mm dMNMs` `sMNMd `mM: +yM+ dM//mNs``sNm//Md +My +mM- dM: +NNNN+ :Md -Mm +mM- dM: `oNN+ :Md -Mm +yM+ dM/+NNo` :Md +My +:Mm` dMMNs` :Md `mM: + yMy dMs` -ms yMy + hMy +. yMh + sMd- -dMs + -dMy- -yMd- + :hMdo. .odMh: + .+hMNho/:..``..:/ohNMh+. + -+shdmNNNNmdhs+- +EOF + ;; - # Get month. (Month code is used for day of week) - # Due to different versions of 'ls', the month can be 1, 01 or Jan. - case "$2" in - 1 | 01 | "Jan") month="Jan"; month_code=0 ;; - 2 | 02 | "Feb") month="Feb"; month_code=3 ;; - 3 | 03 | "Mar") month="Mar"; month_code=3 ;; - 4 | 04 | "Apr") month="Apr"; month_code=6 ;; - 5 | 05 | "May") month="May"; month_code=1 ;; - 6 | 06 | "Jun") month="Jun"; month_code=4 ;; - 7 | 07 | "Jul") month="Jul"; month_code=6 ;; - 8 | 08 | "Aug") month="Aug"; month_code=2 ;; - 9 | 09 | "Sep") month="Sep"; month_code=5 ;; - 10 | "Oct") month="Oct"; month_code=0 ;; - 11 | "Nov") month="Nov"; month_code=3 ;; - 12 | "Dec") month="Dec"; month_code=5 ;; - esac + "Oracle"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} + `-/+++++++++++++++++/-.` + `/syyyyyyyyyyyyyyyyyyyyyyys/. + :yyyyo/-...............-/oyyyy/ + /yyys- .oyyy+ +.yyyy` `syyy- +:yyyo /yyy/ +.yyyy` `syyy- + /yyys. .oyyyo + /yyyyo:-...............-:oyyyy/` + `/syyyyyyyyyyyyyyyyyyyyyyys+. + `.:/+ooooooooooooooo+/:.` +EOF + ;; - # Get leap year. - # Source: http://stackoverflow.com/questions/725098/leap-year-calculation - [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ - [[ "$month" =~ (Jan|Feb) ]] && \ - leap_code=1 + "PacBSD"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} :+sMs. + `:ddNMd- -o--` + -sMMMMh: `+N+`` + yMMMMMs` .....-/-... `mNh/ + yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm + yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm + :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd + +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- + :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. + .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- + /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` +.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- +:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` +/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. +:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` +:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` + sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. + :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// + /dMMMMMMMMMMMMMs- ````````..`` + .oMMMMMMMMMMMMNs` ./y:` + +dNMMNMMMMMMMmy` ``./ys. + `/hMMMMMMMMMMMNo-`` `.+yy+-` + `-/hmNMNMMMMMMmmddddhhy/-` + `-+oooyMMMdsoo+/:. +EOF + ;; - # Calculate day of week. - # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html - year_code="$((${year/??} + (${year/??} / 4) % 7))" - week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" + "Parabola"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} `.-. `. + `.` `:++. `-+o+. + `` `:+/. `:+/. `-+oooo+ + ``-::-.:+/. `:+/. `-+oooooo+ + `.-:///- ..` .-. `-+oooooooo- + `..-..` `+ooooooooo: +`` :oooooooo/ + `ooooooo: + `oooooo: + -oooo+. + +ooo/` + -ooo- + `+o/. + /+- + //` + -. +EOF + ;; - case "$week_day" in - 0) week_day="Sun" ;; - 1) week_day="Mon" ;; - 2) week_day="Tue" ;; - 3) week_day="Wed" ;; - 4) week_day="Thu" ;; - 5) week_day="Fri" ;; - 6) week_day="Sat" ;; - esac + "Pardus"*) + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. +/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ +mN. oMdyy- -y `-dMo .Nm +.mN+` sMy hN+ -: yMs `+Nm. + `yMMddMs.dy `+` sMddMMy` + +MMMo .` . oMMM+ + `NM/ `````.` `.````` +MN` + yM+ `.-:yhomy ymohy:-.` +My + yM: yo oy :My + +Ms .N` `N. +h sM+ + `MN - -::::::- : :o:+`NM` + yM/ sh -dMMMMd- ho +y+My + .dNhsohMh-//: /mm/ ://-yMyoshNd` + `-ommNMm+:/. oo ./:+mMNmmo:` + `/o+.-somNh- :yy: -hNmos-.+o/` + ./` .s/`s+sMdd+``+ddMs+s`/s. `/. + : -y. -hNmddmNy. .y- : + -+ `..` +- +EOF + ;; - # Convert 24 hour time to 12 hour time + AM/PM. - case "$install_time_format" in - "12h") - case "$hour" in - [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; - *) time="$((hour - 12))${min} PM" ;; - esac + "Parrot"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} `:oho/-` +`mMMMMMMMMMMMNmmdhy- + dMMMMMMMMMMMMMMMMMMs` + +MMsohNMMMMMMMMMMMMMm/ + .My .+dMMMMMMMMMMMMMh. + + :NMMMMMMMMMMMMNo + `yMMMMMMMMMMMMMm: + /NMMMMMMMMMMMMMy` + .hMMMMMMMMMMMMMN+ + ``-NMMMMMMMMMd- + /MMMMMMMMMMMs` + mMMMMMMMsyNMN/ + +MMMMMMMo :sNh. + `NMMMMMMm -o/ + oMMMMMMM. + `NMMMMMM+ + +MMd/NMh + mMm -mN` + /MM `h: + dM` . + :M- + d: + -+ + - +EOF ;; - *) time="$4" ;; - esac - # Toggle showing the time. - [[ "$install_time" == "off" ]] && unset time + "Parsix"*) + set_colors 3 1 7 8 + read -rd '' ascii_data <<'EOF' + ${c2}-/+/:. + ${c2}.syssssys. + ${c1}.--. ${c2}ssssssssso${c1} ..--. + :++++++: ${c2}+ssssssss+${c1} ./++/+++: + /+++++++++.${c2}.yssooooy`${c1}-+///////o- + /++++++++++.${c2}+soooos:${c1}:+////////+- + :+++++////o-${c2}oooooo-${c1}+/////////- + `-/++//++-${c4}.-----.-${c1}:+/////:- + ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. +${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- +${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ +${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- + `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` + ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. + ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: + ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ + ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: + ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- + ${c1}`--` ${c2}+sssssssso ${c1}`--` + ${c2}+sssssy+` + ${c2}`.::-` +EOF + ;; - # Print the install date. - printf "%s" "$week_day $day $month $year $time" -} + "PCBSD"* | "TrueOS"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} .. + s. + +y + yN + -MN `. + :NMs `m + .yMMm` `No + `-/+++sdMMMNs+-`+Ms + `:oo+-` .yMMMMy` `-+oNMh + -oo- +NMMMM/ oMMh- + .s+` ` oMMMMM/ - oMMMhy. + +s`- :: :MMMMMd -o `mMMMy`s+ + y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y + s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s +-h .NM` `hMMMMMMMMMMMMMMNMMNy: h- +y- hMN` hMMmMMMMMMMMMNsdMNs. -y +m` mMMy` oMMNoNMMMMMMo` sMMMo `m +m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m +h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h +:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: + y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y + `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` + so -NMMMN /mmd+ `dMMMMMMMm- os + :y: `yMMM` `+NMMMMMMNo`:y: + /s+`.omy /NMMMMMNh/.+s: + .+oo:-. /mdhs+::oo+. + -/o+++++++++++/- +EOF + ;; -get_ppid() { - # Get parent process ID of PID. - case "$os" in - "Windows") - ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" - ppid="${ppid/'PPID'}" + "PCLinuxOS"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' + ${c1}mhhhyyyyhhhdN + dyssyhhhhhhhhhhhssyhN + Nysyhhyo/:-.....-/oyhhhssd + Nsshhy+. `/shhysm + dohhy/ -shhsy + dohhs` /hhys +N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy +ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ ++hho ${c2}ymm- /mmy+mms ${c1}:hhod +/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh ++hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m +yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ + ohhy` ${c2}://` -/+++/- ${c1}ohhom + N+hhy- `shhoh + sshho. `+hhyom + dsyhhs/. `:ohhhoy + dysyhhhso///://+syhhhssh + dhyssyhhhhhhyssyyhN + mddhdhdmN +EOF ;; - "Linux") - ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" - ppid="$(trim "${ppid/PPid:}")" + "Peppermint"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} 8ZZZZZZ${c2}MMMMM +${c1} .ZZZZZZZZZ${c2}MMMMMMM. +${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ +${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM +${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. +${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI +${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM +${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM +${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM +${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM +${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM +${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M +${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 +${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 +${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 +${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z +${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM +${c1} NZZZZZZZZZZZ${c2}MMMMM +${c1} ZZZZZZZZZ${c2}MM) +EOF ;; - *) - ppid="$(ps -p "${1:-$PPID}" -o ppid=)" + "Pop!_OS"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} ///////////// + ///////////////////// + ///////${c2}*767${c1}//////////////// + //////${c2}7676767676*${c1}////////////// + /////${c2}76767${c1}//${c2}7676767${c1}////////////// + /////${c2}767676${c1}///${c2}*76767${c1}/////////////// + ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// +/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// +//////////${c2}76767676767${c1}////${c2}76767${c1}///////// +///////////${c2}76767676${c1}//////${c2}7676${c1}////////// +////////////,${c2}7676${c1},///////${c2}767${c1}/////////// +/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// +///////////////${c2}7676${c1}//////////////////// + ///////////////${c2}7676${c1}///${c2}767${c1}//////////// + //////////////////////${c2}'${c1}//////////// + //////${c2}.7676767676767676767,${c1}////// + /////${c2}767676767676767676767${c1}///// + /////////////////////////// + ///////////////////// + ///////////// +EOF ;; - esac - - printf "%s" "$ppid" -} -get_process_name() { - # Get PID name. - case "$os" in - "Windows") - name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" - name="${name/'COMMAND'}" - name="${name/*\/}" + "Porteus"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} `.-:::-.` + -+ydmNNNNNNNmdy+- + .+dNmdhs+//////+shdmdo. + .smmy+-` ./sdy: + `omdo. `.-/+osssso+/-` `+dy. + `yms. `:shmNmdhsoo++osyyo-``oh. + hm/ .odNmds/.` ``.....:::-+s +/m: `+dNmy:` `./oyhhhhyyooo++so +ys `yNmy- .+hmmho:-.` ``` +s: yNm+` .smNd+. +`` /Nm: +dNd+` + yN+ `smNy. + dm oNNy` + hy -mNm. + +y oNNo + `y` sNN: + `: +NN: + ` .mNo + /mm` + /my` + .sy` + .+: + ` +EOF ;; - "Linux") - name="$(< "/proc/${1:-$PPID}/comm")" + "PostMarketOS"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} ss + `hMMh` + .dMMMMd. + -NMMMMMMN- + /MMMMMMMMMN/ + hMMMMMMMMMMMo + y+`mMMmdNMMMMMMy + `dMM-.-:- .mMMMMMMh` + .mMMMMMMd` `dMMMMMMm. + :NMMMMMMy yMMMMMMN: + /MMMMMMMo oMMMmdmN/ + oMMMMMMM/ /MN.-/:-. + `yMMMMMMN- -:.NMMMMy` + `dMMMMMMM- -/////////////dMMMMMMd` + -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- + :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: ++MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ +EOF ;; - *) - name="$(ps -p "${1:-$PPID}" -o comm=)" + "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} `-/osyyyysosyhhhhhyys+- + -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ + yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy +.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ +-NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ +.Nm+shddyooo+/smNNNNmmmmNh. :mmd. + NNNNy:` ./hmmmmmmmNNNN: hNMh + NMN- -++- +NNNNNNNNNNm+..-sMMMM- +.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ +.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ + mMM+ .. `sNN+. hMMMMhhMMM- + +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy + yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` + sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` + :mMMMMMMMMMMMmddNMMMMMMMMmh/ + /dMMMMMMMMMMMMMMMMMMNdy/` + .+hNMMMMMMMMMNmdhs/. + .:/+ooo+/:-. +EOF ;; - esac - - printf "%s" "$name" -} - -decode_url() { - decode="${1//+/ }" - printf "%b" "${decode//%/\\x}" -} - -# FINISH UP - -usage() { printf "%s" "\ -Usage: neofetch --option \"value\" --option \"value\" - -Neofetch is a CLI system information tool written in BASH. Neofetch -displays information about your system next to an image, your OS logo, -or any ASCII file of your choice. - -NOTE: Every launch flag has a config option. - -Options: - -INFO: - --disable infoname Allows you to disable an info line from appearing - in the output. - - NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - - --os_arch on/off Hide/Show OS architecture. - --speed_type type Change the type of cpu speed to display. - Possible values: current, min, max, bios, - scaling_current, scaling_min, scaling_max - - NOTE: This only supports Linux with cpufreq. - - --speed_shorthand on/off Whether or not to show decimals in CPU speed. - - NOTE: This flag is not supported in systems with CPU speed less than - 1 GHz. - - --cpu_brand on/off Enable/Disable CPU brand in output. - --cpu_cores type Whether or not to display the number of CPU cores - Possible values: logical, physical, off - - NOTE: 'physical' doesn't work on BSD. - - --cpu_speed on/off Hide/Show cpu speed. - --cpu_temp C/F/off Hide/Show cpu temperature. - - NOTE: This only works on Linux and BSD. - - NOTE: For FreeBSD and NetBSD-based systems, you need to enable - coretemp kernel module. This only supports newer Intel processors. - - --distro_shorthand on/off Shorten the output of distro (tiny, on, off) - - NOTE: This option won't work in Windows (Cygwin) - - --kernel_shorthand on/off Shorten the output of kernel - - NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) - - --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) - --refresh_rate on/off Whether to display the refresh rate of each monitor - Unsupported on Windows - --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) - --gpu_type type Which GPU to display. (all, dedicated, integrated) - - NOTE: This only supports Linux. - - --gtk_shorthand on/off Shorten output of gtk theme/icons - --gtk2 on/off Enable/Disable gtk2 theme/font/icons output - --gtk3 on/off Enable/Disable gtk3 theme/font/icons output - --shell_path on/off Enable/Disable showing \$SHELL path - --shell_version on/off Enable/Disable showing \$SHELL version - --disk_show value Which disks to display. - Possible values: '/', '/dev/sdXX', '/path/to/mount point' - - NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') - - --disk_subtitle type What information to append to the Disk subtitle. - Takes: name, mount, dir - - 'name' shows the disk's name (sda1, sda2, etc) - - 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) - - 'dir' shows the basename of the disks's path. (/, Local Disk, etc) - - --ip_host url URL to query for public IP - --song_shorthand on/off Print the Artist/Title on separate lines - --music_player player-name Manually specify a player to use. - Available values are listed in the config file - --install_time on/off Enable/Disable showing the time in Install Date output. - --install_time_format 12h/24h - Set time format in Install Date to be 12 hour or 24 hour. - -TEXT FORMATTING: - --colors x x x x x x Changes the text colors in this order: - title, @, underline, subtitle, colon, info - --underline on/off Enable/Disable the underline. - --underline_char char Character to use when underlining title - --bold on/off Enable/Disable bold text -COLOR BLOCKS: - --color_blocks on/off Enable/Disable the color blocks - --block_width num Width of color blocks in spaces - --block_height num Height of color blocks in lines - --block_range num num Range of colors to print as blocks + "Qubes"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} `..--..` + `.----------.` + `..----------------..` + `.------------------------.`` + `..-------------....-------------..` +.::----------..`` ``..----------:+: +:////:----..` `..---:/ossso +:///////:` `/osssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:////////-` .:sssssssso +:///////////-.` `-/osssssssssso +`//////////////:-```.:+ssssssssssssso- + .-://////////////sssssssssssssso/-` + `.:///////////sssssssssssssso:. + .-:///////ssssssssssssssssss/` + `.:////ssss+/+ssssssssssss. + `--//- `-/osssso/. +EOF + ;; -BARS: - --bar_char 'elapsed char' 'total char' - Characters to use when drawing bars. - --bar_border on/off Whether or not to surround the bar with '[]' - --bar_length num Length in spaces to make the bars. - --bar_colors num num Colors to make the bar. - Set in this order: elapsed, total - --cpu_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --memory_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --battery_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --disk_display mode Bar mode. - Possible values: bar, infobar, barinfo, off + "Raspbian"*) + set_colors 2 1 + read -rd '' ascii_data <<'EOF' +${c1} `.::///+:/-. --///+//-:`` + `+oooooooooooo: `+oooooooooooo: + /oooo++//ooooo: ooooo+//+ooooo. + `+ooooooo:-:oo- +o+::/ooooooo: + `:oooooooo+`` `.oooooooo+- + `:++ooo/. :+ooo+/.` + ${c2}...` `.----.` ``.. + .::::-``:::::::::.`-:::-` + -:::-` .:::::::-` `-:::- + `::. `.--.` `` `.---.``.::` + .::::::::` -::::::::` ` + .::` .:::::::::- `::::::::::``::. +-:::` ::::::::::. ::::::::::.`:::- +:::: -::::::::. `-:::::::: :::: +-::- .-:::-.``....``.-::-. -::- + .. `` .::::::::. `..`.. + -:::-` -::::::::::` .:::::` + :::::::` -::::::::::` :::::::. + .::::::: -::::::::. :::::::: + `-:::::` ..--.` ::::::. + `...` `...--..` `...` + .:::::::::: + `.-::::-` +EOF + ;; -IMAGE BACKEND: - --backend backend Which image backend to use. - Possible values: 'ascii', 'caca', 'catimg', '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/' - --ascii source Shortcut to use 'ascii' backend. - --caca source Shortcut to use 'caca' backend. - --catimg source Shortcut to use 'catimg' backend. - --iterm2 source Shortcut to use 'iterm2' backend. - --jp2a source Shortcut to use 'jp2a' backend. - --kitty source Shortcut to use 'kitty' backend. - --pixterm source Shortcut to use 'pixterm' backend. - --sixel source Shortcut to use 'sixel' backend. - --termpix source Shortcut to use 'termpix' backend. - --tycat source Shortcut to use 'tycat' backend. - --w3m source Shortcut to use 'w3m' backend. - --off Shortcut to use 'off' backend. + "Red Star"* | "Redstar"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} .. + .oK0l + :0KKKKd. + .xKO0KKKKd + ,Od' .d0000l + .c;. .'''... ..'. +.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: +;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. + .okkkkd,.lko .......',;:cllc:;,,'''''. + .cdo. :xd' cd:. ..';'',,,'',,;;;,'. + . .ddl.;doooc'..;oc;'..';::;,'. + coo;.oooolllllllcccc:'. . + .ool''lllllccccccc:::::;. + ;lll. .':cccc:::::::;;;;' + :lcc:'',..';::::;;;;;;;,,. + :cccc::::;...';;;;;,,,,,,. + ,::::::;;;,'. ..',,,,'''. + ........ ...... +EOF + ;; - NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' + "Redhat"* | "Red Hat"* | "rhel"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} `.-..........` + `////////::.`-/. + -: ....-////////. + //:-::///////////` + `--::: `-://////////////: + //////- ``.-:///////// .` + `://////:-.` :///////::///:` + .-/////////:---/////////////: + .-://////////////////////. +${c2} yMN+`.-${c1}::///////////////-` +${c2} .-`:NMMNMs` `..-------..` + MN+/mMMMMMhoooyysshsss +MMM MMMMMMMMMMMMMMyyddMMM+ + MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM + MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM + MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM +EOF + ;; -ASCII: - --ascii_colors x x x x x x Colors to print the ascii art - --ascii_distro distro Which Distro's ascii art to print + "Refracted Devuan"*) + set_colors 8 7 + read -rd '' ascii_data <<'EOF' +${c2} A + VW + VVW\\ + .yWWW\\ + ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ + *WWWWWWWWWWWWWWWW/ $VWWWWw , + ^*%WWWWWWVWWX $WWWW** ,yy + , "**WWW/' **' ,yy/WWW*` + &WWWWwy `*` <,ywWW%VWWW* + yWWWWWWWWWW* ., "**WW%W + ,&WWWWWM*"` ,y/ &WWWww ^* + XWWX*^ ,yWWWW09 .WWWWWWWWwy, + *` &WWWWWM WWWWWWWWWWWWWww, + (WWWWW` /#####WWW*********** + ^WWWW + VWW + Wh. + V/ +EOF + ;; - NOTE: Arch and Ubuntu have 'old' logo variants. + "Rosa"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ROSAROSAROSAROSAR + ROSA AROS + ROS SAROSAROSAROSAR AROS + RO ROSAROSAROSAROSAROSAR RO + ARO AROSAROSAROSARO AROS ROS + ARO ROSAROS OSAR ROSA ROS + RO AROSA ROSAROSAROSA ROSAR RO +RO ROSAR ROSAROSAROSAR R ROSARO RO +RO ROSA AROSAROSAROSA AR ROSARO AR +RO AROS ROSAROSAROSA ROS AROSARO AR +RO AROS ROSAROSARO ROSARO ROSARO AR +RO ROS AROSAROS ROSAROSA AROSAR AR +RO ROSA ROS ROSAROSAR ROSARO RO + RO ROS AROSAROSAROSA ROSARO AR + ARO ROSA ROSAROSAROS AROSAR ARO + ARO OROSA R ROSAROS ROS + RO AROSAROS AROSAROSAR RO + AROS AROSAROSAROSARO AROS + ROSA SARO + ROSAROSAROSAROSAR +EOF + ;; - NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. + "sabotage"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} .|'''.| | '||''|. ..|''|| + ||.. ' ||| || || .|' || + ''|||. | || ||'''|. || || +. '|| .''''|. || || '|. || +|'....|' .|. .||. .||...|' ''|...|' - NOTE: Ubuntu has flavor variants. +|''||''| | ..|'''.| '||''''| + || ||| .|' ' || . + || | || || .... ||''| + || .''''|. '|. || || + .||. .|. .||. ''|...'| .||.....| +EOF + ;; - NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. + "Sabayon"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ........... + .. .. + .. .. + .. ${c2}o ${c1}.. + .. ${c2}:W' ${c1}.. + .. ${c2}.d. ${c1}.. +:. ${c2}.KNO ${c1}.: +:. ${c2}cNNN. ${c1}.: +: ${c2}dXXX, ${c1}: +: ${c2}. dXXX, .cd, ${c1}: +: ${c2}'kc .. dKKK. ,ll;:' ${c1}: +: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: +:. ${c2}.,cdddddddddddddo:. ${c1}.: + .. ${c2}:lllllll: ${c1}.. + .. ${c2}',,,,, ${c1}.. + .. .. + .. .. + ............... +EOF + ;; - NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, - OpenBSD, and Void have a smaller logo variant. + "SailfishOS"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} .+eWWW + .+ee+++eee e. + .ee++eeeeeeee +e. + .e++ee++eeeeeee+eee+e+ + ee.e+.ee+eee++eeeeee+ + W.+e.e+.e++ee+eee + W.+e.W.ee.W++ee' + +e.W W.e+.W.W+ + W.e.+e.W W W. + e e e +e.W.W + .W W W. + W.+e.W. + W++e.ee+. + ++ +ee++eeeee++. + ' '+++e 'ee. + ee + ee + e +EOF + ;; - NOTE: Use '{distro name}_small' to use the small variants. + "SalentOS"*) + set_colors 2 1 3 7 + read -rd '' ascii_data <<'EOF' +${c1} ``..`` + .-:+oshdNMMMMMMNdhyo+:-.` + -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ +${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` +${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- +${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` +${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` +${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd +${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy +${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo +${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ +${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- +${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` +${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm +${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy +${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: +${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. +${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: +${c2} `:smMM${c4}yy${c3}MMNy/` + ${c2}.- ${c4}`${c3}:. +EOF + ;; - --ascii_bold on/off Whether or not to bold the ascii logo. - -L, --logo Hide the info text and only show the ascii logo. + "Scientific"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} =/;;/- + +: // + /; /; + -X H. +.//;;;:;;-, X= :+ .-;:=;:;#;. +M- ,=;;;#:, ,:#;;:=, ,@ +:# :#.=/++++/=.$= #= + ,#; #/:+/;,,/++:+/ ;+. + ,+/. ,;@+, ,#H;, ,/+, + ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; + ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. + ,;: :@#= =$H: .+#- + ,#= #;-///==///-// =#, +;+ :#-;;;:;;;;-X- +: +@- .-;;;;M- =M/;;;-. -X + :;;::;;-. #- :+ ,-;;-;:== + ,X H. + ;/ #= + // +; + '////' +EOF + ;; - Possible values: bar, infobar, barinfo, off + "Siduction"*) + set_colors 4 4 + read -rd '' ascii_data <<'EOF' +${c1} _aass, + jQh: =$w + QWmwawQW + )$QQQQ@( .. + _a_a. ~??^ syDY?Sa, + _mW>-<$c jWmi imm. + ]QQwayQE 4QQmgwmQQ` + ?WWQWP' -9QQQQQ@'._aas, + _a%is. .adYYs,. -"?!` aQB*~^3$c +_Qh;.nm .QWc. {QL ]QQp;..vmQ/ +"QQmmQ@ -QQQggmQP ]QQWmggmQQ( + -???" "$WQQQY` __, ?QQQQQQW! + _yZ!?q, - .yWY!!Sw, "???^ + .QQa_=qQ mQm>..vmm + $QQWQQP $QQQgmQQ@ + "???" _aa, -9WWQQWY` + _mB>~)$a -~~ + mQms_vmQ. + ]WQQQQQP + -?T??" +EOF + ;; -IMAGE: - --loop Redraw the image constantly until Ctrl+C is used. This fixes issues - in some terminals emulators when using image mode. - --size 00px | --size 00% How to size the image. - Possible values: auto, 00px, 00%, none - --crop_mode mode Which crop mode to use - Takes the values: normal, fit, fill - --crop_offset value Change the crop offset for normal mode. - Possible values: northwest, north, northeast, - west, center, east, southwest, south, southeast + "Slackware"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ::::::: + ::::::::::::::::::: + ::::::::::::::::::::::::: + ::::::::${c2}cllcccccllllllll${c1}:::::: + :::::::::${c2}lc dc${c1}::::::: + ::::::::${c2}cl clllccllll oc${c1}::::::::: + :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: + ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: + :::::::::::${c2}lc cclccclc${c1}::::::::::::: +::::::::::::::${c2}lcclcc lc${c1}:::::::::::: +::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: +::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: + :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: + :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: + ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: + :::${c2}oclcccccccccccccllllllllllllll${c1}::::: + ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: + :::::::::::::::::::::::::::::::: + :::::::::::::::::::::::::::: + :::::::::::::::::::::: + :::::::::::: +EOF + ;; - --xoffset px How close the image will be to the left edge of the - window. This only works with w3m. - --yoffset px How close the image will be to the top edge of the - window. This only works with w3m. - --bg_color color Background color to display behind transparent image. - This only works with w3m. - --gap num Gap between image and text. + "SliTaz"*) + set_colors 3 3 + read -rd '' ascii_data <<'EOF' +${c1} @ @( @ + @@ @@ @ @/ + @@ @@ @@ @@ + @@ %@@ @@ @@ + @@ %@@@ @@@@@. @@@@ @@ + @@@ @@@@ @@@@@@@ &@@@ @@@ + @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ + ,@@@@@@@@@@@@@@@@@@@@@@@@@ + .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ +@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ +@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ +@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. +@@ ,@@ @@@@@@@@@@@@@ @@@ @@ +@ @@. @@@@@@@@@@@@@ @@@ *@ +@ @@ @@@@@@@@@@@@ @@ @ + @ @@@@@@@@@. #@ + @ ,@@@@@ @ +EOF + ;; - NOTE: --gap can take a negative value which will move the text - closer to the left side. + "SmartOS"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyys oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyy syyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy yyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +EOF + ;; - --clean Delete cached files and thumbnails. + "Solus"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} -``````````` + `-+/------------.` + .---:mNo---------------. + .-----yMMMy:---------------. + `------oMMMMMm/----------------` + .------/MMMMMMMN+----------------. + .------/NMMMMMMMMm-+/--------------. +`------/NMMMMMMMMMN-:mh/-------------` +.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. +-----/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- +----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. +.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` +`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. +`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ + .------------:://+-/++++++${c1}oshddys: + -hhhhyyyyyyyyyyyhhhhddddhysssso- + `:ossssssyysssssssssssssssso:` + `:+ssssssssssssssssssss+- + `-/+ssssssssssso+/-` + `.-----..` +EOF + ;; -SCREENSHOT: - -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- - shot function will use \$scrot_dir and \$scrot_name. - -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. - --image_host imgur/teknik Website to upload scrots to. - --scrot_cmd cmd Screenshot program to launch + "Source Mage"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} :ymNMNho. +.+sdmNMMMMMMMMMMy` +.-::/yMMMMMMMMMMMm- + sMMMMMMMMMMMm/ + /NMMMMMMMMMMMMMm: + .MMMMMMMMMMMMMMMMM: + `MMMMMMMMMMMMMMMMMN. + NMMMMMMMMMMMMMMMMMd + mMMMMMMMMMMMMMMMMMMo + hhMMMMMMMMMMMMMMMMMM. + .`/MMMMMMMMMMMMMMMMMs + :mMMMMMMMMMMMMMMMN` + `sMMMMMMMMMMMMMMM+ + /NMMMMMMMMMMMMMN` + oMMMMMMMMMMMMM+ + ./sd.-hMMMMMMMMmmN` + ./+oyyyh- `MMMMMMMMMmNh + sMMMMMMMMMmmo + `NMMMMMMMMMd: + -dMMMMMMMMMo + -shmNMMms. +EOF + ;; -OTHER: - --config /path/to/config Specify a path to a custom config file - --config none Launch the script without a config file - --stdout Turn off all colors and disables any ASCII/image backend. - --help Print this text and exit - --version Show neofetch version - -v Display error messages. - -vv Display a verbose log for error reporting. + "Sparky"*) + set_colors 1 7 + read -rd '' ascii_data <<'EOF' +${c1} + . `-:-` + .o` .-///-` + `oo` .:/++:. + os+` -/+++:` ``.........``` + /ys+`./+++/-.-::::::----......`` + `syyo`++o+--::::-::/+++/-`` + -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` +::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` +`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` + -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- + .sdddy::syo--/:. `.:dy+-ohhho ./: + :yddds/:+oo+//:-`- /+ +hy+.shhy: `` + `:ydmmdysooooooo-.ss`/yss--oyyo + `./ossyyyyo+:-/oo:.osso- .oys + ``..-------::////.-oooo/ :so + `...----::::::::--.`/oooo: .o: + ``````` ++o+:` `:` + ./+/-` ` + `-:-. + `` +EOF + ;; -DEVELOPER: - --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) + "SteamOS"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} .,,,,. + .,'onNMMMMMNNnn',. + .'oNMANKMMMMMMMMMMMNNn'. + .'ANMMMMMMMXKNNWWWPFFWNNMNn. + ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, + ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, +,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, +'${c2}+#############, +. ,+' ${c1}+NMMM +${c2} '*#########*' '*,,*' ${c1}.+NMMMM. +${c2} `'*###*' ,.,;###${c1}+WNM, +${c2} .,;;, .;##########${c1}+W +${c2},',. '; ,+##############' + '###+. :,. .,; ,###############' + '####.. `'' .,###############' + '#####+++################' + '*##################*' + ''*##########*'' + '''''' +EOF + ;; + "SunOS" | "Solaris") + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. +EOF + ;; -Report bugs to https://github.com/dylanaraps/neofetch/issues + "openSUSE Tumbleweed"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c2} ...... + .,cdxxxoc,. .:kKMMMNWMMMNk:. + cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. + ;WMK;. .lKMMNM, :NMK, .OMW; + cMW; 'WMMMN ,XMK, oMM' +.MMc ..;l. xMN: KM0 +'MM. 'NMO oMM +.MM, .kMMl xMN + KM0 .kMM0. .dl:,.. .WMd + .XM0. ,OMMK, OMMMK. .XMK + oWMO:. .;xNMMk, NNNMKl. .xWMx + :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, + ..... .:dOOXXKOxl, +EOF + ;; -" -exit 1 -} + "openSUSE"* | "open SUSE"* | "SUSE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c2} .;ldkO0000Okdl;. + .;d00xl:^''''''^:ok00d;. + .d00l' 'o00d. + .d0Kd'${c1} Okxol:;,. ${c2}:O0d. + .OK${c1}KKK0kOKKKKKKKKKKOxo:, ${c2}lKO. + ,0K${c1}KKKKKKKKKKKKKKK0P^${c2},,,${c1}^dx:${c2} ;00, +.OK${c1}KKKKKKKKKKKKKKKk'${c2}.oOPPb.${c1}'0k.${c2} cKO. +:KK${c1}KKKKKKKKKKKKKKK: ${c2}kKx..dd ${c1}lKd${c2} 'OK: +dKK${c1}KKKKKKKKKOx0KKKd ${c2}^0KKKO' ${c1}kKKc${c2} dKd +dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd +:KK${c1}KKKKKKKKKK0o;...^cdxxOK0O/^^' ${c2}.0K: + kKK${c1}KKKKKKKKKKKKK0x;,,......,;od ${c2}lKk + '0K${c1}KKKKKKKKKKKKKKKKKKKK00KKOo^ ${c2}c00' + 'kK${c1}KKOxddxkOO00000Okxoc;'' ${c2}.dKk' + l0Ko. .c00l' + 'l0Kk:. .;xK0l' + 'lkK0xl:;,,,,;:ldO0kl' + '^:ldxkkkkxdl:^' +EOF + ;; -get_args() { - # Check the commandline flags early for '--config'. - [[ "$*" != *--config* ]] && get_user_config + "SwagArch"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} .;ldkOKXXNNNNXXK0Oxoc,. + ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; + 'K0xo ..,;:c:. `'lKMMMMM0 + .lONMMMMMM' `lNMk' +${c2} ;WMMMMMMMMMO. ${c1}....::... +${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, +${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. +${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. +${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: +${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. +${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: +${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. +${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. + :ccc:' `cccccccc:, + '' +EOF + ;; - while [[ "$1" ]]; do - case "$1" in - # Info - "--os_arch") os_arch="$2" ;; - "--cpu_cores") cpu_cores="$2" ;; - "--cpu_speed") cpu_speed="$2" ;; - "--speed_type") speed_type="$2" ;; - "--speed_shorthand") speed_shorthand="$2" ;; - "--distro_shorthand") distro_shorthand="$2" ;; - "--kernel_shorthand") kernel_shorthand="$2" ;; - "--uptime_shorthand") uptime_shorthand="$2" ;; - "--cpu_brand") cpu_brand="$2" ;; - "--gpu_brand") gpu_brand="$2" ;; - "--gpu_type") gpu_type="$2" ;; - "--refresh_rate") refresh_rate="$2" ;; - "--gtk_shorthand") gtk_shorthand="$2" ;; - "--gtk2") gtk2="$2" ;; - "--gtk3") gtk3="$2" ;; - "--shell_path") shell_path="$2" ;; - "--shell_version") shell_version="$2" ;; - "--ip_host") public_ip_host="$2" ;; - "--song_shorthand") song_shorthand="$2" ;; - "--music_player") music_player="$2" ;; - "--install_time") install_time="$2" ;; - "--install_time_format") install_time_format="$2" ;; - "--cpu_temp") - cpu_temp="$2" - [[ "$cpu_temp" == "on" ]] && cpu_temp="C" - ;; + "Tails"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} `` + ./yhNh +syy/Nshh `:o/ +N:dsNshh █ `ohNMMd +N-/+Nshh `yMMMMd +N-yhMshh yMMMMd +N-s:hshh █ yMMMMd so//. +N-oyNsyh yMMMMd d Mms. +N:hohhhd:. yMMMMd syMMM+ +Nsyh+-..+y+- yMMMMd :mMM+ ++hy- -ss/`yMMMM `+d+ + :sy/. ./yNMMMMm `` + .+ys- `:+hNMMMMMMy/` + `hNmmMMMMMMMMMMMMdo. + dMMMMMMMMMMMMMMMMMNh: + +hMMMMMMMMMMMMMMMMMmy. + -oNMMMMMMMMMMmy+.` + `:yNMMMds/.` + .//` +EOF + ;; - "--disk_subtitle") disk_subtitle="$2" ;; - "--disk_show") - unset disk_show - for arg in "$@"; do - case "$arg" in - "--disk_show") ;; - "-"*) break ;; - *) disk_show+=("$arg") ;; - esac - done - ;; + "Trisquel"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' +${c1} ▄▄▄▄▄▄ + ▄█████████▄ + ▄▄▄▄▄▄ ████▀ ▀████ + ▄██████████▄ ████▀ ▄▄ ▀███ + ▄███▀▀ ▀▀████ ███▄ ▄█ ███ +▄███ ▄▄▄ ████▄ ▀██████ ▄███ +███ █▀▀██▄ █████▄ ▀▀ ▄████ +▀███ ███ ███████▄▄ ▄▄██████ +${c1} ▀███▄ ▄███ █████████████${c2}████▀ +${c1} ▀█████████ ███████${c2}███▀▀▀ + ▀▀███▀▀ ██████▀▀ + ██████▀ ▄▄▄▄ + █████▀ ████████ + █████ ███▀ ▀███ + ████▄ ██▄▄▄ ███ + █████▄ ▀▀ ▄██ + ██████▄▄▄████ + ▀▀█████▀▀ +EOF + ;; - "--disable") - for func in "$@"; do - case "$func" in - "--disable") continue ;; - "-"*) break ;; - *) - ((bash_version >= 4)) && func="${func,,}" - unset -f "get_$func" - ;; - esac - done - ;; + "Ubuntu-Budgie"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} ./oydmMMMMMMmdyo/. + :smMMMMMMMMMMMhs+:++yhs: + `omMMMMMMMMMMMN+` `odo` + /NMMMMMMMMMMMMN- `sN/ + `hMMMMmhhmMMMMMMh sMh` + .mMmo- /yMMMMm` `MMm. + mN/ yMMMMMMMd- MMMm +oN- oMMMMMMMMMms+//+o+: :MMMMo +m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm +M` .NMMMMMMMMMMMMMMMNodMMMMMMM +M- sMMMMMMMMMMMMMMMMMMMMMMMMM +mm` mMMMMMMMMMNdhhdNMMMMMMMMMm +oMm/ .dMMMMMMMMh: :dMMMMMMMo + mMMNyo/:/sdMMMMMMMMM+ sMMMMMm + .mMMMMMMMMMMMMMMMMMs `NMMMm. + `hMMMMMMMMMMM.oo+. `MMMh` + /NMMMMMMMMMo sMN/ + `omMMMMMMMMy. :dmo` + :smMMMMMMMh+-` `.:ohs: + ./oydmMMMMMMdhyo/. +EOF + ;; - # Text Colors - "--colors") - unset colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) colors+=("$arg") ;; - esac - done - colors+=(7 7 7 7 7 7) - ;; + "Ubuntu-GNOME"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c3} ./o. + .oooooooo + .oooo```soooo + .oooo` `soooo + .ooo` ${c4}.o.${c3} `\/ooo. + :ooo ${c4}:oooo.${c3} `\/ooo. + sooo ${c4}`ooooo${c3} \/oooo + \/ooo ${c4}`soooo${c3} `ooooo + `soooo ${c4}`\/ooo${c3} `soooo +${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo +${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` +${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` +${c4} `ooooo ${c3}`` ${c4}.oooo +${c4} `soooo. .oooo` + `\/oooooooooo` + ``\/oo`` +EOF + ;; - # Text Formatting - "--underline") underline_enabled="$2" ;; - "--underline_char") underline_char="$2" ;; - "--bold") bold="$2" ;; + "Ubuntu-MATE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} `:+shmNNMMNNmhs+:` + .odMMMMMMMMMMMMMMMMMMdo. + /dMMMMMMMMMMMMMMMmMMMMMMMMd/ + :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: + `yMMMMMMMMMms:..-::oM: -omMMMMMy` + `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` + hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh +/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ +hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh +/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ + hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh + `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` + yMMMMMMMMMms/..-::oM: .+dMMMMMy + :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: + /dMMMMMMMMMMMMMMMdNMMMMMMMd/ + .odMMMMMMMMMMMMMMMMMMdo. + `:+shmNNMMNNmhs+:` +EOF + ;; - # Color Blocks - "--color_blocks") color_blocks="$2" ;; - "--block_range") block_range=("$2" "$3") ;; - "--block_width") block_width="$2" ;; - "--block_height") block_height="$2" ;; + "ubuntu_old") + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} ./+o+- +${c2} yyyyy- ${c1}-yyyyyy+ +${c2} ${c2}://+//////${c1}-yyyyyyo +${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` +${c3} .:++o: ${c2}/++++++++/:--:/- +${c3} o:+o+:++.${c2}`..```.-/oo+++++/ +${c3} .:+o:+o/.${c2} `+sssoo+/ +${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. +${c2}/+++//+:${c3}`oo+o${c2} /::--:. +${c2}+/+o+++${c3}`o++o${c1} ++////. +${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. +${c3} .+.o+oo:.${c1} `oddhhhh+ +${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ +${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: +${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` +${c1} /osyyyyyyo${c3}++ooo+++/ +${c1} ````` ${c3}+oo+++o: +${c3} `oo++. +EOF + ;; - # Bars - "--bar_char") - bar_char_elapsed="$2" - bar_char_total="$3" - ;; + "Ubuntu-Studio") + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} ..-::::::-.` + `.:+++++++++++${c2}ooo${c1}++:.` + ./+++++++++++++${c2}sMMMNdyo${c1}+/. + .++++++++++++++++${c2}oyhmMMMMms${c1}++. + `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` + `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` + +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` + :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: + ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. + ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ + :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: + +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ + `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` + `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ + ./+++++++++++++++${c2}oyhdNMMMms${c1}++. + ./+++++++++++++${c2}hMMMNdyo${c1}+/. + `.:+++++++++++${c2}sso${c1}++:. + ..-::::::-.. +EOF + ;; - "--bar_border") bar_border="$2" ;; - "--bar_length") bar_length="$2" ;; - "--bar_colors") - bar_color_elapsed="$2" - bar_color_total="$3" - ;; + "Ubuntu"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} .-/+oossssoo+/-. + `:+ssssssssssssssssss+:` + -+ssssssssssssssssssyyssss+- + .ossssssssssssssssss${c2}dMMMNy${c1}sssso. + /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ + +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ +.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. ++ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ +oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso +oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso ++ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ +.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ + +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ + /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ + .ossssssssssssssssss${c2}dMMMNy${c1}sssso. + -+sssssssssssssssss${c2}yyy${c1}ssss+- + `:+ssssssssssssssssss+:` + .-/+oossssoo+/-. +EOF + ;; - "--cpu_display") cpu_display="$2" ;; - "--memory_display") memory_display="$2" ;; - "--battery_display") battery_display="$2" ;; - "--disk_display") disk_display="$2" ;; + "void_small") + set_colors 2 8 + read -rd '' ascii_data <<'EOF' +${c1} _______ + _ \______ - +| \ ___ \ | +| | / \ | | +| | \___/ | | +| \______ \_| + -_______\ +EOF + ;; - # Image backend - "--backend") image_backend="$2" ;; - "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ - "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") - image_backend="${1/--}" - case "$2" in - "-"* | "") ;; - *) image_source="$2" ;; - esac - ;; + "Void"*) + set_colors 2 8 + read -rd '' ascii_data <<'EOF' +${c1} __.;=====;.__ + _.=+==++=++=+=+===;. + -=+++=+===+=+=+++++=_ + . -=:`` `--==+=++==. + _vi, ` --+=++++: + .uvnvi. _._ -==+==+. + .vvnvnI` .;==|==;. :|=||=|. +${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL +${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE +${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' +${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! +${c1} -1vvnvv. `~+++` ++|+++ + +vnvnnv, `-|=== + +vnvnvns. . :=- + -Invnvvnsi..___..=sv=. ` + +Invnvnvnnnnnnnnvvnn;. + ~|Invnvnvvnvvvnnv}+` + -~|{*l}*|~ +EOF + ;; - # Image options - "--loop") image_loop="on" ;; - "--image_size" | "--size") image_size="$2" ;; - "--crop_mode") crop_mode="$2" ;; - "--crop_offset") crop_offset="$2" ;; - "--xoffset") xoffset="$2" ;; - "--yoffset") yoffset="$2" ;; - "--background_color" | "--bg_color") background_color="$2" ;; - "--gap") gap="$2" ;; - "--clean") - [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" - rm -rf "/Library/Caches/neofetch/" - rm -rf "/tmp/neofetch/" - exit - ;; + *"[Windows 10]"* | *"on Windows 10"* | "Windows 8"* |\ + "Windows 10"* | "windows10" | "windows8" ) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} .., + ....,,:;+ccllll + ...,,+:; cllllllllllllllllll +,cclllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll - "--ascii_colors") - unset ascii_colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) ascii_colors+=("$arg") - esac - done - ascii_colors+=(7 7 7 7 7 7) - ;; +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +`'ccllllllllll lllllllllllllllllll + `' \\*:: :ccllllllllllllllll + ````''*::cll + `` +EOF + ;; - "--ascii_distro") - image_backend="ascii" - ascii_distro="$2" - case "$2" in "-"* | "") ascii_distro="$distro" ;; esac - ;; + "Windows"*) + set_colors 1 2 4 3 + read -rd '' ascii_data <<'EOF' +${c1} ,.=:!!t3Z3z., + :tt:::tt333EE3 +${c1} Et:::ztt33EEEL${c2} @Ee., .., +${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# +${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL +${c1} it::::tt333EEF${c2} @EEEEEEttttt33F +${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. +${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF +${c3} ;::::::::zt33)${c2} "4EEEtttji3P* +${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. +${c3} i::::::::zt33F${c4} AEEEtttt::::ztF +${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 +${c3} E::::::::zt33L${c4} @EEEtttt::::z3F +${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` +${c3} `${c4} :EEEEtttt::::z7 + "VEzjt:;;z>*` +EOF + ;; + + "Xubuntu"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `-/osyhddddhyso/-` + .+yddddddddddddddddddy+. + :yddddddddddddddddddddddddy: + -yddddddddddddddddddddhdddddddy- + odddddddddddyshdddddddh`dddd+ydddo + `yddddddhshdd- ydddddd+`ddh.:dddddy` + sddddddy /d. :dddddd-:dy`-ddddddds +:ddddddds /+ .dddddd`yy`:ddddddddd: +sdddddddd` . .-:/+ssdyodddddddddds +ddddddddy `:ohddddddddd +dddddddd. +dddddddd +sddddddy ydddddds +:dddddd+ .oddddddd: + sdddddo ./ydddddddds + `yddddd. `:ohddddddddddy` + oddddh/` `.:+shdddddddddddddo + -ydddddhyssyhdddddddddddddddddy- + :yddddddddddddddddddddddddy: + .+yddddddddddddddddddy+. + `-/osyhddddhyso/-` +EOF + ;; - "--ascii_bold") ascii_bold="$2" ;; - "--logo" | "-L") - image_backend="ascii" - print_info() { info line_break; } - ;; + "Zorin"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' +${c1} `osssssssssssssssssssso` + .osssssssssssssssssssssso. + .+oooooooooooooooooooooooo+. - # Screenshot - "--scrot" | "-s") - scrot_args "$@" - ;; - "--upload" | "-su") - scrot_upload="on" - scrot_args "$@" - ;; - "--image_host") image_host="$2" ;; - "--scrot_cmd") scrot_cmd="$2" ;; + `::::::::::::::::::::::. .:` + `+ssssssssssssssssss+:.` `.:+ssso` +.ossssssssssssssso/. `-+ossssssso. +ssssssssssssso/-` `-/osssssssssssss +.ossssssso/-` .-/ossssssssssssssso. + `+sss+:. `.:+ssssssssssssssssss+` + `:. .::::::::::::::::::::::` - # Other - "--config") - case "$2" in - "none" | "off" | "") ;; - *) - config_file="$(get_full_path "$2")" - get_user_config - ;; - esac - ;; - "--stdout") stdout="on" ;; - "-v") verbose="on" ;; - "-vv") set -x; verbose="on" ;; - "--help") usage ;; - "--version") - printf "%s\\n" "Neofetch $version" - exit 1 - ;; - "--gen-man") - help2man -n "A fast, highly customizable system info script" \ - -N ./neofetch -o neofetch.1 - exit 1 - ;; - "--travis") - print_info() { - info title - info underline + .+oooooooooooooooooooooooo+. + -osssssssssssssssssssssso- + `osssssssssssssssssssso` +EOF + ;; - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "GPU Driver" gpu_driver - info "Memory" memory + *) + case "$kernel_name" in + *"BSD") + set_colors 1 7 4 3 6 + read -rd '' ascii_data <<'EOF' +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) +EOF + ;; - info "CPU Usage" cpu_usage - info "Disk" disk - info "Battery" battery - info "Font" font - info "Song" song - info "Local IP" local_ip - info "Public IP" public_ip - info "Users" users - info "Install Date" install_date + "Darwin") + set_colors 2 3 1 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. +EOF + ;; - info line_break - info cols - info line_break + "GNU"*) + set_colors fg 7 + read -rd '' ascii_data <<'EOF' +${c1} _-`````-, ,- '- . + .' .- - | | - -. `. + /.' / `. \ +:/ : _... ..._ `` : +:: : /._ .`:'_.._\. || : +:: `._ ./ ,` : \ . _.'' . +`:. / | -. \-. \\_ / + \:._ _/ .' .@) \@) ` `\ ,.' + _/,--' .- .\,-.`--`. + ,'/'' (( \ ` ) + /'/' \ `-' ( + '/'' `._,-----' + ''/' .,---' + ''/' ;: + ''/'' ''/ + ''/''/'' + '/'/' + `; +EOF + ;; - # Testing. - prin "prin" - prin "prin" "prin" + "Linux") + set_colors fg 8 3 + read -rd '' ascii_data <<'EOF' +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### +EOF + ;; - # Testing no subtitles. - info uptime - info disk - } + "SunOS") + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. +EOF + ;; - refresh_rate="on" - shell_version="on" - cpu_display="infobar" - memory_display="infobar" - disk_display="infobar" - cpu_temp="C" - ;; - esac + "IRIX"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} ./ohmNd/ +dNmho/- + `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. + `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` + -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. + `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` ++mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ +dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd +oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ +.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. + hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh + /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: + `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd + `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` + `yNMMNho-yMMMM` NMMMm.+hNMMNh` + -MMMMd: oMMMM. NMMMh :hMMMM- + -yNMMMmooMMMM- NMMMyomMMMNy- + .omMMMMMMMM-`NMMMMMMMmo. + `:hMMMMMM. NMMMMMh/` + .odNm+ /dNms. +EOF + ;; + esac + ;; + esac - shift - done + # Overwrite distro colors if '$ascii_colors' doesn't + # equal 'distro'. + if [[ "${ascii_colors[0]}" != "distro" ]]; then + color_text="off" + set_colors "${ascii_colors[@]}" + fi } main() { From da49581b731907d04cd137f7e230e3e38733e34b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 3 May 2018 16:22:56 +1000 Subject: [PATCH 0289/1133] general: In-lined license --- neofetch | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index ee0bf7088..28c516cef 100755 --- a/neofetch +++ b/neofetch @@ -1,12 +1,30 @@ #!/usr/bin/env bash -# set -x # vim: noai:ts=4:sw=4:expandtab # -# Neofetch: Simple system information script. +# Neofetch: A command-line system information tool written in bash 3.2+. # https://github.com/dylanaraps/neofetch # -# Created by Dylan Araps -# https://github.com/dylanaraps/ +# The MIT License (MIT) +# +# Copyright (c) 2016-2017 Dylan Araps +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to deal +# in the Software without restriction, including without limitation the rights +# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +# copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +# SOFTWARE. # Neofetch version. version="3.4.1-git" From c9a4ae4b1a34184cd33e42bd7975213162727ec0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 07:56:18 +1000 Subject: [PATCH 0290/1133] general: Remove Makefile --- Makefile | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index 7870d4566..000000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -PREFIX ?= /usr -MANDIR ?= $(PREFIX)/share/man - -all: - @echo Run \'make install\' to install Neofetch. - -install: - @echo 'Making directories...' - @mkdir -p $(DESTDIR)$(PREFIX)/bin - @mkdir -p $(DESTDIR)$(MANDIR)/man1 - - @echo 'Installing binaries...' - @chmod 755 $(DESTDIR)$(PREFIX)/bin/neofetch - - @echo 'Installing man page...' - @cp -p neofetch.1 $(DESTDIR)$(MANDIR)/man1 - -uninstall: - @echo 'Removing files...' - @rm -rf $(DESTDIR)$(PREFIX)/bin/neofetch - @rm -rf $(DESTDIR)$(MANDIR)/man1/neofetch.1* From f31f2a40f006b62395ae91bc8773e66911b62420 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 08:33:32 +1000 Subject: [PATCH 0291/1133] general: Added missing ascii --- neofetch | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 28c516cef..f5251548d 100755 --- a/neofetch +++ b/neofetch @@ -5316,7 +5316,28 @@ EOF "ArcoLinux"*) set_colors 7 4 - ascii_file="arcolinux" + read -rd '' ascii_data <<'EOF' +${c2} /- + ooo: + yoooo/ + yooooooo + yooooooooo + yooooooooooo + .yooooooooooooo + .oooooooooooooooo + .oooooooarcoooooooo + .ooooooooo-oooooooooo + .ooooooooo- oooooooooo + :ooooooooo. :ooooooooo + :ooooooooo. :ooooooooo + :oooarcooo .oooarcooo + :ooooooooy .ooooooooo + :ooooooooo ${c1}/ooooooooooooooooooo${c2} + :ooooooooo ${c1}.-ooooooooooooooooo.${c2} + ooooooooo- ${c1}-ooooooooooooo.${c2} + ooooooooo- ${c1}.-oooooooooo.${c2} +ooooooooo. ${c1}-ooooooooo${c2} +EOF ;; "arch_small") From 2fd328aecaec67e723b9fa95d7aa7e60e81b4481 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 08:49:13 +1000 Subject: [PATCH 0292/1133] general: Move ascii art back to fix merge conflicts. --- neofetch | 8039 +++++++++++++++++++++++++++--------------------------- 1 file changed, 4020 insertions(+), 4019 deletions(-) diff --git a/neofetch b/neofetch index f5251548d..a2fb7f872 100755 --- a/neofetch +++ b/neofetch @@ -50,6 +50,7 @@ shopt -s nocasematch reset="\e[0m" # Neofetch default config. + read -rd '' config <<'EOF' # See this wiki page for more info: # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info @@ -4159,2516 +4160,3537 @@ uppercase() { # COLORS -set_colors() { - c1="$(color "$1")${ascii_bold}" - c2="$(color "$2")${ascii_bold}" - c3="$(color "$3")${ascii_bold}" - c4="$(color "$4")${ascii_bold}" - c5="$(color "$5")${ascii_bold}" - c6="$(color "$6")${ascii_bold}" - - [[ "$color_text" != "off" ]] && set_text_colors "$@" -} +get_distro_colors() { + # This function sets the text colors according + # to your OS/Distro's logo colors. + # + # $ascii_distro is the same as $distro. + case "$ascii_distro" in + "AIX"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} `:+ssssossossss+-` + .oys///oyhddddhyo///sy+. + /yo:+hNNNNNNNNNNNNNNNNh+:oy/ + :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: + `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh + h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy +/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: +h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y +N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m +N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m +h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y +:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- + yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy + sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo + :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- + :ys:/yNNNNNNNNNNNNNNNmy/:sy: + .+ys///osyhhhhys+///sy+. + -/osssossossso/- +EOF + ;; -set_text_colors() { - if [[ "${colors[0]}" == "distro" ]]; then - title_color="$(color "$1")" - at_color="$reset" - underline_color="$reset" - subtitle_color="$(color "$2")" - colon_color="$reset" - info_color="$reset" + "alpine_small") + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} /\\ /\\ + /${c2}/ ${c1}\\ \\ + /${c2}/ ${c1}\\ \\ +/${c2}// ${c1}\\ \\ +${c2}// ${c1}\\ \\ + \\ +EOF + ;; - # If the ascii art uses 8 as a color, make the text the fg. - ((${1:-1} == 8)) && title_color="$reset" - ((${2:-7} == 8)) && subtitle_color="$reset" + "Alpine"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} .hddddddddddddddddddddddh. + :dddddddddddddddddddddddddd: + /dddddddddddddddddddddddddddd/ + +dddddddddddddddddddddddddddddd+ + `sdddddddddddddddddddddddddddddddds` + `ydddddddddddd++hdddddddddddddddddddy` +.hddddddddddd+` `+ddddh:-sdddddddddddh. +hdddddddddd+` `+y: .sddddddddddh +ddddddddh+` `//` `.` -sddddddddd +ddddddh+` `/hddh/` `:s- -sddddddd +ddddh+` `/+/dddddh/` `+s- -sddddd +ddd+` `/o` :dddddddh/` `oy- .yddd +hdddyo+ohddyosdddddddddho+oydddy++ohdddh +.hddddddddddddddddddddddddddddddddddddh. + `yddddddddddddddddddddddddddddddddddy` + `sdddddddddddddddddddddddddddddddds` + +dddddddddddddddddddddddddddddd+ + /dddddddddddddddddddddddddddd/ + :dddddddddddddddddddddddddd: + .hddddddddddddddddddddddh. +EOF + ;; - # If the second color is white use the first for the subtitle. - ((${2:-7} == 7)) && subtitle_color="$(color "$1")" - ((${1:-1} == 7)) && title_color="$reset" - else - title_color="$(color "${colors[0]}")" - at_color="$(color "${colors[1]}")" - underline_color="$(color "${colors[2]}")" - subtitle_color="$(color "${colors[3]}")" - colon_color="$(color "${colors[4]}")" - info_color="$(color "${colors[5]}")" - fi + "Amazon"*) + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} `-/oydNNdyo:.` + `.:+shmMMMMMMMMMMMMMMmhs+:.` + -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- +.`` -/+shmNNMMMMMMNNmhs+/- ``. +dNmhs+:. `.:/oo/:.` .:+shmNd +dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd +dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. + `.:+shNMMMMMh yMMMMMNhs+:`` + `-+shy shs+:` +EOF + ;; - # Bar colors. - if [[ "$bar_color_elapsed" == "distro" ]]; then - bar_color_elapsed="$(color fg)" - else - bar_color_elapsed="$(color "$bar_color_elapsed")" - fi + "Anarchy"*) + set_colors 7 4 + read -rd '' ascii_data <<'EOF' + ${c2}..${c1} + ${c2}..${c1} + ${c2}:..${c1} + ${c2}:+++.${c1} + .:::++${c2}++++${c1}+::. + .:+######${c2}++++${c1}######+:. + .+#########${c2}+++++${c1}##########:. + .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. + +###########${c2}+++++++++${c1}############: + +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ + +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ + :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: + ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ +.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. +.##########${c2}+++++++++++++++++++${c1}###########. + #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ + :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: + +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ + +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ + :##${c2}++++++${c1}############${c2}++++++++++${c1}##: + .${c2}++++++${c1}#############${c2}++++++++++${c1}+. + :${c2}++++${c1}###############${c2}+++++++${c1}:: + .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. + ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. + ${c2}.${c1} ${c2}.:+++${c1}. + ${c2}.:${c1}: + ${c2}..${c1} + ${c2}..${c1} +EOF + ;; - case "$bar_color_total $1" in - "distro "[736]) bar_color_total="$(color "$1")" ;; - "distro "[0-9]) bar_color_total="$(color "$2")" ;; - *) bar_color_total="$(color "$bar_color_total")" ;; - esac -} + "Android"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} -o o- + +hydNNNNdyh+ + +mMMMMMMMMMMMMm+ + `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` + hMMMMMMMMMMMMMMMMMMh + .. yyyyyyyyyyyyyyyyyyyy .. +.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +-MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- + +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ + mMMMMMMMMMMMMMMMMMMm + `/++MMMMh++hMMMM++/` + MMMMo oMMMM + MMMMo oMMMM + oNMm- -mMNs +EOF + ;; -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" ;; - esac -} + "Antergos"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' +${c2} `.-/::/-`` + .-/osssssssso/. + :osyysssssssyyys+- + `.+yyyysssssssssyyyyy+. + `/syyyyyssssssssssyyyyys-` + `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` + .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. + .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. + -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: + -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- + .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` +`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo +.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. +ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy +dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh +-dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- +.smmmmddddddddhhhhhhhhhdddddddddmmmms. + `+ydmmmdddddddddddddddddddmmmmdy/. + `.:+ooyyddddddddddddyyso+:.` +EOF + ;; -# OTHER + "antiX"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} + \ + , - ~ ^ ~ - \ / + , ' \ ' , / + , \ '/ + , \ / , + ,___, \/ , + / | _ _ _|_ o /\ , +|, | / |/ | | | / \ , + \,_/\_/ | |_/|_/|_/_/ \, + , / ,\ + , / , ' \ + ' - , _ _ _ , ' +EOF + ;; -stdout() { - image_backend="off" - unset subtitle_color - unset colon_color - unset info_color - unset underline_color - unset bold - unset title_color - unset at_color - unset text_padding - unset zws - unset reset - unset color_blocks - unset get_line_break -} - -err() { - err+="$(color 1)[!]\e[0m $1\n" -} - -get_full_path() { - # This function finds the absolute path from a relative one. - # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" - - # If the file exists in the current directory, stop here. - [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - - if ! cd "${1%/*}"; then - err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" - err " Check that the directory exists or try another directory." - exit 1 - fi - - local full_dir="${1##*/}" + "AOSC"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} .:+syhhhhys+:. + .ohNMMMMMMMMMMMMMMNho. + `+mMMMMMMMMMMmdmNMMMMMMMMm+` + +NMMMMMMMMMMMM/ `./smMMMMMN+ + .mMMMMMMMMMMMMMMo -yMMMMMm. + :NMMMMMMMMMMMMMMMs .hMMMMN: + .NMMMMhmMMMMMMMMMMm+/- oMMMMN. + dMMMMs ./ymMMMMMMMMMMNy. sMMMMd +-MMMMN` oMMMMMMMMMMMN: `NMMMM- +/MMMMh NMMMMMMMMMMMMm hMMMM/ +/MMMMh NMMMMMMMMMMMMm hMMMM/ +-MMMMN` :MMMMMMMMMMMMy. `NMMMM- + dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd + .NMMMMo -/+sMMMMMMMMMMMmMMMMN. + :NMMMMh. .MMMMMMMMMMMMMMMN: + .mMMMMMy- NMMMMMMMMMMMMMm. + +NMMMMMms/.` mMMMMMMMMMMMN+ + `+mMMMMMMMMNmddMMMMMMMMMMm+` + .ohNMMMMMMMMMMMMMMNho. + .:+syhhhhys+:. +EOF + ;; - # Iterate down a (possible) chain of symlinks. - while [[ -L "$full_dir" ]]; do - full_dir="$(readlink "$full_dir")" - cd "${full_dir%/*}" || exit - full_dir="${full_dir##*/}" - done + "Apricity"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} ./o- + ``...`` `:. -/: + `-+ymNMMMMMNmho-` :sdNNm/ + `+dMMMMMMMMMMMMMMMmo` sh:.:::- + /mMMMMMMMMMMMMMMMMMMMm/`sNd/ + oMMMMMMMMMMMMMMMMMMMMMMMs -` +:MMMMMMMMMMMMMMMMMMMMMMMMM/ +NMMMMMMMMMMMMMMMMMMMMMMMMMd +MMMMMMMmdmMMMMMMMMMMMMMMMMd +MMMMMMy` .mMMMMMMMMMMMmho:` +MMMMMMNo/sMMMMMMMNdy+-.`-/ +MMMMMMMMMMMMNdy+:.`.:ohmm: +MMMMMMMmhs+-.`.:+ymNMMMy. +MMMMMM/`.-/ohmNMMMMMMy- +MMMMMMNmNNMMMMMMMMmo. +MMMMMMMMMMMMMMMms:` +MMMMMMMMMMNds/. +dhhyys+/-` +EOF + ;; - # Final directory. - full_dir="$(pwd -P)/${1/*\/}" + "ArcoLinux"*) + set_colors 7 4 + read -rd '' ascii_data <<'EOF' +${c2} /- + ooo: + yoooo/ + yooooooo + yooooooooo + yooooooooooo + .yooooooooooooo + .oooooooooooooooo + .oooooooarcoooooooo + .ooooooooo-oooooooooo + .ooooooooo- oooooooooo + :ooooooooo. :ooooooooo + :ooooooooo. :ooooooooo + :oooarcooo .oooarcooo + :ooooooooy .ooooooooo + :ooooooooo ${c1}/ooooooooooooooooooo${c2} + :ooooooooo ${c1}.-ooooooooooooooooo.${c2} + ooooooooo- ${c1}-ooooooooooooo.${c2} + ooooooooo- ${c1}.-oooooooooo.${c2} +ooooooooo. ${c1}-ooooooooo${c2} +EOF + ;; - [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" -} + "arch_small") + set_colors 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} /\ + /^^\ + /\ \ + /${c2} __ \ + / ( ) \ + / __| |__\\\ +/// \\\\\ +EOF + ;; -get_user_config() { - # Check $config_file. - if [[ -f "$config_file" ]]; then - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options - return - fi - mkdir -p "${XDG_CONFIG_HOME}/neofetch/" + "arch_old") + set_colors 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} __ + _=(SDGJT=_ + _GTDJHGGFCVS) + ,GTDJGGDTDFBGX0 +${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ +${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL +${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, +${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], +${c1} SDDFDFH' !YEWD,${c2} )HDROD +${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' +${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' +${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' +${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) +${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF +'EHTI !H + `0F' '! +EOF + ;; - # Check ${XDG_CONFIG_HOME}/neofetch and create the - # dir/files if they don't exist. - if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config" + "ArchBox"*) + set_colors 2 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ...:+oh/:::.. + ..-/oshhhhhh` `::::-. + .:/ohhhhhhhhhhhh` `-::::. + .+shhhhhhhhhhhhhhhhh` `.::-. + /`-:+shhhhhhhhhhhhhh` .-/+shh + / .:/ohhhhhhhhh` .:/ohhhhhhhh + / `-:+shhh` ..:+shhhhhhhhhhhh + / .:ohhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / .+o+ `hhhhhhhhhhhhhhhhhhhh + / -hhhhh `hhhhhhhhhhhhhhhhhhhh + / ohhhhho `hhhhhhhhhhhhhhhhhhhh + /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` + `--/:` /: `hhhhhhhhhhhho/- + -/:. `hhhhhhs+:-` + ::::/ho/-` +EOF + ;; - elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + "ARCHlabs"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} 'c' + 'kKk, + .dKKKx. + .oKXKXKd. + .l0XXXXKKo. + c0KXXXXKX0l. + :0XKKOxxOKX0l. + :OXKOc. .c0XX0l. + :OK0o. ${c4}...${c1}'dKKX0l. + :OX0c ${c4};xOx'${c1}'dKXX0l. + :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. + c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. + .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. + .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. + .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. + .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. + .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' + 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' + 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, + ,xko:'. ${c4}.. ${c1} .':okx; + .,'. .',. +EOF + ;; - else - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + *"XFerience"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ``--:::::::-.` + .-/+++ooooooooo+++:-` + `-/+oooooooooooooooooo++:. + -/+oooooo/+ooooooooo+/ooo++:` + `/+oo++oo. .+oooooo+.-: +:-o+- + `/+o/. -o. :oooooo+ ```:.+oo+- +`:+oo- -/` :oooooo+ .`-`+oooo/. +.+ooo+. .` `://///+-+..oooooo+:` +-+ooo:` ``.-+oooooo+/` +-+oo/` :+oooo/. +.+oo: ..-/. . -+oo+/` +`/++- -:::++::/. -+oo+- + ./o: `:///+- `./ooo+:` + .++- `` /-` -:/+oooo+:` + .:+/:`` `-:ooooooo++- + ./+o+//:...../+oooooooo++:` + `:/++ooooooooooooo++/-` + `.-//++++++//:-.` + `````` +EOF + ;; - # The config file doesn't exist, create it. - printf "%s\n" "$config" > "$config_file" - fi + "ArchMerge"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} y: + sMN- + +MMMm` + /MMMMMd` + :NMMMMMMy + -NMMMMMMMMs + .NMMMMMMMMMM+ + .mMMMMMMMMMMMM+ + oNMMMMMMMMMMMMM+ + `+:-+NMMMMMMMMMMMM+ + .sNMNhNMMMMMMMMMMMM/ + `hho/sNMMMMMMMMMMMMMMM/ + `.`omMMmMMMMMMMMMMMMMMMM+ + .mMNdshMMMMd+::oNMMMMMMMMMo + .mMMMMMMMMM+ `yMMMMMMMMMs + .NMMMMMMMMM/ yMMMMMMMMMy + -NMMMMMMMMMh `mNMMMMMMMMd` + /NMMMNds+:.` `-/oymMMMm. + +Mmy/. `:smN: +/+. -o. +EOF + ;; - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options -} - -bar() { - # Get the values. - elapsed="$(($1 * bar_length / $2))" - - # Create the bar with spaces. - printf -v prog "%${elapsed}s" - printf -v total "%$((bar_length - elapsed))s" - - # Set the colors and swap the spaces for $bar_char_. - bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" - bar+="${bar_color_total}${total// /${bar_char_total}}" - - # Borders. - [[ "$bar_border" == "on" ]] && \ - bar="$(color fg)[${bar}$(color fg)]" - - printf "%b" "${bar}${info_color}" -} - -cache() { - if [[ "$2" ]]; then - mkdir -p "${cache_dir}/neofetch" - printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" - fi -} - -get_cache_dir() { - case "$os" in - "Mac OS X") cache_dir="/Library/Caches" ;; - *) cache_dir="/tmp" ;; - esac -} - -kde_config_dir() { - # If the user is using KDE get the KDE - # configuration directory. - if [[ "$kde_config_dir" ]]; then - return - - elif type -p kf5-config >/dev/null 2>&1; then - kde_config_dir="$(kf5-config --path config)" - - elif type -p kde4-config >/dev/null 2>&1; then - kde_config_dir="$(kde4-config --path config)" - - elif type -p kde-config >/dev/null 2>&1; then - kde_config_dir="$(kde-config --path config)" - - elif [[ -d "${HOME}/.kde4" ]]; then - kde_config_dir="${HOME}/.kde4/share/config" + "Arch"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} -` + .o+` + `ooo/ + `+oooo: + `+oooooo: + -+oooooo+: + `/:-:++oooo+: + `/++++/+++++++: + `/++++++++++++++: + `/+++o${c2}oooooooo${c1}oooo/` +${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` +${c2} .oossssso-````/ossssss+` + -osssssso. :ssssssso. + :osssssss/ osssso+++. + /ossssssss/ +ssssooo/- + `/ossssso+/:- -:/+osssso+- + `+sso+:-` `.-/+oso: + `++:. `-/+/ + .` `/ +EOF + ;; - elif [[ -d "${HOME}/.kde3" ]]; then - kde_config_dir="${HOME}/.kde3/share/config" - fi + "Artix"*) + set_colors 6 4 2 7 + read -rd '' ascii_data <<'EOF' +${c1} d${c2}c. +${c1} x${c2}dc. +${c1} '.${c4}.${c1} d${c2}dlc. +${c1} c${c2}0d:${c1}o${c2}xllc; +${c1} :${c2}0ddlolc,lc, +${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. +${c1} ;${c1}K${c2}kxoOddollc' cllc. +${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: +${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: +${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, +${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. +${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; +${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, +${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. +${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. +${c1} 0${c2}Okd''dc. .cll; +${c1} k${c2}Okd' .llc, +${c1} d${c2}Od, 'lc. +${c1} :,${c4}. ${c2}... +EOF + ;; - kde_config_dir="${kde_config_dir/$'/:'*}" -} + "Arya"*) + set_colors 2 1 + read -rd '' ascii_data <<'EOF' +${c1} `oyyy/${c2}-yyyyyy+ +${c1} -syyyy/${c2}-yyyyyy+ +${c1} .syyyyy/${c2}-yyyyyy+ +${c1} :yyyyyy/${c2}-yyyyyy+ +${c1} `/ :yyyyyy/${c2}-yyyyyy+ +${c1} .+s :yyyyyy/${c2}-yyyyyy+ +${c1} .oys :yyyyyy/${c2}-yyyyyy+ +${c1} -oyys :yyyyyy/${c2}-yyyyyy+ +${c1} :syyys :yyyyyy/${c2}-yyyyyy+ +${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ +${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ +${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- +${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy +${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy +${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy +EOF + ;; -get_term_padding() { - # Terminal info. - # - # Parse terminal config files to get - # info about padding. Due to how w3m-img - # works padding around the terminal throws - # off the cursor placement calculation in - # specific terminals. - # - # Note: This issue only seems to affect - # URxvt. - ((term_run != 1)) && get_term + "Bitrig"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} `hMMMMN+ + -MMo-dMd` + oMN- oMN` + yMd /NM: + .mMmyyhMMs + :NMMMhsmMh + +MNhNNoyMm- + hMd.-hMNMN: + mMmsssmMMMo + .MMdyyhNMMMd + oMN.`/dMddMN` + yMm/hNm+./MM/ +.dMMMmo.``.NMo +:NMMMNmmmmmMMh +/MN/-------oNN: +hMd. .dMh +sm/ /ms +EOF + ;; - case "$term" in - "URxvt"*) - border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" + "BLAG"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} d + ,MK: + xMMMX: + .NMMMMMX; + lMMMMMMMM0clodkO0KXWW: + KMMMMMMMMMMMMMMMMMMX' + .;d0NMMMMMMMMMMMMMMMMMMK. + .;dONMMMMMMMMMMMMMMMMMMMMMMx +'dKMMMMMMMMMMMMMMMMMMMMMMMMl + .:xKWMMMMMMMMMMMMMMMMMMM0. + .:xNMMMMMMMMMMMMMMMMMK. + lMMMMMMMMMMMMMMMMMMK. + ,MMMMMMMMWkOXWMMMMMM0 + .NMMMMMNd. `':ldko + OMMMK: + oWk, + ;: +EOF ;; - esac -} -dynamic_prompt() { - case "$image_backend" in - "ascii") printf "\n" ;; - "off") return ;; - *) - get_term_padding - lines="$(((border + height + yoffset) / font_height))" - image_prompt="on" + "BlankOn"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` +${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ +${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys +${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys +${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys +${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys +${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys +${c2}NMMMMMN: .NMMMMMN${c1}yyyyys +${c2}MMMMMMm. NMMMMMN${c1}yyyyys +${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys +${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys +${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys +${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys +${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys +${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys +${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo +${c2} `.:/++++/:.` ${c1}:oys+. +EOF ;; - esac - # If the info is higher than the ascii/image place the prompt - # based on the info height instead of the ascii/image height. - if ((lines < info_height)); then - [[ "$image_prompt" ]] && printf "\n" - return - else - [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" - lines="$((lines - info_height + 1))" - fi + "BSD") + set_colors 1 7 4 3 6 + read -rd '' ascii_data <<'EOF' +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) +EOF + ;; - # Set the prompt location. - if ((lines > 1)); then - case "$kernel_name" in - "OpenBSD") tput cud "$lines" ;; - *) printf "%b" "\e[${lines}B" ;; - esac - fi -} - -old_functions() { - # Deprecated functions. - # Neofetch 2.0 changed the names of a few variables. - # This function adds backwards compatibility for the - # old variable names. - if type printinfo >/dev/null 2>&1; then - print_info() { printinfo ; } - get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } - get_termfont() { get_term_font; termfont="$term_font"; } - get_localip() { get_local_ip; localip="$local_ip"; } - get_publicip() { get_public_ip; publicip="$public_ip"; } - get_linebreak() { get_line_break; linebreak="$line_break"; } - fi - - get_birthday() { get_install_date; birthday="$install_date"; } -} - -old_options() { - [[ -n "$osx_buildversion" ]] && \ - err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." - [[ -n "$osx_codename" ]] && \ - err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." - [[ "$cpu_cores" == "on" ]] && \ - err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." - [[ -n "$image" ]] && \ - { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } - - # All progress_ variables were changed to bar_. - [[ -n "$progress_char" ]] && \ - err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." - [[ -n "$progress_border" ]] && \ - { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ - bar_border="$progress_border"; } - [[ -n "$progress_length" ]] && \ - { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ - bar_length="$progress_length"; } - [[ -n "$progress_color_elapsed" ]] && \ - { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ - bar_color_elapsed="$progress_color_elapsed"; } - [[ -n "$progress_color_total" ]] && \ - { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ - bar_color_total="$progress_color_total"; } - - # All cpufreq values were changed in 3.0. - [[ "$speed_type" == "current" ]] && \ - err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." - [[ "$speed_type" == "min" ]] && \ - err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." - [[ "$speed_type" == "max" ]] && \ - err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." - [[ "$speed_type" == "bios" ]] && \ - err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." - - # Ascii_logo_size was removed in 3.0. - [[ "$ascii_logo_size" ]] && \ - err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." - - # $start and $end were replaced with ${block_range[@]} in 3.0. - [[ "$start" && "$end" ]] && \ - { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ - block_range=("$start" "$end"); } - - # Fahrenheit support was added to CPU so the options were changed. - [[ "$cpu_temp" == "on" ]] && \ - { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; - cpu_temp="C"; } - - # Birthday was renamed to Install Date in 3.0 - [[ -n "$birthday_time" ]] && \ - { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ - install_time="$birthday_time"; } - - # Scrot dir was removed in 3.1.0. - [[ -n "$scrot_dir" ]] && scrot_dir= - - # cpu_shorthand was deprecated in 3.3.0 - [[ -n "$cpu_shorthand" ]] && \ - { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and - \$cpu_speed instead."; } -} - -cache_uname() { - # Cache the output of uname so we don't - # have to spawn it multiple times. - IFS=" " read -ra uname <<< "$(uname -sr)" - - kernel_name="${uname[0]}" - kernel_version="${uname[1]}" -} - -convert_time() { - # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. - year="$1" - day="${3#0}" - - # Split time into hours/minutes. - hour="${4/:*}" - min="${4/${hour}}" - - # Get month. (Month code is used for day of week) - # Due to different versions of 'ls', the month can be 1, 01 or Jan. - case "$2" in - 1 | 01 | "Jan") month="Jan"; month_code=0 ;; - 2 | 02 | "Feb") month="Feb"; month_code=3 ;; - 3 | 03 | "Mar") month="Mar"; month_code=3 ;; - 4 | 04 | "Apr") month="Apr"; month_code=6 ;; - 5 | 05 | "May") month="May"; month_code=1 ;; - 6 | 06 | "Jun") month="Jun"; month_code=4 ;; - 7 | 07 | "Jul") month="Jul"; month_code=6 ;; - 8 | 08 | "Aug") month="Aug"; month_code=2 ;; - 9 | 09 | "Sep") month="Sep"; month_code=5 ;; - 10 | "Oct") month="Oct"; month_code=0 ;; - 11 | "Nov") month="Nov"; month_code=3 ;; - 12 | "Dec") month="Dec"; month_code=5 ;; - esac - - # Get leap year. - # Source: http://stackoverflow.com/questions/725098/leap-year-calculation - [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ - [[ "$month" =~ (Jan|Feb) ]] && \ - leap_code=1 - - # Calculate day of week. - # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html - year_code="$((${year/??} + (${year/??} / 4) % 7))" - week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" - - case "$week_day" in - 0) week_day="Sun" ;; - 1) week_day="Mon" ;; - 2) week_day="Tue" ;; - 3) week_day="Wed" ;; - 4) week_day="Thu" ;; - 5) week_day="Fri" ;; - 6) week_day="Sat" ;; - esac - - # Convert 24 hour time to 12 hour time + AM/PM. - case "$install_time_format" in - "12h") - case "$hour" in - [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; - *) time="$((hour - 12))${min} PM" ;; - esac - ;; - *) time="$4" ;; - esac - - # Toggle showing the time. - [[ "$install_time" == "off" ]] && unset time - - # Print the install date. - printf "%s" "$week_day $day $month $year $time" -} - -get_ppid() { - # Get parent process ID of PID. - case "$os" in - "Windows") - ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" - ppid="${ppid/'PPID'}" - ;; - - "Linux") - ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" - ppid="$(trim "${ppid/PPid:}")" - ;; - - *) - ppid="$(ps -p "${1:-$PPID}" -o ppid=)" - ;; - esac - - printf "%s" "$ppid" -} - -get_process_name() { - # Get PID name. - case "$os" in - "Windows") - name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" - name="${name/'COMMAND'}" - name="${name/*\/}" + "BunsenLabs"*) + set_colors fg 7 + read -rd '' ascii_data <<'EOF' +${c1} `++ + -yMMs + `yMMMMN` + -NMMMMMMm. + :MMMMMMMMMN- + .NMMMMMMMMMMM/ + yMMMMMMMMMMMMM/ +`MMMMMMNMMMMMMMN. +-MMMMN+ /mMMMMMMy +-MMMm` `dMMMMMM +`MMN. .NMMMMM. + hMy yMMMMM` + -Mo +MMMMN + /o +MMMMs + +MMMN` + hMMM: + `NMM/ + +MN: + mh. + -/ +EOF ;; - "Linux") - name="$(< "/proc/${1:-$PPID}/comm")" + "Calculate"*) + set_colors 7 3 + read -rd '' ascii_data <<'EOF' +${c1} ...... + ,,+++++++,. + .,,,....,,,${c2}+**+,,.${c1} + ............,${c2}++++,,,${c1} + ............... + ......,,,........ + .....+*#####+,,,*+. + .....,*###############,..,,,,,,.. + ......,*#################*..,,,,,..,,,.. + .,,....*####################+***+,,,,...,++, + .,,..,..*#####################*, + ,+,.+*..*#######################. + ,+,,+*+..,########################* +.,++++++. ..+##**###################+ +..... ..+##***#################*. + .,.*#*****##############*. + ..,,*********#####****+. + ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} + ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} + ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} +EOF ;; - *) - name="$(ps -p "${1:-$PPID}" -o comm=)" + "CentOS"*) + set_colors 3 2 4 5 7 + read -rd '' ascii_data <<'EOF' +${c1} .. + .PLTJ. + <><><><> + ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK + ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK + ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V + ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. +${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. +${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. +${c4} +${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV +${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' + ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' + ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 + ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK + ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK +${c2} <><><><> + 'MKKM' + '' +EOF ;; - esac - - printf "%s" "$name" -} - -decode_url() { - decode="${1//+/ }" - printf "%b" "${decode//%/\\x}" -} -# FINISH UP - -usage() { printf "%s" "\ -Usage: neofetch --option \"value\" --option \"value\" - -Neofetch is a CLI system information tool written in BASH. Neofetch -displays information about your system next to an image, your OS logo, -or any ASCII file of your choice. - -NOTE: Every launch flag has a config option. - -Options: - -INFO: - --disable infoname Allows you to disable an info line from appearing - in the output. - - NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - - --os_arch on/off Hide/Show OS architecture. - --speed_type type Change the type of cpu speed to display. - Possible values: current, min, max, bios, - scaling_current, scaling_min, scaling_max - - NOTE: This only supports Linux with cpufreq. - - --speed_shorthand on/off Whether or not to show decimals in CPU speed. - - NOTE: This flag is not supported in systems with CPU speed less than - 1 GHz. - - --cpu_brand on/off Enable/Disable CPU brand in output. - --cpu_cores type Whether or not to display the number of CPU cores - Possible values: logical, physical, off - - NOTE: 'physical' doesn't work on BSD. - - --cpu_speed on/off Hide/Show cpu speed. - --cpu_temp C/F/off Hide/Show cpu temperature. - - NOTE: This only works on Linux and BSD. - - NOTE: For FreeBSD and NetBSD-based systems, you need to enable - coretemp kernel module. This only supports newer Intel processors. - - --distro_shorthand on/off Shorten the output of distro (tiny, on, off) - - NOTE: This option won't work in Windows (Cygwin) - - --kernel_shorthand on/off Shorten the output of kernel - - NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) - - --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) - --refresh_rate on/off Whether to display the refresh rate of each monitor - Unsupported on Windows - --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) - --gpu_type type Which GPU to display. (all, dedicated, integrated) - - NOTE: This only supports Linux. - - --gtk_shorthand on/off Shorten output of gtk theme/icons - --gtk2 on/off Enable/Disable gtk2 theme/font/icons output - --gtk3 on/off Enable/Disable gtk3 theme/font/icons output - --shell_path on/off Enable/Disable showing \$SHELL path - --shell_version on/off Enable/Disable showing \$SHELL version - --disk_show value Which disks to display. - Possible values: '/', '/dev/sdXX', '/path/to/mount point' - - NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') - - --disk_subtitle type What information to append to the Disk subtitle. - Takes: name, mount, dir - - 'name' shows the disk's name (sda1, sda2, etc) - - 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) + "Chakra"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} _ _ _ "kkkkkkkk. + ,kkkkkkkk., 'kkkkkkkkk, + ,kkkkkkkkkkkk., 'kkkkkkkkk. + ,kkkkkkkkkkkkkkkk,'kkkkkkkk, + ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. + "''"''',;::,,"''kkk''kkkkk; __ + ,kkkkkkkkkk, "k''kkkkk' ,kkkk + ,kkkkkkk' ., ' .: 'kkkk',kkkkkk + ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk + ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk +.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' +;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' +'kkkkkkk; 'kkkkkkkk.,""''"''"" + ''kkkk; 'kkkkkkkkkk., + ';' 'kkkkkkkkkkkk., + ';kkkkkkkkkk' + ';kkkkkk' + "''" +EOF + ;; - 'dir' shows the basename of the disks's path. (/, Local Disk, etc) + "ChaletOS"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `.//+osso+/:`` + `/sdNNmhyssssydmNNdo:` + :hNmy+-` .-+hNNs- + /mMh/` `+:` `+dMd: + .hMd- -sNNMNo. /yyy /mMs` + -NM+ `/dMd/--omNh::dMM `yMd` + .NN+ .sNNs:/dMNy:/hNmo/s yMd` + hMs `/hNd+-smMMMMMMd+:omNy- `dMo +:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` +/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: +/Md` MMMMMMMMMMMMMMMMMMMN .MN: +:NN. MMMMMMm....--NMMMMMN -Mm. +`dMo MMMMMMd mMMMMMN hMs + -MN: MMMMMMd mMMMMMN oMm` + :NM: MMMMMMd mMMMMMN +Mm- + -mMy. mmmmmmh dmmmmmh -hMh. + oNNs- :yMm/ + .+mMdo:` `:smMd/` + -ohNNmhsoo++osshmNNh+. + `./+syyhhyys+:`` +EOF + ;; - --ip_host url URL to query for public IP - --song_shorthand on/off Print the Artist/Title on separate lines - --music_player player-name Manually specify a player to use. - Available values are listed in the config file - --install_time on/off Enable/Disable showing the time in Install Date output. - --install_time_format 12h/24h - Set time format in Install Date to be 12 hour or 24 hour. + "Chapeau"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} .-/-. + ////////. + ////////${c2}y+${c1}//. + ////////${c2}mMN${c1}/////. + ////////${c2}mMN+${c1}////////. + ////////////////////////. + /////////+${c2}shhddhyo${c1}+////////. + ////////${c2}ymMNmdhhdmNNdo${c1}///////. +///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. +///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// +//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// +//////${c2}+MMmssssssssssssss+${c1}/////// +`//////${c2}yMMy${c1}//////////////////// + `//////${c2}smMNhso++oydNm${c1}//////// + `///////${c2}ohmNMMMNNdy+${c1}/////// + `//////////${c2}++${c1}////////// + `////////////////. + -////////- +EOF + ;; -TEXT FORMATTING: - --colors x x x x x x Changes the text colors in this order: - title, @, underline, subtitle, colon, info - --underline on/off Enable/Disable the underline. - --underline_char char Character to use when underlining title - --bold on/off Enable/Disable bold text + "Chrom"*) + set_colors 2 1 3 4 7 + read -rd '' ascii_data <<'EOF' +${c2} .,:loool:,. + .,coooooooooooooc,. + .,lllllllllllllllllllll,. + ;ccccccccccccccccccccccccc; +${c1} '${c2}ccccccccccccccccccccccccccccc. +${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: +${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. +${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d +${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 +${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 +${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d +${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. +${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; +${c1} .:ccccccccllllllllo${c3}O0000000OOO, +${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. +${c1} '::ccccccccc${c3}dOOOOOOOkx:. +${c1} ..,::cccc${c3}xOOOkkko;. +${c1} ..,:${c3}dOkxl:. +EOF + ;; -COLOR BLOCKS: - --color_blocks on/off Enable/Disable the color blocks - --block_width num Width of color blocks in spaces - --block_height num Height of color blocks in lines - --block_range num num Range of colors to print as blocks + "Clover"*) + set_colors 2 6 + read -rd '' ascii_data <<'EOF' +${c1} `omo``omo` + `oNMMMNNMMMNo` + `oNMMMMMMMMMMMMNo` + oNMMMMMMMMMMMMMMMMNo + `sNMMMMMMMMMMMMMMNs` + `omo` `sNMMMMMMMMMMNs` `omo` + `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` + `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` +oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo +`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` +`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` +oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo + `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` + `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` + `oNs` `sNMMMMMMMMMMNs` `oNs` + `sNMMMMMMMMMMMMMMNs` + +NMMMMMMMMMMMMMMMMNo + `oNMMMMMMMMMMMMNo` + `oNMMMNNMMMNs` + `omo``oNs` +EOF + ;; -BARS: - --bar_char 'elapsed char' 'total char' - Characters to use when drawing bars. - --bar_border on/off Whether or not to surround the bar with '[]' - --bar_length num Length in spaces to make the bars. - --bar_colors num num Colors to make the bar. - Set in this order: elapsed, total - --cpu_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --memory_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --battery_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --disk_display mode Bar mode. - Possible values: bar, infobar, barinfo, off + "Container Linux by CoreOS"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ..... + .';:cccccccc:;'. + ':ccccclc${c3}lllllllll${c1}cc:. + .;cccccccc${c3}lllllllllllllll${c1}c, + ;clllccccc${c3}llllllllllllllllll${c1}c, + .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: + ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: + :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, +.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c +.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. +.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. +.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc + :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; + .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc + .cllllllllllclcccclccclccllllcllc + :cllllllllccclcllllllllllllcc; + .cccccccccccccclcccccccccc:. + .;cccclccccccllllllccc,. + .';ccccclllccc:;.. + ..... +EOF + ;; -IMAGE BACKEND: - --backend backend Which image backend to use. - Possible values: 'ascii', 'caca', 'catimg', '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/' - --ascii source Shortcut to use 'ascii' backend. - --caca source Shortcut to use 'caca' backend. - --catimg source Shortcut to use 'catimg' backend. - --iterm2 source Shortcut to use 'iterm2' backend. - --jp2a source Shortcut to use 'jp2a' backend. - --kitty source Shortcut to use 'kitty' backend. - --pixterm source Shortcut to use 'pixterm' backend. - --sixel source Shortcut to use 'sixel' backend. - --termpix source Shortcut to use 'termpix' backend. - --tycat source Shortcut to use 'tycat' backend. - --w3m source Shortcut to use 'w3m' backend. - --off Shortcut to use 'off' backend. + "crux_small") + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} ___ + (${c3}.· ${c1}| + (${c2}<> ${c1}| + / ${c3}__ ${c1}\\ + ( ${c3}/ \\ ${c1}/| +${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) +${c2}\/${c1}-____${c2}\/ +EOF + ;; - NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' + "CRUX"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} odddd + oddxkkkxxdoo + ddcoddxxxdoool + xdclodod olol + xoc xdd olol + xdc ${c2}k00${c1}Okdlol + xxd${c2}kOKKKOkd${c1}ldd + xdco${c2}xOkdlo${c1}dldd + ddc:cl${c2}lll${c1}oooodo + odxxdd${c3}xkO000kx${c1}ooxdo + oxdd${c3}x0NMMMMMMWW0od${c1}kkxo + oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx +docldkXW${c3}MMMMMMMWWN${c1}Odolco +xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c +${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l +${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd +${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo +${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo +EOF + ;; -ASCII: - --ascii_colors x x x x x x Colors to print the ascii art - --ascii_distro distro Which Distro's ascii art to print + "debian_small") + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' + ${c1}_____ + / __ \\ +| / | +| \\___- +-_ + --_ +EOF + ;; - NOTE: Arch and Ubuntu have 'old' logo variants. + "Debian"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c2} _,met$$$$$gg. + ,g$$$$$$$$$$$$$$$P. + ,g$$P" """Y$$.". + ,$$P' `$$$. +',$$P ,ggs. `$$b: +`d$$' ,$P"' ${c1}.${c2} $$$ + $$P d$' ${c1},${c2} $$P + $$: $$. ${c1}-${c2} ,d$$' + $$; Y$b._ _,d$P' + Y$$. ${c1}`.${c2}`"Y$$$$P"' +${c2} `$$b ${c1}"-.__ +${c2} `Y$$ + `Y$$. + `$$b. + `Y$$b. + `"Y$b._ + `""" +EOF + ;; - NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. + "Deepin"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} ............ + .';;;;;. .,;,. + .,;;;;;;;. ';;;;;;;. + .;::::::::' .,::;;,''''',. + ,'.:::::::: .;;'. '; + ;' 'cccccc, ,' :: '.. .: + ,, :ccccc. ;: .c, '' :. ,; +.l. cllll' ., .lc :; .l' l. +.c :lllc ;cl: .l' .ll. :' +.l 'looc. . ,o: 'oo' c, +.o. .:ool::coc' .ooo' o. + :: ..... .;dddo ;c + l:... .';lddddo. ,o + lxxxxxdoolllodxxxxxxxxxc :l + ,dxxxxxxxxxxxxxxxxxxl. 'o, + ,dkkkkkkkkkkkkko;. .;o; + .;okkkkkdl;. .,cl:. + .,:cccccccc:,. +EOF + ;; - NOTE: Ubuntu has flavor variants. + "DesaOS") + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1}███████████████████████ +███████████████████████ +███████████████████████ +███████████████████████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +██████████████████████████████ +██████████████████████████████ +████████████████████████ +████████████████████████ +████████████████████████ +EOF + ;; - NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. + "Devuan"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} ..,,;;;::;,.. + `':ddd;:,. + `'dPPd:,. + `:b$$b`. + 'P$$$d` + .$$$$$` + ;$$$$$P + .:P$$$$$$` + .,:b$$$$$$$;' + .,:dP$$$$$$$$b:' + .,:;db$$$$$$$$$$Pd'` + ,db$$$$$$$$$$$$$$b:'` +:$$$$$$$$$$$$b:'` + `$$$$$bd:''` + `'''` +EOF + ;; - NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, - OpenBSD, and Void have a smaller logo variant. + "DracOS"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} `-:/- + -os: + -os/` + :sy+-` + `/yyyy+. + `+yyyyo- + `/yyyys: +`:osssoooo++- +yyyyyy/` + ./yyyyyyo yo`:syyyy+. + -oyyy+ +- :yyyyyo- + `:sy: `. `/yyyyys: + ./o/.` .oyyso+oo:` + :+oo+//::::///:-.` `.` +EOF + ;; - NOTE: Use '{distro name}_small' to use the small variants. + "dragonfly_old"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' + ${c1} | + .-. + ${c3} ()${c1}I${c3}() + ${c1} "==.__:-:__.==" + "==.__/~|~\__.==" + "==._( Y )_.==" + ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. +( ..=${c1}\\=${c1}/${c2}=.. ) + `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` + `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` + .-~` /${c1}|=|${c2}\ `~-. + .~` / ${c1}|=|${c2} \ `~. + .-~` .' ${c1}|=|${c2} `. `~-. + (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) + `~"~"` ${c1} |=|${c2} `"~"~` + ${c1} /=\\ + \\=/ + ^ +EOF + ;; - --ascii_bold on/off Whether or not to bold the ascii logo. - -L, --logo Hide the info text and only show the ascii logo. + "dragonfly_small"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c2}(\${c3}"${c2}/) +${c2}(/${c1}|${c2}\) +${c1} | + | +EOF + ;; - Possible values: bar, infobar, barinfo, off + "DragonFly"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c2},--, ${c1}| ${c2},--, +${c2}| `-, ${c1},^, ${c2},-' | +${c2} `, `-, ${c3}(/ \) ${c2},-' ,' +${c2} `-, `-,${c1}/ \${c2},-' ,-' +${c2} `------${c1}( )${c2}------' +${c2} ,----------${c1}( )${c2}----------, +${c2} | _,-${c1}( )${c2}-,_ | +${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' +${c1} | | + | | + | | + | | + | | + | | + `|' +EOF + ;; -IMAGE: - --loop Redraw the image constantly until Ctrl+C is used. This fixes issues - in some terminals emulators when using image mode. - --size 00px | --size 00% How to size the image. - Possible values: auto, 00px, 00%, none - --crop_mode mode Which crop mode to use - Takes the values: normal, fit, fill - --crop_offset value Change the crop offset for normal mode. - Possible values: northwest, north, northeast, - west, center, east, southwest, south, southeast + "Elementary"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee eeeeeeeeeeee eeeee + eeee eeeee eee eeee + eeee eeee eee eeee +eee eee eee eee +eee eee eee eee +ee eee eeee eeee +ee eee eeeee eeeeee +ee eee eeeee eeeee ee +eee eeee eeeeee eeeee eee +eee eeeeeeeeee eeeeee eee + eeeeeeeeeeeeeeeeeeeeeeee eeeee + eeeeeeee eeeeeeeeeeee eeee + eeeee eeeee + eeeeeee eeeeeee + eeeeeeeeeeeeeeeee +EOF + ;; - --xoffset px How close the image will be to the left edge of the - window. This only works with w3m. - --yoffset px How close the image will be to the top edge of the - window. This only works with w3m. - --bg_color color Background color to display behind transparent image. - This only works with w3m. - --gap num Gap between image and text. + "Endless"*) + set_colors 1 7 + read -rd '' ascii_data <<'EOF' +${c1} `:+yhmNMMMMNmhy+:` + -odMMNhso//////oshNMMdo- + /dMMh+. .+hMMd/ + /mMNo` `oNMm: + `yMMo` `oMMy` + `dMN- -NMd` + hMN. .NMh +/MM/ -os` /MM/ +dMm `smNmmhs/- `:sNMd+ `` mMd +MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM +MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM +dMm `/++/-``/yNNh+/sdNMNddMm- mMd +/MM/ `dNy: `-::- /MM/ + hMN. .NMh + `dMN- -NMd` + `yMMo` `oMMy` + /mMNo` `oNMm/ + /dMMh+. .+hMMd/ + -odMMNhso//////oshNMMdo- + `:+yhmNMMMMNmhy+:` +EOF + ;; - NOTE: --gap can take a negative value which will move the text - closer to the left side. + "Exherbo"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} , +OXo. +NXdX0: .cok0KXNNXXK0ko:. +KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... +'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. + cNMk NK .oXM. OMMMMO. 0MMNo kW. + lMc o: ., .oKNk; ;NMMWlxW' + ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO + XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk +.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl +,M: ,XMMWx::,''oOK0x; NM. +'Ml ,kNKOxxxxxkkO0XXKOd:. oMk + NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW + ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW + ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO + 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' + xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd + 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO + :XMNxl,';:lodxkOO000Oxc. .oWMMo + 'dXMMXkl;,. .,o0MMNo' + ':d0XWMMMMWNNNNMMMNOl' + ':okKXWNKkl' +EOF + ;; - --clean Delete cached files and thumbnails. + "Fedora"* | "RFRemix"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} /:-------------:\\ + :-------------------:: + :-----------${c2}/shhOHbmp${c1}---:\\ + /-----------${c2}omMMMNNNMMD ${c1}---: + :-----------${c2}sMMMMNMNMP${c1}. ---: + :-----------${c2}:MMMdP${c1}------- ---\\ +,------------${c2}:MMMd${c1}-------- ---: +:------------${c2}:MMMd${c1}------- .---: +:---- ${c2}oNMMMMMMMMMNho${c1} .----: +:-- .${c2}+shhhMMMmhhy++${c1} .------/ +:- -------${c2}:MMMd${c1}--------------: +:- --------${c2}/MMMd${c1}-------------; +:- ------${c2}/hMMMy${c1}------------: +:--${c2} :dMNdhhdNMMNo${c1}------------; +:---${c2}:sdNMMMMNds:${c1}------------: +:------${c2}:://:${c1}-------------:: +:---------------------:// +EOF + ;; -SCREENSHOT: - -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- - shot function will use \$scrot_dir and \$scrot_name. - -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. - --image_host imgur/teknik Website to upload scrots to. - --scrot_cmd cmd Screenshot program to launch + "freebsd_small") + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} /\\ _____ /\\ + \\_) (_/ + / \ +| | +| | + \ / + --_____-- +EOF + ;; -OTHER: - --config /path/to/config Specify a path to a custom config file - --config none Launch the script without a config file - --stdout Turn off all colors and disables any ASCII/image backend. - --help Print this text and exit - --version Show neofetch version - -v Display error messages. - -vv Display a verbose log for error reporting. + "FreeBSD"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' + ${c2}``` ${c1}` + ${c2}` `.....---...${c1}....--.``` -/ + ${c2}+o .--` ${c1}/y:` +. + ${c2} yo`:. ${c1}:o `+- + ${c2}y/ ${c1}-/` -o/ + ${c2}.- ${c1}::/sy+:. + ${c2}/ ${c1}`-- / + ${c2}`: ${c1}:` + ${c2}`: ${c1}:` + ${c2}/ ${c1}/ + ${c2}.- ${c1}-. + ${c2}-- ${c1}-. + ${c2}`:` ${c1}`:` + .-- `--. + .---.....----. +EOF + ;; -DEVELOPER: - --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) + "FreeMiNT"*) + # Don't explicitly set colors since + # TosWin2 doesn't reset well. + read -rd '' ascii_data <<'EOF' +${c1} ## + ## ######### + #### ## + #### #### ## +#### #### ## ## + #### #### ## ## + #### #### ## ## ## + #### ###### + ###### ## ## #### + #### ################ + #### ## #### + ## #### ###### + ## ## #### #### + ## ## ## ## ## #### + #### ## ## ## +EOF + ;; + "Frugalware"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `++/::-.` + /o+++++++++/::-.` + `o+++++++++++++++o++/::-.` + /+++++++++++++++++++++++oo++/:-.`` + .o+ooooooooooooooooooosssssssso++oo++/:-` + ++osoooooooooooosssssssssssssyyo+++++++o: + -o+ssoooooooooooosssssssssssssyyo+++++++s` + o++ssoooooo++++++++++++++sssyyyyo++++++o: + :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo + `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: + /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss + .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- + ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso + -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. + sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ + :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` + yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ +-ysooooooydhhhhhhhhhhhddddddddddddddddssy + .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: + ``.-/+oosysssssssssssssssssssssss + ``.:/+osyysssssssssssssh. + `-:/+osyyssssyo + .-:+++` +EOF + ;; -Report bugs to https://github.com/dylanaraps/neofetch/issues + "Funtoo"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c2} _______ ____ + /MMMMMMM/ /MMMM| _____ _____ + __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ +|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ +|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| +|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| + |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ + |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ +EOF + ;; -" -exit 1 -} + "GalliumOS"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1}sooooooooooooooooooooooooooooooooooooo+: +yyooooooooooooooooooooooooooooooooo+/::: +yyysoooooooooooooooooooooooooooo+/:::::: +yyyyyoooooooooooooooooooooooo+/::::::::: +yyyyyysoooooooooooooooooo++/:::::::::::: +yyyyyyysoooooooooooooo++/::::::::::::::: +yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: +yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: +yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: +yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: +yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: +yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: +yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: +yyyyyyyyyyyyyyys+:--...........-///::::: +yyyyyyyyyyyys+:--................://:::: +yyyyyyyyyo+:-.....................-//::: +yyyyyyo+:-..........................://: +yyyo+:-..............................-// +o/:-...................................: +EOF + ;; -get_args() { - # Check the commandline flags early for '--config'. - [[ "$*" != *--config* ]] && get_user_config + "gentoo_small") + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} _-----_ +( \\ +\ 0 \\ +${c2} \ ) + / _/ +( _- +\____- +EOF + ;; - while [[ "$1" ]]; do - case "$1" in - # Info - "--os_arch") os_arch="$2" ;; - "--cpu_cores") cpu_cores="$2" ;; - "--cpu_speed") cpu_speed="$2" ;; - "--speed_type") speed_type="$2" ;; - "--speed_shorthand") speed_shorthand="$2" ;; - "--distro_shorthand") distro_shorthand="$2" ;; - "--kernel_shorthand") kernel_shorthand="$2" ;; - "--uptime_shorthand") uptime_shorthand="$2" ;; - "--cpu_brand") cpu_brand="$2" ;; - "--gpu_brand") gpu_brand="$2" ;; - "--gpu_type") gpu_type="$2" ;; - "--refresh_rate") refresh_rate="$2" ;; - "--gtk_shorthand") gtk_shorthand="$2" ;; - "--gtk2") gtk2="$2" ;; - "--gtk3") gtk3="$2" ;; - "--shell_path") shell_path="$2" ;; - "--shell_version") shell_version="$2" ;; - "--ip_host") public_ip_host="$2" ;; - "--song_shorthand") song_shorthand="$2" ;; - "--music_player") music_player="$2" ;; - "--install_time") install_time="$2" ;; - "--install_time_format") install_time_format="$2" ;; - "--cpu_temp") - cpu_temp="$2" - [[ "$cpu_temp" == "on" ]] && cpu_temp="C" - ;; + "Gentoo"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} -/oyddmdhs+:. + -o${c2}dNMMMMMMMMNNmhy+${c1}-` + -y${c2}NMMMMMMMMMMMNNNmmdhy${c1}+- + `o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/` + om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o` +.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+` + oy${c2}hdmNMMMMMMMN${c1}dyooy${c2}dmddddhhhhyhN${c1}d. + :o${c2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${c1}Mh + .:${c2}+sydNMMMMMNNNmmmdddhhhhhhmM${c1}my + /m${c2}MMMMMMNNNmmmdddhhhhhmMNh${c1}s: + `o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+` + `s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. + /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:` ++M${c2}MMMMMMNNNNNmmmmdmNMNdso${c1}/- +yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` +/h${c2}MMNNNNNNNNMNdhs++/${c1}-` +`/${c2}ohdmmddhys+++/:${c1}.` + `-//////:--. +EOF + ;; - "--disk_subtitle") disk_subtitle="$2" ;; - "--disk_show") - unset disk_show - for arg in "$@"; do - case "$arg" in - "--disk_show") ;; - "-"*) break ;; - *) disk_show+=("$arg") ;; - esac - done - ;; + "gNewSense"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} ..,,,,.. + .oocchhhhhhhhhhccoo. + .ochhlllllllc hhhhhh ollllllhhco. + ochlllllllllll hhhllllllhhh lllllllllllhco + .cllllllllllllll hlllllo +hllh llllllllllllllc. +ollllllllllhco'' hlllllo +hllh ``ochllllllllllo +hllllllllc' hllllllllllllh `cllllllllh +ollllllh +llllllllllll+ hllllllo + `cllllh. ohllllllho .hllllc' + ochllc. ++++ .cllhco + `+occooo+. .+ooocco+' + `+oo++++ ++++oo+' +EOF + ;; - "--disable") - for func in "$@"; do - case "$func" in - "--disable") continue ;; - "-"*) break ;; - *) - ((bash_version >= 4)) && func="${func,,}" - unset -f "get_$func" - ;; - esac - done - ;; + "GNU") + set_colors fg 7 + read -rd '' ascii_data <<'EOF' +${c1} _-`````-, ,- '- . + .' .- - | | - -. `. + /.' / `. \ +:/ : _... ..._ `` : +:: : /._ .`:'_.._\. || : +:: `._ ./ ,` : \ . _.'' . +`:. / | -. \-. \\_ / + \:._ _/ .' .@) \@) ` `\ ,.' + _/,--' .- .\,-.`--`. + ,'/'' (( \ ` ) + /'/' \ `-' ( + '/'' `._,-----' + ''/' .,---' + ''/' ;: + ''/'' ''/ + ''/''/'' + '/'/' + `; +EOF + ;; - # Text Colors - "--colors") - unset colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) colors+=("$arg") ;; - esac - done - colors+=(7 7 7 7 7 7) - ;; + "GoboLinux"*) + set_colors 5 4 6 2 + read -rd '' ascii_data <<'EOF' +${c1}_____ _ +/ ____| | | +| | __ ___ | |__ ___ +| | |_ |/ _ \| '_ \ / _ \ +| |__| | (_) | |_) | (_) | + \_____|\___/|_.__/ \___/ +EOF + ;; - # Text Formatting - "--underline") underline_enabled="$2" ;; - "--underline_char") underline_char="$2" ;; - "--bold") bold="$2" ;; + "Grombyang"*) + set_colors 4 2 1 + read -rd '' ascii_data <<'EOF' +${c1} eeeeeeeeeeee + eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee ${c2}.o+ ${c1}eeee + eeee ${c2}`ooo/ ${c1}eeee + eeee ${c2}`+oooo: ${c1}eeee +eee ${c2}`+oooooo: ${c1}eee +eee ${c2}-+oooooo+: ${c1}eee +ee ${c2}`/:oooooooo+: ${c1}ee +ee ${c2}`/+ +++ +: ${c1}ee +ee ${c2}+o+\ ${c1}ee +eee ${c2}+o+\ ${c1}eee +eee ${c2}// \\ooo/ \\\ ${c1}eee + eee ${c2}//++++oooo++++\\\ ${c1}eee + eeee ${c2}::::++oooo+::::: ${c1}eeee + eeeee ${c3}Grombyang OS ${c1} eeee + eeeeeeeeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeee +EOF + ;; - # Color Blocks - "--color_blocks") color_blocks="$2" ;; - "--block_range") block_range=("$2" "$3") ;; - "--block_width") block_width="$2" ;; - "--block_height") block_height="$2" ;; + "GuixSD"*) + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1} .. `. + `--..```..` `..```..--` + .-:///-:::. `-:::///:-. + ````.:::` `:::.```` + -//:` -::- + ://: -::- + `///- .:::` + -+++-:::. + :+/:::- + `-....` +EOF + ;; - # Bars - "--bar_char") - bar_char_elapsed="$2" - bar_char_total="$3" - ;; + "Haiku"*) + set_colors 2 8 + read -rd '' ascii_data <<'EOF' +${c2} :dc' + 'l:;'${c1},${c2}'ck. .;dc:. + co ${c1}..${c2}k. .;; ':o. + co ${c1}..${c2}k. ol ${c1}.${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. +.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. + ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; + ..${c1}oOolllllccccccc:::::${c2}od; + cx:ooc${c1}:::::::;${c2}cooolcX. + cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. + cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. + .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. + '::c'${c1}...${c2}do${c1}..... .${c2}K, + cd,.${c1}....:${c2}O,${c1} + ':clod:'${c1} + ${c1} +EOF + ;; - "--bar_border") bar_border="$2" ;; - "--bar_length") bar_length="$2" ;; - "--bar_colors") - bar_color_elapsed="$2" - bar_color_total="$3" - ;; + "Hyperbola"*) + set_colors 8 + read -rd '' ascii_data <<'EOF' +${c1} WW + KX W + WO0W NX0O + NOO0NW WNXK0OOKW + W0OOOOOOOOOOOOKN + N0OOOOOOO0KXW + WNXXXNW + NXK00000KN + WNK0OOOOOOOOOO0W + NK0OOOOOOOOOOOOOO0W + X0OOOOOOO00KK00OOOOOK + X0OOOO0KNWW WX0OO0W + X0OO0XNW KOOW + N00KNW KOW + NKXN W0W +WW W +EOF + ;; - "--cpu_display") cpu_display="$2" ;; - "--memory_display") memory_display="$2" ;; - "--battery_display") battery_display="$2" ;; - "--disk_display") disk_display="$2" ;; + "Kali"*) + set_colors 4 8 + read -rd '' ascii_data <<'EOF' +${c1}.............. + ..,;:ccc,. + ......''';lxO. +.....''''..........,:ld; + .';;;:::;,,.x, + ..'''. 0Xxoc:,. ... + .... ,ONkc;,;cokOdc',. + . OMo ':${c2}dd${c1}o. + dMc :OO; + 0M. .:o. + ;Wd + ;XO, + ,d0Odlc;,.. + ..',;:cdOOd::,. + .:d;.':;. + 'd, .' + ;l .. + .o + c + .' + . +EOF + ;; - # Image backend - "--backend") image_backend="$2" ;; - "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ - "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") - image_backend="${1/--}" - case "$2" in - "-"* | "") ;; - *) image_source="$2" ;; - esac - ;; + "KaOS"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} .. + ..... ..OSSAAAAAAA.. + .KKKKSS. .SSAAAAAAAAAAA. +.KKKKKSO. .SAAAAAAAAAA... +KKKKKKS. .OAAAAAAAA. +KKKKKKS. .OAAAAAA. +KKKKKKS. .SSAA.. +.KKKKKS..OAAAAAAAAAAAA........ + DKKKKO.=AA=========A===AASSSO.. + AKKKS.==========AASSSSAAAAAASS. + .=KKO..========ASS.....SSSSASSSS. + .KK. .ASS..O.. =SSSSAOSS: + .OK. .ASSSSSSSO...=A.SSA. + .K ..SSSASSSS.. ..SSA. + .SSS.AAKAKSSKA. + .SSS....S.. +EOF + ;; - # Image options - "--loop") image_loop="on" ;; - "--image_size" | "--size") image_size="$2" ;; - "--crop_mode") crop_mode="$2" ;; - "--crop_offset") crop_offset="$2" ;; - "--xoffset") xoffset="$2" ;; - "--yoffset") yoffset="$2" ;; - "--background_color" | "--bg_color") background_color="$2" ;; - "--gap") gap="$2" ;; - "--clean") - [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" - rm -rf "/Library/Caches/neofetch/" - rm -rf "/tmp/neofetch/" - exit - ;; + "KDE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} `..---+/---..` + `---.`` `` `.---.` + .--.` `` `-:-. + `:/: `.----//----.` :/- + .:. `---` `--.` .:` + .:` `--` .:- `:. + `/ `:. `.-::-.` -:` `/` + /. /. `:++++++++:` .: .: +`/ .: `+++++++++++/ /` `+` +/+` -- .++++++++++++` :. .+: +`/ .: `+++++++++++/ /` `+` + /` /. `:++++++++:` .: .: + ./ `:. `.:::-.` -:` `/` + .:` `--` .:- `:. + .:. `---` `--.` .:` + `:/: `.----//----.` :/- + .-:.` `` `-:-. + `---.`` `` `.---.` + `..---+/---..` +EOF + ;; - "--ascii_colors") - unset ascii_colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) ascii_colors+=("$arg") - esac - done - ascii_colors+=(7 7 7 7 7 7) - ;; + "Kogaion"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ;; ,; + ;;; ,;; + ,;;;; ;;;; + ,;;;;;;;; ;;;; + ;;;;;;;;;;; ;;;;; + ,;;;;;;;;;;;; ';;;;;, + ;;;;;;;;;;;;;;, ';;;;;;; + ;;;;;;;;;;;;;;;;;, ';;;;; +; ';;;;;;;;;;;;;;;;;;, ;;; +;;;, ';;;;;;;;;;;;;;;;;;;,;; +;;;;;, ';;;;;;;;;;;;;;;;;;, +;;;;;;;;, ';;;;;;;;;;;;;;;;, +;;;;;;;;;;;;, ';;;;;;;;;;;;;; +';;;;;;;;;;;;; ';;;;;;;;;;;;; + ';;;;;;;;;;;;;, ';;;;;;;;;;; + ';;;;;;;;;;;;; ;;;;;;;;;; + ';;;;;;;;;;;; ;;;;;;;; + ';;;;;;;; ;;;;;; + ';;;;; ;;;; + ';;; ;; +EOF + ;; - "--ascii_distro") - image_backend="ascii" - ascii_distro="$2" - case "$2" in "-"* | "") ascii_distro="$distro" ;; esac - ;; + "Korora"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} ____________ + _add55555555554${c1}: + _w?'${c1}``````````'${c2})k${c1}: + _Z'${c1}`${c2} ]k${c1}: + m(${c1}`${c2} )k${c1}: + _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: + .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` + jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` + jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` +.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` +:#${c1}:${c2} ${c1}`${c2})e${c1}``` +:m${c1}:${c2} ,#'${c1}` +:#${c1}:${c2} .s2'${c1}` +:m,________.aa7^${c1}` +:#baaaaaaas!J'${c1}` + ``````````` +EOF + ;; - "--ascii_bold") ascii_bold="$2" ;; - "--logo" | "-L") - image_backend="ascii" - print_info() { info line_break; } - ;; + "KSLinux"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} K K U U RRRR ooo + K K U U R R o o + KKK U U RRRR o o + K K U U R R o o + K K UUU R R ooo - # Screenshot - "--scrot" | "-s") - scrot_args "$@" - ;; - "--upload" | "-su") - scrot_upload="on" - scrot_args "$@" - ;; +${c2} SSS AAA W W AAA + S A A W W A A + SSS AAAAA W W W AAAAA + S A A WW WW A A + SSS A A W W A A +EOF + ;; - "--image_host") image_host="$2" ;; - "--scrot_cmd") scrot_cmd="$2" ;; + "Kubuntu"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `.:/ossyyyysso/:. + .:oyyyyyyyyyyyyyyyyyyo:` + -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- + -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- + oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo + `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` + oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- +oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy +oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- + oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo + `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo + oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo + -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- + -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- + ./oyyyyyyyyyyyyyyyyyyo/. + `.:/oosyyyysso/:.` +EOF + ;; - # Other - "--config") - case "$2" in - "none" | "off" | "") ;; - *) - config_file="$(get_full_path "$2")" - get_user_config - ;; - esac - ;; - "--stdout") stdout="on" ;; - "-v") verbose="on" ;; - "-vv") set -x; verbose="on" ;; - "--help") usage ;; - "--version") - printf "%s\\n" "Neofetch $version" - exit 1 - ;; - "--gen-man") - help2man -n "A fast, highly customizable system info script" \ - -N ./neofetch -o neofetch.1 - exit 1 - ;; + "LEDE"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' + ${c1} _________ + / /\ + / LE / \ + / DE / \ + /________/ LE \ + \ \ DE / + \ LE \ / + \ DE \ / + \________\/ +EOF + ;; - "--travis") - print_info() { - info title - info underline + "Linux") + set_colors fg 8 3 + read -rd '' ascii_data <<'EOF' +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### +EOF + ;; - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "GPU Driver" gpu_driver - info "Memory" memory + "LMDE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' + ${c2}`.-::---.. +${c1} .:++++ooooosssoo:. + .+o++::. `.:oos+. +${c1} :oo:.` -+oo${c2}: +${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` +${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` +${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: +${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` +${c1}`s: `oo s m Myy+-o:` +`oo :+sdoohyoydyso/. + :o. .:////////++: +${c1} `/++ ${c2}-:::::- +${c1} ${c2}`${c1}++- +${c1} ${c2}`${c1}/+- +${c1} ${c2}.${c1}+/. +${c1} ${c2}.${c1}:+-. + `--.`` +EOF + ;; - info "CPU Usage" cpu_usage - info "Disk" disk - info "Battery" battery - info "Font" font - info "Song" song - info "Local IP" local_ip - info "Public IP" public_ip - info "Users" users - info "Install Date" install_date + "Lubuntu"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `-/+oyyhhhhyyo+/-` + ./shhhhhhhhhhhhhhhhhhs/. + `:shhhhhhhhhhhhhhhhhhhhhhhhs:` + :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: + `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` + `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` + shhhhhhhhy+. .ohhhhhhhhhhhhhs +:hhhhhhy/. /hhhhhhhhhhhhh: +shhhy/. :hhhhhhhhhhhhs +hy+. ` `+yhs/` +hhhhhhhhhhhh +-.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh +shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs +:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: + shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs + `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` + +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` + :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: + :shhhhhhhhhhhhhhhhhhhhhy`+s:` + .+shhhhhhhhhhhhhhhhhhs:` + `-/+oyyhhhhyys+/-` +EOF + ;; - info line_break - info cols - info line_break + "Lunar"*) + set_colors 4 7 3 + read -rd '' ascii_data <<'EOF' +${c1}`-. `-. + -ohys/-` `:+shy/` + -omNNdyo/` :+shmNNy/` + ${c3} - + /mMmo + hMMMN` + .NMMs + ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` + /:.` ${c3}/${c1} `.:/` +${c3} __ + | | _ _ ___ ___ ___ + | |__| | | | .'| _| + |_____|___|_|_|__,|_| +EOF + ;; - # Testing. - prin "prin" - prin "prin" "prin" + "mac"*"_small") + set_colors 2 3 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} .:' + _ :'_ +${c2} .'`_`-'_``. +:________.-' +${c3}:_______: +:_______: +${c4} :_______`-; +${c5} `._.-._.' +EOF + ;; - # Testing no subtitles. - info uptime - info disk - } + "mac" | "Darwin") + set_colors 2 3 1 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. +EOF + ;; - refresh_rate="on" - shell_version="on" - cpu_display="infobar" - memory_display="infobar" - disk_display="infobar" - cpu_temp="C" - ;; - esac + "Mageia"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} .°°. + °° .°°. + .°°°. °° + . . + °°° .°°°. + .°°°. '___' +${c2} .${c1}'___' ${c2} . + :dkxc;'. ..,cxkd; + .dkk. kkkkkkkkkk .kkd. +.dkk. ';cloolc;. .kkd +ckk. .kk; +xO: cOd +xO: lOd +lOO. .OO: +.k00. .00x + .k00; ;00O. + .lO0Kc;,,,,,,;c0KOc. + ;d00KKKKKK00d; + .,KKKK,. +EOF + ;; - shift - done -} + "MagpieOS"*) + set_colors 2 1 3 5 + read -rd '' ascii_data <<'EOF' +${c1} ;00000 :000Ol + .x00kk00: O0kk00k; + l00: :00. o0k :O0k. + .k0k. x${c2}d$dddd${c1}k' .d00; + k0k. ${c2}.dddddl ${c1}o00, + o00. ${c2}':cc:. ${c1}d0O +.00l ,00. +l00. d0x +k0O .:k0o +O0k ;dO0000d. +k0O .O0O${c2}xxxxk${c1}00: +o00. k0O${c2}dddddd${c1}occ +'00l x0O${c2}dddddo${c3};..${c1} + x00. .x00${c2}kxxd${c3}:..${c1} + .O0x .:oxxx${c4}Okl.${c1} + .x0d ${c4},xx,${c1} + .:o. ${c4}.xd ckd${c1} + .. ${c4}dxl .xx; + :xxolldxd' + ;oxdl. +EOF + ;; -get_distro_colors() { - # This function sets the text colors according - # to your OS/Distro's logo colors. - # - # $ascii_distro is the same as $distro. - case "$ascii_distro" in - "AIX"*) + "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} `:+ssssossossss+-` - .oys///oyhddddhyo///sy+. - /yo:+hNNNNNNNNNNNNNNNNh+:oy/ - :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: - `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh - h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy -/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: -h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y -N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m -N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m -h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y -:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- - yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy - sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo - :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- - :ys:/yNNNNNNNNNNNNNNNmy/:sy: - .+ys///osyhhhhys+///sy+. - -/osssossossso/- +${c1}██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ EOF ;; - "alpine_small") - set_colors 4 7 + "Maui"*) + set_colors 6 7 read -rd '' ascii_data <<'EOF' -${c1} /\\ /\\ - /${c2}/ ${c1}\\ \\ - /${c2}/ ${c1}\\ \\ -/${c2}// ${c1}\\ \\ -${c2}// ${c1}\\ \\ - \\ +${c1} `.-://////:--` + .:/oooooooooooooooo+:. + `:+ooooooooooooooooooooooo:` + `:oooooooooooooooooooooooooooo/` + ..```-oooooo/-`` `:oooooo+:.` `-- + :. +oo+-` /ooo/` -/ + -o. `o+- +o/` -o: +`oo` ::` :o/ `+. .+o` /oo. +/o+ . -+oo- ` /oo/ `ooo/ ++o- /ooo+` .+ooo. :ooo+ +++ .+oooo: -oooo+ `oooo+ +:. .oooooo` :ooooo- :oooo: +` .oooooo: :ooooo+ `ooo+-` + .+oooooo` -oooooo: `o/- + +oooooo: .ooooooo. + /ooooooo` /ooooooo/ .. + `:oooooooo/:::/ooooooooo+:--:/:` + `:+oooooooooooooooooooooo+:` + .:+oooooooooooooooo+:. + `.-://////:-.` EOF ;; - "Alpine"*) - set_colors 4 5 7 6 + "Mer"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} .hddddddddddddddddddddddh. - :dddddddddddddddddddddddddd: - /dddddddddddddddddddddddddddd/ - +dddddddddddddddddddddddddddddd+ - `sdddddddddddddddddddddddddddddddds` - `ydddddddddddd++hdddddddddddddddddddy` -.hddddddddddd+` `+ddddh:-sdddddddddddh. -hdddddddddd+` `+y: .sddddddddddh -ddddddddh+` `//` `.` -sddddddddd -ddddddh+` `/hddh/` `:s- -sddddddd -ddddh+` `/+/dddddh/` `+s- -sddddd -ddd+` `/o` :dddddddh/` `oy- .yddd -hdddyo+ohddyosdddddddddho+oydddy++ohdddh -.hddddddddddddddddddddddddddddddddddddh. - `yddddddddddddddddddddddddddddddddddy` - `sdddddddddddddddddddddddddddddddds` - +dddddddddddddddddddddddddddddd+ - /dddddddddddddddddddddddddddd/ - :dddddddddddddddddddddddddd: - .hddddddddddddddddddddddh. +${c1} dMs + .-` + `y`-o+` + ``NMMy + .--`:++. + .hNNNNs + /MMMMMN + `ommmd/ +/ + ```` +/ + `:+sssso/-` + .-::. `-::-` `smNMNmdmNMNd/ .://-` +.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo +dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- +MMm yMM- :MMs NMN` `:::::--sMMh dMM` +MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` +NNd sNN- -NNs -mMNs-.--..:dMMh` dNN +--- .--` `--. .smMMmdddmMNdo` .-- + ./ohddds+:` + +h- `.:-. + ./`.dMMMN+ + +MMMMMd + `+dmmy- + ``` .+` + .dMNo-y. + `hmm/ + .:` + dMs +EOF + ;; + + "Minix"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c2} -sdhyo+:-` -/syymm: + sdyooymmNNy. `` .smNmmdysNd + odyoso+syNNmysoyhhdhsoomNmm+/osdm/ + :hhy+-/syNNmddhddddddmNMNo:sdNd: + `smNNdNmmNmddddddddddmmmmmmmy` + `ohhhhdddddmmNNdmddNmNNmdddddmdh- + odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: + `+mNho:` smmd/ sNNh :dmms` -+ymmo. +-od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: ++sms -.` :so: .NN+ :os/ .-`mNh: +.-hyh+:////- -sNNd:` .--://ohNs- + `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ + -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: + //oydNMMMMydMMNysNMMmsMMMMMNyo/` + ../-yNMMy--/::/-.sMMmos+.` + -+oyhNsooo+omy/``` + `::ohdmds-` +EOF + ;; + + "Linux Mint"* | "LinuxMint"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. +MMm----::-://////////////oymNMd+` +MMd ${c2}/++ ${c1}-sNMd: +MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: +ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm + NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM + NMm ${c2}dMM` ..` ... ydm. ${c1}dMM + hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM + -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM + -dMNs-${c2}``-::::-------.`` ${c1}dMM + `/dMNmy+/:-------------:/yMMM + ./ydNMMMMMMMMMMMMMMMMMMMMM + .MMMMMMMMMMMMMMMMMMM EOF ;; - "Amazon"*) - set_colors 3 7 + "MX"*) + set_colors 4 6 7 read -rd '' ascii_data <<'EOF' -${c1} `-/oydNNdyo:.` - `.:+shmMMMMMMMMMMMMMMmhs+:.` - -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- -.`` -/+shmNNMMMMMMNNmhs+/- ``. -dNmhs+:. `.:/oo/:.` .:+shmNd -dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd -dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. - `.:+shNMMMMMh yMMMMMNhs+:`` - `-+shy shs+:` +${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM +MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM +MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM +MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM +MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM +MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM +MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM +MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM +MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM +MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM +MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM +MMMMMMMNo` :mMMN+` `-hMMMMMMMM +MMMMMMh. `oNMMd: `/mMMMMMM +MMMMm/ -hMd- `sNMMMM +MMNs` - :dMMM +Mm: `oMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM EOF ;; - "Anarchy"*) - set_colors 7 4 + "NetBSD"*) + set_colors 5 7 read -rd '' ascii_data <<'EOF' - ${c2}..${c1} - ${c2}..${c1} - ${c2}:..${c1} - ${c2}:+++.${c1} - .:::++${c2}++++${c1}+::. - .:+######${c2}++++${c1}######+:. - .+#########${c2}+++++${c1}##########:. - .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. - +###########${c2}+++++++++${c1}############: - +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ - +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ - :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: - ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ -.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. -.##########${c2}+++++++++++++++++++${c1}###########. - #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ - :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: - +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ - +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ - :##${c2}++++++${c1}############${c2}++++++++++${c1}##: - .${c2}++++++${c1}#############${c2}++++++++++${c1}+. - :${c2}++++${c1}###############${c2}+++++++${c1}:: - .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. - ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. - ${c2}.${c1} ${c2}.:+++${c1}. - ${c2}.:${c1}: - ${c2}..${c1} - ${c2}..${c1} +${c1} `-/oshdmNMNdhyo+:-` +${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` +${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` + ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` + ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` + ${c2}-N/${c1}hMMMMMMMMMmho:` + ${c2}-N/${c1}-:/++/:.` +${c2} :M+ + :Mo + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms EOF ;; - "Android"*) - set_colors 2 7 + "Netrunner"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} -o o- - +hydNNNNdyh+ - +mMMMMMMMMMMMMm+ - `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` - hMMMMMMMMMMMMMMMMMMh - .. yyyyyyyyyyyyyyyyyyyy .. -.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: --MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- - +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ - mMMMMMMMMMMMMMMMMMMm - `/++MMMMh++hMMMM++/` - MMMMo oMMMM - MMMMo oMMMM - oNMm- -mMNs +${c1} .:oydmMMMMMMmdyo:` + -smMMMMMMMMMMMMMMMMMMds- + +mMMMMMMMMMMMMMMMMMMMMMMMMd+ + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ + `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` + .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` + dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh ++MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ +mMMMMMMMMd+:.` `mMMMMMMMMMMMMd +MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM +mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd ++MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ + dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh + `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` + `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: + +dMMMMMMMMMMMMMMMMMMMMMMMMd/ + -odMMMMMMMMMMMMMMMMMMdo- + `:+ydmNMMMMNmhy+-` EOF ;; - "Antergos"*) - set_colors 4 6 + "Nitrux"*) + set_colors 4 read -rd '' ascii_data <<'EOF' -${c2} `.-/::/-`` - .-/osssssssso/. - :osyysssssssyyys+- - `.+yyyysssssssssyyyyy+. - `/syyyyyssssssssssyyyyys-` - `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` - .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. - .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. - -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: - -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- - .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` -`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo -.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. -ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy -dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh --dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- -.smmmmddddddddhhhhhhhhhdddddddddmmmms. - `+ydmmmdddddddddddddddddddmmmmdy/. - `.:+ooyyddddddddddddyyso+:.` +${c1}`:/. +`/yo +`/yo +`/yo .+:. +`/yo .sys+:.` +`/yo `-/sys+:.` +`/yo ./sss+:.` +`/yo .:oss+:-` +`/yo ./o///:-` +`/yo `.-:///////:` +`/yo `.://///++//-`` +`/yo `.-:////++++/-` +`/yo `-://///++o+/-` +`/yo `-/+o+++ooo+/-` +`/s+:+oooossso/.` +`//+sssssso:. +`+syyyy+:` +:+s+- EOF ;; - "antiX"*) - set_colors 1 7 3 + "nixos_small") + set_colors 4 6 read -rd '' ascii_data <<'EOF' -${c1} - \ - , - ~ ^ ~ - \ / - , ' \ ' , / - , \ '/ - , \ / , - ,___, \/ , - / | _ _ _|_ o /\ , -|, | / |/ | | | / \ , - \,_/\_/ | |_/|_/|_/_/ \, - , / ,\ - , / , ' \ - ' - , _ _ _ , ' + ${c1}\\\\ \\\\ // + ==\\\\__\\\\/ // + // \\\\// +==// //== + //\\\\___// +// /\\\\ \\\\== + // \\\\ \\\\ EOF ;; - "AOSC"*) - set_colors 4 7 1 + "NixOS"*) + set_colors 4 6 read -rd '' ascii_data <<'EOF' -${c2} .:+syhhhhys+:. - .ohNMMMMMMMMMMMMMMNho. - `+mMMMMMMMMMMmdmNMMMMMMMMm+` - +NMMMMMMMMMMMM/ `./smMMMMMN+ - .mMMMMMMMMMMMMMMo -yMMMMMm. - :NMMMMMMMMMMMMMMMs .hMMMMN: - .NMMMMhmMMMMMMMMMMm+/- oMMMMN. - dMMMMs ./ymMMMMMMMMMMNy. sMMMMd --MMMMN` oMMMMMMMMMMMN: `NMMMM- -/MMMMh NMMMMMMMMMMMMm hMMMM/ -/MMMMh NMMMMMMMMMMMMm hMMMM/ --MMMMN` :MMMMMMMMMMMMy. `NMMMM- - dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd - .NMMMMo -/+sMMMMMMMMMMMmMMMMN. - :NMMMMh. .MMMMMMMMMMMMMMMN: - .mMMMMMy- NMMMMMMMMMMMMMm. - +NMMMMMms/.` mMMMMMMMMMMMN+ - `+mMMMMMMMMNmddMMMMMMMMMMm+` - .ohNMMMMMMMMMMMMMMNho. - .:+syhhhhys+:. +${c1} ::::. ${c2}'::::: ::::' +${c1} '::::: ${c2}':::::. ::::' +${c1} ::::: ${c2}'::::.::::: +${c1} .......:::::..... ${c2}:::::::: +${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. + ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' +${c2} ..... ::::' ${c1}:::::' +${c2} ::::: '::' ${c1}:::::' +${c2} ........::::: ' ${c1}:::::::::::. +${c2}::::::::::::: ${c1}::::::::::::: +${c2} ::::::::::: ${c1}.. ${c1}::::: +${c2} .::::: ${c1}.::: ${c1}::::: +${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... + ::::: ${c1}':::::. ${c2}......:::::::::::::' + ::: ${c1}::::::. ${c2}':::::::::::::::::' +${c1} .:::::::: ${c2}':::::::::: +${c1} .::::''::::. ${c2}'::::. +${c1} .::::' ::::. ${c2}'::::. +${c1} .:::: :::: ${c2}'::::. EOF ;; - "Apricity"*) - set_colors 4 7 1 + "Nurunner"*) + set_colors 4 read -rd '' ascii_data <<'EOF' -${c2} ./o- - ``...`` `:. -/: - `-+ymNMMMMMNmho-` :sdNNm/ - `+dMMMMMMMMMMMMMMMmo` sh:.:::- - /mMMMMMMMMMMMMMMMMMMMm/`sNd/ - oMMMMMMMMMMMMMMMMMMMMMMMs -` -:MMMMMMMMMMMMMMMMMMMMMMMMM/ -NMMMMMMMMMMMMMMMMMMMMMMMMMd -MMMMMMMmdmMMMMMMMMMMMMMMMMd -MMMMMMy` .mMMMMMMMMMMMmho:` -MMMMMMNo/sMMMMMMMNdy+-.`-/ -MMMMMMMMMMMMNdy+:.`.:ohmm: -MMMMMMMmhs+-.`.:+ymNMMMy. -MMMMMM/`.-/ohmNMMMMMMy- -MMMMMMNmNNMMMMMMMMmo. -MMMMMMMMMMMMMMMms:` -MMMMMMMMMMNds/. -dhhyys+/-` +${c1} ,xc + ;00cxXl + ;K0, .xNo. + :KO' .lXx. + cXk. ;xl cXk. + cXk. ;k:.,xo. cXk. + .lXx. :x::0MNl,dd. :KO, + .xNx. cx;:KMMMMMNo'dx. ;KK; + .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: +;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO + 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: + .kNo .xo'xWMMMMMM0;:O: ;KK; + .dXd. .do,oNMMO;ck: ;00, + oNd. .dx,;'cO; ;K0, + oNx. okk; ;K0, + lXx. :KO' + cKk' cXk. + ;00:lXx. + ,kd. EOF ;; - "ArcoLinux"*) - set_colors 7 4 + "NuTyX"*) + set_colors 4 1 read -rd '' ascii_data <<'EOF' -${c2} /- - ooo: - yoooo/ - yooooooo - yooooooooo - yooooooooooo - .yooooooooooooo - .oooooooooooooooo - .oooooooarcoooooooo - .ooooooooo-oooooooooo - .ooooooooo- oooooooooo - :ooooooooo. :ooooooooo - :ooooooooo. :ooooooooo - :oooarcooo .oooarcooo - :ooooooooy .ooooooooo - :ooooooooo ${c1}/ooooooooooooooooooo${c2} - :ooooooooo ${c1}.-ooooooooooooooooo.${c2} - ooooooooo- ${c1}-ooooooooooooo.${c2} - ooooooooo- ${c1}.-oooooooooo.${c2} -ooooooooo. ${c1}-ooooooooo${c2} +${c1} . + . + ... + ... + .... .........--. + ..-++-----....--++++++---. + .-++++++-. .-++++++++++++-----.. + .--... .++..-+++--.....-++++++++++--.. + . .-+-. .**- .... ..-+----.. + .+++. .*+. + -++-----. + .+++++- ++. .*+. .....-+++-----. + -+++-++. .+. .-+***++***++--++++. . + -+-. -- -. -*- ...... ..--. +.-. .+- . -+. +. .+- +. + -- -- + -+----. .- + -++-.+. . + .++. -- + +. ----. + . .+. .. + - . + . EOF ;; - "arch_small") - set_colors 6 7 1 + "OBRevenge"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} /\ - /^^\ - /\ \ - /${c2} __ \ - / ( ) \ - / __| |__\\\ -/// \\\\\ +${c1} __ __ + _@@@@ @@@g_ + _@@@@@@ @@@@@@ + _@@@@@@M W@@@@@@_ + j@@@@P ^W@@@@ + @@@@L____ _____Q@@@@ +Q@@@@@@@@@@j@@@@@@@@@@ +@@@@@ T@j@ T@@@@@ +@@@@@ ___Q@J@ _@@@@@ +@@@@@fMMM@@j@jggg@@@@@@ +@@@@@ j@j@^MW@P @@@@ +Q@@@@@ggg@@f@ @@@@@@L +^@@@@WWMMP ^ Q@@@@ + @@@@@_ _@@@@l + W@@@@@g_____g@@@@@P + @@@@@@@@@@@@@@@@l + ^W@@@@@@@@@@@P + ^TMMMMTll EOF ;; - "arch_old") - set_colors 6 7 1 + "openbsd_small") + set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' -${c1} __ - _=(SDGJT=_ - _GTDJHGGFCVS) - ,GTDJGGDTDFBGX0 -${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ -${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL -${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, -${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], -${c1} SDDFDFH' !YEWD,${c2} )HDROD -${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' -${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' -${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' -${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) -${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF -'EHTI !H - `0F' '! +${c1} _____ + \\- -/ + \\_/ \\ + | ${c2}O O${c1} | + |_ < ) 3 ) + / \\ / + /-_____-\\ EOF ;; - "ArchBox"*) - set_colors 2 7 1 + "OpenBSD"*) + set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' -${c1} ...:+oh/:::.. - ..-/oshhhhhh` `::::-. - .:/ohhhhhhhhhhhh` `-::::. - .+shhhhhhhhhhhhhhhhh` `.::-. - /`-:+shhhhhhhhhhhhhh` .-/+shh - / .:/ohhhhhhhhh` .:/ohhhhhhhh - / `-:+shhh` ..:+shhhhhhhhhhhh - / .:ohhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / .+o+ `hhhhhhhhhhhhhhhhhhhh - / -hhhhh `hhhhhhhhhhhhhhhhhhhh - / ohhhhho `hhhhhhhhhhhhhhhhhhhh - /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` - `--/:` /: `hhhhhhhhhhhho/- - -/:. `hhhhhhs+:-` - ::::/ho/-` + ${c3} _ + (_) +${c1} | . +${c1} . |L /| . ${c3} _ +${c1} _ . |\ _| \--+._/| . ${c3}(_) +${c1} / ||\| Y J ) / |/| ./ + J |)'( | ` F`.'/ ${c3} _ +${c1} -<| F __ .-< ${c3}(_) +${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ + J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ +${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) +${c1} '-F -<_. \\ .-' `-' L__ +__J _ _. >-' ${c1})${c4}._. ${c1}|-' +${c1} `-|.' /_. ${c4}\_| ${c1} F + /.- . _.< + /' /.' .' `\\ + /L /' |/ _.-'-\\ + /'J ___.---'\| + |\ .--' V | `. ` + |/`. `-. `._) + / .-.\\ + \\ ( `\\ + `.\ EOF ;; - "ARCHlabs"*) - set_colors 6 6 7 1 + "OpenIndiana"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} 'c' - 'kKk, - .dKKKx. - .oKXKXKd. - .l0XXXXKKo. - c0KXXXXKX0l. - :0XKKOxxOKX0l. - :OXKOc. .c0XX0l. - :OK0o. ${c4}...${c1}'dKKX0l. - :OX0c ${c4};xOx'${c1}'dKXX0l. - :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. - c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. - .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. - .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. - .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. - .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. - .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' - 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' - 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, - ,xko:'. ${c4}.. ${c1} .':okx; - .,'. .',. -EOF - ;; +${c2} .sy/ + .yh+ - *"XFerience"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ``--:::::::-.` - .-/+++ooooooooo+++:-` - `-/+oooooooooooooooooo++:. - -/+oooooo/+ooooooooo+/ooo++:` - `/+oo++oo. .+oooooo+.-: +:-o+- - `/+o/. -o. :oooooo+ ```:.+oo+- -`:+oo- -/` :oooooo+ .`-`+oooo/. -.+ooo+. .` `://///+-+..oooooo+:` --+ooo:` ``.-+oooooo+/` --+oo/` :+oooo/. -.+oo: ..-/. . -+oo+/` -`/++- -:::++::/. -+oo+- - ./o: `:///+- `./ooo+:` - .++- `` /-` -:/+oooo+:` - .:+/:`` `-:ooooooo++- - ./+o+//:...../+oooooooo++:` - `:/++ooooooooooooo++/-` - `.-//++++++//:-.` - `````` + ${c1}-+syyyo+- ${c2} /+. + ${c1}+ddo/---/sdh/ ${c2} ym- + ${c1}`hm+ `sms${c2} ym-```````.-. + ${c1}sm+ sm/ ${c2} ym- +s + ${c1}hm. /mo ${c2} ym- /h + ${c1}omo ym: ${c2} ym- `os` + ${c1}smo` .ym+ ${c2} ym- .os- + `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. + ..` ${c1}`:+oo+/-` ${c2} -//oyo- + -:` .:oys/. ++- `./oyys/. +h+` `.-:+oyyyo/-` +`/ossssysso+/-.` EOF ;; - "ArchMerge"*) - set_colors 6 6 7 1 + "OpenMandriva"*) + set_colors 4 3 read -rd '' ascii_data <<'EOF' -${c1} y: - sMN- - +MMMm` - /MMMMMd` - :NMMMMMMy - -NMMMMMMMMs - .NMMMMMMMMMM+ - .mMMMMMMMMMMMM+ - oNMMMMMMMMMMMMM+ - `+:-+NMMMMMMMMMMMM+ - .sNMNhNMMMMMMMMMMMM/ - `hho/sNMMMMMMMMMMMMMMM/ - `.`omMMmMMMMMMMMMMMMMMMM+ - .mMNdshMMMMd+::oNMMMMMMMMMo - .mMMMMMMMMM+ `yMMMMMMMMMs - .NMMMMMMMMM/ yMMMMMMMMMy - -NMMMMMMMMMh `mNMMMMMMMMd` - /NMMMNds+:.` `-/oymMMMm. - +Mmy/. `:smN: -/+. -o. +${c2} `` + `-. +${c1} ` ${c2}.--- +${c1} -/ ${c2}-::--` +${c1} `++ ${c2}`----...```-:::::. +${c1} `os. ${c2}.::::::::::::::-``` ` ` +${c1} +s+ ${c2}.::::::::::::::::---...--` +${c1}-ss: ${c2}`-::::::::::::::::-.``.`` +${c1}/ss- ${c2}.::::::::::::-.`` ` +${c1}+ss: ${c2}.::::::::::::- +${c1}/sso ${c2}.::::::-::::::- +${c1}.sss/ ${c2}-:::-.` .::::: +${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: +${c1} -ossso+/:://+/-` ${c2}.:` +${c1} -/+ooo+/-. ${c2}` EOF ;; - "Arch"*) - set_colors 6 6 7 1 + "OpenWrt"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} -` - .o+` - `ooo/ - `+oooo: - `+oooooo: - -+oooooo+: - `/:-:++oooo+: - `/++++/+++++++: - `/++++++++++++++: - `/+++o${c2}oooooooo${c1}oooo/` -${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` -${c2} .oossssso-````/ossssss+` - -osssssso. :ssssssso. - :osssssss/ osssso+++. - /ossssssss/ +ssssooo/- - `/ossssso+/:- -:/+osssso+- - `+sso+:-` `.-/+oso: - `++:. `-/+/ - .` `/ +${c1} _______ +| |.-----.-----.-----. +| - || _ | -__| | +|_______|| __|_____|__|__| + |__| + ________ __ +| | | |.----.| |_ +| | | || _|| _| +|________||__| |____| EOF ;; - "Artix"*) - set_colors 6 4 2 7 + "Open Source Media Center"* | "osmc") + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} d${c2}c. -${c1} x${c2}dc. -${c1} '.${c4}.${c1} d${c2}dlc. -${c1} c${c2}0d:${c1}o${c2}xllc; -${c1} :${c2}0ddlolc,lc, -${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. -${c1} ;${c1}K${c2}kxoOddollc' cllc. -${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: -${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: -${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, -${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. -${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; -${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, -${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. -${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. -${c1} 0${c2}Okd''dc. .cll; -${c1} k${c2}Okd' .llc, -${c1} d${c2}Od, 'lc. -${c1} :,${c4}. ${c2}... +${c1} -+shdmNNNNmdhs+- + .+hMNho/:..``..:/ohNMh+. + :hMdo. .odMh: + -dMy- -yMd- + sMd- -dMs + hMy +. .+ yMh + yMy dMs. .sMd yMy +:Mm dMNMs` `sMNMd `mM: +yM+ dM//mNs``sNm//Md +My +mM- dM: +NNNN+ :Md -Mm +mM- dM: `oNN+ :Md -Mm +yM+ dM/+NNo` :Md +My +:Mm` dMMNs` :Md `mM: + yMy dMs` -ms yMy + hMy +. yMh + sMd- -dMs + -dMy- -yMd- + :hMdo. .odMh: + .+hMNho/:..``..:/ohNMh+. + -+shdmNNNNmdhs+- EOF ;; - "Arya"*) - set_colors 2 1 + "Oracle"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} `oyyy/${c2}-yyyyyy+ -${c1} -syyyy/${c2}-yyyyyy+ -${c1} .syyyyy/${c2}-yyyyyy+ -${c1} :yyyyyy/${c2}-yyyyyy+ -${c1} `/ :yyyyyy/${c2}-yyyyyy+ -${c1} .+s :yyyyyy/${c2}-yyyyyy+ -${c1} .oys :yyyyyy/${c2}-yyyyyy+ -${c1} -oyys :yyyyyy/${c2}-yyyyyy+ -${c1} :syyys :yyyyyy/${c2}-yyyyyy+ -${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ -${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ -${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- -${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy -${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy -${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy +${c1} + `-/+++++++++++++++++/-.` + `/syyyyyyyyyyyyyyyyyyyyyyys/. + :yyyyo/-...............-/oyyyy/ + /yyys- .oyyy+ +.yyyy` `syyy- +:yyyo /yyy/ +.yyyy` `syyy- + /yyys. .oyyyo + /yyyyo:-...............-:oyyyy/` + `/syyyyyyyyyyyyyyyyyyyyyyys+. + `.:/+ooooooooooooooo+/:.` EOF ;; - "Bitrig"*) - set_colors 2 7 + "PacBSD"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} `hMMMMN+ - -MMo-dMd` - oMN- oMN` - yMd /NM: - .mMmyyhMMs - :NMMMhsmMh - +MNhNNoyMm- - hMd.-hMNMN: - mMmsssmMMMo - .MMdyyhNMMMd - oMN.`/dMddMN` - yMm/hNm+./MM/ -.dMMMmo.``.NMo -:NMMMNmmmmmMMh -/MN/-------oNN: -hMd. .dMh -sm/ /ms +${c1} :+sMs. + `:ddNMd- -o--` + -sMMMMh: `+N+`` + yMMMMMs` .....-/-... `mNh/ + yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm + yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm + :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd + +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- + :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. + .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- + /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` +.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- +:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` +/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. +:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` +:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` + sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. + :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// + /dMMMMMMMMMMMMMs- ````````..`` + .oMMMMMMMMMMMMNs` ./y:` + +dNMMNMMMMMMMmy` ``./ys. + `/hMMMMMMMMMMMNo-`` `.+yy+-` + `-/hmNMNMMMMMMmmddddhhy/-` + `-+oooyMMMdsoo+/:. EOF ;; - "BLAG"*) + "Parabola"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' -${c1} d - ,MK: - xMMMX: - .NMMMMMX; - lMMMMMMMM0clodkO0KXWW: - KMMMMMMMMMMMMMMMMMMX' - .;d0NMMMMMMMMMMMMMMMMMMK. - .;dONMMMMMMMMMMMMMMMMMMMMMMx -'dKMMMMMMMMMMMMMMMMMMMMMMMMl - .:xKWMMMMMMMMMMMMMMMMMMM0. - .:xNMMMMMMMMMMMMMMMMMK. - lMMMMMMMMMMMMMMMMMMK. - ,MMMMMMMMWkOXWMMMMMM0 - .NMMMMMNd. `':ldko - OMMMK: - oWk, - ;: +${c1} `.-. `. + `.` `:++. `-+o+. + `` `:+/. `:+/. `-+oooo+ + ``-::-.:+/. `:+/. `-+oooooo+ + `.-:///- ..` .-. `-+oooooooo- + `..-..` `+ooooooooo: +`` :oooooooo/ + `ooooooo: + `oooooo: + -oooo+. + +ooo/` + -ooo- + `+o/. + /+- + //` + -. EOF ;; - "BlankOn"*) - set_colors 1 7 3 + "Pardus"*) + set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' -${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` -${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ -${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys -${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys -${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys -${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys -${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys -${c2}NMMMMMN: .NMMMMMN${c1}yyyyys -${c2}MMMMMMm. NMMMMMN${c1}yyyyys -${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys -${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys -${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys -${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys -${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys -${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys -${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo -${c2} `.:/++++/:.` ${c1}:oys+. +${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. +/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ +mN. oMdyy- -y `-dMo .Nm +.mN+` sMy hN+ -: yMs `+Nm. + `yMMddMs.dy `+` sMddMMy` + +MMMo .` . oMMM+ + `NM/ `````.` `.````` +MN` + yM+ `.-:yhomy ymohy:-.` +My + yM: yo oy :My + +Ms .N` `N. +h sM+ + `MN - -::::::- : :o:+`NM` + yM/ sh -dMMMMd- ho +y+My + .dNhsohMh-//: /mm/ ://-yMyoshNd` + `-ommNMm+:/. oo ./:+mMNmmo:` + `/o+.-somNh- :yy: -hNmos-.+o/` + ./` .s/`s+sMdd+``+ddMs+s`/s. `/. + : -y. -hNmddmNy. .y- : + -+ `..` +- EOF ;; - "BSD") - set_colors 1 7 4 3 6 + "Parrot"*) + set_colors 6 7 read -rd '' ascii_data <<'EOF' -${c1} , , - /( )` - \ \___ / | - /- _ `-/ ' - (${c2}/\/ \ ${c1}\ /\ - ${c2}/ / | ` ${c1}\ - ${c3}O O ${c2}) ${c1}/ | - ${c2}`-^--'${c1}`< ' - (_.) _ ) / - `.___/` / - `-----' / -${c4}<----. __ / __ \ -${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| -<----' ${c1}`--' `.__,' \ - | | - \ / /\ - ${c5}______${c1}( (_ / \______/ - ${c5},' ,-----' | - `--{__________) +${c1} `:oho/-` +`mMMMMMMMMMMMNmmdhy- + dMMMMMMMMMMMMMMMMMMs` + +MMsohNMMMMMMMMMMMMMm/ + .My .+dMMMMMMMMMMMMMh. + + :NMMMMMMMMMMMMNo + `yMMMMMMMMMMMMMm: + /NMMMMMMMMMMMMMy` + .hMMMMMMMMMMMMMN+ + ``-NMMMMMMMMMd- + /MMMMMMMMMMMs` + mMMMMMMMsyNMN/ + +MMMMMMMo :sNh. + `NMMMMMMm -o/ + oMMMMMMM. + `NMMMMMM+ + +MMd/NMh + mMm -mN` + /MM `h: + dM` . + :M- + d: + -+ + - EOF ;; - "BunsenLabs"*) - set_colors fg 7 + "Parsix"*) + set_colors 3 1 7 8 read -rd '' ascii_data <<'EOF' -${c1} `++ - -yMMs - `yMMMMN` - -NMMMMMMm. - :MMMMMMMMMN- - .NMMMMMMMMMMM/ - yMMMMMMMMMMMMM/ -`MMMMMMNMMMMMMMN. --MMMMN+ /mMMMMMMy --MMMm` `dMMMMMM -`MMN. .NMMMMM. - hMy yMMMMM` - -Mo +MMMMN - /o +MMMMs - +MMMN` - hMMM: - `NMM/ - +MN: - mh. - -/ + ${c2}-/+/:. + ${c2}.syssssys. + ${c1}.--. ${c2}ssssssssso${c1} ..--. + :++++++: ${c2}+ssssssss+${c1} ./++/+++: + /+++++++++.${c2}.yssooooy`${c1}-+///////o- + /++++++++++.${c2}+soooos:${c1}:+////////+- + :+++++////o-${c2}oooooo-${c1}+/////////- + `-/++//++-${c4}.-----.-${c1}:+/////:- + ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. +${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- +${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ +${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- + `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` + ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. + ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: + ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ + ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: + ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- + ${c1}`--` ${c2}+sssssssso ${c1}`--` + ${c2}+sssssy+` + ${c2}`.::-` EOF ;; - "Calculate"*) - set_colors 7 3 + "PCBSD"* | "TrueOS"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} ...... - ,,+++++++,. - .,,,....,,,${c2}+**+,,.${c1} - ............,${c2}++++,,,${c1} - ............... - ......,,,........ - .....+*#####+,,,*+. - .....,*###############,..,,,,,,.. - ......,*#################*..,,,,,..,,,.. - .,,....*####################+***+,,,,...,++, - .,,..,..*#####################*, - ,+,.+*..*#######################. - ,+,,+*+..,########################* -.,++++++. ..+##**###################+ -..... ..+##***#################*. - .,.*#*****##############*. - ..,,*********#####****+. - ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} - ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} - ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} +${c1} .. + s. + +y + yN + -MN `. + :NMs `m + .yMMm` `No + `-/+++sdMMMNs+-`+Ms + `:oo+-` .yMMMMy` `-+oNMh + -oo- +NMMMM/ oMMh- + .s+` ` oMMMMM/ - oMMMhy. + +s`- :: :MMMMMd -o `mMMMy`s+ + y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y + s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s +-h .NM` `hMMMMMMMMMMMMMMNMMNy: h- +y- hMN` hMMmMMMMMMMMMNsdMNs. -y +m` mMMy` oMMNoNMMMMMMo` sMMMo `m +m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m +h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h +:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: + y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y + `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` + so -NMMMN /mmd+ `dMMMMMMMm- os + :y: `yMMM` `+NMMMMMMNo`:y: + /s+`.omy /NMMMMMNh/.+s: + .+oo:-. /mdhs+::oo+. + -/o+++++++++++/- EOF ;; - "CentOS"*) - set_colors 3 2 4 5 7 + "PCLinuxOS"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} .. - .PLTJ. - <><><><> - ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK - ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK - ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V - ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. -${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. -${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. -${c4} -${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV -${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' - ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' - ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 - ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK - ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK -${c2} <><><><> - 'MKKM' - '' + ${c1}mhhhyyyyhhhdN + dyssyhhhhhhhhhhhssyhN + Nysyhhyo/:-.....-/oyhhhssd + Nsshhy+. `/shhysm + dohhy/ -shhsy + dohhs` /hhys +N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy +ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ ++hho ${c2}ymm- /mmy+mms ${c1}:hhod +/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh ++hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m +yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ + ohhy` ${c2}://` -/+++/- ${c1}ohhom + N+hhy- `shhoh + sshho. `+hhyom + dsyhhs/. `:ohhhoy + dysyhhhso///://+syhhhssh + dhyssyhhhhhhyssyyhN + mddhdhdmN EOF ;; - "Chakra"*) - set_colors 4 5 7 6 + "Peppermint"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} _ _ _ "kkkkkkkk. - ,kkkkkkkk., 'kkkkkkkkk, - ,kkkkkkkkkkkk., 'kkkkkkkkk. - ,kkkkkkkkkkkkkkkk,'kkkkkkkk, - ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. - "''"''',;::,,"''kkk''kkkkk; __ - ,kkkkkkkkkk, "k''kkkkk' ,kkkk - ,kkkkkkk' ., ' .: 'kkkk',kkkkkk - ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk - ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk -.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' -;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' -'kkkkkkk; 'kkkkkkkk.,""''"''"" - ''kkkk; 'kkkkkkkkkk., - ';' 'kkkkkkkkkkkk., - ';kkkkkkkkkk' - ';kkkkkk' - "''" +${c1} 8ZZZZZZ${c2}MMMMM +${c1} .ZZZZZZZZZ${c2}MMMMMMM. +${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ +${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM +${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. +${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI +${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM +${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM +${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM +${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM +${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM +${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M +${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 +${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 +${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 +${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z +${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM +${c1} NZZZZZZZZZZZ${c2}MMMMM +${c1} ZZZZZZZZZ${c2}MM) EOF ;; - "ChaletOS"*) - set_colors 4 7 1 + "Pop!_OS"*) + set_colors 6 7 read -rd '' ascii_data <<'EOF' -${c1} `.//+osso+/:`` - `/sdNNmhyssssydmNNdo:` - :hNmy+-` .-+hNNs- - /mMh/` `+:` `+dMd: - .hMd- -sNNMNo. /yyy /mMs` - -NM+ `/dMd/--omNh::dMM `yMd` - .NN+ .sNNs:/dMNy:/hNmo/s yMd` - hMs `/hNd+-smMMMMMMd+:omNy- `dMo -:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` -/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: -/Md` MMMMMMMMMMMMMMMMMMMN .MN: -:NN. MMMMMMm....--NMMMMMN -Mm. -`dMo MMMMMMd mMMMMMN hMs - -MN: MMMMMMd mMMMMMN oMm` - :NM: MMMMMMd mMMMMMN +Mm- - -mMy. mmmmmmh dmmmmmh -hMh. - oNNs- :yMm/ - .+mMdo:` `:smMd/` - -ohNNmhsoo++osshmNNh+. - `./+syyhhyys+:`` +${c1} ///////////// + ///////////////////// + ///////${c2}*767${c1}//////////////// + //////${c2}7676767676*${c1}////////////// + /////${c2}76767${c1}//${c2}7676767${c1}////////////// + /////${c2}767676${c1}///${c2}*76767${c1}/////////////// + ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// +/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// +//////////${c2}76767676767${c1}////${c2}76767${c1}///////// +///////////${c2}76767676${c1}//////${c2}7676${c1}////////// +////////////,${c2}7676${c1},///////${c2}767${c1}/////////// +/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// +///////////////${c2}7676${c1}//////////////////// + ///////////////${c2}7676${c1}///${c2}767${c1}//////////// + //////////////////////${c2}'${c1}//////////// + //////${c2}.7676767676767676767,${c1}////// + /////${c2}767676767676767676767${c1}///// + /////////////////////////// + ///////////////////// + ///////////// EOF ;; - "Chapeau"*) - set_colors 2 7 + "Porteus"*) + set_colors 6 7 read -rd '' ascii_data <<'EOF' -${c1} .-/-. - ////////. - ////////${c2}y+${c1}//. - ////////${c2}mMN${c1}/////. - ////////${c2}mMN+${c1}////////. - ////////////////////////. - /////////+${c2}shhddhyo${c1}+////////. - ////////${c2}ymMNmdhhdmNNdo${c1}///////. -///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. -///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// -//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// -//////${c2}+MMmssssssssssssss+${c1}/////// -`//////${c2}yMMy${c1}//////////////////// - `//////${c2}smMNhso++oydNm${c1}//////// - `///////${c2}ohmNMMMNNdy+${c1}/////// - `//////////${c2}++${c1}////////// - `////////////////. - -////////- +${c1} `.-:::-.` + -+ydmNNNNNNNmdy+- + .+dNmdhs+//////+shdmdo. + .smmy+-` ./sdy: + `omdo. `.-/+osssso+/-` `+dy. + `yms. `:shmNmdhsoo++osyyo-``oh. + hm/ .odNmds/.` ``.....:::-+s +/m: `+dNmy:` `./oyhhhhyyooo++so +ys `yNmy- .+hmmho:-.` ``` +s: yNm+` .smNd+. +`` /Nm: +dNd+` + yN+ `smNy. + dm oNNy` + hy -mNm. + +y oNNo + `y` sNN: + `: +NN: + ` .mNo + /mm` + /my` + .sy` + .+: + ` EOF ;; - "Chrom"*) - set_colors 2 1 3 4 7 + "PostMarketOS"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c2} .,:loool:,. - .,coooooooooooooc,. - .,lllllllllllllllllllll,. - ;ccccccccccccccccccccccccc; -${c1} '${c2}ccccccccccccccccccccccccccccc. -${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: -${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. -${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d -${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 -${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 -${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d -${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. -${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; -${c1} .:ccccccccllllllllo${c3}O0000000OOO, -${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. -${c1} '::ccccccccc${c3}dOOOOOOOkx:. -${c1} ..,::cccc${c3}xOOOkkko;. -${c1} ..,:${c3}dOkxl:. +${c1} ss + `hMMh` + .dMMMMd. + -NMMMMMMN- + /MMMMMMMMMN/ + hMMMMMMMMMMMo + y+`mMMmdNMMMMMMy + `dMM-.-:- .mMMMMMMh` + .mMMMMMMd` `dMMMMMMm. + :NMMMMMMy yMMMMMMN: + /MMMMMMMo oMMMmdmN/ + oMMMMMMM/ /MN.-/:-. + `yMMMMMMN- -:.NMMMMy` + `dMMMMMMM- -/////////////dMMMMMMd` + -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- + :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: ++MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ EOF ;; - "Clover"*) - set_colors 2 6 + "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) + set_colors 4 7 read -rd '' ascii_data <<'EOF' -${c1} `omo``omo` - `oNMMMNNMMMNo` - `oNMMMMMMMMMMMMNo` - oNMMMMMMMMMMMMMMMMNo - `sNMMMMMMMMMMMMMMNs` - `omo` `sNMMMMMMMMMMNs` `omo` - `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` - `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` -oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo -`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` -`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` -oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo - `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` - `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` - `oNs` `sNMMMMMMMMMMNs` `oNs` - `sNMMMMMMMMMMMMMMNs` - +NMMMMMMMMMMMMMMMMNo - `oNMMMMMMMMMMMMNo` - `oNMMMNNMMMNs` - `omo``oNs` +${c1} `-/osyyyysosyhhhhhyys+- + -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ + yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy +.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ +-NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ +.Nm+shddyooo+/smNNNNmmmmNh. :mmd. + NNNNy:` ./hmmmmmmmNNNN: hNMh + NMN- -++- +NNNNNNNNNNm+..-sMMMM- +.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ +.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ + mMM+ .. `sNN+. hMMMMhhMMM- + +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy + yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` + sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` + :mMMMMMMMMMMMmddNMMMMMMMMmh/ + /dMMMMMMMMMMMMMMMMMMNdy/` + .+hNMMMMMMMMMNmdhs/. + .:/+ooo+/:-. EOF ;; - "Container Linux by CoreOS"*) - set_colors 4 7 1 + "Qubes"*) + set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c1} ..... - .';:cccccccc:;'. - ':ccccclc${c3}lllllllll${c1}cc:. - .;cccccccc${c3}lllllllllllllll${c1}c, - ;clllccccc${c3}llllllllllllllllll${c1}c, - .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: - ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: - :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, -.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c -.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. -.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. -.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc - :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; - .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc - .cllllllllllclcccclccclccllllcllc - :cllllllllccclcllllllllllllcc; - .cccccccccccccclcccccccccc:. - .;cccclccccccllllllccc,. - .';ccccclllccc:;.. - ..... +${c1} `..--..` + `.----------.` + `..----------------..` + `.------------------------.`` + `..-------------....-------------..` +.::----------..`` ``..----------:+: +:////:----..` `..---:/ossso +:///////:` `/osssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:////////-` .:sssssssso +:///////////-.` `-/osssssssssso +`//////////////:-```.:+ssssssssssssso- + .-://////////////sssssssssssssso/-` + `.:///////////sssssssssssssso:. + .-:///////ssssssssssssssssss/` + `.:////ssss+/+ssssssssssss. + `--//- `-/osssso/. EOF ;; - "crux_small") - set_colors 4 5 7 6 + "Raspbian"*) + set_colors 2 1 read -rd '' ascii_data <<'EOF' -${c1} ___ - (${c3}.· ${c1}| - (${c2}<> ${c1}| - / ${c3}__ ${c1}\\ - ( ${c3}/ \\ ${c1}/| -${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) -${c2}\/${c1}-____${c2}\/ +${c1} `.::///+:/-. --///+//-:`` + `+oooooooooooo: `+oooooooooooo: + /oooo++//ooooo: ooooo+//+ooooo. + `+ooooooo:-:oo- +o+::/ooooooo: + `:oooooooo+`` `.oooooooo+- + `:++ooo/. :+ooo+/.` + ${c2}...` `.----.` ``.. + .::::-``:::::::::.`-:::-` + -:::-` .:::::::-` `-:::- + `::. `.--.` `` `.---.``.::` + .::::::::` -::::::::` ` + .::` .:::::::::- `::::::::::``::. +-:::` ::::::::::. ::::::::::.`:::- +:::: -::::::::. `-:::::::: :::: +-::- .-:::-.``....``.-::-. -::- + .. `` .::::::::. `..`.. + -:::-` -::::::::::` .:::::` + :::::::` -::::::::::` :::::::. + .::::::: -::::::::. :::::::: + `-:::::` ..--.` ::::::. + `...` `...--..` `...` + .:::::::::: + `.-::::-` EOF ;; - "CRUX"*) - set_colors 4 5 7 6 + "Red Star"* | "Redstar"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} odddd - oddxkkkxxdoo - ddcoddxxxdoool - xdclodod olol - xoc xdd olol - xdc ${c2}k00${c1}Okdlol - xxd${c2}kOKKKOkd${c1}ldd - xdco${c2}xOkdlo${c1}dldd - ddc:cl${c2}lll${c1}oooodo - odxxdd${c3}xkO000kx${c1}ooxdo - oxdd${c3}x0NMMMMMMWW0od${c1}kkxo - oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx -docldkXW${c3}MMMMMMMWWN${c1}Odolco -xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c -${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l -${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd -${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo -${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo +${c1} .. + .oK0l + :0KKKKd. + .xKO0KKKKd + ,Od' .d0000l + .c;. .'''... ..'. +.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: +;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. + .okkkkd,.lko .......',;:cllc:;,,'''''. + .cdo. :xd' cd:. ..';'',,,'',,;;;,'. + . .ddl.;doooc'..;oc;'..';::;,'. + coo;.oooolllllllcccc:'. . + .ool''lllllccccccc:::::;. + ;lll. .':cccc:::::::;;;;' + :lcc:'',..';::::;;;;;;;,,. + :cccc::::;...';;;;;,,,,,,. + ,::::::;;;,'. ..',,,,'''. + ........ ...... EOF ;; - "debian_small") + "Redhat"* | "Red Hat"* | "rhel"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - ${c1}_____ - / __ \\ -| / | -| \\___- --_ - --_ +${c1} `.-..........` + `////////::.`-/. + -: ....-////////. + //:-::///////////` + `--::: `-://////////////: + //////- ``.-:///////// .` + `://////:-.` :///////::///:` + .-/////////:---/////////////: + .-://////////////////////. +${c2} yMN+`.-${c1}::///////////////-` +${c2} .-`:NMMNMs` `..-------..` + MN+/mMMMMMhoooyysshsss +MMM MMMMMMMMMMMMMMyyddMMM+ + MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM + MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM + MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM EOF ;; - "Debian"*) - set_colors 1 7 3 + "Refracted Devuan"*) + set_colors 8 7 read -rd '' ascii_data <<'EOF' -${c2} _,met$$$$$gg. - ,g$$$$$$$$$$$$$$$P. - ,g$$P" """Y$$.". - ,$$P' `$$$. -',$$P ,ggs. `$$b: -`d$$' ,$P"' ${c1}.${c2} $$$ - $$P d$' ${c1},${c2} $$P - $$: $$. ${c1}-${c2} ,d$$' - $$; Y$b._ _,d$P' - Y$$. ${c1}`.${c2}`"Y$$$$P"' -${c2} `$$b ${c1}"-.__ -${c2} `Y$$ - `Y$$. - `$$b. - `Y$$b. - `"Y$b._ - `""" +${c2} A + VW + VVW\\ + .yWWW\\ + ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ + *WWWWWWWWWWWWWWWW/ $VWWWWw , + ^*%WWWWWWVWWX $WWWW** ,yy + , "**WWW/' **' ,yy/WWW*` + &WWWWwy `*` <,ywWW%VWWW* + yWWWWWWWWWW* ., "**WW%W + ,&WWWWWM*"` ,y/ &WWWww ^* + XWWX*^ ,yWWWW09 .WWWWWWWWwy, + *` &WWWWWM WWWWWWWWWWWWWww, + (WWWWW` /#####WWW*********** + ^WWWW + VWW + Wh. + V/ EOF ;; - "Deepin"*) - set_colors 2 7 + "Rosa"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} ............ - .';;;;;. .,;,. - .,;;;;;;;. ';;;;;;;. - .;::::::::' .,::;;,''''',. - ,'.:::::::: .;;'. '; - ;' 'cccccc, ,' :: '.. .: - ,, :ccccc. ;: .c, '' :. ,; -.l. cllll' ., .lc :; .l' l. -.c :lllc ;cl: .l' .ll. :' -.l 'looc. . ,o: 'oo' c, -.o. .:ool::coc' .ooo' o. - :: ..... .;dddo ;c - l:... .';lddddo. ,o - lxxxxxdoolllodxxxxxxxxxc :l - ,dxxxxxxxxxxxxxxxxxxl. 'o, - ,dkkkkkkkkkkkkko;. .;o; - .;okkkkkdl;. .,cl:. - .,:cccccccc:,. +${c1} ROSAROSAROSAROSAR + ROSA AROS + ROS SAROSAROSAROSAR AROS + RO ROSAROSAROSAROSAROSAR RO + ARO AROSAROSAROSARO AROS ROS + ARO ROSAROS OSAR ROSA ROS + RO AROSA ROSAROSAROSA ROSAR RO +RO ROSAR ROSAROSAROSAR R ROSARO RO +RO ROSA AROSAROSAROSA AR ROSARO AR +RO AROS ROSAROSAROSA ROS AROSARO AR +RO AROS ROSAROSARO ROSARO ROSARO AR +RO ROS AROSAROS ROSAROSA AROSAR AR +RO ROSA ROS ROSAROSAR ROSARO RO + RO ROS AROSAROSAROSA ROSARO AR + ARO ROSA ROSAROSAROS AROSAR ARO + ARO OROSA R ROSAROS ROS + RO AROSAROS AROSAROSAR RO + AROS AROSAROSAROSARO AROS + ROSA SARO + ROSAROSAROSAROSAR EOF ;; - "DesaOS") - set_colors 2 7 + "sabotage"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1}███████████████████████ -███████████████████████ -███████████████████████ -███████████████████████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -██████████████████████████████ -██████████████████████████████ -████████████████████████ -████████████████████████ -████████████████████████ +${c2} .|'''.| | '||''|. ..|''|| + ||.. ' ||| || || .|' || + ''|||. | || ||'''|. || || +. '|| .''''|. || || '|. || +|'....|' .|. .||. .||...|' ''|...|' + +|''||''| | ..|'''.| '||''''| + || ||| .|' ' || . + || | || || .... ||''| + || .''''|. '|. || || + .||. .|. .||. ''|...'| .||.....| EOF ;; - "Devuan"*) - set_colors 5 7 + "Sabayon"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} ..,,;;;::;,.. - `':ddd;:,. - `'dPPd:,. - `:b$$b`. - 'P$$$d` - .$$$$$` - ;$$$$$P - .:P$$$$$$` - .,:b$$$$$$$;' - .,:dP$$$$$$$$b:' - .,:;db$$$$$$$$$$Pd'` - ,db$$$$$$$$$$$$$$b:'` -:$$$$$$$$$$$$b:'` - `$$$$$bd:''` - `'''` +${c1} ........... + .. .. + .. .. + .. ${c2}o ${c1}.. + .. ${c2}:W' ${c1}.. + .. ${c2}.d. ${c1}.. +:. ${c2}.KNO ${c1}.: +:. ${c2}cNNN. ${c1}.: +: ${c2}dXXX, ${c1}: +: ${c2}. dXXX, .cd, ${c1}: +: ${c2}'kc .. dKKK. ,ll;:' ${c1}: +: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: +:. ${c2}.,cdddddddddddddo:. ${c1}.: + .. ${c2}:lllllll: ${c1}.. + .. ${c2}',,,,, ${c1}.. + .. .. + .. .. + ............... EOF ;; - "DracOS"*) - set_colors 1 7 3 + "SailfishOS"*) + set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c1} `-:/- - -os: - -os/` - :sy+-` - `/yyyy+. - `+yyyyo- - `/yyyys: -`:osssoooo++- +yyyyyy/` - ./yyyyyyo yo`:syyyy+. - -oyyy+ +- :yyyyyo- - `:sy: `. `/yyyyys: - ./o/.` .oyyso+oo:` - :+oo+//::::///:-.` `.` +${c1} .+eWWW + .+ee+++eee e. + .ee++eeeeeeee +e. + .e++ee++eeeeeee+eee+e+ + ee.e+.ee+eee++eeeeee+ + W.+e.e+.e++ee+eee + W.+e.W.ee.W++ee' + +e.W W.e+.W.W+ + W.e.+e.W W W. + e e e +e.W.W + .W W W. + W.+e.W. + W++e.ee+. + ++ +ee++eeeee++. + ' '+++e 'ee. + ee + ee + e EOF ;; - "dragonfly_old"*) - set_colors 1 7 3 + "SalentOS"*) + set_colors 2 1 3 7 read -rd '' ascii_data <<'EOF' - ${c1} | - .-. - ${c3} ()${c1}I${c3}() - ${c1} "==.__:-:__.==" - "==.__/~|~\__.==" - "==._( Y )_.==" - ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. -( ..=${c1}\\=${c1}/${c2}=.. ) - `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` - `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` - .-~` /${c1}|=|${c2}\ `~-. - .~` / ${c1}|=|${c2} \ `~. - .-~` .' ${c1}|=|${c2} `. `~-. - (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) - `~"~"` ${c1} |=|${c2} `"~"~` - ${c1} /=\\ - \\=/ - ^ +${c1} ``..`` + .-:+oshdNMMMMMMNdhyo+:-.` + -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ +${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` +${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- +${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` +${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` +${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd +${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy +${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo +${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ +${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- +${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` +${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm +${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy +${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: +${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. +${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: +${c2} `:smMM${c4}yy${c3}MMNy/` + ${c2}.- ${c4}`${c3}:. EOF ;; - "dragonfly_small"*) - set_colors 1 7 3 + "Scientific"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c2}(\${c3}"${c2}/) -${c2}(/${c1}|${c2}\) -${c1} | - | +${c1} =/;;/- + +: // + /; /; + -X H. +.//;;;:;;-, X= :+ .-;:=;:;#;. +M- ,=;;;#:, ,:#;;:=, ,@ +:# :#.=/++++/=.$= #= + ,#; #/:+/;,,/++:+/ ;+. + ,+/. ,;@+, ,#H;, ,/+, + ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; + ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. + ,;: :@#= =$H: .+#- + ,#= #;-///==///-// =#, +;+ :#-;;;:;;;;-X- +: +@- .-;;;;M- =M/;;;-. -X + :;;::;;-. #- :+ ,-;;-;:== + ,X H. + ;/ #= + // +; + '////' EOF ;; - "DragonFly"*) - set_colors 1 7 3 + "Siduction"*) + set_colors 4 4 read -rd '' ascii_data <<'EOF' -${c2},--, ${c1}| ${c2},--, -${c2}| `-, ${c1},^, ${c2},-' | -${c2} `, `-, ${c3}(/ \) ${c2},-' ,' -${c2} `-, `-,${c1}/ \${c2},-' ,-' -${c2} `------${c1}( )${c2}------' -${c2} ,----------${c1}( )${c2}----------, -${c2} | _,-${c1}( )${c2}-,_ | -${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' -${c1} | | - | | - | | - | | - | | - | | - `|' +${c1} _aass, + jQh: =$w + QWmwawQW + )$QQQQ@( .. + _a_a. ~??^ syDY?Sa, + _mW>-<$c jWmi imm. + ]QQwayQE 4QQmgwmQQ` + ?WWQWP' -9QQQQQ@'._aas, + _a%is. .adYYs,. -"?!` aQB*~^3$c +_Qh;.nm .QWc. {QL ]QQp;..vmQ/ +"QQmmQ@ -QQQggmQP ]QQWmggmQQ( + -???" "$WQQQY` __, ?QQQQQQW! + _yZ!?q, - .yWY!!Sw, "???^ + .QQa_=qQ mQm>..vmm + $QQWQQP $QQQgmQQ@ + "???" _aa, -9WWQQWY` + _mB>~)$a -~~ + mQms_vmQ. + ]WQQQQQP + -?T??" EOF ;; - "Elementary"*) + "Slackware"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c2} eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee eeeeeeeeeeee eeeee - eeee eeeee eee eeee - eeee eeee eee eeee -eee eee eee eee -eee eee eee eee -ee eee eeee eeee -ee eee eeeee eeeeee -ee eee eeeee eeeee ee -eee eeee eeeeee eeeee eee -eee eeeeeeeeee eeeeee eee - eeeeeeeeeeeeeeeeeeeeeeee eeeee - eeeeeeee eeeeeeeeeeee eeee - eeeee eeeee - eeeeeee eeeeeee - eeeeeeeeeeeeeeeee +${c1} ::::::: + ::::::::::::::::::: + ::::::::::::::::::::::::: + ::::::::${c2}cllcccccllllllll${c1}:::::: + :::::::::${c2}lc dc${c1}::::::: + ::::::::${c2}cl clllccllll oc${c1}::::::::: + :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: + ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: + :::::::::::${c2}lc cclccclc${c1}::::::::::::: +::::::::::::::${c2}lcclcc lc${c1}:::::::::::: +::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: +::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: + :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: + :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: + ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: + :::${c2}oclcccccccccccccllllllllllllll${c1}::::: + ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: + :::::::::::::::::::::::::::::::: + :::::::::::::::::::::::::::: + :::::::::::::::::::::: + :::::::::::: EOF ;; - "Endless"*) - set_colors 1 7 + "SliTaz"*) + set_colors 3 3 read -rd '' ascii_data <<'EOF' -${c1} `:+yhmNMMMMNmhy+:` - -odMMNhso//////oshNMMdo- - /dMMh+. .+hMMd/ - /mMNo` `oNMm: - `yMMo` `oMMy` - `dMN- -NMd` - hMN. .NMh -/MM/ -os` /MM/ -dMm `smNmmhs/- `:sNMd+ `` mMd -MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM -MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM -dMm `/++/-``/yNNh+/sdNMNddMm- mMd -/MM/ `dNy: `-::- /MM/ - hMN. .NMh - `dMN- -NMd` - `yMMo` `oMMy` - /mMNo` `oNMm/ - /dMMh+. .+hMMd/ - -odMMNhso//////oshNMMdo- - `:+yhmNMMMMNmhy+:` +${c1} @ @( @ + @@ @@ @ @/ + @@ @@ @@ @@ + @@ %@@ @@ @@ + @@ %@@@ @@@@@. @@@@ @@ + @@@ @@@@ @@@@@@@ &@@@ @@@ + @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ + ,@@@@@@@@@@@@@@@@@@@@@@@@@ + .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ +@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ +@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ +@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. +@@ ,@@ @@@@@@@@@@@@@ @@@ @@ +@ @@. @@@@@@@@@@@@@ @@@ *@ +@ @@ @@@@@@@@@@@@ @@ @ + @ @@@@@@@@@. #@ + @ ,@@@@@ @ EOF ;; - "Exherbo"*) + "SmartOS"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyys oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyy syyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy yyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +EOF + ;; + + "Solus"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c2} , -OXo. -NXdX0: .cok0KXNNXXK0ko:. -KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... -'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. - cNMk NK .oXM. OMMMMO. 0MMNo kW. - lMc o: ., .oKNk; ;NMMWlxW' - ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO - XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk -.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl -,M: ,XMMWx::,''oOK0x; NM. -'Ml ,kNKOxxxxxkkO0XXKOd:. oMk - NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW - ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW - ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO - 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' - xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd - 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO - :XMNxl,';:lodxkOO000Oxc. .oWMMo - 'dXMMXkl;,. .,o0MMNo' - ':d0XWMMMMWNNNNMMMNOl' - ':okKXWNKkl' +${c2} -``````````` + `-+/------------.` + .---:mNo---------------. + .-----yMMMy:---------------. + `------oMMMMMm/----------------` + .------/MMMMMMMN+----------------. + .------/NMMMMMMMMm-+/--------------. +`------/NMMMMMMMMMN-:mh/-------------` +.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. +-----/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- +----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. +.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` +`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. +`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ + .------------:://+-/++++++${c1}oshddys: + -hhhhyyyyyyyyyyyhhhhddddhysssso- + `:ossssssyysssssssssssssssso:` + `:+ssssssssssssssssssss+- + `-/+ssssssssssso+/-` + `.-----..` EOF ;; - "Fedora"* | "RFRemix"*) + "Source Mage"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} /:-------------:\\ - :-------------------:: - :-----------${c2}/shhOHbmp${c1}---:\\ - /-----------${c2}omMMMNNNMMD ${c1}---: - :-----------${c2}sMMMMNMNMP${c1}. ---: - :-----------${c2}:MMMdP${c1}------- ---\\ -,------------${c2}:MMMd${c1}-------- ---: -:------------${c2}:MMMd${c1}------- .---: -:---- ${c2}oNMMMMMMMMMNho${c1} .----: -:-- .${c2}+shhhMMMmhhy++${c1} .------/ -:- -------${c2}:MMMd${c1}--------------: -:- --------${c2}/MMMd${c1}-------------; -:- ------${c2}/hMMMy${c1}------------: -:--${c2} :dMNdhhdNMMNo${c1}------------; -:---${c2}:sdNMMMMNds:${c1}------------: -:------${c2}:://:${c1}-------------:: -:---------------------:// +${c2} :ymNMNho. +.+sdmNMMMMMMMMMMy` +.-::/yMMMMMMMMMMMm- + sMMMMMMMMMMMm/ + /NMMMMMMMMMMMMMm: + .MMMMMMMMMMMMMMMMM: + `MMMMMMMMMMMMMMMMMN. + NMMMMMMMMMMMMMMMMMd + mMMMMMMMMMMMMMMMMMMo + hhMMMMMMMMMMMMMMMMMM. + .`/MMMMMMMMMMMMMMMMMs + :mMMMMMMMMMMMMMMMN` + `sMMMMMMMMMMMMMMM+ + /NMMMMMMMMMMMMMN` + oMMMMMMMMMMMMM+ + ./sd.-hMMMMMMMMmmN` + ./+oyyyh- `MMMMMMMMMmNh + sMMMMMMMMMmmo + `NMMMMMMMMMd: + -dMMMMMMMMMo + -shmNMMms. EOF ;; - "freebsd_small") - set_colors 1 7 3 + "Sparky"*) + set_colors 1 7 read -rd '' ascii_data <<'EOF' -${c1} /\\ _____ /\\ - \\_) (_/ - / \ -| | -| | - \ / - --_____-- +${c1} + . `-:-` + .o` .-///-` + `oo` .:/++:. + os+` -/+++:` ``.........``` + /ys+`./+++/-.-::::::----......`` + `syyo`++o+--::::-::/+++/-`` + -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` +::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` +`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` + -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- + .sdddy::syo--/:. `.:dy+-ohhho ./: + :yddds/:+oo+//:-`- /+ +hy+.shhy: `` + `:ydmmdysooooooo-.ss`/yss--oyyo + `./ossyyyyo+:-/oo:.osso- .oys + ``..-------::////.-oooo/ :so + `...----::::::::--.`/oooo: .o: + ``````` ++o+:` `:` + ./+/-` ` + `-:-. + `` EOF ;; - "FreeBSD"*) - set_colors 1 7 3 + "SteamOS"*) + set_colors 5 7 read -rd '' ascii_data <<'EOF' - ${c2}``` ${c1}` - ${c2}` `.....---...${c1}....--.``` -/ - ${c2}+o .--` ${c1}/y:` +. - ${c2} yo`:. ${c1}:o `+- - ${c2}y/ ${c1}-/` -o/ - ${c2}.- ${c1}::/sy+:. - ${c2}/ ${c1}`-- / - ${c2}`: ${c1}:` - ${c2}`: ${c1}:` - ${c2}/ ${c1}/ - ${c2}.- ${c1}-. - ${c2}-- ${c1}-. - ${c2}`:` ${c1}`:` - .-- `--. - .---.....----. +${c1} .,,,,. + .,'onNMMMMMNNnn',. + .'oNMANKMMMMMMMMMMMNNn'. + .'ANMMMMMMMXKNNWWWPFFWNNMNn. + ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, + ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, +,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, +'${c2}+#############, +. ,+' ${c1}+NMMM +${c2} '*#########*' '*,,*' ${c1}.+NMMMM. +${c2} `'*###*' ,.,;###${c1}+WNM, +${c2} .,;;, .;##########${c1}+W +${c2},',. '; ,+##############' + '###+. :,. .,; ,###############' + '####.. `'' .,###############' + '#####+++################' + '*##################*' + ''*##########*'' + '''''' EOF ;; - "FreeMiNT"*) - # Don't explicitly set colors since - # TosWin2 doesn't reset well. + "SunOS" | "Solaris") + set_colors 3 7 read -rd '' ascii_data <<'EOF' -${c1} ## - ## ######### - #### ## - #### #### ## -#### #### ## ## - #### #### ## ## - #### #### ## ## ## - #### ###### - ###### ## ## #### - #### ################ - #### ## #### - ## #### ###### - ## ## #### #### - ## ## ## ## ## #### - #### ## ## ## +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. EOF ;; - "Frugalware"*) - set_colors 4 7 1 + "openSUSE Tumbleweed"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} `++/::-.` - /o+++++++++/::-.` - `o+++++++++++++++o++/::-.` - /+++++++++++++++++++++++oo++/:-.`` - .o+ooooooooooooooooooosssssssso++oo++/:-` - ++osoooooooooooosssssssssssssyyo+++++++o: - -o+ssoooooooooooosssssssssssssyyo+++++++s` - o++ssoooooo++++++++++++++sssyyyyo++++++o: - :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo - `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: - /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss - .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- - ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso - -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. - sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ - :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` - yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ --ysooooooydhhhhhhhhhhhddddddddddddddddssy - .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: - ``.-/+oosysssssssssssssssssssssss - ``.:/+osyysssssssssssssh. - `-:/+osyyssssyo - .-:+++` +${c2} ...... + .,cdxxxoc,. .:kKMMMNWMMMNk:. + cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. + ;WMK;. .lKMMNM, :NMK, .OMW; + cMW; 'WMMMN ,XMK, oMM' +.MMc ..;l. xMN: KM0 +'MM. 'NMO oMM +.MM, .kMMl xMN + KM0 .kMM0. .dl:,.. .WMd + .XM0. ,OMMK, OMMMK. .XMK + oWMO:. .;xNMMk, NNNMKl. .xWMx + :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, + ..... .:dOOXXKOxl, EOF ;; - "Funtoo"*) - set_colors 5 7 + "openSUSE"* | "open SUSE"* | "SUSE"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c2} _______ ____ - /MMMMMMM/ /MMMM| _____ _____ - __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ -|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ -|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| -|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| - |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ - |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ +${c2} .;ldkO0000Okdl;. + .;d00xl:^''''''^:ok00d;. + .d00l' 'o00d. + .d0Kd'${c1} Okxol:;,. ${c2}:O0d. + .OK${c1}KKK0kOKKKKKKKKKKOxo:, ${c2}lKO. + ,0K${c1}KKKKKKKKKKKKKKK0P^${c2},,,${c1}^dx:${c2} ;00, +.OK${c1}KKKKKKKKKKKKKKKk'${c2}.oOPPb.${c1}'0k.${c2} cKO. +:KK${c1}KKKKKKKKKKKKKKK: ${c2}kKx..dd ${c1}lKd${c2} 'OK: +dKK${c1}KKKKKKKKKOx0KKKd ${c2}^0KKKO' ${c1}kKKc${c2} dKd +dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd +:KK${c1}KKKKKKKKKK0o;...^cdxxOK0O/^^' ${c2}.0K: + kKK${c1}KKKKKKKKKKKKK0x;,,......,;od ${c2}lKk + '0K${c1}KKKKKKKKKKKKKKKKKKKK00KKOo^ ${c2}c00' + 'kK${c1}KKOxddxkOO00000Okxoc;'' ${c2}.dKk' + l0Ko. .c00l' + 'l0Kk:. .;xK0l' + 'lkK0xl:;,,,,;:ldO0kl' + '^:ldxkkkkxdl:^' EOF ;; - "GalliumOS"*) + "SwagArch"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1}sooooooooooooooooooooooooooooooooooooo+: -yyooooooooooooooooooooooooooooooooo+/::: -yyysoooooooooooooooooooooooooooo+/:::::: -yyyyyoooooooooooooooooooooooo+/::::::::: -yyyyyysoooooooooooooooooo++/:::::::::::: -yyyyyyysoooooooooooooo++/::::::::::::::: -yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: -yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: -yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: -yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: -yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: -yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: -yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: -yyyyyyyyyyyyyyys+:--...........-///::::: -yyyyyyyyyyyys+:--................://:::: -yyyyyyyyyo+:-.....................-//::: -yyyyyyo+:-..........................://: -yyyo+:-..............................-// -o/:-...................................: -EOF - ;; - - "gentoo_small") - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} _-----_ -( \\ -\ 0 \\ -${c2} \ ) - / _/ -( _- -\____- +${c2} .;ldkOKXXNNNNXXK0Oxoc,. + ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; + 'K0xo ..,;:c:. `'lKMMMMM0 + .lONMMMMMM' `lNMk' +${c2} ;WMMMMMMMMMO. ${c1}....::... +${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, +${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. +${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. +${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: +${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. +${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: +${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. +${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. + :ccc:' `cccccccc:, + '' EOF ;; - "Gentoo"*) + "Tails"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' -${c1} -/oyddmdhs+:. - -o${c2}dNMMMMMMMMNNmhy+${c1}-` - -y${c2}NMMMMMMMMMMMNNNmmdhy${c1}+- - `o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/` - om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o` -.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+` - oy${c2}hdmNMMMMMMMN${c1}dyooy${c2}dmddddhhhhyhN${c1}d. - :o${c2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${c1}Mh - .:${c2}+sydNMMMMMNNNmmmdddhhhhhhmM${c1}my - /m${c2}MMMMMMNNNmmmdddhhhhhmMNh${c1}s: - `o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+` - `s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. - /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:` -+M${c2}MMMMMMNNNNNmmmmdmNMNdso${c1}/- -yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` -/h${c2}MMNNNNNNNNMNdhs++/${c1}-` -`/${c2}ohdmmddhys+++/:${c1}.` - `-//////:--. +${c1} `` + ./yhNh +syy/Nshh `:o/ +N:dsNshh █ `ohNMMd +N-/+Nshh `yMMMMd +N-yhMshh yMMMMd +N-s:hshh █ yMMMMd so//. +N-oyNsyh yMMMMd d Mms. +N:hohhhd:. yMMMMd syMMM+ +Nsyh+-..+y+- yMMMMd :mMM+ ++hy- -ss/`yMMMM `+d+ + :sy/. ./yNMMMMm `` + .+ys- `:+hNMMMMMMy/` + `hNmmMMMMMMMMMMMMdo. + dMMMMMMMMMMMMMMMMMNh: + +hMMMMMMMMMMMMMMMMMmy. + -oNMMMMMMMMMMmy+.` + `:yNMMMds/.` + .//` EOF ;; - "gNewSense"*) - set_colors 4 5 7 6 + "Trisquel"*) + set_colors 4 6 read -rd '' ascii_data <<'EOF' -${c1} ..,,,,.. - .oocchhhhhhhhhhccoo. - .ochhlllllllc hhhhhh ollllllhhco. - ochlllllllllll hhhllllllhhh lllllllllllhco - .cllllllllllllll hlllllo +hllh llllllllllllllc. -ollllllllllhco'' hlllllo +hllh ``ochllllllllllo -hllllllllc' hllllllllllllh `cllllllllh -ollllllh +llllllllllll+ hllllllo - `cllllh. ohllllllho .hllllc' - ochllc. ++++ .cllhco - `+occooo+. .+ooocco+' - `+oo++++ ++++oo+' +${c1} ▄▄▄▄▄▄ + ▄█████████▄ + ▄▄▄▄▄▄ ████▀ ▀████ + ▄██████████▄ ████▀ ▄▄ ▀███ + ▄███▀▀ ▀▀████ ███▄ ▄█ ███ +▄███ ▄▄▄ ████▄ ▀██████ ▄███ +███ █▀▀██▄ █████▄ ▀▀ ▄████ +▀███ ███ ███████▄▄ ▄▄██████ +${c1} ▀███▄ ▄███ █████████████${c2}████▀ +${c1} ▀█████████ ███████${c2}███▀▀▀ + ▀▀███▀▀ ██████▀▀ + ██████▀ ▄▄▄▄ + █████▀ ████████ + █████ ███▀ ▀███ + ████▄ ██▄▄▄ ███ + █████▄ ▀▀ ▄██ + ██████▄▄▄████ + ▀▀█████▀▀ EOF ;; - "GNU") - set_colors fg 7 + "Ubuntu-Budgie"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} _-`````-, ,- '- . - .' .- - | | - -. `. - /.' / `. \ -:/ : _... ..._ `` : -:: : /._ .`:'_.._\. || : -:: `._ ./ ,` : \ . _.'' . -`:. / | -. \-. \\_ / - \:._ _/ .' .@) \@) ` `\ ,.' - _/,--' .- .\,-.`--`. - ,'/'' (( \ ` ) - /'/' \ `-' ( - '/'' `._,-----' - ''/' .,---' - ''/' ;: - ''/'' ''/ - ''/''/'' - '/'/' - `; +${c2} ./oydmMMMMMMmdyo/. + :smMMMMMMMMMMMhs+:++yhs: + `omMMMMMMMMMMMN+` `odo` + /NMMMMMMMMMMMMN- `sN/ + `hMMMMmhhmMMMMMMh sMh` + .mMmo- /yMMMMm` `MMm. + mN/ yMMMMMMMd- MMMm +oN- oMMMMMMMMMms+//+o+: :MMMMo +m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm +M` .NMMMMMMMMMMMMMMMNodMMMMMMM +M- sMMMMMMMMMMMMMMMMMMMMMMMMM +mm` mMMMMMMMMMNdhhdNMMMMMMMMMm +oMm/ .dMMMMMMMMh: :dMMMMMMMo + mMMNyo/:/sdMMMMMMMMM+ sMMMMMm + .mMMMMMMMMMMMMMMMMMs `NMMMm. + `hMMMMMMMMMMM.oo+. `MMMh` + /NMMMMMMMMMo sMN/ + `omMMMMMMMMy. :dmo` + :smMMMMMMMh+-` `.:ohs: + ./oydmMMMMMMdhyo/. EOF ;; - "GoboLinux"*) - set_colors 5 4 6 2 + "Ubuntu-GNOME"*) + set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c1}_____ _ -/ ____| | | -| | __ ___ | |__ ___ -| | |_ |/ _ \| '_ \ / _ \ -| |__| | (_) | |_) | (_) | - \_____|\___/|_.__/ \___/ +${c3} ./o. + .oooooooo + .oooo```soooo + .oooo` `soooo + .ooo` ${c4}.o.${c3} `\/ooo. + :ooo ${c4}:oooo.${c3} `\/ooo. + sooo ${c4}`ooooo${c3} \/oooo + \/ooo ${c4}`soooo${c3} `ooooo + `soooo ${c4}`\/ooo${c3} `soooo +${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo +${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` +${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` +${c4} `ooooo ${c3}`` ${c4}.oooo +${c4} `soooo. .oooo` + `\/oooooooooo` + ``\/oo`` EOF ;; - "Grombyang"*) - set_colors 4 2 1 + "Ubuntu-MATE"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} eeeeeeeeeeee - eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee ${c2}.o+ ${c1}eeee - eeee ${c2}`ooo/ ${c1}eeee - eeee ${c2}`+oooo: ${c1}eeee -eee ${c2}`+oooooo: ${c1}eee -eee ${c2}-+oooooo+: ${c1}eee -ee ${c2}`/:oooooooo+: ${c1}ee -ee ${c2}`/+ +++ +: ${c1}ee -ee ${c2}+o+\ ${c1}ee -eee ${c2}+o+\ ${c1}eee -eee ${c2}// \\ooo/ \\\ ${c1}eee - eee ${c2}//++++oooo++++\\\ ${c1}eee - eeee ${c2}::::++oooo+::::: ${c1}eeee - eeeee ${c3}Grombyang OS ${c1} eeee - eeeeeeeeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeee +${c1} `:+shmNNMMNNmhs+:` + .odMMMMMMMMMMMMMMMMMMdo. + /dMMMMMMMMMMMMMMMmMMMMMMMMd/ + :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: + `yMMMMMMMMMms:..-::oM: -omMMMMMy` + `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` + hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh +/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ +hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh +/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ + hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh + `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` + yMMMMMMMMMms/..-::oM: .+dMMMMMy + :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: + /dMMMMMMMMMMMMMMMdNMMMMMMMd/ + .odMMMMMMMMMMMMMMMMMMdo. + `:+shmNNMMNNmhs+:` EOF ;; - "GuixSD"*) - set_colors 3 7 6 1 8 + "ubuntu_old") + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} .. `. - `--..```..` `..```..--` - .-:///-:::. `-:::///:-. - ````.:::` `:::.```` - -//:` -::- - ://: -::- - `///- .:::` - -+++-:::. - :+/:::- - `-....` +${c1} ./+o+- +${c2} yyyyy- ${c1}-yyyyyy+ +${c2} ${c2}://+//////${c1}-yyyyyyo +${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` +${c3} .:++o: ${c2}/++++++++/:--:/- +${c3} o:+o+:++.${c2}`..```.-/oo+++++/ +${c3} .:+o:+o/.${c2} `+sssoo+/ +${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. +${c2}/+++//+:${c3}`oo+o${c2} /::--:. +${c2}+/+o+++${c3}`o++o${c1} ++////. +${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. +${c3} .+.o+oo:.${c1} `oddhhhh+ +${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ +${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: +${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` +${c1} /osyyyyyyo${c3}++ooo+++/ +${c1} ````` ${c3}+oo+++o: +${c3} `oo++. EOF ;; - "Haiku"*) - set_colors 2 8 + "Ubuntu-Studio") + set_colors 6 7 read -rd '' ascii_data <<'EOF' -${c2} :dc' - 'l:;'${c1},${c2}'ck. .;dc:. - co ${c1}..${c2}k. .;; ':o. - co ${c1}..${c2}k. ol ${c1}.${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. -.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. - ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; - ..${c1}oOolllllccccccc:::::${c2}od; - cx:ooc${c1}:::::::;${c2}cooolcX. - cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. - cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. - .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. - '::c'${c1}...${c2}do${c1}..... .${c2}K, - cd,.${c1}....:${c2}O,${c1} - ':clod:'${c1} - ${c1} +${c1} ..-::::::-.` + `.:+++++++++++${c2}ooo${c1}++:.` + ./+++++++++++++${c2}sMMMNdyo${c1}+/. + .++++++++++++++++${c2}oyhmMMMMms${c1}++. + `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` + `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` + +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` + :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: + ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. + ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ + :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: + +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ + `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` + `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ + ./+++++++++++++++${c2}oyhdNMMMms${c1}++. + ./+++++++++++++${c2}hMMMNdyo${c1}+/. + `.:+++++++++++${c2}sso${c1}++:. + ..-::::::-.. EOF ;; - "Hyperbola"*) - set_colors 8 + "Ubuntu"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} WW - KX W - WO0W NX0O - NOO0NW WNXK0OOKW - W0OOOOOOOOOOOOKN - N0OOOOOOO0KXW - WNXXXNW - NXK00000KN - WNK0OOOOOOOOOO0W - NK0OOOOOOOOOOOOOO0W - X0OOOOOOO00KK00OOOOOK - X0OOOO0KNWW WX0OO0W - X0OO0XNW KOOW - N00KNW KOW - NKXN W0W -WW W +${c1} .-/+oossssoo+/-. + `:+ssssssssssssssssss+:` + -+ssssssssssssssssssyyssss+- + .ossssssssssssssssss${c2}dMMMNy${c1}sssso. + /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ + +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ +.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. ++ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ +oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso +oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso ++ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ +.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ + +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ + /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ + .ossssssssssssssssss${c2}dMMMNy${c1}sssso. + -+sssssssssssssssss${c2}yyy${c1}ssss+- + `:+ssssssssssssssssss+:` + .-/+oossssoo+/-. EOF ;; - "Kali"*) - set_colors 4 8 + "void_small") + set_colors 2 8 read -rd '' ascii_data <<'EOF' -${c1}.............. - ..,;:ccc,. - ......''';lxO. -.....''''..........,:ld; - .';;;:::;,,.x, - ..'''. 0Xxoc:,. ... - .... ,ONkc;,;cokOdc',. - . OMo ':${c2}dd${c1}o. - dMc :OO; - 0M. .:o. - ;Wd - ;XO, - ,d0Odlc;,.. - ..',;:cdOOd::,. - .:d;.':;. - 'd, .' - ;l .. - .o - c - .' - . +${c1} _______ + _ \______ - +| \ ___ \ | +| | / \ | | +| | \___/ | | +| \______ \_| + -_______\ EOF ;; - "KaOS"*) - set_colors 4 7 1 + "Void"*) + set_colors 2 8 read -rd '' ascii_data <<'EOF' -${c1} .. - ..... ..OSSAAAAAAA.. - .KKKKSS. .SSAAAAAAAAAAA. -.KKKKKSO. .SAAAAAAAAAA... -KKKKKKS. .OAAAAAAAA. -KKKKKKS. .OAAAAAA. -KKKKKKS. .SSAA.. -.KKKKKS..OAAAAAAAAAAAA........ - DKKKKO.=AA=========A===AASSSO.. - AKKKS.==========AASSSSAAAAAASS. - .=KKO..========ASS.....SSSSASSSS. - .KK. .ASS..O.. =SSSSAOSS: - .OK. .ASSSSSSSO...=A.SSA. - .K ..SSSASSSS.. ..SSA. - .SSS.AAKAKSSKA. - .SSS....S.. +${c1} __.;=====;.__ + _.=+==++=++=+=+===;. + -=+++=+===+=+=+++++=_ + . -=:`` `--==+=++==. + _vi, ` --+=++++: + .uvnvi. _._ -==+==+. + .vvnvnI` .;==|==;. :|=||=|. +${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL +${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE +${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' +${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! +${c1} -1vvnvv. `~+++` ++|+++ + +vnvnnv, `-|=== + +vnvnvns. . :=- + -Invnvvnsi..___..=sv=. ` + +Invnvnvnnnnnnnnvvnn;. + ~|Invnvnvvnvvvnnv}+` + -~|{*l}*|~ EOF ;; - "KDE"*) - set_colors 2 7 + *"[Windows 10]"* | *"on Windows 10"* | "Windows 8"* |\ + "Windows 10"* | "windows10" | "windows8" ) + set_colors 6 7 read -rd '' ascii_data <<'EOF' -${c1} `..---+/---..` - `---.`` `` `.---.` - .--.` `` `-:-. - `:/: `.----//----.` :/- - .:. `---` `--.` .:` - .:` `--` .:- `:. - `/ `:. `.-::-.` -:` `/` - /. /. `:++++++++:` .: .: -`/ .: `+++++++++++/ /` `+` -/+` -- .++++++++++++` :. .+: -`/ .: `+++++++++++/ /` `+` - /` /. `:++++++++:` .: .: - ./ `:. `.:::-.` -:` `/` - .:` `--` .:- `:. - .:. `---` `--.` .:` - `:/: `.----//----.` :/- - .-:.` `` `-:-. - `---.`` `` `.---.` - `..---+/---..` +${c1} .., + ....,,:;+ccllll + ...,,+:; cllllllllllllllllll +,cclllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll + +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +`'ccllllllllll lllllllllllllllllll + `' \\*:: :ccllllllllllllllll + ````''*::cll + `` EOF ;; - "Kogaion"*) - set_colors 4 7 1 + "Windows"*) + set_colors 1 2 4 3 read -rd '' ascii_data <<'EOF' -${c1} ;; ,; - ;;; ,;; - ,;;;; ;;;; - ,;;;;;;;; ;;;; - ;;;;;;;;;;; ;;;;; - ,;;;;;;;;;;;; ';;;;;, - ;;;;;;;;;;;;;;, ';;;;;;; - ;;;;;;;;;;;;;;;;;, ';;;;; -; ';;;;;;;;;;;;;;;;;;, ;;; -;;;, ';;;;;;;;;;;;;;;;;;;,;; -;;;;;, ';;;;;;;;;;;;;;;;;;, -;;;;;;;;, ';;;;;;;;;;;;;;;;, -;;;;;;;;;;;;, ';;;;;;;;;;;;;; -';;;;;;;;;;;;; ';;;;;;;;;;;;; - ';;;;;;;;;;;;;, ';;;;;;;;;;; - ';;;;;;;;;;;;; ;;;;;;;;;; - ';;;;;;;;;;;; ;;;;;;;; - ';;;;;;;; ;;;;;; - ';;;;; ;;;; - ';;; ;; +${c1} ,.=:!!t3Z3z., + :tt:::tt333EE3 +${c1} Et:::ztt33EEEL${c2} @Ee., .., +${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# +${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL +${c1} it::::tt333EEF${c2} @EEEEEEttttt33F +${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. +${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF +${c3} ;::::::::zt33)${c2} "4EEEtttji3P* +${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. +${c3} i::::::::zt33F${c4} AEEEtttt::::ztF +${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 +${c3} E::::::::zt33L${c4} @EEEtttt::::z3F +${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` +${c3} `${c4} :EEEEtttt::::z7 + "VEzjt:;;z>*` EOF ;; - "Korora"*) + "Xubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c2} ____________ - _add55555555554${c1}: - _w?'${c1}``````````'${c2})k${c1}: - _Z'${c1}`${c2} ]k${c1}: - m(${c1}`${c2} )k${c1}: - _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: - .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` - jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` - jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` -.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` -:#${c1}:${c2} ${c1}`${c2})e${c1}``` -:m${c1}:${c2} ,#'${c1}` -:#${c1}:${c2} .s2'${c1}` -:m,________.aa7^${c1}` -:#baaaaaaas!J'${c1}` - ``````````` +${c1} `-/osyhddddhyso/-` + .+yddddddddddddddddddy+. + :yddddddddddddddddddddddddy: + -yddddddddddddddddddddhdddddddy- + odddddddddddyshdddddddh`dddd+ydddo + `yddddddhshdd- ydddddd+`ddh.:dddddy` + sddddddy /d. :dddddd-:dy`-ddddddds +:ddddddds /+ .dddddd`yy`:ddddddddd: +sdddddddd` . .-:/+ssdyodddddddddds +ddddddddy `:ohddddddddd +dddddddd. +dddddddd +sddddddy ydddddds +:dddddd+ .oddddddd: + sdddddo ./ydddddddds + `yddddd. `:ohddddddddddy` + oddddh/` `.:+shdddddddddddddo + -ydddddhyssyhdddddddddddddddddy- + :yddddddddddddddddddddddddy: + .+yddddddddddddddddddy+. + `-/osyhddddhyso/-` EOF ;; - "KSLinux"*) - set_colors 4 7 1 + "Zorin"*) + set_colors 4 6 read -rd '' ascii_data <<'EOF' -${c1} K K U U RRRR ooo - K K U U R R o o - KKK U U RRRR o o - K K U U R R o o - K K UUU R R ooo +${c1} `osssssssssssssssssssso` + .osssssssssssssssssssssso. + .+oooooooooooooooooooooooo+. -${c2} SSS AAA W W AAA - S A A W W A A - SSS AAAAA W W W AAAAA - S A A WW WW A A - SSS A A W W A A + + `::::::::::::::::::::::. .:` + `+ssssssssssssssssss+:.` `.:+ssso` +.ossssssssssssssso/. `-+ossssssso. +ssssssssssssso/-` `-/osssssssssssss +.ossssssso/-` .-/ossssssssssssssso. + `+sss+:. `.:+ssssssssssssssssss+` + `:. .::::::::::::::::::::::` + + + .+oooooooooooooooooooooooo+. + -osssssssssssssssssssssso- + `osssssssssssssssssssso` EOF ;; - "Kubuntu"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `.:/ossyyyysso/:. - .:oyyyyyyyyyyyyyyyyyyo:` - -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- - -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- - oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo - `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` - oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- -oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy -oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- - oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo - `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo - oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo - -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- - -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- - ./oyyyyyyyyyyyyyyyyyyo/. - `.:/oosyyyysso/:.` + *) + case "$kernel_name" in + *"BSD") + set_colors 1 7 4 3 6 + read -rd '' ascii_data <<'EOF' +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) EOF - ;; + ;; - "LEDE"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' - ${c1} _________ - / /\ - / LE / \ - / DE / \ - /________/ LE \ - \ \ DE / - \ LE \ / - \ DE \ / - \________\/ + "Darwin") + set_colors 2 3 1 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. EOF - ;; + ;; - "Linux") - set_colors fg 8 3 - read -rd '' ascii_data <<'EOF' + "GNU"*) + set_colors fg 7 + read -rd '' ascii_data <<'EOF' +${c1} _-`````-, ,- '- . + .' .- - | | - -. `. + /.' / `. \ +:/ : _... ..._ `` : +:: : /._ .`:'_.._\. || : +:: `._ ./ ,` : \ . _.'' . +`:. / | -. \-. \\_ / + \:._ _/ .' .@) \@) ` `\ ,.' + _/,--' .- .\,-.`--`. + ,'/'' (( \ ` ) + /'/' \ `-' ( + '/'' `._,-----' + ''/' .,---' + ''/' ;: + ''/'' ''/ + ''/''/'' + '/'/' + `; +EOF + ;; + + "Linux") + set_colors fg 8 3 + read -rd '' ascii_data <<'EOF' ${c2} ##### ${c2} ####### ${c2} ##${c1}O${c2}#${c1}O${c2}## @@ -6682,1985 +7704,964 @@ ${c3}######${c2}#${c1}#######${c2}#${c3}###### ${c3}#######${c2}#${c1}#####${c2}#${c3}####### ${c3} #####${c2}#######${c3}##### EOF - ;; + ;; - "LMDE"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' - ${c2}`.-::---.. -${c1} .:++++ooooosssoo:. - .+o++::. `.:oos+. -${c1} :oo:.` -+oo${c2}: -${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` -${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` -${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: -${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` -${c1}`s: `oo s m Myy+-o:` -`oo :+sdoohyoydyso/. - :o. .:////////++: -${c1} `/++ ${c2}-:::::- -${c1} ${c2}`${c1}++- -${c1} ${c2}`${c1}/+- -${c1} ${c2}.${c1}+/. -${c1} ${c2}.${c1}:+-. - `--.`` + "SunOS") + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. EOF - ;; + ;; - "Lubuntu"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `-/+oyyhhhhyyo+/-` - ./shhhhhhhhhhhhhhhhhhs/. - `:shhhhhhhhhhhhhhhhhhhhhhhhs:` - :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: - `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` - `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` - shhhhhhhhy+. .ohhhhhhhhhhhhhs -:hhhhhhy/. /hhhhhhhhhhhhh: -shhhy/. :hhhhhhhhhhhhs -hy+. ` `+yhs/` +hhhhhhhhhhhh --.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh -shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs -:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: - shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs - `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` - +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` - :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: - :shhhhhhhhhhhhhhhhhhhhhy`+s:` - .+shhhhhhhhhhhhhhhhhhs:` - `-/+oyyhhhhyys+/-` + "IRIX"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} ./ohmNd/ +dNmho/- + `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. + `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` + -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. + `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` ++mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ +dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd +oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ +.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. + hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh + /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: + `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd + `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` + `yNMMNho-yMMMM` NMMMm.+hNMMNh` + -MMMMd: oMMMM. NMMMh :hMMMM- + -yNMMMmooMMMM- NMMMyomMMMNy- + .omMMMMMMMM-`NMMMMMMMmo. + `:hMMMMMM. NMMMMMh/` + .odNm+ /dNms. EOF + ;; + esac ;; + esac + + # Overwrite distro colors if '$ascii_colors' doesn't + # equal 'distro'. + if [[ "${ascii_colors[0]}" != "distro" ]]; then + color_text="off" + set_colors "${ascii_colors[@]}" + fi +} + +set_colors() { + c1="$(color "$1")${ascii_bold}" + c2="$(color "$2")${ascii_bold}" + c3="$(color "$3")${ascii_bold}" + c4="$(color "$4")${ascii_bold}" + c5="$(color "$5")${ascii_bold}" + c6="$(color "$6")${ascii_bold}" + + [[ "$color_text" != "off" ]] && set_text_colors "$@" +} + +set_text_colors() { + if [[ "${colors[0]}" == "distro" ]]; then + title_color="$(color "$1")" + at_color="$reset" + underline_color="$reset" + subtitle_color="$(color "$2")" + colon_color="$reset" + info_color="$reset" + + # If the ascii art uses 8 as a color, make the text the fg. + ((${1:-1} == 8)) && title_color="$reset" + ((${2:-7} == 8)) && subtitle_color="$reset" + + # If the second color is white use the first for the subtitle. + ((${2:-7} == 7)) && subtitle_color="$(color "$1")" + ((${1:-1} == 7)) && title_color="$reset" + else + title_color="$(color "${colors[0]}")" + at_color="$(color "${colors[1]}")" + underline_color="$(color "${colors[2]}")" + subtitle_color="$(color "${colors[3]}")" + colon_color="$(color "${colors[4]}")" + info_color="$(color "${colors[5]}")" + fi + + # Bar colors. + if [[ "$bar_color_elapsed" == "distro" ]]; then + bar_color_elapsed="$(color fg)" + else + bar_color_elapsed="$(color "$bar_color_elapsed")" + fi + + case "$bar_color_total $1" in + "distro "[736]) bar_color_total="$(color "$1")" ;; + "distro "[0-9]) bar_color_total="$(color "$2")" ;; + *) bar_color_total="$(color "$bar_color_total")" ;; + esac +} + +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" ;; + esac +} + +# OTHER + +stdout() { + image_backend="off" + unset subtitle_color + unset colon_color + unset info_color + unset underline_color + unset bold + unset title_color + unset at_color + unset text_padding + unset zws + unset reset + unset color_blocks + unset get_line_break +} + +err() { + err+="$(color 1)[!]\e[0m $1\n" +} + +get_full_path() { + # This function finds the absolute path from a relative one. + # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" - "Lunar"*) - set_colors 4 7 3 - read -rd '' ascii_data <<'EOF' -${c1}`-. `-. - -ohys/-` `:+shy/` - -omNNdyo/` :+shmNNy/` - ${c3} - - /mMmo - hMMMN` - .NMMs - ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` - /:.` ${c3}/${c1} `.:/` -${c3} __ - | | _ _ ___ ___ ___ - | |__| | | | .'| _| - |_____|___|_|_|__,|_| -EOF - ;; + # If the file exists in the current directory, stop here. + [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - "mac"*"_small") - set_colors 2 3 1 5 4 - read -rd '' ascii_data <<'EOF' -${c1} .:' - _ :'_ -${c2} .'`_`-'_``. -:________.-' -${c3}:_______: -:_______: -${c4} :_______`-; -${c5} `._.-._.' -EOF - ;; + if ! cd "${1%/*}"; then + err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" + err " Check that the directory exists or try another directory." + exit 1 + fi - "mac" | "Darwin") - set_colors 2 3 1 1 5 4 - read -rd '' ascii_data <<'EOF' -${c1} 'c. - ,xNMM. - .OMMMMo - OMMM0, - .;loddo:' loolloddol;. - cKMMMMMMMMMMNWMMMMMMMMMM0: -${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. - XMMMMMMMMMMMMMMMMMMMMMMMX. -${c3};MMMMMMMMMMMMMMMMMMMMMMMM: -:MMMMMMMMMMMMMMMMMMMMMMMM: -${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. - kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. - ${c6}kMMMMMMMMMMMMMMMMMMMMMMd - ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. -EOF - ;; + local full_dir="${1##*/}" - "Mageia"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} .°°. - °° .°°. - .°°°. °° - . . - °°° .°°°. - .°°°. '___' -${c2} .${c1}'___' ${c2} . - :dkxc;'. ..,cxkd; - .dkk. kkkkkkkkkk .kkd. -.dkk. ';cloolc;. .kkd -ckk. .kk; -xO: cOd -xO: lOd -lOO. .OO: -.k00. .00x - .k00; ;00O. - .lO0Kc;,,,,,,;c0KOc. - ;d00KKKKKK00d; - .,KKKK,. -EOF - ;; + # Iterate down a (possible) chain of symlinks. + while [[ -L "$full_dir" ]]; do + full_dir="$(readlink "$full_dir")" + cd "${full_dir%/*}" || exit + full_dir="${full_dir##*/}" + done - "MagpieOS"*) - set_colors 2 1 3 5 - read -rd '' ascii_data <<'EOF' -${c1} ;00000 :000Ol - .x00kk00: O0kk00k; - l00: :00. o0k :O0k. - .k0k. x${c2}d$dddd${c1}k' .d00; - k0k. ${c2}.dddddl ${c1}o00, - o00. ${c2}':cc:. ${c1}d0O -.00l ,00. -l00. d0x -k0O .:k0o -O0k ;dO0000d. -k0O .O0O${c2}xxxxk${c1}00: -o00. k0O${c2}dddddd${c1}occ -'00l x0O${c2}dddddo${c3};..${c1} - x00. .x00${c2}kxxd${c3}:..${c1} - .O0x .:oxxx${c4}Okl.${c1} - .x0d ${c4},xx,${c1} - .:o. ${c4}.xd ckd${c1} - .. ${c4}dxl .xx; - :xxolldxd' - ;oxdl. -EOF - ;; + # Final directory. + full_dir="$(pwd -P)/${1/*\/}" - "Manjaro"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1}██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -EOF - ;; + [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" +} - "Maui"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} `.-://////:--` - .:/oooooooooooooooo+:. - `:+ooooooooooooooooooooooo:` - `:oooooooooooooooooooooooooooo/` - ..```-oooooo/-`` `:oooooo+:.` `-- - :. +oo+-` /ooo/` -/ - -o. `o+- +o/` -o: -`oo` ::` :o/ `+. .+o` /oo. -/o+ . -+oo- ` /oo/ `ooo/ -+o- /ooo+` .+ooo. :ooo+ -++ .+oooo: -oooo+ `oooo+ -:. .oooooo` :ooooo- :oooo: -` .oooooo: :ooooo+ `ooo+-` - .+oooooo` -oooooo: `o/- - +oooooo: .ooooooo. - /ooooooo` /ooooooo/ .. - `:oooooooo/:::/ooooooooo+:--:/:` - `:+oooooooooooooooooooooo+:` - .:+oooooooooooooooo+:. - `.-://////:-.` -EOF - ;; +get_user_config() { + # Check $config_file. + if [[ -f "$config_file" ]]; then + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options + return + fi + mkdir -p "${XDG_CONFIG_HOME}/neofetch/" - "Mer"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} dMs - .-` - `y`-o+` - ``NMMy - .--`:++. - .hNNNNs - /MMMMMN - `ommmd/ +/ - ```` +/ - `:+sssso/-` - .-::. `-::-` `smNMNmdmNMNd/ .://-` -.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo -dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- -MMm yMM- :MMs NMN` `:::::--sMMh dMM` -MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` -NNd sNN- -NNs -mMNs-.--..:dMMh` dNN ---- .--` `--. .smMMmdddmMNdo` .-- - ./ohddds+:` - +h- `.:-. - ./`.dMMMN+ - +MMMMMd - `+dmmy- - ``` .+` - .dMNo-y. - `hmm/ - .:` - dMs -EOF - ;; + # Check ${XDG_CONFIG_HOME}/neofetch and create the + # dir/files if they don't exist. + if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config" - "Minix"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2} -sdhyo+:-` -/syymm: - sdyooymmNNy. `` .smNmmdysNd - odyoso+syNNmysoyhhdhsoomNmm+/osdm/ - :hhy+-/syNNmddhddddddmNMNo:sdNd: - `smNNdNmmNmddddddddddmmmmmmmy` - `ohhhhdddddmmNNdmddNmNNmdddddmdh- - odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: - `+mNho:` smmd/ sNNh :dmms` -+ymmo. --od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: -+sms -.` :so: .NN+ :os/ .-`mNh: -.-hyh+:////- -sNNd:` .--://ohNs- - `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ - -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: - //oydNMMMMydMMNysNMMmsMMMMMNyo/` - ../-yNMMy--/::/-.sMMmos+.` - -+oyhNsooo+omy/``` - `::ohdmds-` -EOF - ;; + elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - "Linux Mint"* | "LinuxMint"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. -MMm----::-://////////////oymNMd+` -MMd ${c2}/++ ${c1}-sNMd: -MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: -ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm - NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM - NMm ${c2}dMM` ..` ... ydm. ${c1}dMM - hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM - -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM - -dMNs-${c2}``-::::-------.`` ${c1}dMM - `/dMNmy+/:-------------:/yMMM - ./ydNMMMMMMMMMMMMMMMMMMMMM - .MMMMMMMMMMMMMMMMMMM -EOF - ;; + else + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - "MX"*) - set_colors 4 6 7 - read -rd '' ascii_data <<'EOF' -${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM -MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM -MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM -MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM -MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM -MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM -MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM -MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM -MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM -MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM -MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM -MMMMMMMNo` :mMMN+` `-hMMMMMMMM -MMMMMMh. `oNMMd: `/mMMMMMM -MMMMm/ -hMd- `sNMMMM -MMNs` - :dMMM -Mm: `oMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM -EOF - ;; + # The config file doesn't exist, create it. + printf "%s\n" "$config" > "$config_file" + fi - "NetBSD"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} `-/oshdmNMNdhyo+:-` -${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` -${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` - ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` - ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` - ${c2}-N/${c1}hMMMMMMMMMmho:` - ${c2}-N/${c1}-:/++/:.` -${c2} :M+ - :Mo - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms -EOF - ;; + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options +} - "Netrunner"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} .:oydmMMMMMMmdyo:` - -smMMMMMMMMMMMMMMMMMMds- - +mMMMMMMMMMMMMMMMMMMMMMMMMd+ - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ - `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` - .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` - dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh -+MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ -mMMMMMMMMd+:.` `mMMMMMMMMMMMMd -MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM -mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd -+MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ - dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh - `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` - `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: - +dMMMMMMMMMMMMMMMMMMMMMMMMd/ - -odMMMMMMMMMMMMMMMMMMdo- - `:+ydmNMMMMNmhy+-` -EOF - ;; +bar() { + # Get the values. + elapsed="$(($1 * bar_length / $2))" - "Nitrux"*) - set_colors 4 - read -rd '' ascii_data <<'EOF' -${c1}`:/. -`/yo -`/yo -`/yo .+:. -`/yo .sys+:.` -`/yo `-/sys+:.` -`/yo ./sss+:.` -`/yo .:oss+:-` -`/yo ./o///:-` -`/yo `.-:///////:` -`/yo `.://///++//-`` -`/yo `.-:////++++/-` -`/yo `-://///++o+/-` -`/yo `-/+o+++ooo+/-` -`/s+:+oooossso/.` -`//+sssssso:. -`+syyyy+:` -:+s+- -EOF - ;; + # Create the bar with spaces. + printf -v prog "%${elapsed}s" + printf -v total "%$((bar_length - elapsed))s" - "nixos_small") - set_colors 4 6 - read -rd '' ascii_data <<'EOF' - ${c1}\\\\ \\\\ // - ==\\\\__\\\\/ // - // \\\\// -==// //== - //\\\\___// -// /\\\\ \\\\== - // \\\\ \\\\ -EOF - ;; + # Set the colors and swap the spaces for $bar_char_. + bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" + bar+="${bar_color_total}${total// /${bar_char_total}}" - "NixOS"*) - set_colors 4 6 - read -rd '' ascii_data <<'EOF' -${c1} ::::. ${c2}'::::: ::::' -${c1} '::::: ${c2}':::::. ::::' -${c1} ::::: ${c2}'::::.::::: -${c1} .......:::::..... ${c2}:::::::: -${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. - ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' -${c2} ..... ::::' ${c1}:::::' -${c2} ::::: '::' ${c1}:::::' -${c2} ........::::: ' ${c1}:::::::::::. -${c2}::::::::::::: ${c1}::::::::::::: -${c2} ::::::::::: ${c1}.. ${c1}::::: -${c2} .::::: ${c1}.::: ${c1}::::: -${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... - ::::: ${c1}':::::. ${c2}......:::::::::::::' - ::: ${c1}::::::. ${c2}':::::::::::::::::' -${c1} .:::::::: ${c2}':::::::::: -${c1} .::::''::::. ${c2}'::::. -${c1} .::::' ::::. ${c2}'::::. -${c1} .:::: :::: ${c2}'::::. -EOF - ;; + # Borders. + [[ "$bar_border" == "on" ]] && \ + bar="$(color fg)[${bar}$(color fg)]" - "Nurunner"*) - set_colors 4 - read -rd '' ascii_data <<'EOF' -${c1} ,xc - ;00cxXl - ;K0, .xNo. - :KO' .lXx. - cXk. ;xl cXk. - cXk. ;k:.,xo. cXk. - .lXx. :x::0MNl,dd. :KO, - .xNx. cx;:KMMMMMNo'dx. ;KK; - .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: -;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO - 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: - .kNo .xo'xWMMMMMM0;:O: ;KK; - .dXd. .do,oNMMO;ck: ;00, - oNd. .dx,;'cO; ;K0, - oNx. okk; ;K0, - lXx. :KO' - cKk' cXk. - ;00:lXx. - ,kd. -EOF - ;; + printf "%b" "${bar}${info_color}" +} - "NuTyX"*) - set_colors 4 1 - read -rd '' ascii_data <<'EOF' -${c1} . - . - ... - ... - .... .........--. - ..-++-----....--++++++---. - .-++++++-. .-++++++++++++-----.. - .--... .++..-+++--.....-++++++++++--.. - . .-+-. .**- .... ..-+----.. - .+++. .*+. + -++-----. - .+++++- ++. .*+. .....-+++-----. - -+++-++. .+. .-+***++***++--++++. . - -+-. -- -. -*- ...... ..--. -.-. .+- . -+. -. .+- +. - -- -- - -+----. .- - -++-.+. . - .++. -- - +. ----. - . .+. .. - - . - . -EOF - ;; +cache() { + if [[ "$2" ]]; then + mkdir -p "${cache_dir}/neofetch" + printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" + fi +} - "OBRevenge"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} __ __ - _@@@@ @@@g_ - _@@@@@@ @@@@@@ - _@@@@@@M W@@@@@@_ - j@@@@P ^W@@@@ - @@@@L____ _____Q@@@@ -Q@@@@@@@@@@j@@@@@@@@@@ -@@@@@ T@j@ T@@@@@ -@@@@@ ___Q@J@ _@@@@@ -@@@@@fMMM@@j@jggg@@@@@@ -@@@@@ j@j@^MW@P @@@@ -Q@@@@@ggg@@f@ @@@@@@L -^@@@@WWMMP ^ Q@@@@ - @@@@@_ _@@@@l - W@@@@@g_____g@@@@@P - @@@@@@@@@@@@@@@@l - ^W@@@@@@@@@@@P - ^TMMMMTll -EOF - ;; +get_cache_dir() { + case "$os" in + "Mac OS X") cache_dir="/Library/Caches" ;; + *) cache_dir="/tmp" ;; + esac +} + +kde_config_dir() { + # If the user is using KDE get the KDE + # configuration directory. + if [[ "$kde_config_dir" ]]; then + return + + elif type -p kf5-config >/dev/null 2>&1; then + kde_config_dir="$(kf5-config --path config)" + + elif type -p kde4-config >/dev/null 2>&1; then + kde_config_dir="$(kde4-config --path config)" + + elif type -p kde-config >/dev/null 2>&1; then + kde_config_dir="$(kde-config --path config)" + + elif [[ -d "${HOME}/.kde4" ]]; then + kde_config_dir="${HOME}/.kde4/share/config" - "openbsd_small") - set_colors 3 7 6 1 8 - read -rd '' ascii_data <<'EOF' -${c1} _____ - \\- -/ - \\_/ \\ - | ${c2}O O${c1} | - |_ < ) 3 ) - / \\ / - /-_____-\\ -EOF - ;; + elif [[ -d "${HOME}/.kde3" ]]; then + kde_config_dir="${HOME}/.kde3/share/config" + fi - "OpenBSD"*) - set_colors 3 7 6 1 8 - read -rd '' ascii_data <<'EOF' - ${c3} _ - (_) -${c1} | . -${c1} . |L /| . ${c3} _ -${c1} _ . |\ _| \--+._/| . ${c3}(_) -${c1} / ||\| Y J ) / |/| ./ - J |)'( | ` F`.'/ ${c3} _ -${c1} -<| F __ .-< ${c3}(_) -${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ - J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ -${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) -${c1} '-F -<_. \\ .-' `-' L__ -__J _ _. >-' ${c1})${c4}._. ${c1}|-' -${c1} `-|.' /_. ${c4}\_| ${c1} F - /.- . _.< - /' /.' .' `\\ - /L /' |/ _.-'-\\ - /'J ___.---'\| - |\ .--' V | `. ` - |/`. `-. `._) - / .-.\\ - \\ ( `\\ - `.\ -EOF - ;; + kde_config_dir="${kde_config_dir/$'/:'*}" +} - "OpenIndiana"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} .sy/ - .yh+ +get_term_padding() { + # Terminal info. + # + # Parse terminal config files to get + # info about padding. Due to how w3m-img + # works padding around the terminal throws + # off the cursor placement calculation in + # specific terminals. + # + # Note: This issue only seems to affect + # URxvt. + ((term_run != 1)) && get_term - ${c1}-+syyyo+- ${c2} /+. - ${c1}+ddo/---/sdh/ ${c2} ym- - ${c1}`hm+ `sms${c2} ym-```````.-. - ${c1}sm+ sm/ ${c2} ym- +s - ${c1}hm. /mo ${c2} ym- /h - ${c1}omo ym: ${c2} ym- `os` - ${c1}smo` .ym+ ${c2} ym- .os- - `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. - ..` ${c1}`:+oo+/-` ${c2} -//oyo- - -:` .:oys/. -+- `./oyys/. -h+` `.-:+oyyyo/-` -`/ossssysso+/-.` -EOF + case "$term" in + "URxvt"*) + border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" ;; + esac +} - "OpenMandriva"*) - set_colors 4 3 - read -rd '' ascii_data <<'EOF' -${c2} `` - `-. -${c1} ` ${c2}.--- -${c1} -/ ${c2}-::--` -${c1} `++ ${c2}`----...```-:::::. -${c1} `os. ${c2}.::::::::::::::-``` ` ` -${c1} +s+ ${c2}.::::::::::::::::---...--` -${c1}-ss: ${c2}`-::::::::::::::::-.``.`` -${c1}/ss- ${c2}.::::::::::::-.`` ` -${c1}+ss: ${c2}.::::::::::::- -${c1}/sso ${c2}.::::::-::::::- -${c1}.sss/ ${c2}-:::-.` .::::: -${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: -${c1} -ossso+/:://+/-` ${c2}.:` -${c1} -/+ooo+/-. ${c2}` -EOF +dynamic_prompt() { + case "$image_backend" in + "ascii") printf "\n" ;; + "off") return ;; + *) + get_term_padding + lines="$(((border + height + yoffset) / font_height))" + image_prompt="on" ;; + esac - "OpenWrt"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} _______ -| |.-----.-----.-----. -| - || _ | -__| | -|_______|| __|_____|__|__| - |__| - ________ __ -| | | |.----.| |_ -| | | || _|| _| -|________||__| |____| -EOF - ;; + # If the info is higher than the ascii/image place the prompt + # based on the info height instead of the ascii/image height. + if ((lines < info_height)); then + [[ "$image_prompt" ]] && printf "\n" + return + else + [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" + lines="$((lines - info_height + 1))" + fi - "Open Source Media Center"* | "osmc") - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} -+shdmNNNNmdhs+- - .+hMNho/:..``..:/ohNMh+. - :hMdo. .odMh: - -dMy- -yMd- - sMd- -dMs - hMy +. .+ yMh - yMy dMs. .sMd yMy -:Mm dMNMs` `sMNMd `mM: -yM+ dM//mNs``sNm//Md +My -mM- dM: +NNNN+ :Md -Mm -mM- dM: `oNN+ :Md -Mm -yM+ dM/+NNo` :Md +My -:Mm` dMMNs` :Md `mM: - yMy dMs` -ms yMy - hMy +. yMh - sMd- -dMs - -dMy- -yMd- - :hMdo. .odMh: - .+hMNho/:..``..:/ohNMh+. - -+shdmNNNNmdhs+- -EOF - ;; + # Set the prompt location. + if ((lines > 1)); then + case "$kernel_name" in + "OpenBSD") tput cud "$lines" ;; + *) printf "%b" "\e[${lines}B" ;; + esac + fi +} - "Oracle"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} - `-/+++++++++++++++++/-.` - `/syyyyyyyyyyyyyyyyyyyyyyys/. - :yyyyo/-...............-/oyyyy/ - /yyys- .oyyy+ -.yyyy` `syyy- -:yyyo /yyy/ -.yyyy` `syyy- - /yyys. .oyyyo - /yyyyo:-...............-:oyyyy/` - `/syyyyyyyyyyyyyyyyyyyyyyys+. - `.:/+ooooooooooooooo+/:.` -EOF - ;; +old_functions() { + # Deprecated functions. + # Neofetch 2.0 changed the names of a few variables. + # This function adds backwards compatibility for the + # old variable names. + if type printinfo >/dev/null 2>&1; then + print_info() { printinfo ; } + get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } + get_termfont() { get_term_font; termfont="$term_font"; } + get_localip() { get_local_ip; localip="$local_ip"; } + get_publicip() { get_public_ip; publicip="$public_ip"; } + get_linebreak() { get_line_break; linebreak="$line_break"; } + fi - "PacBSD"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} :+sMs. - `:ddNMd- -o--` - -sMMMMh: `+N+`` - yMMMMMs` .....-/-... `mNh/ - yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm - yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm - :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd - +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- - :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. - .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- - /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` -.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- -:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` -/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. -:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` -:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` - sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. - :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// - /dMMMMMMMMMMMMMs- ````````..`` - .oMMMMMMMMMMMMNs` ./y:` - +dNMMNMMMMMMMmy` ``./ys. - `/hMMMMMMMMMMMNo-`` `.+yy+-` - `-/hmNMNMMMMMMmmddddhhy/-` - `-+oooyMMMdsoo+/:. -EOF - ;; + get_birthday() { get_install_date; birthday="$install_date"; } +} - "Parabola"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} `.-. `. - `.` `:++. `-+o+. - `` `:+/. `:+/. `-+oooo+ - ``-::-.:+/. `:+/. `-+oooooo+ - `.-:///- ..` .-. `-+oooooooo- - `..-..` `+ooooooooo: -`` :oooooooo/ - `ooooooo: - `oooooo: - -oooo+. - +ooo/` - -ooo- - `+o/. - /+- - //` - -. -EOF - ;; +old_options() { + [[ -n "$osx_buildversion" ]] && \ + err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." + [[ -n "$osx_codename" ]] && \ + err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." + [[ "$cpu_cores" == "on" ]] && \ + err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." + [[ -n "$image" ]] && \ + { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } - "Pardus"*) - set_colors 3 7 6 1 8 - read -rd '' ascii_data <<'EOF' -${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. -/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ -mN. oMdyy- -y `-dMo .Nm -.mN+` sMy hN+ -: yMs `+Nm. - `yMMddMs.dy `+` sMddMMy` - +MMMo .` . oMMM+ - `NM/ `````.` `.````` +MN` - yM+ `.-:yhomy ymohy:-.` +My - yM: yo oy :My - +Ms .N` `N. +h sM+ - `MN - -::::::- : :o:+`NM` - yM/ sh -dMMMMd- ho +y+My - .dNhsohMh-//: /mm/ ://-yMyoshNd` - `-ommNMm+:/. oo ./:+mMNmmo:` - `/o+.-somNh- :yy: -hNmos-.+o/` - ./` .s/`s+sMdd+``+ddMs+s`/s. `/. - : -y. -hNmddmNy. .y- : - -+ `..` +- -EOF - ;; + # All progress_ variables were changed to bar_. + [[ -n "$progress_char" ]] && \ + err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." + [[ -n "$progress_border" ]] && \ + { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ + bar_border="$progress_border"; } + [[ -n "$progress_length" ]] && \ + { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ + bar_length="$progress_length"; } + [[ -n "$progress_color_elapsed" ]] && \ + { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ + bar_color_elapsed="$progress_color_elapsed"; } + [[ -n "$progress_color_total" ]] && \ + { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ + bar_color_total="$progress_color_total"; } - "Parrot"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} `:oho/-` -`mMMMMMMMMMMMNmmdhy- - dMMMMMMMMMMMMMMMMMMs` - +MMsohNMMMMMMMMMMMMMm/ - .My .+dMMMMMMMMMMMMMh. - + :NMMMMMMMMMMMMNo - `yMMMMMMMMMMMMMm: - /NMMMMMMMMMMMMMy` - .hMMMMMMMMMMMMMN+ - ``-NMMMMMMMMMd- - /MMMMMMMMMMMs` - mMMMMMMMsyNMN/ - +MMMMMMMo :sNh. - `NMMMMMMm -o/ - oMMMMMMM. - `NMMMMMM+ - +MMd/NMh - mMm -mN` - /MM `h: - dM` . - :M- - d: - -+ - - -EOF - ;; + # All cpufreq values were changed in 3.0. + [[ "$speed_type" == "current" ]] && \ + err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." + [[ "$speed_type" == "min" ]] && \ + err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." + [[ "$speed_type" == "max" ]] && \ + err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." + [[ "$speed_type" == "bios" ]] && \ + err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." - "Parsix"*) - set_colors 3 1 7 8 - read -rd '' ascii_data <<'EOF' - ${c2}-/+/:. - ${c2}.syssssys. - ${c1}.--. ${c2}ssssssssso${c1} ..--. - :++++++: ${c2}+ssssssss+${c1} ./++/+++: - /+++++++++.${c2}.yssooooy`${c1}-+///////o- - /++++++++++.${c2}+soooos:${c1}:+////////+- - :+++++////o-${c2}oooooo-${c1}+/////////- - `-/++//++-${c4}.-----.-${c1}:+/////:- - ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. -${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- -${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ -${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- - `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` - ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. - ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: - ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ - ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: - ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- - ${c1}`--` ${c2}+sssssssso ${c1}`--` - ${c2}+sssssy+` - ${c2}`.::-` -EOF - ;; + # Ascii_logo_size was removed in 3.0. + [[ "$ascii_logo_size" ]] && \ + err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." - "PCBSD"* | "TrueOS"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} .. - s. - +y - yN - -MN `. - :NMs `m - .yMMm` `No - `-/+++sdMMMNs+-`+Ms - `:oo+-` .yMMMMy` `-+oNMh - -oo- +NMMMM/ oMMh- - .s+` ` oMMMMM/ - oMMMhy. - +s`- :: :MMMMMd -o `mMMMy`s+ - y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y - s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s --h .NM` `hMMMMMMMMMMMMMMNMMNy: h- -y- hMN` hMMmMMMMMMMMMNsdMNs. -y -m` mMMy` oMMNoNMMMMMMo` sMMMo `m -m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m -h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h -:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: - y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y - `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` - so -NMMMN /mmd+ `dMMMMMMMm- os - :y: `yMMM` `+NMMMMMMNo`:y: - /s+`.omy /NMMMMMNh/.+s: - .+oo:-. /mdhs+::oo+. - -/o+++++++++++/- -EOF - ;; + # $start and $end were replaced with ${block_range[@]} in 3.0. + [[ "$start" && "$end" ]] && \ + { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ + block_range=("$start" "$end"); } - "PCLinuxOS"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' - ${c1}mhhhyyyyhhhdN - dyssyhhhhhhhhhhhssyhN - Nysyhhyo/:-.....-/oyhhhssd - Nsshhy+. `/shhysm - dohhy/ -shhsy - dohhs` /hhys -N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy -ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ -+hho ${c2}ymm- /mmy+mms ${c1}:hhod -/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh -+hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m -yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ - ohhy` ${c2}://` -/+++/- ${c1}ohhom - N+hhy- `shhoh - sshho. `+hhyom - dsyhhs/. `:ohhhoy - dysyhhhso///://+syhhhssh - dhyssyhhhhhhyssyyhN - mddhdhdmN -EOF - ;; + # Fahrenheit support was added to CPU so the options were changed. + [[ "$cpu_temp" == "on" ]] && \ + { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; + cpu_temp="C"; } - "Peppermint"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} 8ZZZZZZ${c2}MMMMM -${c1} .ZZZZZZZZZ${c2}MMMMMMM. -${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ -${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM -${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. -${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI -${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM -${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM -${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM -${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM -${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM -${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M -${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 -${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 -${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 -${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z -${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM -${c1} NZZZZZZZZZZZ${c2}MMMMM -${c1} ZZZZZZZZZ${c2}MM) -EOF - ;; + # Birthday was renamed to Install Date in 3.0 + [[ -n "$birthday_time" ]] && \ + { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ + install_time="$birthday_time"; } - "Pop!_OS"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} ///////////// - ///////////////////// - ///////${c2}*767${c1}//////////////// - //////${c2}7676767676*${c1}////////////// - /////${c2}76767${c1}//${c2}7676767${c1}////////////// - /////${c2}767676${c1}///${c2}*76767${c1}/////////////// - ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// -/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// -//////////${c2}76767676767${c1}////${c2}76767${c1}///////// -///////////${c2}76767676${c1}//////${c2}7676${c1}////////// -////////////,${c2}7676${c1},///////${c2}767${c1}/////////// -/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// -///////////////${c2}7676${c1}//////////////////// - ///////////////${c2}7676${c1}///${c2}767${c1}//////////// - //////////////////////${c2}'${c1}//////////// - //////${c2}.7676767676767676767,${c1}////// - /////${c2}767676767676767676767${c1}///// - /////////////////////////// - ///////////////////// - ///////////// -EOF - ;; + # Scrot dir was removed in 3.1.0. + [[ -n "$scrot_dir" ]] && scrot_dir= - "Porteus"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} `.-:::-.` - -+ydmNNNNNNNmdy+- - .+dNmdhs+//////+shdmdo. - .smmy+-` ./sdy: - `omdo. `.-/+osssso+/-` `+dy. - `yms. `:shmNmdhsoo++osyyo-``oh. - hm/ .odNmds/.` ``.....:::-+s -/m: `+dNmy:` `./oyhhhhyyooo++so -ys `yNmy- .+hmmho:-.` ``` -s: yNm+` .smNd+. -`` /Nm: +dNd+` - yN+ `smNy. - dm oNNy` - hy -mNm. - +y oNNo - `y` sNN: - `: +NN: - ` .mNo - /mm` - /my` - .sy` - .+: - ` -EOF - ;; + # cpu_shorthand was deprecated in 3.3.0 + [[ -n "$cpu_shorthand" ]] && \ + { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and + \$cpu_speed instead."; } +} - "PostMarketOS"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} ss - `hMMh` - .dMMMMd. - -NMMMMMMN- - /MMMMMMMMMN/ - hMMMMMMMMMMMo - y+`mMMmdNMMMMMMy - `dMM-.-:- .mMMMMMMh` - .mMMMMMMd` `dMMMMMMm. - :NMMMMMMy yMMMMMMN: - /MMMMMMMo oMMMmdmN/ - oMMMMMMM/ /MN.-/:-. - `yMMMMMMN- -:.NMMMMy` - `dMMMMMMM- -/////////////dMMMMMMd` - -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- - :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: -+MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ -EOF - ;; +cache_uname() { + # Cache the output of uname so we don't + # have to spawn it multiple times. + IFS=" " read -ra uname <<< "$(uname -sr)" - "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) - set_colors 4 7 - read -rd '' ascii_data <<'EOF' -${c1} `-/osyyyysosyhhhhhyys+- - -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ - yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy -.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ --NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ -.Nm+shddyooo+/smNNNNmmmmNh. :mmd. - NNNNy:` ./hmmmmmmmNNNN: hNMh - NMN- -++- +NNNNNNNNNNm+..-sMMMM- -.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ -.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ - mMM+ .. `sNN+. hMMMMhhMMM- - +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy - yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` - sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` - :mMMMMMMMMMMMmddNMMMMMMMMmh/ - /dMMMMMMMMMMMMMMMMMMNdy/` - .+hNMMMMMMMMMNmdhs/. - .:/+ooo+/:-. -EOF - ;; + kernel_name="${uname[0]}" + kernel_version="${uname[1]}" +} - "Qubes"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} `..--..` - `.----------.` - `..----------------..` - `.------------------------.`` - `..-------------....-------------..` -.::----------..`` ``..----------:+: -:////:----..` `..---:/ossso -:///////:` `/osssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:////////-` .:sssssssso -:///////////-.` `-/osssssssssso -`//////////////:-```.:+ssssssssssssso- - .-://////////////sssssssssssssso/-` - `.:///////////sssssssssssssso:. - .-:///////ssssssssssssssssss/` - `.:////ssss+/+ssssssssssss. - `--//- `-/osssso/. -EOF - ;; +convert_time() { + # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. + year="$1" + day="${3#0}" - "Raspbian"*) - set_colors 2 1 - read -rd '' ascii_data <<'EOF' -${c1} `.::///+:/-. --///+//-:`` - `+oooooooooooo: `+oooooooooooo: - /oooo++//ooooo: ooooo+//+ooooo. - `+ooooooo:-:oo- +o+::/ooooooo: - `:oooooooo+`` `.oooooooo+- - `:++ooo/. :+ooo+/.` - ${c2}...` `.----.` ``.. - .::::-``:::::::::.`-:::-` - -:::-` .:::::::-` `-:::- - `::. `.--.` `` `.---.``.::` - .::::::::` -::::::::` ` - .::` .:::::::::- `::::::::::``::. --:::` ::::::::::. ::::::::::.`:::- -:::: -::::::::. `-:::::::: :::: --::- .-:::-.``....``.-::-. -::- - .. `` .::::::::. `..`.. - -:::-` -::::::::::` .:::::` - :::::::` -::::::::::` :::::::. - .::::::: -::::::::. :::::::: - `-:::::` ..--.` ::::::. - `...` `...--..` `...` - .:::::::::: - `.-::::-` -EOF - ;; + # Split time into hours/minutes. + hour="${4/:*}" + min="${4/${hour}}" - "Red Star"* | "Redstar"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} .. - .oK0l - :0KKKKd. - .xKO0KKKKd - ,Od' .d0000l - .c;. .'''... ..'. -.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: -;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. - .okkkkd,.lko .......',;:cllc:;,,'''''. - .cdo. :xd' cd:. ..';'',,,'',,;;;,'. - . .ddl.;doooc'..;oc;'..';::;,'. - coo;.oooolllllllcccc:'. . - .ool''lllllccccccc:::::;. - ;lll. .':cccc:::::::;;;;' - :lcc:'',..';::::;;;;;;;,,. - :cccc::::;...';;;;;,,,,,,. - ,::::::;;;,'. ..',,,,'''. - ........ ...... -EOF - ;; + # Get month. (Month code is used for day of week) + # Due to different versions of 'ls', the month can be 1, 01 or Jan. + case "$2" in + 1 | 01 | "Jan") month="Jan"; month_code=0 ;; + 2 | 02 | "Feb") month="Feb"; month_code=3 ;; + 3 | 03 | "Mar") month="Mar"; month_code=3 ;; + 4 | 04 | "Apr") month="Apr"; month_code=6 ;; + 5 | 05 | "May") month="May"; month_code=1 ;; + 6 | 06 | "Jun") month="Jun"; month_code=4 ;; + 7 | 07 | "Jul") month="Jul"; month_code=6 ;; + 8 | 08 | "Aug") month="Aug"; month_code=2 ;; + 9 | 09 | "Sep") month="Sep"; month_code=5 ;; + 10 | "Oct") month="Oct"; month_code=0 ;; + 11 | "Nov") month="Nov"; month_code=3 ;; + 12 | "Dec") month="Dec"; month_code=5 ;; + esac - "Redhat"* | "Red Hat"* | "rhel"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} `.-..........` - `////////::.`-/. - -: ....-////////. - //:-::///////////` - `--::: `-://////////////: - //////- ``.-:///////// .` - `://////:-.` :///////::///:` - .-/////////:---/////////////: - .-://////////////////////. -${c2} yMN+`.-${c1}::///////////////-` -${c2} .-`:NMMNMs` `..-------..` - MN+/mMMMMMhoooyysshsss -MMM MMMMMMMMMMMMMMyyddMMM+ - MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM - MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM - MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM -EOF - ;; + # Get leap year. + # Source: http://stackoverflow.com/questions/725098/leap-year-calculation + [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ + [[ "$month" =~ (Jan|Feb) ]] && \ + leap_code=1 - "Refracted Devuan"*) - set_colors 8 7 - read -rd '' ascii_data <<'EOF' -${c2} A - VW - VVW\\ - .yWWW\\ - ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ - *WWWWWWWWWWWWWWWW/ $VWWWWw , - ^*%WWWWWWVWWX $WWWW** ,yy - , "**WWW/' **' ,yy/WWW*` - &WWWWwy `*` <,ywWW%VWWW* - yWWWWWWWWWW* ., "**WW%W - ,&WWWWWM*"` ,y/ &WWWww ^* - XWWX*^ ,yWWWW09 .WWWWWWWWwy, - *` &WWWWWM WWWWWWWWWWWWWww, - (WWWWW` /#####WWW*********** - ^WWWW - VWW - Wh. - V/ -EOF + # Calculate day of week. + # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html + year_code="$((${year/??} + (${year/??} / 4) % 7))" + week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" + + case "$week_day" in + 0) week_day="Sun" ;; + 1) week_day="Mon" ;; + 2) week_day="Tue" ;; + 3) week_day="Wed" ;; + 4) week_day="Thu" ;; + 5) week_day="Fri" ;; + 6) week_day="Sat" ;; + esac + + # Convert 24 hour time to 12 hour time + AM/PM. + case "$install_time_format" in + "12h") + case "$hour" in + [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; + *) time="$((hour - 12))${min} PM" ;; + esac ;; + *) time="$4" ;; + esac - "Rosa"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ROSAROSAROSAROSAR - ROSA AROS - ROS SAROSAROSAROSAR AROS - RO ROSAROSAROSAROSAROSAR RO - ARO AROSAROSAROSARO AROS ROS - ARO ROSAROS OSAR ROSA ROS - RO AROSA ROSAROSAROSA ROSAR RO -RO ROSAR ROSAROSAROSAR R ROSARO RO -RO ROSA AROSAROSAROSA AR ROSARO AR -RO AROS ROSAROSAROSA ROS AROSARO AR -RO AROS ROSAROSARO ROSARO ROSARO AR -RO ROS AROSAROS ROSAROSA AROSAR AR -RO ROSA ROS ROSAROSAR ROSARO RO - RO ROS AROSAROSAROSA ROSARO AR - ARO ROSA ROSAROSAROS AROSAR ARO - ARO OROSA R ROSAROS ROS - RO AROSAROS AROSAROSAR RO - AROS AROSAROSAROSARO AROS - ROSA SARO - ROSAROSAROSAROSAR -EOF + # Toggle showing the time. + [[ "$install_time" == "off" ]] && unset time + + # Print the install date. + printf "%s" "$week_day $day $month $year $time" +} + +get_ppid() { + # Get parent process ID of PID. + case "$os" in + "Windows") + ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" + ppid="${ppid/'PPID'}" ;; - "sabotage"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} .|'''.| | '||''|. ..|''|| - ||.. ' ||| || || .|' || - ''|||. | || ||'''|. || || -. '|| .''''|. || || '|. || -|'....|' .|. .||. .||...|' ''|...|' + "Linux") + ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" + ppid="$(trim "${ppid/PPid:}")" + ;; -|''||''| | ..|'''.| '||''''| - || ||| .|' ' || . - || | || || .... ||''| - || .''''|. '|. || || - .||. .|. .||. ''|...'| .||.....| -EOF + *) + ppid="$(ps -p "${1:-$PPID}" -o ppid=)" ;; + esac - "Sabayon"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ........... - .. .. - .. .. - .. ${c2}o ${c1}.. - .. ${c2}:W' ${c1}.. - .. ${c2}.d. ${c1}.. -:. ${c2}.KNO ${c1}.: -:. ${c2}cNNN. ${c1}.: -: ${c2}dXXX, ${c1}: -: ${c2}. dXXX, .cd, ${c1}: -: ${c2}'kc .. dKKK. ,ll;:' ${c1}: -: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: -:. ${c2}.,cdddddddddddddo:. ${c1}.: - .. ${c2}:lllllll: ${c1}.. - .. ${c2}',,,,, ${c1}.. - .. .. - .. .. - ............... -EOF + printf "%s" "$ppid" +} + +get_process_name() { + # Get PID name. + case "$os" in + "Windows") + name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" + name="${name/'COMMAND'}" + name="${name/*\/}" ;; - "SailfishOS"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} .+eWWW - .+ee+++eee e. - .ee++eeeeeeee +e. - .e++ee++eeeeeee+eee+e+ - ee.e+.ee+eee++eeeeee+ - W.+e.e+.e++ee+eee - W.+e.W.ee.W++ee' - +e.W W.e+.W.W+ - W.e.+e.W W W. - e e e +e.W.W - .W W W. - W.+e.W. - W++e.ee+. - ++ +ee++eeeee++. - ' '+++e 'ee. - ee - ee - e -EOF + "Linux") + name="$(< "/proc/${1:-$PPID}/comm")" ;; - "SalentOS"*) - set_colors 2 1 3 7 - read -rd '' ascii_data <<'EOF' -${c1} ``..`` - .-:+oshdNMMMMMMNdhyo+:-.` - -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ -${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` -${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- -${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` -${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` -${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd -${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy -${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo -${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ -${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- -${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` -${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm -${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy -${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: -${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. -${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: -${c2} `:smMM${c4}yy${c3}MMNy/` - ${c2}.- ${c4}`${c3}:. -EOF + *) + name="$(ps -p "${1:-$PPID}" -o comm=)" ;; + esac + + printf "%s" "$name" +} + +decode_url() { + decode="${1//+/ }" + printf "%b" "${decode//%/\\x}" +} + +# FINISH UP + +usage() { printf "%s" "\ +Usage: neofetch --option \"value\" --option \"value\" + +Neofetch is a CLI system information tool written in BASH. Neofetch +displays information about your system next to an image, your OS logo, +or any ASCII file of your choice. + +NOTE: Every launch flag has a config option. + +Options: + +INFO: + --disable infoname Allows you to disable an info line from appearing + in the output. + + NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' + + --os_arch on/off Hide/Show OS architecture. + --speed_type type Change the type of cpu speed to display. + Possible values: current, min, max, bios, + scaling_current, scaling_min, scaling_max + + NOTE: This only supports Linux with cpufreq. + + --speed_shorthand on/off Whether or not to show decimals in CPU speed. + + NOTE: This flag is not supported in systems with CPU speed less than + 1 GHz. + + --cpu_brand on/off Enable/Disable CPU brand in output. + --cpu_cores type Whether or not to display the number of CPU cores + Possible values: logical, physical, off + + NOTE: 'physical' doesn't work on BSD. + + --cpu_speed on/off Hide/Show cpu speed. + --cpu_temp C/F/off Hide/Show cpu temperature. + + NOTE: This only works on Linux and BSD. + + NOTE: For FreeBSD and NetBSD-based systems, you need to enable + coretemp kernel module. This only supports newer Intel processors. + + --distro_shorthand on/off Shorten the output of distro (tiny, on, off) + + NOTE: This option won't work in Windows (Cygwin) + + --kernel_shorthand on/off Shorten the output of kernel + + NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) + + --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) + --refresh_rate on/off Whether to display the refresh rate of each monitor + Unsupported on Windows + --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) + --gpu_type type Which GPU to display. (all, dedicated, integrated) + + NOTE: This only supports Linux. + + --gtk_shorthand on/off Shorten output of gtk theme/icons + --gtk2 on/off Enable/Disable gtk2 theme/font/icons output + --gtk3 on/off Enable/Disable gtk3 theme/font/icons output + --shell_path on/off Enable/Disable showing \$SHELL path + --shell_version on/off Enable/Disable showing \$SHELL version + --disk_show value Which disks to display. + Possible values: '/', '/dev/sdXX', '/path/to/mount point' + + NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') + + --disk_subtitle type What information to append to the Disk subtitle. + Takes: name, mount, dir + + 'name' shows the disk's name (sda1, sda2, etc) + + 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) + + 'dir' shows the basename of the disks's path. (/, Local Disk, etc) + + --ip_host url URL to query for public IP + --song_shorthand on/off Print the Artist/Title on separate lines + --music_player player-name Manually specify a player to use. + Available values are listed in the config file + --install_time on/off Enable/Disable showing the time in Install Date output. + --install_time_format 12h/24h + Set time format in Install Date to be 12 hour or 24 hour. + +TEXT FORMATTING: + --colors x x x x x x Changes the text colors in this order: + title, @, underline, subtitle, colon, info + --underline on/off Enable/Disable the underline. + --underline_char char Character to use when underlining title + --bold on/off Enable/Disable bold text + +COLOR BLOCKS: + --color_blocks on/off Enable/Disable the color blocks + --block_width num Width of color blocks in spaces + --block_height num Height of color blocks in lines + --block_range num num Range of colors to print as blocks + +BARS: + --bar_char 'elapsed char' 'total char' + Characters to use when drawing bars. + --bar_border on/off Whether or not to surround the bar with '[]' + --bar_length num Length in spaces to make the bars. + --bar_colors num num Colors to make the bar. + Set in this order: elapsed, total + --cpu_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --memory_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --battery_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --disk_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + +IMAGE BACKEND: + --backend backend Which image backend to use. + Possible values: 'ascii', 'caca', 'catimg', '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/' + --ascii source Shortcut to use 'ascii' backend. + --caca source Shortcut to use 'caca' backend. + --catimg source Shortcut to use 'catimg' backend. + --iterm2 source Shortcut to use 'iterm2' backend. + --jp2a source Shortcut to use 'jp2a' backend. + --kitty source Shortcut to use 'kitty' backend. + --pixterm source Shortcut to use 'pixterm' backend. + --sixel source Shortcut to use 'sixel' backend. + --termpix source Shortcut to use 'termpix' backend. + --tycat source Shortcut to use 'tycat' backend. + --w3m source Shortcut to use 'w3m' backend. + --off Shortcut to use 'off' backend. + + NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', + '/path/to/ascii', '/path/to/dir/' - "Scientific"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} =/;;/- - +: // - /; /; - -X H. -.//;;;:;;-, X= :+ .-;:=;:;#;. -M- ,=;;;#:, ,:#;;:=, ,@ -:# :#.=/++++/=.$= #= - ,#; #/:+/;,,/++:+/ ;+. - ,+/. ,;@+, ,#H;, ,/+, - ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; - ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. - ,;: :@#= =$H: .+#- - ,#= #;-///==///-// =#, -;+ :#-;;;:;;;;-X- +: -@- .-;;;;M- =M/;;;-. -X - :;;::;;-. #- :+ ,-;;-;:== - ,X H. - ;/ #= - // +; - '////' -EOF - ;; +ASCII: + --ascii_colors x x x x x x Colors to print the ascii art + --ascii_distro distro Which Distro's ascii art to print - "Siduction"*) - set_colors 4 4 - read -rd '' ascii_data <<'EOF' -${c1} _aass, - jQh: =$w - QWmwawQW - )$QQQQ@( .. - _a_a. ~??^ syDY?Sa, - _mW>-<$c jWmi imm. - ]QQwayQE 4QQmgwmQQ` - ?WWQWP' -9QQQQQ@'._aas, - _a%is. .adYYs,. -"?!` aQB*~^3$c -_Qh;.nm .QWc. {QL ]QQp;..vmQ/ -"QQmmQ@ -QQQggmQP ]QQWmggmQQ( - -???" "$WQQQY` __, ?QQQQQQW! - _yZ!?q, - .yWY!!Sw, "???^ - .QQa_=qQ mQm>..vmm - $QQWQQP $QQQgmQQ@ - "???" _aa, -9WWQQWY` - _mB>~)$a -~~ - mQms_vmQ. - ]WQQQQQP - -?T??" -EOF - ;; + NOTE: Arch and Ubuntu have 'old' logo variants. - "Slackware"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ::::::: - ::::::::::::::::::: - ::::::::::::::::::::::::: - ::::::::${c2}cllcccccllllllll${c1}:::::: - :::::::::${c2}lc dc${c1}::::::: - ::::::::${c2}cl clllccllll oc${c1}::::::::: - :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: - ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: - :::::::::::${c2}lc cclccclc${c1}::::::::::::: -::::::::::::::${c2}lcclcc lc${c1}:::::::::::: -::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: -::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: - :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: - :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: - ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: - :::${c2}oclcccccccccccccllllllllllllll${c1}::::: - ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: - :::::::::::::::::::::::::::::::: - :::::::::::::::::::::::::::: - :::::::::::::::::::::: - :::::::::::: -EOF - ;; + NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. - "SliTaz"*) - set_colors 3 3 - read -rd '' ascii_data <<'EOF' -${c1} @ @( @ - @@ @@ @ @/ - @@ @@ @@ @@ - @@ %@@ @@ @@ - @@ %@@@ @@@@@. @@@@ @@ - @@@ @@@@ @@@@@@@ &@@@ @@@ - @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ - ,@@@@@@@@@@@@@@@@@@@@@@@@@ - .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ -@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ -@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ -@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. -@@ ,@@ @@@@@@@@@@@@@ @@@ @@ -@ @@. @@@@@@@@@@@@@ @@@ *@ -@ @@ @@@@@@@@@@@@ @@ @ - @ @@@@@@@@@. #@ - @ ,@@@@@ @ -EOF - ;; + NOTE: Ubuntu has flavor variants. - "SmartOS"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyys oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyy syyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy yyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -EOF - ;; + NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', + 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. - "Solus"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} -``````````` - `-+/------------.` - .---:mNo---------------. - .-----yMMMy:---------------. - `------oMMMMMm/----------------` - .------/MMMMMMMN+----------------. - .------/NMMMMMMMMm-+/--------------. -`------/NMMMMMMMMMN-:mh/-------------` -.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. ------/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- -----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. -.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` -`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. -`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ - .------------:://+-/++++++${c1}oshddys: - -hhhhyyyyyyyyyyyhhhhddddhysssso- - `:ossssssyysssssssssssssssso:` - `:+ssssssssssssssssssss+- - `-/+ssssssssssso+/-` - `.-----..` -EOF - ;; + NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, + OpenBSD, and Void have a smaller logo variant. - "Source Mage"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} :ymNMNho. -.+sdmNMMMMMMMMMMy` -.-::/yMMMMMMMMMMMm- - sMMMMMMMMMMMm/ - /NMMMMMMMMMMMMMm: - .MMMMMMMMMMMMMMMMM: - `MMMMMMMMMMMMMMMMMN. - NMMMMMMMMMMMMMMMMMd - mMMMMMMMMMMMMMMMMMMo - hhMMMMMMMMMMMMMMMMMM. - .`/MMMMMMMMMMMMMMMMMs - :mMMMMMMMMMMMMMMMN` - `sMMMMMMMMMMMMMMM+ - /NMMMMMMMMMMMMMN` - oMMMMMMMMMMMMM+ - ./sd.-hMMMMMMMMmmN` - ./+oyyyh- `MMMMMMMMMmNh - sMMMMMMMMMmmo - `NMMMMMMMMMd: - -dMMMMMMMMMo - -shmNMMms. -EOF - ;; + NOTE: Use '{distro name}_small' to use the small variants. - "Sparky"*) - set_colors 1 7 - read -rd '' ascii_data <<'EOF' -${c1} - . `-:-` - .o` .-///-` - `oo` .:/++:. - os+` -/+++:` ``.........``` - /ys+`./+++/-.-::::::----......`` - `syyo`++o+--::::-::/+++/-`` - -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` -::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` -`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` - -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- - .sdddy::syo--/:. `.:dy+-ohhho ./: - :yddds/:+oo+//:-`- /+ +hy+.shhy: `` - `:ydmmdysooooooo-.ss`/yss--oyyo - `./ossyyyyo+:-/oo:.osso- .oys - ``..-------::////.-oooo/ :so - `...----::::::::--.`/oooo: .o: - ``````` ++o+:` `:` - ./+/-` ` - `-:-. - `` -EOF - ;; + --ascii_bold on/off Whether or not to bold the ascii logo. + -L, --logo Hide the info text and only show the ascii logo. - "SteamOS"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} .,,,,. - .,'onNMMMMMNNnn',. - .'oNMANKMMMMMMMMMMMNNn'. - .'ANMMMMMMMXKNNWWWPFFWNNMNn. - ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, - ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, -,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, -'${c2}+#############, +. ,+' ${c1}+NMMM -${c2} '*#########*' '*,,*' ${c1}.+NMMMM. -${c2} `'*###*' ,.,;###${c1}+WNM, -${c2} .,;;, .;##########${c1}+W -${c2},',. '; ,+##############' - '###+. :,. .,; ,###############' - '####.. `'' .,###############' - '#####+++################' - '*##################*' - ''*##########*'' - '''''' -EOF - ;; + Possible values: bar, infobar, barinfo, off + +IMAGE: + --loop Redraw the image constantly until Ctrl+C is used. This fixes issues + in some terminals emulators when using image mode. + --size 00px | --size 00% How to size the image. + Possible values: auto, 00px, 00%, none + --crop_mode mode Which crop mode to use + Takes the values: normal, fit, fill + --crop_offset value Change the crop offset for normal mode. + Possible values: northwest, north, northeast, + west, center, east, southwest, south, southeast + + --xoffset px How close the image will be to the left edge of the + window. This only works with w3m. + --yoffset px How close the image will be to the top edge of the + window. This only works with w3m. + --bg_color color Background color to display behind transparent image. + This only works with w3m. + --gap num Gap between image and text. + + NOTE: --gap can take a negative value which will move the text + closer to the left side. - "SunOS" | "Solaris") - set_colors 3 7 - read -rd '' ascii_data <<'EOF' -${c1} `- ` - `-- `+- .: - .+: `++: -/+- . - `.::` -++/``:::`./+/ `.-/. - `++/-`.` ` /++:` - `` ./:` .: `..`.- -``./+/:- -+++:- - -/+` :. -EOF - ;; + --clean Delete cached files and thumbnails. - "openSUSE Tumbleweed"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c2} ...... - .,cdxxxoc,. .:kKMMMNWMMMNk:. - cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. - ;WMK;. .lKMMNM, :NMK, .OMW; - cMW; 'WMMMN ,XMK, oMM' -.MMc ..;l. xMN: KM0 -'MM. 'NMO oMM -.MM, .kMMl xMN - KM0 .kMM0. .dl:,.. .WMd - .XM0. ,OMMK, OMMMK. .XMK - oWMO:. .;xNMMk, NNNMKl. .xWMx - :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, - ..... .:dOOXXKOxl, -EOF - ;; +SCREENSHOT: + -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- + shot function will use \$scrot_dir and \$scrot_name. + -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. + --image_host imgur/teknik Website to upload scrots to. + --scrot_cmd cmd Screenshot program to launch - "openSUSE"* | "open SUSE"* | "SUSE"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c2} .;ldkO0000Okdl;. - .;d00xl:^''''''^:ok00d;. - .d00l' 'o00d. - .d0Kd'${c1} Okxol:;,. ${c2}:O0d. - .OK${c1}KKK0kOKKKKKKKKKKOxo:, ${c2}lKO. - ,0K${c1}KKKKKKKKKKKKKKK0P^${c2},,,${c1}^dx:${c2} ;00, -.OK${c1}KKKKKKKKKKKKKKKk'${c2}.oOPPb.${c1}'0k.${c2} cKO. -:KK${c1}KKKKKKKKKKKKKKK: ${c2}kKx..dd ${c1}lKd${c2} 'OK: -dKK${c1}KKKKKKKKKOx0KKKd ${c2}^0KKKO' ${c1}kKKc${c2} dKd -dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd -:KK${c1}KKKKKKKKKK0o;...^cdxxOK0O/^^' ${c2}.0K: - kKK${c1}KKKKKKKKKKKKK0x;,,......,;od ${c2}lKk - '0K${c1}KKKKKKKKKKKKKKKKKKKK00KKOo^ ${c2}c00' - 'kK${c1}KKOxddxkOO00000Okxoc;'' ${c2}.dKk' - l0Ko. .c00l' - 'l0Kk:. .;xK0l' - 'lkK0xl:;,,,,;:ldO0kl' - '^:ldxkkkkxdl:^' -EOF - ;; +OTHER: + --config /path/to/config Specify a path to a custom config file + --config none Launch the script without a config file + --stdout Turn off all colors and disables any ASCII/image backend. + --help Print this text and exit + --version Show neofetch version + -v Display error messages. + -vv Display a verbose log for error reporting. - "SwagArch"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} .;ldkOKXXNNNNXXK0Oxoc,. - ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; - 'K0xo ..,;:c:. `'lKMMMMM0 - .lONMMMMMM' `lNMk' -${c2} ;WMMMMMMMMMO. ${c1}....::... -${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, -${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. -${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. -${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: -${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. -${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: -${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. -${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. - :ccc:' `cccccccc:, - '' -EOF - ;; +DEVELOPER: + --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) - "Tails"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} `` - ./yhNh -syy/Nshh `:o/ -N:dsNshh █ `ohNMMd -N-/+Nshh `yMMMMd -N-yhMshh yMMMMd -N-s:hshh █ yMMMMd so//. -N-oyNsyh yMMMMd d Mms. -N:hohhhd:. yMMMMd syMMM+ -Nsyh+-..+y+- yMMMMd :mMM+ -+hy- -ss/`yMMMM `+d+ - :sy/. ./yNMMMMm `` - .+ys- `:+hNMMMMMMy/` - `hNmmMMMMMMMMMMMMdo. - dMMMMMMMMMMMMMMMMMNh: - +hMMMMMMMMMMMMMMMMMmy. - -oNMMMMMMMMMMmy+.` - `:yNMMMds/.` - .//` -EOF - ;; - "Trisquel"*) - set_colors 4 6 - read -rd '' ascii_data <<'EOF' -${c1} ▄▄▄▄▄▄ - ▄█████████▄ - ▄▄▄▄▄▄ ████▀ ▀████ - ▄██████████▄ ████▀ ▄▄ ▀███ - ▄███▀▀ ▀▀████ ███▄ ▄█ ███ -▄███ ▄▄▄ ████▄ ▀██████ ▄███ -███ █▀▀██▄ █████▄ ▀▀ ▄████ -▀███ ███ ███████▄▄ ▄▄██████ -${c1} ▀███▄ ▄███ █████████████${c2}████▀ -${c1} ▀█████████ ███████${c2}███▀▀▀ - ▀▀███▀▀ ██████▀▀ - ██████▀ ▄▄▄▄ - █████▀ ████████ - █████ ███▀ ▀███ - ████▄ ██▄▄▄ ███ - █████▄ ▀▀ ▄██ - ██████▄▄▄████ - ▀▀█████▀▀ -EOF - ;; +Report bugs to https://github.com/dylanaraps/neofetch/issues - "Ubuntu-Budgie"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} ./oydmMMMMMMmdyo/. - :smMMMMMMMMMMMhs+:++yhs: - `omMMMMMMMMMMMN+` `odo` - /NMMMMMMMMMMMMN- `sN/ - `hMMMMmhhmMMMMMMh sMh` - .mMmo- /yMMMMm` `MMm. - mN/ yMMMMMMMd- MMMm -oN- oMMMMMMMMMms+//+o+: :MMMMo -m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm -M` .NMMMMMMMMMMMMMMMNodMMMMMMM -M- sMMMMMMMMMMMMMMMMMMMMMMMMM -mm` mMMMMMMMMMNdhhdNMMMMMMMMMm -oMm/ .dMMMMMMMMh: :dMMMMMMMo - mMMNyo/:/sdMMMMMMMMM+ sMMMMMm - .mMMMMMMMMMMMMMMMMMs `NMMMm. - `hMMMMMMMMMMM.oo+. `MMMh` - /NMMMMMMMMMo sMN/ - `omMMMMMMMMy. :dmo` - :smMMMMMMMh+-` `.:ohs: - ./oydmMMMMMMdhyo/. -EOF - ;; +" +exit 1 +} - "Ubuntu-GNOME"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c3} ./o. - .oooooooo - .oooo```soooo - .oooo` `soooo - .ooo` ${c4}.o.${c3} `\/ooo. - :ooo ${c4}:oooo.${c3} `\/ooo. - sooo ${c4}`ooooo${c3} \/oooo - \/ooo ${c4}`soooo${c3} `ooooo - `soooo ${c4}`\/ooo${c3} `soooo -${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo -${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` -${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` -${c4} `ooooo ${c3}`` ${c4}.oooo -${c4} `soooo. .oooo` - `\/oooooooooo` - ``\/oo`` -EOF - ;; +get_args() { + # Check the commandline flags early for '--config'. + [[ "$*" != *--config* ]] && get_user_config - "Ubuntu-MATE"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} `:+shmNNMMNNmhs+:` - .odMMMMMMMMMMMMMMMMMMdo. - /dMMMMMMMMMMMMMMMmMMMMMMMMd/ - :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: - `yMMMMMMMMMms:..-::oM: -omMMMMMy` - `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` - hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh -/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ -hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh -/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ - hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh - `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` - yMMMMMMMMMms/..-::oM: .+dMMMMMy - :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: - /dMMMMMMMMMMMMMMMdNMMMMMMMd/ - .odMMMMMMMMMMMMMMMMMMdo. - `:+shmNNMMNNmhs+:` -EOF - ;; + while [[ "$1" ]]; do + case "$1" in + # Info + "--os_arch") os_arch="$2" ;; + "--cpu_cores") cpu_cores="$2" ;; + "--cpu_speed") cpu_speed="$2" ;; + "--speed_type") speed_type="$2" ;; + "--speed_shorthand") speed_shorthand="$2" ;; + "--distro_shorthand") distro_shorthand="$2" ;; + "--kernel_shorthand") kernel_shorthand="$2" ;; + "--uptime_shorthand") uptime_shorthand="$2" ;; + "--cpu_brand") cpu_brand="$2" ;; + "--gpu_brand") gpu_brand="$2" ;; + "--gpu_type") gpu_type="$2" ;; + "--refresh_rate") refresh_rate="$2" ;; + "--gtk_shorthand") gtk_shorthand="$2" ;; + "--gtk2") gtk2="$2" ;; + "--gtk3") gtk3="$2" ;; + "--shell_path") shell_path="$2" ;; + "--shell_version") shell_version="$2" ;; + "--ip_host") public_ip_host="$2" ;; + "--song_shorthand") song_shorthand="$2" ;; + "--music_player") music_player="$2" ;; + "--install_time") install_time="$2" ;; + "--install_time_format") install_time_format="$2" ;; + "--cpu_temp") + cpu_temp="$2" + [[ "$cpu_temp" == "on" ]] && cpu_temp="C" + ;; + + "--disk_subtitle") disk_subtitle="$2" ;; + "--disk_show") + unset disk_show + for arg in "$@"; do + case "$arg" in + "--disk_show") ;; + "-"*) break ;; + *) disk_show+=("$arg") ;; + esac + done + ;; - "ubuntu_old") - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} ./+o+- -${c2} yyyyy- ${c1}-yyyyyy+ -${c2} ${c2}://+//////${c1}-yyyyyyo -${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` -${c3} .:++o: ${c2}/++++++++/:--:/- -${c3} o:+o+:++.${c2}`..```.-/oo+++++/ -${c3} .:+o:+o/.${c2} `+sssoo+/ -${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. -${c2}/+++//+:${c3}`oo+o${c2} /::--:. -${c2}+/+o+++${c3}`o++o${c1} ++////. -${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. -${c3} .+.o+oo:.${c1} `oddhhhh+ -${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ -${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: -${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` -${c1} /osyyyyyyo${c3}++ooo+++/ -${c1} ````` ${c3}+oo+++o: -${c3} `oo++. -EOF - ;; + "--disable") + for func in "$@"; do + case "$func" in + "--disable") continue ;; + "-"*) break ;; + *) + ((bash_version >= 4)) && func="${func,,}" + unset -f "get_$func" + ;; + esac + done + ;; - "Ubuntu-Studio") - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} ..-::::::-.` - `.:+++++++++++${c2}ooo${c1}++:.` - ./+++++++++++++${c2}sMMMNdyo${c1}+/. - .++++++++++++++++${c2}oyhmMMMMms${c1}++. - `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` - `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` - +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` - :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: - ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. - ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ - :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: - +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ - `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` - `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ - ./+++++++++++++++${c2}oyhdNMMMms${c1}++. - ./+++++++++++++${c2}hMMMNdyo${c1}+/. - `.:+++++++++++${c2}sso${c1}++:. - ..-::::::-.. -EOF - ;; + # Text Colors + "--colors") + unset colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) colors+=("$arg") ;; + esac + done + colors+=(7 7 7 7 7 7) + ;; - "Ubuntu"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} .-/+oossssoo+/-. - `:+ssssssssssssssssss+:` - -+ssssssssssssssssssyyssss+- - .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ - +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ -.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. -+ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ -oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso -oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso -+ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ -.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ - +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ - /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ - .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - -+sssssssssssssssss${c2}yyy${c1}ssss+- - `:+ssssssssssssssssss+:` - .-/+oossssoo+/-. -EOF - ;; + # Text Formatting + "--underline") underline_enabled="$2" ;; + "--underline_char") underline_char="$2" ;; + "--bold") bold="$2" ;; - "void_small") - set_colors 2 8 - read -rd '' ascii_data <<'EOF' -${c1} _______ - _ \______ - -| \ ___ \ | -| | / \ | | -| | \___/ | | -| \______ \_| - -_______\ -EOF - ;; + # Color Blocks + "--color_blocks") color_blocks="$2" ;; + "--block_range") block_range=("$2" "$3") ;; + "--block_width") block_width="$2" ;; + "--block_height") block_height="$2" ;; - "Void"*) - set_colors 2 8 - read -rd '' ascii_data <<'EOF' -${c1} __.;=====;.__ - _.=+==++=++=+=+===;. - -=+++=+===+=+=+++++=_ - . -=:`` `--==+=++==. - _vi, ` --+=++++: - .uvnvi. _._ -==+==+. - .vvnvnI` .;==|==;. :|=||=|. -${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL -${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE -${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' -${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! -${c1} -1vvnvv. `~+++` ++|+++ - +vnvnnv, `-|=== - +vnvnvns. . :=- - -Invnvvnsi..___..=sv=. ` - +Invnvnvnnnnnnnnvvnn;. - ~|Invnvnvvnvvvnnv}+` - -~|{*l}*|~ -EOF - ;; + # Bars + "--bar_char") + bar_char_elapsed="$2" + bar_char_total="$3" + ;; - *"[Windows 10]"* | *"on Windows 10"* | "Windows 8"* |\ - "Windows 10"* | "windows10" | "windows8" ) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} .., - ....,,:;+ccllll - ...,,+:; cllllllllllllllllll -,cclllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll + "--bar_border") bar_border="$2" ;; + "--bar_length") bar_length="$2" ;; + "--bar_colors") + bar_color_elapsed="$2" + bar_color_total="$3" + ;; -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -`'ccllllllllll lllllllllllllllllll - `' \\*:: :ccllllllllllllllll - ````''*::cll - `` -EOF - ;; + "--cpu_display") cpu_display="$2" ;; + "--memory_display") memory_display="$2" ;; + "--battery_display") battery_display="$2" ;; + "--disk_display") disk_display="$2" ;; - "Windows"*) - set_colors 1 2 4 3 - read -rd '' ascii_data <<'EOF' -${c1} ,.=:!!t3Z3z., - :tt:::tt333EE3 -${c1} Et:::ztt33EEEL${c2} @Ee., .., -${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# -${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL -${c1} it::::tt333EEF${c2} @EEEEEEttttt33F -${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. -${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF -${c3} ;::::::::zt33)${c2} "4EEEtttji3P* -${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. -${c3} i::::::::zt33F${c4} AEEEtttt::::ztF -${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 -${c3} E::::::::zt33L${c4} @EEEtttt::::z3F -${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` -${c3} `${c4} :EEEEtttt::::z7 - "VEzjt:;;z>*` -EOF - ;; + # Image backend + "--backend") image_backend="$2" ;; + "--source") image_source="$2" ;; + "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + image_backend="${1/--}" + case "$2" in + "-"* | "") ;; + *) image_source="$2" ;; + esac + ;; - "Xubuntu"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `-/osyhddddhyso/-` - .+yddddddddddddddddddy+. - :yddddddddddddddddddddddddy: - -yddddddddddddddddddddhdddddddy- - odddddddddddyshdddddddh`dddd+ydddo - `yddddddhshdd- ydddddd+`ddh.:dddddy` - sddddddy /d. :dddddd-:dy`-ddddddds -:ddddddds /+ .dddddd`yy`:ddddddddd: -sdddddddd` . .-:/+ssdyodddddddddds -ddddddddy `:ohddddddddd -dddddddd. +dddddddd -sddddddy ydddddds -:dddddd+ .oddddddd: - sdddddo ./ydddddddds - `yddddd. `:ohddddddddddy` - oddddh/` `.:+shdddddddddddddo - -ydddddhyssyhdddddddddddddddddy- - :yddddddddddddddddddddddddy: - .+yddddddddddddddddddy+. - `-/osyhddddhyso/-` -EOF - ;; + # Image options + "--loop") image_loop="on" ;; + "--image_size" | "--size") image_size="$2" ;; + "--crop_mode") crop_mode="$2" ;; + "--crop_offset") crop_offset="$2" ;; + "--xoffset") xoffset="$2" ;; + "--yoffset") yoffset="$2" ;; + "--background_color" | "--bg_color") background_color="$2" ;; + "--gap") gap="$2" ;; + "--clean") + [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" + rm -rf "/Library/Caches/neofetch/" + rm -rf "/tmp/neofetch/" + exit + ;; + + "--ascii_colors") + unset ascii_colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) ascii_colors+=("$arg") + esac + done + ascii_colors+=(7 7 7 7 7 7) + ;; - "Zorin"*) - set_colors 4 6 - read -rd '' ascii_data <<'EOF' -${c1} `osssssssssssssssssssso` - .osssssssssssssssssssssso. - .+oooooooooooooooooooooooo+. + "--ascii_distro") + image_backend="ascii" + ascii_distro="$2" + case "$2" in "-"* | "") ascii_distro="$distro" ;; esac + ;; + "--ascii_bold") ascii_bold="$2" ;; + "--logo" | "-L") + image_backend="ascii" + print_info() { info line_break; } + ;; - `::::::::::::::::::::::. .:` - `+ssssssssssssssssss+:.` `.:+ssso` -.ossssssssssssssso/. `-+ossssssso. -ssssssssssssso/-` `-/osssssssssssss -.ossssssso/-` .-/ossssssssssssssso. - `+sss+:. `.:+ssssssssssssssssss+` - `:. .::::::::::::::::::::::` + # Screenshot + "--scrot" | "-s") + scrot_args "$@" + ;; + "--upload" | "-su") + scrot_upload="on" + scrot_args "$@" + ;; + "--image_host") image_host="$2" ;; + "--scrot_cmd") scrot_cmd="$2" ;; - .+oooooooooooooooooooooooo+. - -osssssssssssssssssssssso- - `osssssssssssssssssssso` -EOF - ;; + # Other + "--config") + case "$2" in + "none" | "off" | "") ;; + *) + config_file="$(get_full_path "$2")" + get_user_config + ;; + esac + ;; + "--stdout") stdout="on" ;; + "-v") verbose="on" ;; + "-vv") set -x; verbose="on" ;; + "--help") usage ;; + "--version") + printf "%s\\n" "Neofetch $version" + exit 1 + ;; + "--gen-man") + help2man -n "A fast, highly customizable system info script" \ + -N ./neofetch -o neofetch.1 + exit 1 + ;; - *) - case "$kernel_name" in - *"BSD") - set_colors 1 7 4 3 6 - read -rd '' ascii_data <<'EOF' -${c1} , , - /( )` - \ \___ / | - /- _ `-/ ' - (${c2}/\/ \ ${c1}\ /\ - ${c2}/ / | ` ${c1}\ - ${c3}O O ${c2}) ${c1}/ | - ${c2}`-^--'${c1}`< ' - (_.) _ ) / - `.___/` / - `-----' / -${c4}<----. __ / __ \ -${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| -<----' ${c1}`--' `.__,' \ - | | - \ / /\ - ${c5}______${c1}( (_ / \______/ - ${c5},' ,-----' | - `--{__________) -EOF - ;; + "--travis") + print_info() { + info title + info underline - "Darwin") - set_colors 2 3 1 1 5 4 - read -rd '' ascii_data <<'EOF' -${c1} 'c. - ,xNMM. - .OMMMMo - OMMM0, - .;loddo:' loolloddol;. - cKMMMMMMMMMMNWMMMMMMMMMM0: -${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. - XMMMMMMMMMMMMMMMMMMMMMMMX. -${c3};MMMMMMMMMMMMMMMMMMMMMMMM: -:MMMMMMMMMMMMMMMMMMMMMMMM: -${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. - kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. - ${c6}kMMMMMMMMMMMMMMMMMMMMMMd - ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. -EOF - ;; + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "GPU Driver" gpu_driver + info "Memory" memory - "GNU"*) - set_colors fg 7 - read -rd '' ascii_data <<'EOF' -${c1} _-`````-, ,- '- . - .' .- - | | - -. `. - /.' / `. \ -:/ : _... ..._ `` : -:: : /._ .`:'_.._\. || : -:: `._ ./ ,` : \ . _.'' . -`:. / | -. \-. \\_ / - \:._ _/ .' .@) \@) ` `\ ,.' - _/,--' .- .\,-.`--`. - ,'/'' (( \ ` ) - /'/' \ `-' ( - '/'' `._,-----' - ''/' .,---' - ''/' ;: - ''/'' ''/ - ''/''/'' - '/'/' - `; -EOF - ;; + info "CPU Usage" cpu_usage + info "Disk" disk + info "Battery" battery + info "Font" font + info "Song" song + info "Local IP" local_ip + info "Public IP" public_ip + info "Users" users + info "Install Date" install_date - "Linux") - set_colors fg 8 3 - read -rd '' ascii_data <<'EOF' -${c2} ##### -${c2} ####### -${c2} ##${c1}O${c2}#${c1}O${c2}## -${c2} #${c3}#####${c2}# -${c2} ##${c1}##${c3}###${c1}##${c2}## -${c2} #${c1}##########${c2}## -${c2} #${c1}############${c2}## -${c2} #${c1}############${c2}### -${c3} ##${c2}#${c1}###########${c2}##${c3}# -${c3}######${c2}#${c1}#######${c2}#${c3}###### -${c3}#######${c2}#${c1}#####${c2}#${c3}####### -${c3} #####${c2}#######${c3}##### -EOF - ;; + info line_break + info cols + info line_break - "SunOS") - set_colors 3 7 - read -rd '' ascii_data <<'EOF' -${c1} `- ` - `-- `+- .: - .+: `++: -/+- . - `.::` -++/``:::`./+/ `.-/. - `++/-`.` ` /++:` - `` ./:` .: `..`.- -``./+/:- -+++:- - -/+` :. -EOF - ;; + # Testing. + prin "prin" + prin "prin" "prin" - "IRIX"*) - set_colors 4 7 - read -rd '' ascii_data <<'EOF' -${c1} ./ohmNd/ +dNmho/- - `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. - `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` - -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. - `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` -+mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ -dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd -oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ -.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. - hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh - /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: - `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd - `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` - `yNMMNho-yMMMM` NMMMm.+hNMMNh` - -MMMMd: oMMMM. NMMMh :hMMMM- - -yNMMMmooMMMM- NMMMyomMMMNy- - .omMMMMMMMM-`NMMMMMMMmo. - `:hMMMMMM. NMMMMMh/` - .odNm+ /dNms. -EOF - ;; - esac - ;; - esac + # Testing no subtitles. + info uptime + info disk + } - # Overwrite distro colors if '$ascii_colors' doesn't - # equal 'distro'. - if [[ "${ascii_colors[0]}" != "distro" ]]; then - color_text="off" - set_colors "${ascii_colors[@]}" - fi + refresh_rate="on" + shell_version="on" + cpu_display="infobar" + memory_display="infobar" + disk_display="infobar" + cpu_temp="C" + ;; + esac + + shift + done } main() { From b3af154dc5638a605c9fa8c7735fb434ae4f3a13 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 09:11:22 +1000 Subject: [PATCH 0293/1133] general: Move ascii art back to the bottom. --- neofetch | 8084 +++++++++++++++++++++++++++--------------------------- 1 file changed, 4042 insertions(+), 4042 deletions(-) diff --git a/neofetch b/neofetch index a2fb7f872..e7f011902 100755 --- a/neofetch +++ b/neofetch @@ -4160,3513 +4160,2215 @@ uppercase() { # COLORS -get_distro_colors() { - # This function sets the text colors according - # to your OS/Distro's logo colors. - # - # $ascii_distro is the same as $distro. - case "$ascii_distro" in - "AIX"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} `:+ssssossossss+-` - .oys///oyhddddhyo///sy+. - /yo:+hNNNNNNNNNNNNNNNNh+:oy/ - :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: - `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh - h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy -/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: -h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y -N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m -N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m -h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y -:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- - yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss - `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy - sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo - :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- - :ys:/yNNNNNNNNNNNNNNNmy/:sy: - .+ys///osyhhhhys+///sy+. - -/osssossossso/- -EOF - ;; +set_colors() { + c1="$(color "$1")${ascii_bold}" + c2="$(color "$2")${ascii_bold}" + c3="$(color "$3")${ascii_bold}" + c4="$(color "$4")${ascii_bold}" + c5="$(color "$5")${ascii_bold}" + c6="$(color "$6")${ascii_bold}" - "alpine_small") - set_colors 4 7 - read -rd '' ascii_data <<'EOF' -${c1} /\\ /\\ - /${c2}/ ${c1}\\ \\ - /${c2}/ ${c1}\\ \\ -/${c2}// ${c1}\\ \\ -${c2}// ${c1}\\ \\ - \\ -EOF - ;; + [[ "$color_text" != "off" ]] && set_text_colors "$@" +} - "Alpine"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} .hddddddddddddddddddddddh. - :dddddddddddddddddddddddddd: - /dddddddddddddddddddddddddddd/ - +dddddddddddddddddddddddddddddd+ - `sdddddddddddddddddddddddddddddddds` - `ydddddddddddd++hdddddddddddddddddddy` -.hddddddddddd+` `+ddddh:-sdddddddddddh. -hdddddddddd+` `+y: .sddddddddddh -ddddddddh+` `//` `.` -sddddddddd -ddddddh+` `/hddh/` `:s- -sddddddd -ddddh+` `/+/dddddh/` `+s- -sddddd -ddd+` `/o` :dddddddh/` `oy- .yddd -hdddyo+ohddyosdddddddddho+oydddy++ohdddh -.hddddddddddddddddddddddddddddddddddddh. - `yddddddddddddddddddddddddddddddddddy` - `sdddddddddddddddddddddddddddddddds` - +dddddddddddddddddddddddddddddd+ - /dddddddddddddddddddddddddddd/ - :dddddddddddddddddddddddddd: - .hddddddddddddddddddddddh. -EOF - ;; +set_text_colors() { + if [[ "${colors[0]}" == "distro" ]]; then + title_color="$(color "$1")" + at_color="$reset" + underline_color="$reset" + subtitle_color="$(color "$2")" + colon_color="$reset" + info_color="$reset" - "Amazon"*) - set_colors 3 7 - read -rd '' ascii_data <<'EOF' -${c1} `-/oydNNdyo:.` - `.:+shmMMMMMMMMMMMMMMmhs+:.` - -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- -.`` -/+shmNNMMMMMMNNmhs+/- ``. -dNmhs+:. `.:/oo/:.` .:+shmNd -dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd -dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd -.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. - `.:+shNMMMMMh yMMMMMNhs+:`` - `-+shy shs+:` -EOF - ;; + # If the ascii art uses 8 as a color, make the text the fg. + ((${1:-1} == 8)) && title_color="$reset" + ((${2:-7} == 8)) && subtitle_color="$reset" - "Anarchy"*) - set_colors 7 4 - read -rd '' ascii_data <<'EOF' - ${c2}..${c1} - ${c2}..${c1} - ${c2}:..${c1} - ${c2}:+++.${c1} - .:::++${c2}++++${c1}+::. - .:+######${c2}++++${c1}######+:. - .+#########${c2}+++++${c1}##########:. - .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. - +###########${c2}+++++++++${c1}############: - +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ - +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ - :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: - ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ -.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. -.##########${c2}+++++++++++++++++++${c1}###########. - #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ - :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: - +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ - +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ - :##${c2}++++++${c1}############${c2}++++++++++${c1}##: - .${c2}++++++${c1}#############${c2}++++++++++${c1}+. - :${c2}++++${c1}###############${c2}+++++++${c1}:: - .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. - ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. - ${c2}.${c1} ${c2}.:+++${c1}. - ${c2}.:${c1}: - ${c2}..${c1} - ${c2}..${c1} -EOF - ;; + # If the second color is white use the first for the subtitle. + ((${2:-7} == 7)) && subtitle_color="$(color "$1")" + ((${1:-1} == 7)) && title_color="$reset" + else + title_color="$(color "${colors[0]}")" + at_color="$(color "${colors[1]}")" + underline_color="$(color "${colors[2]}")" + subtitle_color="$(color "${colors[3]}")" + colon_color="$(color "${colors[4]}")" + info_color="$(color "${colors[5]}")" + fi - "Android"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} -o o- - +hydNNNNdyh+ - +mMMMMMMMMMMMMm+ - `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` - hMMMMMMMMMMMMMMMMMMh - .. yyyyyyyyyyyyyyyyyyyy .. -.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: -:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: --MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- - +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ - mMMMMMMMMMMMMMMMMMMm - `/++MMMMh++hMMMM++/` - MMMMo oMMMM - MMMMo oMMMM - oNMm- -mMNs -EOF - ;; + # Bar colors. + if [[ "$bar_color_elapsed" == "distro" ]]; then + bar_color_elapsed="$(color fg)" + else + bar_color_elapsed="$(color "$bar_color_elapsed")" + fi - "Antergos"*) - set_colors 4 6 - read -rd '' ascii_data <<'EOF' -${c2} `.-/::/-`` - .-/osssssssso/. - :osyysssssssyyys+- - `.+yyyysssssssssyyyyy+. - `/syyyyyssssssssssyyyyys-` - `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` - .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. - .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. - -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: - -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- - .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` -`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo -.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. -ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy -dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh --dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- -.smmmmddddddddhhhhhhhhhdddddddddmmmms. - `+ydmmmdddddddddddddddddddmmmmdy/. - `.:+ooyyddddddddddddyyso+:.` -EOF - ;; + case "$bar_color_total $1" in + "distro "[736]) bar_color_total="$(color "$1")" ;; + "distro "[0-9]) bar_color_total="$(color "$2")" ;; + *) bar_color_total="$(color "$bar_color_total")" ;; + esac +} - "antiX"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} - \ - , - ~ ^ ~ - \ / - , ' \ ' , / - , \ '/ - , \ / , - ,___, \/ , - / | _ _ _|_ o /\ , -|, | / |/ | | | / \ , - \,_/\_/ | |_/|_/|_/_/ \, - , / ,\ - , / , ' \ - ' - , _ _ _ , ' -EOF - ;; +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" ;; + esac +} - "AOSC"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} .:+syhhhhys+:. - .ohNMMMMMMMMMMMMMMNho. - `+mMMMMMMMMMMmdmNMMMMMMMMm+` - +NMMMMMMMMMMMM/ `./smMMMMMN+ - .mMMMMMMMMMMMMMMo -yMMMMMm. - :NMMMMMMMMMMMMMMMs .hMMMMN: - .NMMMMhmMMMMMMMMMMm+/- oMMMMN. - dMMMMs ./ymMMMMMMMMMMNy. sMMMMd --MMMMN` oMMMMMMMMMMMN: `NMMMM- -/MMMMh NMMMMMMMMMMMMm hMMMM/ -/MMMMh NMMMMMMMMMMMMm hMMMM/ --MMMMN` :MMMMMMMMMMMMy. `NMMMM- - dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd - .NMMMMo -/+sMMMMMMMMMMMmMMMMN. - :NMMMMh. .MMMMMMMMMMMMMMMN: - .mMMMMMy- NMMMMMMMMMMMMMm. - +NMMMMMms/.` mMMMMMMMMMMMN+ - `+mMMMMMMMMNmddMMMMMMMMMMm+` - .ohNMMMMMMMMMMMMMMNho. - .:+syhhhhys+:. -EOF - ;; +# OTHER - "Apricity"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} ./o- - ``...`` `:. -/: - `-+ymNMMMMMNmho-` :sdNNm/ - `+dMMMMMMMMMMMMMMMmo` sh:.:::- - /mMMMMMMMMMMMMMMMMMMMm/`sNd/ - oMMMMMMMMMMMMMMMMMMMMMMMs -` -:MMMMMMMMMMMMMMMMMMMMMMMMM/ -NMMMMMMMMMMMMMMMMMMMMMMMMMd -MMMMMMMmdmMMMMMMMMMMMMMMMMd -MMMMMMy` .mMMMMMMMMMMMmho:` -MMMMMMNo/sMMMMMMMNdy+-.`-/ -MMMMMMMMMMMMNdy+:.`.:ohmm: -MMMMMMMmhs+-.`.:+ymNMMMy. -MMMMMM/`.-/ohmNMMMMMMy- -MMMMMMNmNNMMMMMMMMmo. -MMMMMMMMMMMMMMMms:` -MMMMMMMMMMNds/. -dhhyys+/-` -EOF - ;; +stdout() { + image_backend="off" + unset subtitle_color + unset colon_color + unset info_color + unset underline_color + unset bold + unset title_color + unset at_color + unset text_padding + unset zws + unset reset + unset color_blocks + unset get_line_break +} - "ArcoLinux"*) - set_colors 7 4 - read -rd '' ascii_data <<'EOF' -${c2} /- - ooo: - yoooo/ - yooooooo - yooooooooo - yooooooooooo - .yooooooooooooo - .oooooooooooooooo - .oooooooarcoooooooo - .ooooooooo-oooooooooo - .ooooooooo- oooooooooo - :ooooooooo. :ooooooooo - :ooooooooo. :ooooooooo - :oooarcooo .oooarcooo - :ooooooooy .ooooooooo - :ooooooooo ${c1}/ooooooooooooooooooo${c2} - :ooooooooo ${c1}.-ooooooooooooooooo.${c2} - ooooooooo- ${c1}-ooooooooooooo.${c2} - ooooooooo- ${c1}.-oooooooooo.${c2} -ooooooooo. ${c1}-ooooooooo${c2} -EOF - ;; +err() { + err+="$(color 1)[!]\e[0m $1\n" +} - "arch_small") - set_colors 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} /\ - /^^\ - /\ \ - /${c2} __ \ - / ( ) \ - / __| |__\\\ -/// \\\\\ -EOF - ;; +get_full_path() { + # This function finds the absolute path from a relative one. + # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" - "arch_old") - set_colors 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} __ - _=(SDGJT=_ - _GTDJHGGFCVS) - ,GTDJGGDTDFBGX0 -${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ -${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL -${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, -${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], -${c1} SDDFDFH' !YEWD,${c2} )HDROD -${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' -${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' -${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' -${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) -${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF -'EHTI !H - `0F' '! -EOF - ;; + # If the file exists in the current directory, stop here. + [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - "ArchBox"*) - set_colors 2 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ...:+oh/:::.. - ..-/oshhhhhh` `::::-. - .:/ohhhhhhhhhhhh` `-::::. - .+shhhhhhhhhhhhhhhhh` `.::-. - /`-:+shhhhhhhhhhhhhh` .-/+shh - / .:/ohhhhhhhhh` .:/ohhhhhhhh - / `-:+shhh` ..:+shhhhhhhhhhhh - / .:ohhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / `hhhhhhhhhhhhhhhhhhhh - / .+o+ `hhhhhhhhhhhhhhhhhhhh - / -hhhhh `hhhhhhhhhhhhhhhhhhhh - / ohhhhho `hhhhhhhhhhhhhhhhhhhh - /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` - `--/:` /: `hhhhhhhhhhhho/- - -/:. `hhhhhhs+:-` - ::::/ho/-` -EOF - ;; + if ! cd "${1%/*}"; then + err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" + err " Check that the directory exists or try another directory." + exit 1 + fi + + local full_dir="${1##*/}" + + # Iterate down a (possible) chain of symlinks. + while [[ -L "$full_dir" ]]; do + full_dir="$(readlink "$full_dir")" + cd "${full_dir%/*}" || exit + full_dir="${full_dir##*/}" + done - "ARCHlabs"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} 'c' - 'kKk, - .dKKKx. - .oKXKXKd. - .l0XXXXKKo. - c0KXXXXKX0l. - :0XKKOxxOKX0l. - :OXKOc. .c0XX0l. - :OK0o. ${c4}...${c1}'dKKX0l. - :OX0c ${c4};xOx'${c1}'dKXX0l. - :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. - c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. - .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. - .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. - .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. - .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. - .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' - 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' - 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, - ,xko:'. ${c4}.. ${c1} .':okx; - .,'. .',. -EOF - ;; + # Final directory. + full_dir="$(pwd -P)/${1/*\/}" - *"XFerience"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ``--:::::::-.` - .-/+++ooooooooo+++:-` - `-/+oooooooooooooooooo++:. - -/+oooooo/+ooooooooo+/ooo++:` - `/+oo++oo. .+oooooo+.-: +:-o+- - `/+o/. -o. :oooooo+ ```:.+oo+- -`:+oo- -/` :oooooo+ .`-`+oooo/. -.+ooo+. .` `://///+-+..oooooo+:` --+ooo:` ``.-+oooooo+/` --+oo/` :+oooo/. -.+oo: ..-/. . -+oo+/` -`/++- -:::++::/. -+oo+- - ./o: `:///+- `./ooo+:` - .++- `` /-` -:/+oooo+:` - .:+/:`` `-:ooooooo++- - ./+o+//:...../+oooooooo++:` - `:/++ooooooooooooo++/-` - `.-//++++++//:-.` - `````` -EOF - ;; + [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" +} - "ArchMerge"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} y: - sMN- - +MMMm` - /MMMMMd` - :NMMMMMMy - -NMMMMMMMMs - .NMMMMMMMMMM+ - .mMMMMMMMMMMMM+ - oNMMMMMMMMMMMMM+ - `+:-+NMMMMMMMMMMMM+ - .sNMNhNMMMMMMMMMMMM/ - `hho/sNMMMMMMMMMMMMMMM/ - `.`omMMmMMMMMMMMMMMMMMMM+ - .mMNdshMMMMd+::oNMMMMMMMMMo - .mMMMMMMMMM+ `yMMMMMMMMMs - .NMMMMMMMMM/ yMMMMMMMMMy - -NMMMMMMMMMh `mNMMMMMMMMd` - /NMMMNds+:.` `-/oymMMMm. - +Mmy/. `:smN: -/+. -o. -EOF - ;; +get_user_config() { + # Check $config_file. + if [[ -f "$config_file" ]]; then + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options + return + fi + mkdir -p "${XDG_CONFIG_HOME}/neofetch/" - "Arch"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} -` - .o+` - `ooo/ - `+oooo: - `+oooooo: - -+oooooo+: - `/:-:++oooo+: - `/++++/+++++++: - `/++++++++++++++: - `/+++o${c2}oooooooo${c1}oooo/` -${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` -${c2} .oossssso-````/ossssss+` - -osssssso. :ssssssso. - :osssssss/ osssso+++. - /ossssssss/ +ssssooo/- - `/ossssso+/:- -:/+osssso+- - `+sso+:-` `.-/+oso: - `++:. `-/+/ - .` `/ -EOF - ;; + # Check ${XDG_CONFIG_HOME}/neofetch and create the + # dir/files if they don't exist. + if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config" - "Artix"*) - set_colors 6 4 2 7 - read -rd '' ascii_data <<'EOF' -${c1} d${c2}c. -${c1} x${c2}dc. -${c1} '.${c4}.${c1} d${c2}dlc. -${c1} c${c2}0d:${c1}o${c2}xllc; -${c1} :${c2}0ddlolc,lc, -${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. -${c1} ;${c1}K${c2}kxoOddollc' cllc. -${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: -${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: -${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, -${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. -${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; -${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, -${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. -${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. -${c1} 0${c2}Okd''dc. .cll; -${c1} k${c2}Okd' .llc, -${c1} d${c2}Od, 'lc. -${c1} :,${c4}. ${c2}... -EOF - ;; + elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - "Arya"*) - set_colors 2 1 - read -rd '' ascii_data <<'EOF' -${c1} `oyyy/${c2}-yyyyyy+ -${c1} -syyyy/${c2}-yyyyyy+ -${c1} .syyyyy/${c2}-yyyyyy+ -${c1} :yyyyyy/${c2}-yyyyyy+ -${c1} `/ :yyyyyy/${c2}-yyyyyy+ -${c1} .+s :yyyyyy/${c2}-yyyyyy+ -${c1} .oys :yyyyyy/${c2}-yyyyyy+ -${c1} -oyys :yyyyyy/${c2}-yyyyyy+ -${c1} :syyys :yyyyyy/${c2}-yyyyyy+ -${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ -${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ -${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- -${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy -${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy -${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy -EOF - ;; + else + config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" - "Bitrig"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} `hMMMMN+ - -MMo-dMd` - oMN- oMN` - yMd /NM: - .mMmyyhMMs - :NMMMhsmMh - +MNhNNoyMm- - hMd.-hMNMN: - mMmsssmMMMo - .MMdyyhNMMMd - oMN.`/dMddMN` - yMm/hNm+./MM/ -.dMMMmo.``.NMo -:NMMMNmmmmmMMh -/MN/-------oNN: -hMd. .dMh -sm/ /ms -EOF - ;; + # The config file doesn't exist, create it. + printf "%s\n" "$config" > "$config_file" + fi - "BLAG"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} d - ,MK: - xMMMX: - .NMMMMMX; - lMMMMMMMM0clodkO0KXWW: - KMMMMMMMMMMMMMMMMMMX' - .;d0NMMMMMMMMMMMMMMMMMMK. - .;dONMMMMMMMMMMMMMMMMMMMMMMx -'dKMMMMMMMMMMMMMMMMMMMMMMMMl - .:xKWMMMMMMMMMMMMMMMMMMM0. - .:xNMMMMMMMMMMMMMMMMMK. - lMMMMMMMMMMMMMMMMMMK. - ,MMMMMMMMWkOXWMMMMMM0 - .NMMMMMNd. `':ldko - OMMMK: - oWk, - ;: -EOF - ;; + source "$config_file" + err "Config: Sourced user config. (${config_file})" + old_options +} - "BlankOn"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` -${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ -${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys -${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys -${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys -${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys -${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys -${c2}NMMMMMN: .NMMMMMN${c1}yyyyys -${c2}MMMMMMm. NMMMMMN${c1}yyyyys -${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys -${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys -${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys -${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys -${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys -${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys -${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo -${c2} `.:/++++/:.` ${c1}:oys+. -EOF - ;; +bar() { + # Get the values. + elapsed="$(($1 * bar_length / $2))" + + # Create the bar with spaces. + printf -v prog "%${elapsed}s" + printf -v total "%$((bar_length - elapsed))s" + + # Set the colors and swap the spaces for $bar_char_. + bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" + bar+="${bar_color_total}${total// /${bar_char_total}}" + + # Borders. + [[ "$bar_border" == "on" ]] && \ + bar="$(color fg)[${bar}$(color fg)]" + + printf "%b" "${bar}${info_color}" +} - "BSD") - set_colors 1 7 4 3 6 - read -rd '' ascii_data <<'EOF' -${c1} , , - /( )` - \ \___ / | - /- _ `-/ ' - (${c2}/\/ \ ${c1}\ /\ - ${c2}/ / | ` ${c1}\ - ${c3}O O ${c2}) ${c1}/ | - ${c2}`-^--'${c1}`< ' - (_.) _ ) / - `.___/` / - `-----' / -${c4}<----. __ / __ \ -${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| -<----' ${c1}`--' `.__,' \ - | | - \ / /\ - ${c5}______${c1}( (_ / \______/ - ${c5},' ,-----' | - `--{__________) -EOF - ;; +cache() { + if [[ "$2" ]]; then + mkdir -p "${cache_dir}/neofetch" + printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" + fi +} - "BunsenLabs"*) - set_colors fg 7 - read -rd '' ascii_data <<'EOF' -${c1} `++ - -yMMs - `yMMMMN` - -NMMMMMMm. - :MMMMMMMMMN- - .NMMMMMMMMMMM/ - yMMMMMMMMMMMMM/ -`MMMMMMNMMMMMMMN. --MMMMN+ /mMMMMMMy --MMMm` `dMMMMMM -`MMN. .NMMMMM. - hMy yMMMMM` - -Mo +MMMMN - /o +MMMMs - +MMMN` - hMMM: - `NMM/ - +MN: - mh. - -/ -EOF - ;; +get_cache_dir() { + case "$os" in + "Mac OS X") cache_dir="/Library/Caches" ;; + *) cache_dir="/tmp" ;; + esac +} - "Calculate"*) - set_colors 7 3 - read -rd '' ascii_data <<'EOF' -${c1} ...... - ,,+++++++,. - .,,,....,,,${c2}+**+,,.${c1} - ............,${c2}++++,,,${c1} - ............... - ......,,,........ - .....+*#####+,,,*+. - .....,*###############,..,,,,,,.. - ......,*#################*..,,,,,..,,,.. - .,,....*####################+***+,,,,...,++, - .,,..,..*#####################*, - ,+,.+*..*#######################. - ,+,,+*+..,########################* -.,++++++. ..+##**###################+ -..... ..+##***#################*. - .,.*#*****##############*. - ..,,*********#####****+. - ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} - ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} - ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} -EOF - ;; +kde_config_dir() { + # If the user is using KDE get the KDE + # configuration directory. + if [[ "$kde_config_dir" ]]; then + return - "CentOS"*) - set_colors 3 2 4 5 7 - read -rd '' ascii_data <<'EOF' -${c1} .. - .PLTJ. - <><><><> - ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK - ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK - ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V - ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. -${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. -${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. -${c4} -${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV -${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' - ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' - ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 - ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK - ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK -${c2} <><><><> - 'MKKM' - '' -EOF - ;; + elif type -p kf5-config >/dev/null 2>&1; then + kde_config_dir="$(kf5-config --path config)" - "Chakra"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} _ _ _ "kkkkkkkk. - ,kkkkkkkk., 'kkkkkkkkk, - ,kkkkkkkkkkkk., 'kkkkkkkkk. - ,kkkkkkkkkkkkkkkk,'kkkkkkkk, - ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. - "''"''',;::,,"''kkk''kkkkk; __ - ,kkkkkkkkkk, "k''kkkkk' ,kkkk - ,kkkkkkk' ., ' .: 'kkkk',kkkkkk - ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk - ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk -.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' -;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' -'kkkkkkk; 'kkkkkkkk.,""''"''"" - ''kkkk; 'kkkkkkkkkk., - ';' 'kkkkkkkkkkkk., - ';kkkkkkkkkk' - ';kkkkkk' - "''" -EOF - ;; + elif type -p kde4-config >/dev/null 2>&1; then + kde_config_dir="$(kde4-config --path config)" - "ChaletOS"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `.//+osso+/:`` - `/sdNNmhyssssydmNNdo:` - :hNmy+-` .-+hNNs- - /mMh/` `+:` `+dMd: - .hMd- -sNNMNo. /yyy /mMs` - -NM+ `/dMd/--omNh::dMM `yMd` - .NN+ .sNNs:/dMNy:/hNmo/s yMd` - hMs `/hNd+-smMMMMMMd+:omNy- `dMo -:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` -/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: -/Md` MMMMMMMMMMMMMMMMMMMN .MN: -:NN. MMMMMMm....--NMMMMMN -Mm. -`dMo MMMMMMd mMMMMMN hMs - -MN: MMMMMMd mMMMMMN oMm` - :NM: MMMMMMd mMMMMMN +Mm- - -mMy. mmmmmmh dmmmmmh -hMh. - oNNs- :yMm/ - .+mMdo:` `:smMd/` - -ohNNmhsoo++osshmNNh+. - `./+syyhhyys+:`` -EOF - ;; + elif type -p kde-config >/dev/null 2>&1; then + kde_config_dir="$(kde-config --path config)" - "Chapeau"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} .-/-. - ////////. - ////////${c2}y+${c1}//. - ////////${c2}mMN${c1}/////. - ////////${c2}mMN+${c1}////////. - ////////////////////////. - /////////+${c2}shhddhyo${c1}+////////. - ////////${c2}ymMNmdhhdmNNdo${c1}///////. -///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. -///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// -//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// -//////${c2}+MMmssssssssssssss+${c1}/////// -`//////${c2}yMMy${c1}//////////////////// - `//////${c2}smMNhso++oydNm${c1}//////// - `///////${c2}ohmNMMMNNdy+${c1}/////// - `//////////${c2}++${c1}////////// - `////////////////. - -////////- -EOF - ;; + elif [[ -d "${HOME}/.kde4" ]]; then + kde_config_dir="${HOME}/.kde4/share/config" - "Chrom"*) - set_colors 2 1 3 4 7 - read -rd '' ascii_data <<'EOF' -${c2} .,:loool:,. - .,coooooooooooooc,. - .,lllllllllllllllllllll,. - ;ccccccccccccccccccccccccc; -${c1} '${c2}ccccccccccccccccccccccccccccc. -${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: -${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. -${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d -${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 -${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 -${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d -${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. -${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; -${c1} .:ccccccccllllllllo${c3}O0000000OOO, -${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. -${c1} '::ccccccccc${c3}dOOOOOOOkx:. -${c1} ..,::cccc${c3}xOOOkkko;. -${c1} ..,:${c3}dOkxl:. -EOF - ;; + elif [[ -d "${HOME}/.kde3" ]]; then + kde_config_dir="${HOME}/.kde3/share/config" + fi - "Clover"*) - set_colors 2 6 - read -rd '' ascii_data <<'EOF' -${c1} `omo``omo` - `oNMMMNNMMMNo` - `oNMMMMMMMMMMMMNo` - oNMMMMMMMMMMMMMMMMNo - `sNMMMMMMMMMMMMMMNs` - `omo` `sNMMMMMMMMMMNs` `omo` - `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` - `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` -oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo -`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` -`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` -oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo - `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` - `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` - `oNs` `sNMMMMMMMMMMNs` `oNs` - `sNMMMMMMMMMMMMMMNs` - +NMMMMMMMMMMMMMMMMNo - `oNMMMMMMMMMMMMNo` - `oNMMMNNMMMNs` - `omo``oNs` -EOF - ;; + kde_config_dir="${kde_config_dir/$'/:'*}" +} + +get_term_padding() { + # Terminal info. + # + # Parse terminal config files to get + # info about padding. Due to how w3m-img + # works padding around the terminal throws + # off the cursor placement calculation in + # specific terminals. + # + # Note: This issue only seems to affect + # URxvt. + ((term_run != 1)) && get_term - "Container Linux by CoreOS"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ..... - .';:cccccccc:;'. - ':ccccclc${c3}lllllllll${c1}cc:. - .;cccccccc${c3}lllllllllllllll${c1}c, - ;clllccccc${c3}llllllllllllllllll${c1}c, - .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: - ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: - :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, -.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c -.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. -.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. -.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc - :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; - .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc - .cllllllllllclcccclccclccllllcllc - :cllllllllccclcllllllllllllcc; - .cccccccccccccclcccccccccc:. - .;cccclccccccllllllccc,. - .';ccccclllccc:;.. - ..... -EOF + case "$term" in + "URxvt"*) + border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" ;; + esac +} - "crux_small") - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} ___ - (${c3}.· ${c1}| - (${c2}<> ${c1}| - / ${c3}__ ${c1}\\ - ( ${c3}/ \\ ${c1}/| -${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) -${c2}\/${c1}-____${c2}\/ -EOF +dynamic_prompt() { + case "$image_backend" in + "ascii") printf "\n" ;; + "off") return ;; + *) + get_term_padding + lines="$(((border + height + yoffset) / font_height))" + image_prompt="on" ;; + esac - "CRUX"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} odddd - oddxkkkxxdoo - ddcoddxxxdoool - xdclodod olol - xoc xdd olol - xdc ${c2}k00${c1}Okdlol - xxd${c2}kOKKKOkd${c1}ldd - xdco${c2}xOkdlo${c1}dldd - ddc:cl${c2}lll${c1}oooodo - odxxdd${c3}xkO000kx${c1}ooxdo - oxdd${c3}x0NMMMMMMWW0od${c1}kkxo - oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx -docldkXW${c3}MMMMMMMWWN${c1}Odolco -xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c -${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l -${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd -${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo -${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo -EOF - ;; + # If the info is higher than the ascii/image place the prompt + # based on the info height instead of the ascii/image height. + if ((lines < info_height)); then + [[ "$image_prompt" ]] && printf "\n" + return + else + [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" + lines="$((lines - info_height + 1))" + fi - "debian_small") - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' - ${c1}_____ - / __ \\ -| / | -| \\___- --_ - --_ -EOF - ;; + # Set the prompt location. + if ((lines > 1)); then + case "$kernel_name" in + "OpenBSD") tput cud "$lines" ;; + *) printf "%b" "\e[${lines}B" ;; + esac + fi +} - "Debian"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2} _,met$$$$$gg. - ,g$$$$$$$$$$$$$$$P. - ,g$$P" """Y$$.". - ,$$P' `$$$. -',$$P ,ggs. `$$b: -`d$$' ,$P"' ${c1}.${c2} $$$ - $$P d$' ${c1},${c2} $$P - $$: $$. ${c1}-${c2} ,d$$' - $$; Y$b._ _,d$P' - Y$$. ${c1}`.${c2}`"Y$$$$P"' -${c2} `$$b ${c1}"-.__ -${c2} `Y$$ - `Y$$. - `$$b. - `Y$$b. - `"Y$b._ - `""" -EOF - ;; +old_functions() { + # Deprecated functions. + # Neofetch 2.0 changed the names of a few variables. + # This function adds backwards compatibility for the + # old variable names. + if type printinfo >/dev/null 2>&1; then + print_info() { printinfo ; } + get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } + get_termfont() { get_term_font; termfont="$term_font"; } + get_localip() { get_local_ip; localip="$local_ip"; } + get_publicip() { get_public_ip; publicip="$public_ip"; } + get_linebreak() { get_line_break; linebreak="$line_break"; } + fi - "Deepin"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} ............ - .';;;;;. .,;,. - .,;;;;;;;. ';;;;;;;. - .;::::::::' .,::;;,''''',. - ,'.:::::::: .;;'. '; - ;' 'cccccc, ,' :: '.. .: - ,, :ccccc. ;: .c, '' :. ,; -.l. cllll' ., .lc :; .l' l. -.c :lllc ;cl: .l' .ll. :' -.l 'looc. . ,o: 'oo' c, -.o. .:ool::coc' .ooo' o. - :: ..... .;dddo ;c - l:... .';lddddo. ,o - lxxxxxdoolllodxxxxxxxxxc :l - ,dxxxxxxxxxxxxxxxxxxl. 'o, - ,dkkkkkkkkkkkkko;. .;o; - .;okkkkkdl;. .,cl:. - .,:cccccccc:,. -EOF - ;; + get_birthday() { get_install_date; birthday="$install_date"; } +} - "DesaOS") - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1}███████████████████████ -███████████████████████ -███████████████████████ -███████████████████████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -████████ ███████ -██████████████████████████████ -██████████████████████████████ -████████████████████████ -████████████████████████ -████████████████████████ -EOF - ;; +old_options() { + [[ -n "$osx_buildversion" ]] && \ + err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." + [[ -n "$osx_codename" ]] && \ + err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." + [[ "$cpu_cores" == "on" ]] && \ + err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." + [[ -n "$image" ]] && \ + { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } + + # All progress_ variables were changed to bar_. + [[ -n "$progress_char" ]] && \ + err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." + [[ -n "$progress_border" ]] && \ + { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ + bar_border="$progress_border"; } + [[ -n "$progress_length" ]] && \ + { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ + bar_length="$progress_length"; } + [[ -n "$progress_color_elapsed" ]] && \ + { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ + bar_color_elapsed="$progress_color_elapsed"; } + [[ -n "$progress_color_total" ]] && \ + { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ + bar_color_total="$progress_color_total"; } + + # All cpufreq values were changed in 3.0. + [[ "$speed_type" == "current" ]] && \ + err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." + [[ "$speed_type" == "min" ]] && \ + err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." + [[ "$speed_type" == "max" ]] && \ + err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." + [[ "$speed_type" == "bios" ]] && \ + err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." + + # Ascii_logo_size was removed in 3.0. + [[ "$ascii_logo_size" ]] && \ + err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." + + # $start and $end were replaced with ${block_range[@]} in 3.0. + [[ "$start" && "$end" ]] && \ + { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ + block_range=("$start" "$end"); } + + # Fahrenheit support was added to CPU so the options were changed. + [[ "$cpu_temp" == "on" ]] && \ + { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; + cpu_temp="C"; } + + # Birthday was renamed to Install Date in 3.0 + [[ -n "$birthday_time" ]] && \ + { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ + install_time="$birthday_time"; } + + # Scrot dir was removed in 3.1.0. + [[ -n "$scrot_dir" ]] && scrot_dir= + + # cpu_shorthand was deprecated in 3.3.0 + [[ -n "$cpu_shorthand" ]] && \ + { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and + \$cpu_speed instead."; } +} + +cache_uname() { + # Cache the output of uname so we don't + # have to spawn it multiple times. + IFS=" " read -ra uname <<< "$(uname -sr)" + + kernel_name="${uname[0]}" + kernel_version="${uname[1]}" +} - "Devuan"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} ..,,;;;::;,.. - `':ddd;:,. - `'dPPd:,. - `:b$$b`. - 'P$$$d` - .$$$$$` - ;$$$$$P - .:P$$$$$$` - .,:b$$$$$$$;' - .,:dP$$$$$$$$b:' - .,:;db$$$$$$$$$$Pd'` - ,db$$$$$$$$$$$$$$b:'` -:$$$$$$$$$$$$b:'` - `$$$$$bd:''` - `'''` -EOF - ;; +convert_time() { + # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. + year="$1" + day="${3#0}" - "DracOS"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} `-:/- - -os: - -os/` - :sy+-` - `/yyyy+. - `+yyyyo- - `/yyyys: -`:osssoooo++- +yyyyyy/` - ./yyyyyyo yo`:syyyy+. - -oyyy+ +- :yyyyyo- - `:sy: `. `/yyyyys: - ./o/.` .oyyso+oo:` - :+oo+//::::///:-.` `.` -EOF - ;; + # Split time into hours/minutes. + hour="${4/:*}" + min="${4/${hour}}" - "dragonfly_old"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' - ${c1} | - .-. - ${c3} ()${c1}I${c3}() - ${c1} "==.__:-:__.==" - "==.__/~|~\__.==" - "==._( Y )_.==" - ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. -( ..=${c1}\\=${c1}/${c2}=.. ) - `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` - `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` - .-~` /${c1}|=|${c2}\ `~-. - .~` / ${c1}|=|${c2} \ `~. - .-~` .' ${c1}|=|${c2} `. `~-. - (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) - `~"~"` ${c1} |=|${c2} `"~"~` - ${c1} /=\\ - \\=/ - ^ -EOF - ;; + # Get month. (Month code is used for day of week) + # Due to different versions of 'ls', the month can be 1, 01 or Jan. + case "$2" in + 1 | 01 | "Jan") month="Jan"; month_code=0 ;; + 2 | 02 | "Feb") month="Feb"; month_code=3 ;; + 3 | 03 | "Mar") month="Mar"; month_code=3 ;; + 4 | 04 | "Apr") month="Apr"; month_code=6 ;; + 5 | 05 | "May") month="May"; month_code=1 ;; + 6 | 06 | "Jun") month="Jun"; month_code=4 ;; + 7 | 07 | "Jul") month="Jul"; month_code=6 ;; + 8 | 08 | "Aug") month="Aug"; month_code=2 ;; + 9 | 09 | "Sep") month="Sep"; month_code=5 ;; + 10 | "Oct") month="Oct"; month_code=0 ;; + 11 | "Nov") month="Nov"; month_code=3 ;; + 12 | "Dec") month="Dec"; month_code=5 ;; + esac - "dragonfly_small"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2}(\${c3}"${c2}/) -${c2}(/${c1}|${c2}\) -${c1} | - | -EOF - ;; + # Get leap year. + # Source: http://stackoverflow.com/questions/725098/leap-year-calculation + [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ + [[ "$month" =~ (Jan|Feb) ]] && \ + leap_code=1 - "DragonFly"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2},--, ${c1}| ${c2},--, -${c2}| `-, ${c1},^, ${c2},-' | -${c2} `, `-, ${c3}(/ \) ${c2},-' ,' -${c2} `-, `-,${c1}/ \${c2},-' ,-' -${c2} `------${c1}( )${c2}------' -${c2} ,----------${c1}( )${c2}----------, -${c2} | _,-${c1}( )${c2}-,_ | -${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' -${c1} | | - | | - | | - | | - | | - | | - `|' -EOF - ;; + # Calculate day of week. + # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html + year_code="$((${year/??} + (${year/??} / 4) % 7))" + week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" - "Elementary"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee eeeeeeeeeeee eeeee - eeee eeeee eee eeee - eeee eeee eee eeee -eee eee eee eee -eee eee eee eee -ee eee eeee eeee -ee eee eeeee eeeeee -ee eee eeeee eeeee ee -eee eeee eeeeee eeeee eee -eee eeeeeeeeee eeeeee eee - eeeeeeeeeeeeeeeeeeeeeeee eeeee - eeeeeeee eeeeeeeeeeee eeee - eeeee eeeee - eeeeeee eeeeeee - eeeeeeeeeeeeeeeee -EOF - ;; + case "$week_day" in + 0) week_day="Sun" ;; + 1) week_day="Mon" ;; + 2) week_day="Tue" ;; + 3) week_day="Wed" ;; + 4) week_day="Thu" ;; + 5) week_day="Fri" ;; + 6) week_day="Sat" ;; + esac - "Endless"*) - set_colors 1 7 - read -rd '' ascii_data <<'EOF' -${c1} `:+yhmNMMMMNmhy+:` - -odMMNhso//////oshNMMdo- - /dMMh+. .+hMMd/ - /mMNo` `oNMm: - `yMMo` `oMMy` - `dMN- -NMd` - hMN. .NMh -/MM/ -os` /MM/ -dMm `smNmmhs/- `:sNMd+ `` mMd -MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM -MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM -dMm `/++/-``/yNNh+/sdNMNddMm- mMd -/MM/ `dNy: `-::- /MM/ - hMN. .NMh - `dMN- -NMd` - `yMMo` `oMMy` - /mMNo` `oNMm/ - /dMMh+. .+hMMd/ - -odMMNhso//////oshNMMdo- - `:+yhmNMMMMNmhy+:` -EOF + # Convert 24 hour time to 12 hour time + AM/PM. + case "$install_time_format" in + "12h") + case "$hour" in + [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; + *) time="$((hour - 12))${min} PM" ;; + esac ;; + *) time="$4" ;; + esac - "Exherbo"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} , -OXo. -NXdX0: .cok0KXNNXXK0ko:. -KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... -'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. - cNMk NK .oXM. OMMMMO. 0MMNo kW. - lMc o: ., .oKNk; ;NMMWlxW' - ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO - XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk -.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl -,M: ,XMMWx::,''oOK0x; NM. -'Ml ,kNKOxxxxxkkO0XXKOd:. oMk - NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW - ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW - ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO - 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' - xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd - 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO - :XMNxl,';:lodxkOO000Oxc. .oWMMo - 'dXMMXkl;,. .,o0MMNo' - ':d0XWMMMMWNNNNMMMNOl' - ':okKXWNKkl' -EOF - ;; + # Toggle showing the time. + [[ "$install_time" == "off" ]] && unset time - "Fedora"* | "RFRemix"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} /:-------------:\\ - :-------------------:: - :-----------${c2}/shhOHbmp${c1}---:\\ - /-----------${c2}omMMMNNNMMD ${c1}---: - :-----------${c2}sMMMMNMNMP${c1}. ---: - :-----------${c2}:MMMdP${c1}------- ---\\ -,------------${c2}:MMMd${c1}-------- ---: -:------------${c2}:MMMd${c1}------- .---: -:---- ${c2}oNMMMMMMMMMNho${c1} .----: -:-- .${c2}+shhhMMMmhhy++${c1} .------/ -:- -------${c2}:MMMd${c1}--------------: -:- --------${c2}/MMMd${c1}-------------; -:- ------${c2}/hMMMy${c1}------------: -:--${c2} :dMNdhhdNMMNo${c1}------------; -:---${c2}:sdNMMMMNds:${c1}------------: -:------${c2}:://:${c1}-------------:: -:---------------------:// -EOF - ;; + # Print the install date. + printf "%s" "$week_day $day $month $year $time" +} - "freebsd_small") - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} /\\ _____ /\\ - \\_) (_/ - / \ -| | -| | - \ / - --_____-- -EOF +get_ppid() { + # Get parent process ID of PID. + case "$os" in + "Windows") + ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" + ppid="${ppid/'PPID'}" ;; - "FreeBSD"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' - ${c2}``` ${c1}` - ${c2}` `.....---...${c1}....--.``` -/ - ${c2}+o .--` ${c1}/y:` +. - ${c2} yo`:. ${c1}:o `+- - ${c2}y/ ${c1}-/` -o/ - ${c2}.- ${c1}::/sy+:. - ${c2}/ ${c1}`-- / - ${c2}`: ${c1}:` - ${c2}`: ${c1}:` - ${c2}/ ${c1}/ - ${c2}.- ${c1}-. - ${c2}-- ${c1}-. - ${c2}`:` ${c1}`:` - .-- `--. - .---.....----. -EOF + "Linux") + ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" + ppid="$(trim "${ppid/PPid:}")" ;; - "FreeMiNT"*) - # Don't explicitly set colors since - # TosWin2 doesn't reset well. - read -rd '' ascii_data <<'EOF' -${c1} ## - ## ######### - #### ## - #### #### ## -#### #### ## ## - #### #### ## ## - #### #### ## ## ## - #### ###### - ###### ## ## #### - #### ################ - #### ## #### - ## #### ###### - ## ## #### #### - ## ## ## ## ## #### - #### ## ## ## -EOF + *) + ppid="$(ps -p "${1:-$PPID}" -o ppid=)" ;; + esac - "Frugalware"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `++/::-.` - /o+++++++++/::-.` - `o+++++++++++++++o++/::-.` - /+++++++++++++++++++++++oo++/:-.`` - .o+ooooooooooooooooooosssssssso++oo++/:-` - ++osoooooooooooosssssssssssssyyo+++++++o: - -o+ssoooooooooooosssssssssssssyyo+++++++s` - o++ssoooooo++++++++++++++sssyyyyo++++++o: - :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo - `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: - /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss - .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- - ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso - -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. - sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ - :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` - yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ --ysooooooydhhhhhhhhhhhddddddddddddddddssy - .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: - ``.-/+oosysssssssssssssssssssssss - ``.:/+osyysssssssssssssh. - `-:/+osyyssssyo - .-:+++` -EOF + printf "%s" "$ppid" +} + +get_process_name() { + # Get PID name. + case "$os" in + "Windows") + name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" + name="${name/'COMMAND'}" + name="${name/*\/}" ;; - "Funtoo"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c2} _______ ____ - /MMMMMMM/ /MMMM| _____ _____ - __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ -|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ -|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| -|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| - |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ - |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ -EOF + "Linux") + name="$(< "/proc/${1:-$PPID}/comm")" ;; - "GalliumOS"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1}sooooooooooooooooooooooooooooooooooooo+: -yyooooooooooooooooooooooooooooooooo+/::: -yyysoooooooooooooooooooooooooooo+/:::::: -yyyyyoooooooooooooooooooooooo+/::::::::: -yyyyyysoooooooooooooooooo++/:::::::::::: -yyyyyyysoooooooooooooo++/::::::::::::::: -yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: -yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: -yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: -yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: -yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: -yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: -yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: -yyyyyyyyyyyyyyys+:--...........-///::::: -yyyyyyyyyyyys+:--................://:::: -yyyyyyyyyo+:-.....................-//::: -yyyyyyo+:-..........................://: -yyyo+:-..............................-// -o/:-...................................: -EOF + *) + name="$(ps -p "${1:-$PPID}" -o comm=)" ;; + esac + + printf "%s" "$name" +} + +decode_url() { + decode="${1//+/ }" + printf "%b" "${decode//%/\\x}" +} + +# FINISH UP + +usage() { printf "%s" "\ +Usage: neofetch --option \"value\" --option \"value\" + +Neofetch is a CLI system information tool written in BASH. Neofetch +displays information about your system next to an image, your OS logo, +or any ASCII file of your choice. + +NOTE: Every launch flag has a config option. + +Options: + +INFO: + --disable infoname Allows you to disable an info line from appearing + in the output. + + NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' + + --os_arch on/off Hide/Show OS architecture. + --speed_type type Change the type of cpu speed to display. + Possible values: current, min, max, bios, + scaling_current, scaling_min, scaling_max + + NOTE: This only supports Linux with cpufreq. + + --speed_shorthand on/off Whether or not to show decimals in CPU speed. + + NOTE: This flag is not supported in systems with CPU speed less than + 1 GHz. + + --cpu_brand on/off Enable/Disable CPU brand in output. + --cpu_cores type Whether or not to display the number of CPU cores + Possible values: logical, physical, off + + NOTE: 'physical' doesn't work on BSD. + + --cpu_speed on/off Hide/Show cpu speed. + --cpu_temp C/F/off Hide/Show cpu temperature. + + NOTE: This only works on Linux and BSD. + + NOTE: For FreeBSD and NetBSD-based systems, you need to enable + coretemp kernel module. This only supports newer Intel processors. + + --distro_shorthand on/off Shorten the output of distro (tiny, on, off) + + NOTE: This option won't work in Windows (Cygwin) + + --kernel_shorthand on/off Shorten the output of kernel + + NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) + + --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) + --refresh_rate on/off Whether to display the refresh rate of each monitor + Unsupported on Windows + --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) + --gpu_type type Which GPU to display. (all, dedicated, integrated) + + NOTE: This only supports Linux. + + --gtk_shorthand on/off Shorten output of gtk theme/icons + --gtk2 on/off Enable/Disable gtk2 theme/font/icons output + --gtk3 on/off Enable/Disable gtk3 theme/font/icons output + --shell_path on/off Enable/Disable showing \$SHELL path + --shell_version on/off Enable/Disable showing \$SHELL version + --disk_show value Which disks to display. + Possible values: '/', '/dev/sdXX', '/path/to/mount point' + + NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') + + --disk_subtitle type What information to append to the Disk subtitle. + Takes: name, mount, dir + + 'name' shows the disk's name (sda1, sda2, etc) + + 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) + + 'dir' shows the basename of the disks's path. (/, Local Disk, etc) + + --ip_host url URL to query for public IP + --song_shorthand on/off Print the Artist/Title on separate lines + --music_player player-name Manually specify a player to use. + Available values are listed in the config file + --install_time on/off Enable/Disable showing the time in Install Date output. + --install_time_format 12h/24h + Set time format in Install Date to be 12 hour or 24 hour. + +TEXT FORMATTING: + --colors x x x x x x Changes the text colors in this order: + title, @, underline, subtitle, colon, info + --underline on/off Enable/Disable the underline. + --underline_char char Character to use when underlining title + --bold on/off Enable/Disable bold text + +COLOR BLOCKS: + --color_blocks on/off Enable/Disable the color blocks + --block_width num Width of color blocks in spaces + --block_height num Height of color blocks in lines + --block_range num num Range of colors to print as blocks + +BARS: + --bar_char 'elapsed char' 'total char' + Characters to use when drawing bars. + --bar_border on/off Whether or not to surround the bar with '[]' + --bar_length num Length in spaces to make the bars. + --bar_colors num num Colors to make the bar. + Set in this order: elapsed, total + --cpu_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --memory_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --battery_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + --disk_display mode Bar mode. + Possible values: bar, infobar, barinfo, off + +IMAGE BACKEND: + --backend backend Which image backend to use. + Possible values: 'ascii', 'caca', 'catimg', '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/' + --ascii source Shortcut to use 'ascii' backend. + --caca source Shortcut to use 'caca' backend. + --catimg source Shortcut to use 'catimg' backend. + --iterm2 source Shortcut to use 'iterm2' backend. + --jp2a source Shortcut to use 'jp2a' backend. + --kitty source Shortcut to use 'kitty' backend. + --pixterm source Shortcut to use 'pixterm' backend. + --sixel source Shortcut to use 'sixel' backend. + --termpix source Shortcut to use 'termpix' backend. + --tycat source Shortcut to use 'tycat' backend. + --w3m source Shortcut to use 'w3m' backend. + --off Shortcut to use 'off' backend. - "gentoo_small") - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} _-----_ -( \\ -\ 0 \\ -${c2} \ ) - / _/ -( _- -\____- -EOF - ;; + NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', + '/path/to/ascii', '/path/to/dir/' - "Gentoo"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} -/oyddmdhs+:. - -o${c2}dNMMMMMMMMNNmhy+${c1}-` - -y${c2}NMMMMMMMMMMMNNNmmdhy${c1}+- - `o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/` - om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o` -.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+` - oy${c2}hdmNMMMMMMMN${c1}dyooy${c2}dmddddhhhhyhN${c1}d. - :o${c2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${c1}Mh - .:${c2}+sydNMMMMMNNNmmmdddhhhhhhmM${c1}my - /m${c2}MMMMMMNNNmmmdddhhhhhmMNh${c1}s: - `o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+` - `s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. - /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:` -+M${c2}MMMMMMNNNNNmmmmdmNMNdso${c1}/- -yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` -/h${c2}MMNNNNNNNNMNdhs++/${c1}-` -`/${c2}ohdmmddhys+++/:${c1}.` - `-//////:--. -EOF - ;; +ASCII: + --ascii_colors x x x x x x Colors to print the ascii art + --ascii_distro distro Which Distro's ascii art to print - "gNewSense"*) - set_colors 4 5 7 6 - read -rd '' ascii_data <<'EOF' -${c1} ..,,,,.. - .oocchhhhhhhhhhccoo. - .ochhlllllllc hhhhhh ollllllhhco. - ochlllllllllll hhhllllllhhh lllllllllllhco - .cllllllllllllll hlllllo +hllh llllllllllllllc. -ollllllllllhco'' hlllllo +hllh ``ochllllllllllo -hllllllllc' hllllllllllllh `cllllllllh -ollllllh +llllllllllll+ hllllllo - `cllllh. ohllllllho .hllllc' - ochllc. ++++ .cllhco - `+occooo+. .+ooocco+' - `+oo++++ ++++oo+' -EOF - ;; + NOTE: Arch and Ubuntu have 'old' logo variants. - "GNU") - set_colors fg 7 - read -rd '' ascii_data <<'EOF' -${c1} _-`````-, ,- '- . - .' .- - | | - -. `. - /.' / `. \ -:/ : _... ..._ `` : -:: : /._ .`:'_.._\. || : -:: `._ ./ ,` : \ . _.'' . -`:. / | -. \-. \\_ / - \:._ _/ .' .@) \@) ` `\ ,.' - _/,--' .- .\,-.`--`. - ,'/'' (( \ ` ) - /'/' \ `-' ( - '/'' `._,-----' - ''/' .,---' - ''/' ;: - ''/'' ''/ - ''/''/'' - '/'/' - `; -EOF - ;; + NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. - "GoboLinux"*) - set_colors 5 4 6 2 - read -rd '' ascii_data <<'EOF' -${c1}_____ _ -/ ____| | | -| | __ ___ | |__ ___ -| | |_ |/ _ \| '_ \ / _ \ -| |__| | (_) | |_) | (_) | - \_____|\___/|_.__/ \___/ -EOF - ;; + NOTE: Ubuntu has flavor variants. - "Grombyang"*) - set_colors 4 2 1 - read -rd '' ascii_data <<'EOF' -${c1} eeeeeeeeeeee - eeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeeeeeeeee - eeeee ${c2}.o+ ${c1}eeee - eeee ${c2}`ooo/ ${c1}eeee - eeee ${c2}`+oooo: ${c1}eeee -eee ${c2}`+oooooo: ${c1}eee -eee ${c2}-+oooooo+: ${c1}eee -ee ${c2}`/:oooooooo+: ${c1}ee -ee ${c2}`/+ +++ +: ${c1}ee -ee ${c2}+o+\ ${c1}ee -eee ${c2}+o+\ ${c1}eee -eee ${c2}// \\ooo/ \\\ ${c1}eee - eee ${c2}//++++oooo++++\\\ ${c1}eee - eeee ${c2}::::++oooo+::::: ${c1}eeee - eeeee ${c3}Grombyang OS ${c1} eeee - eeeeeeeeeeeeeeeeeeeeeee - eeeeeeeeeeeeeeeee -EOF - ;; + NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', + 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. - "GuixSD"*) - set_colors 3 7 6 1 8 - read -rd '' ascii_data <<'EOF' -${c1} .. `. - `--..```..` `..```..--` - .-:///-:::. `-:::///:-. - ````.:::` `:::.```` - -//:` -::- - ://: -::- - `///- .:::` - -+++-:::. - :+/:::- - `-....` -EOF - ;; + NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, + OpenBSD, and Void have a smaller logo variant. - "Haiku"*) - set_colors 2 8 - read -rd '' ascii_data <<'EOF' -${c2} :dc' - 'l:;'${c1},${c2}'ck. .;dc:. - co ${c1}..${c2}k. .;; ':o. - co ${c1}..${c2}k. ol ${c1}.${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. -.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. - ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; - ..${c1}oOolllllccccccc:::::${c2}od; - cx:ooc${c1}:::::::;${c2}cooolcX. - cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. - cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. - .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. - '::c'${c1}...${c2}do${c1}..... .${c2}K, - cd,.${c1}....:${c2}O,${c1} - ':clod:'${c1} - ${c1} -EOF - ;; + NOTE: Use '{distro name}_small' to use the small variants. - "Hyperbola"*) - set_colors 8 - read -rd '' ascii_data <<'EOF' -${c1} WW - KX W - WO0W NX0O - NOO0NW WNXK0OOKW - W0OOOOOOOOOOOOKN - N0OOOOOOO0KXW - WNXXXNW - NXK00000KN - WNK0OOOOOOOOOO0W - NK0OOOOOOOOOOOOOO0W - X0OOOOOOO00KK00OOOOOK - X0OOOO0KNWW WX0OO0W - X0OO0XNW KOOW - N00KNW KOW - NKXN W0W -WW W -EOF - ;; + --ascii_bold on/off Whether or not to bold the ascii logo. + -L, --logo Hide the info text and only show the ascii logo. - "Kali"*) - set_colors 4 8 - read -rd '' ascii_data <<'EOF' -${c1}.............. - ..,;:ccc,. - ......''';lxO. -.....''''..........,:ld; - .';;;:::;,,.x, - ..'''. 0Xxoc:,. ... - .... ,ONkc;,;cokOdc',. - . OMo ':${c2}dd${c1}o. - dMc :OO; - 0M. .:o. - ;Wd - ;XO, - ,d0Odlc;,.. - ..',;:cdOOd::,. - .:d;.':;. - 'd, .' - ;l .. - .o - c - .' - . -EOF - ;; + Possible values: bar, infobar, barinfo, off - "KaOS"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} .. - ..... ..OSSAAAAAAA.. - .KKKKSS. .SSAAAAAAAAAAA. -.KKKKKSO. .SAAAAAAAAAA... -KKKKKKS. .OAAAAAAAA. -KKKKKKS. .OAAAAAA. -KKKKKKS. .SSAA.. -.KKKKKS..OAAAAAAAAAAAA........ - DKKKKO.=AA=========A===AASSSO.. - AKKKS.==========AASSSSAAAAAASS. - .=KKO..========ASS.....SSSSASSSS. - .KK. .ASS..O.. =SSSSAOSS: - .OK. .ASSSSSSSO...=A.SSA. - .K ..SSSASSSS.. ..SSA. - .SSS.AAKAKSSKA. - .SSS....S.. -EOF - ;; +IMAGE: + --loop Redraw the image constantly until Ctrl+C is used. This fixes issues + in some terminals emulators when using image mode. + --size 00px | --size 00% How to size the image. + Possible values: auto, 00px, 00%, none + --crop_mode mode Which crop mode to use + Takes the values: normal, fit, fill + --crop_offset value Change the crop offset for normal mode. + Possible values: northwest, north, northeast, + west, center, east, southwest, south, southeast - "KDE"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1} `..---+/---..` - `---.`` `` `.---.` - .--.` `` `-:-. - `:/: `.----//----.` :/- - .:. `---` `--.` .:` - .:` `--` .:- `:. - `/ `:. `.-::-.` -:` `/` - /. /. `:++++++++:` .: .: -`/ .: `+++++++++++/ /` `+` -/+` -- .++++++++++++` :. .+: -`/ .: `+++++++++++/ /` `+` - /` /. `:++++++++:` .: .: - ./ `:. `.:::-.` -:` `/` - .:` `--` .:- `:. - .:. `---` `--.` .:` - `:/: `.----//----.` :/- - .-:.` `` `-:-. - `---.`` `` `.---.` - `..---+/---..` -EOF - ;; + --xoffset px How close the image will be to the left edge of the + window. This only works with w3m. + --yoffset px How close the image will be to the top edge of the + window. This only works with w3m. + --bg_color color Background color to display behind transparent image. + This only works with w3m. + --gap num Gap between image and text. - "Kogaion"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ;; ,; - ;;; ,;; - ,;;;; ;;;; - ,;;;;;;;; ;;;; - ;;;;;;;;;;; ;;;;; - ,;;;;;;;;;;;; ';;;;;, - ;;;;;;;;;;;;;;, ';;;;;;; - ;;;;;;;;;;;;;;;;;, ';;;;; -; ';;;;;;;;;;;;;;;;;;, ;;; -;;;, ';;;;;;;;;;;;;;;;;;;,;; -;;;;;, ';;;;;;;;;;;;;;;;;;, -;;;;;;;;, ';;;;;;;;;;;;;;;;, -;;;;;;;;;;;;, ';;;;;;;;;;;;;; -';;;;;;;;;;;;; ';;;;;;;;;;;;; - ';;;;;;;;;;;;;, ';;;;;;;;;;; - ';;;;;;;;;;;;; ;;;;;;;;;; - ';;;;;;;;;;;; ;;;;;;;; - ';;;;;;;; ;;;;;; - ';;;;; ;;;; - ';;; ;; -EOF - ;; + NOTE: --gap can take a negative value which will move the text + closer to the left side. - "Korora"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} ____________ - _add55555555554${c1}: - _w?'${c1}``````````'${c2})k${c1}: - _Z'${c1}`${c2} ]k${c1}: - m(${c1}`${c2} )k${c1}: - _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: - .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` - jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` - jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` -.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` -:#${c1}:${c2} ${c1}`${c2})e${c1}``` -:m${c1}:${c2} ,#'${c1}` -:#${c1}:${c2} .s2'${c1}` -:m,________.aa7^${c1}` -:#baaaaaaas!J'${c1}` - ``````````` -EOF - ;; + --clean Delete cached files and thumbnails. - "KSLinux"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} K K U U RRRR ooo - K K U U R R o o - KKK U U RRRR o o - K K U U R R o o - K K UUU R R ooo +SCREENSHOT: + -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- + shot function will use \$scrot_dir and \$scrot_name. + -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. + --image_host imgur/teknik Website to upload scrots to. + --scrot_cmd cmd Screenshot program to launch -${c2} SSS AAA W W AAA - S A A W W A A - SSS AAAAA W W W AAAAA - S A A WW WW A A - SSS A A W W A A -EOF - ;; +OTHER: + --config /path/to/config Specify a path to a custom config file + --config none Launch the script without a config file + --stdout Turn off all colors and disables any ASCII/image backend. + --help Print this text and exit + --version Show neofetch version + -v Display error messages. + -vv Display a verbose log for error reporting. - "Kubuntu"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `.:/ossyyyysso/:. - .:oyyyyyyyyyyyyyyyyyyo:` - -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- - -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- - oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo - `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` - oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- -oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy -yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy -oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo --yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- - oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo - `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo - oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo - -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- - -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- - ./oyyyyyyyyyyyyyyyyyyo/. - `.:/oosyyyysso/:.` -EOF - ;; +DEVELOPER: + --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) - "LEDE"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' - ${c1} _________ - / /\ - / LE / \ - / DE / \ - /________/ LE \ - \ \ DE / - \ LE \ / - \ DE \ / - \________\/ -EOF - ;; - "Linux") - set_colors fg 8 3 - read -rd '' ascii_data <<'EOF' -${c2} ##### -${c2} ####### -${c2} ##${c1}O${c2}#${c1}O${c2}## -${c2} #${c3}#####${c2}# -${c2} ##${c1}##${c3}###${c1}##${c2}## -${c2} #${c1}##########${c2}## -${c2} #${c1}############${c2}## -${c2} #${c1}############${c2}### -${c3} ##${c2}#${c1}###########${c2}##${c3}# -${c3}######${c2}#${c1}#######${c2}#${c3}###### -${c3}#######${c2}#${c1}#####${c2}#${c3}####### -${c3} #####${c2}#######${c3}##### -EOF - ;; +Report bugs to https://github.com/dylanaraps/neofetch/issues - "LMDE"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' - ${c2}`.-::---.. -${c1} .:++++ooooosssoo:. - .+o++::. `.:oos+. -${c1} :oo:.` -+oo${c2}: -${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` -${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` -${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: -${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` -${c1}`s: `oo s m Myy+-o:` -`oo :+sdoohyoydyso/. - :o. .:////////++: -${c1} `/++ ${c2}-:::::- -${c1} ${c2}`${c1}++- -${c1} ${c2}`${c1}/+- -${c1} ${c2}.${c1}+/. -${c1} ${c2}.${c1}:+-. - `--.`` -EOF - ;; +" +exit 1 +} - "Lubuntu"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} `-/+oyyhhhhyyo+/-` - ./shhhhhhhhhhhhhhhhhhs/. - `:shhhhhhhhhhhhhhhhhhhhhhhhs:` - :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: - `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` - `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` - shhhhhhhhy+. .ohhhhhhhhhhhhhs -:hhhhhhy/. /hhhhhhhhhhhhh: -shhhy/. :hhhhhhhhhhhhs -hy+. ` `+yhs/` +hhhhhhhhhhhh --.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh -shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs -:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: - shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs - `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` - +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` - :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: - :shhhhhhhhhhhhhhhhhhhhhy`+s:` - .+shhhhhhhhhhhhhhhhhhs:` - `-/+oyyhhhhyys+/-` -EOF - ;; +get_args() { + # Check the commandline flags early for '--config'. + [[ "$*" != *--config* ]] && get_user_config - "Lunar"*) - set_colors 4 7 3 - read -rd '' ascii_data <<'EOF' -${c1}`-. `-. - -ohys/-` `:+shy/` - -omNNdyo/` :+shmNNy/` - ${c3} - - /mMmo - hMMMN` - .NMMs - ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` - /:.` ${c3}/${c1} `.:/` -${c3} __ - | | _ _ ___ ___ ___ - | |__| | | | .'| _| - |_____|___|_|_|__,|_| -EOF - ;; + while [[ "$1" ]]; do + case "$1" in + # Info + "--os_arch") os_arch="$2" ;; + "--cpu_cores") cpu_cores="$2" ;; + "--cpu_speed") cpu_speed="$2" ;; + "--speed_type") speed_type="$2" ;; + "--speed_shorthand") speed_shorthand="$2" ;; + "--distro_shorthand") distro_shorthand="$2" ;; + "--kernel_shorthand") kernel_shorthand="$2" ;; + "--uptime_shorthand") uptime_shorthand="$2" ;; + "--cpu_brand") cpu_brand="$2" ;; + "--gpu_brand") gpu_brand="$2" ;; + "--gpu_type") gpu_type="$2" ;; + "--refresh_rate") refresh_rate="$2" ;; + "--gtk_shorthand") gtk_shorthand="$2" ;; + "--gtk2") gtk2="$2" ;; + "--gtk3") gtk3="$2" ;; + "--shell_path") shell_path="$2" ;; + "--shell_version") shell_version="$2" ;; + "--ip_host") public_ip_host="$2" ;; + "--song_shorthand") song_shorthand="$2" ;; + "--music_player") music_player="$2" ;; + "--install_time") install_time="$2" ;; + "--install_time_format") install_time_format="$2" ;; + "--cpu_temp") + cpu_temp="$2" + [[ "$cpu_temp" == "on" ]] && cpu_temp="C" + ;; - "mac"*"_small") - set_colors 2 3 1 5 4 - read -rd '' ascii_data <<'EOF' -${c1} .:' - _ :'_ -${c2} .'`_`-'_``. -:________.-' -${c3}:_______: -:_______: -${c4} :_______`-; -${c5} `._.-._.' -EOF - ;; + "--disk_subtitle") disk_subtitle="$2" ;; + "--disk_show") + unset disk_show + for arg in "$@"; do + case "$arg" in + "--disk_show") ;; + "-"*) break ;; + *) disk_show+=("$arg") ;; + esac + done + ;; - "mac" | "Darwin") - set_colors 2 3 1 1 5 4 - read -rd '' ascii_data <<'EOF' -${c1} 'c. - ,xNMM. - .OMMMMo - OMMM0, - .;loddo:' loolloddol;. - cKMMMMMMMMMMNWMMMMMMMMMM0: -${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. - XMMMMMMMMMMMMMMMMMMMMMMMX. -${c3};MMMMMMMMMMMMMMMMMMMMMMMM: -:MMMMMMMMMMMMMMMMMMMMMMMM: -${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. - kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. - ${c6}kMMMMMMMMMMMMMMMMMMMMMMd - ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. -EOF - ;; + "--disable") + for func in "$@"; do + case "$func" in + "--disable") continue ;; + "-"*) break ;; + *) + ((bash_version >= 4)) && func="${func,,}" + unset -f "get_$func" + ;; + esac + done + ;; - "Mageia"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} .°°. - °° .°°. - .°°°. °° - . . - °°° .°°°. - .°°°. '___' -${c2} .${c1}'___' ${c2} . - :dkxc;'. ..,cxkd; - .dkk. kkkkkkkkkk .kkd. -.dkk. ';cloolc;. .kkd -ckk. .kk; -xO: cOd -xO: lOd -lOO. .OO: -.k00. .00x - .k00; ;00O. - .lO0Kc;,,,,,,;c0KOc. - ;d00KKKKKK00d; - .,KKKK,. -EOF - ;; + # Text Colors + "--colors") + unset colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) colors+=("$arg") ;; + esac + done + colors+=(7 7 7 7 7 7) + ;; - "MagpieOS"*) - set_colors 2 1 3 5 - read -rd '' ascii_data <<'EOF' -${c1} ;00000 :000Ol - .x00kk00: O0kk00k; - l00: :00. o0k :O0k. - .k0k. x${c2}d$dddd${c1}k' .d00; - k0k. ${c2}.dddddl ${c1}o00, - o00. ${c2}':cc:. ${c1}d0O -.00l ,00. -l00. d0x -k0O .:k0o -O0k ;dO0000d. -k0O .O0O${c2}xxxxk${c1}00: -o00. k0O${c2}dddddd${c1}occ -'00l x0O${c2}dddddo${c3};..${c1} - x00. .x00${c2}kxxd${c3}:..${c1} - .O0x .:oxxx${c4}Okl.${c1} - .x0d ${c4},xx,${c1} - .:o. ${c4}.xd ckd${c1} - .. ${c4}dxl .xx; - :xxolldxd' - ;oxdl. -EOF - ;; + # Text Formatting + "--underline") underline_enabled="$2" ;; + "--underline_char") underline_char="$2" ;; + "--bold") bold="$2" ;; - "Manjaro"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1}██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -████████ ████████ ████████ -EOF - ;; + # Color Blocks + "--color_blocks") color_blocks="$2" ;; + "--block_range") block_range=("$2" "$3") ;; + "--block_width") block_width="$2" ;; + "--block_height") block_height="$2" ;; - "Maui"*) - set_colors 6 7 - read -rd '' ascii_data <<'EOF' -${c1} `.-://////:--` - .:/oooooooooooooooo+:. - `:+ooooooooooooooooooooooo:` - `:oooooooooooooooooooooooooooo/` - ..```-oooooo/-`` `:oooooo+:.` `-- - :. +oo+-` /ooo/` -/ - -o. `o+- +o/` -o: -`oo` ::` :o/ `+. .+o` /oo. -/o+ . -+oo- ` /oo/ `ooo/ -+o- /ooo+` .+ooo. :ooo+ -++ .+oooo: -oooo+ `oooo+ -:. .oooooo` :ooooo- :oooo: -` .oooooo: :ooooo+ `ooo+-` - .+oooooo` -oooooo: `o/- - +oooooo: .ooooooo. - /ooooooo` /ooooooo/ .. - `:oooooooo/:::/ooooooooo+:--:/:` - `:+oooooooooooooooooooooo+:` - .:+oooooooooooooooo+:. - `.-://////:-.` -EOF - ;; + # Bars + "--bar_char") + bar_char_elapsed="$2" + bar_char_total="$3" + ;; - "Mer"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} dMs - .-` - `y`-o+` - ``NMMy - .--`:++. - .hNNNNs - /MMMMMN - `ommmd/ +/ - ```` +/ - `:+sssso/-` - .-::. `-::-` `smNMNmdmNMNd/ .://-` -.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo -dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- -MMm yMM- :MMs NMN` `:::::--sMMh dMM` -MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` -NNd sNN- -NNs -mMNs-.--..:dMMh` dNN ---- .--` `--. .smMMmdddmMNdo` .-- - ./ohddds+:` - +h- `.:-. - ./`.dMMMN+ - +MMMMMd - `+dmmy- - ``` .+` - .dMNo-y. - `hmm/ - .:` - dMs -EOF - ;; + "--bar_border") bar_border="$2" ;; + "--bar_length") bar_length="$2" ;; + "--bar_colors") + bar_color_elapsed="$2" + bar_color_total="$3" + ;; - "Minix"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c2} -sdhyo+:-` -/syymm: - sdyooymmNNy. `` .smNmmdysNd - odyoso+syNNmysoyhhdhsoomNmm+/osdm/ - :hhy+-/syNNmddhddddddmNMNo:sdNd: - `smNNdNmmNmddddddddddmmmmmmmy` - `ohhhhdddddmmNNdmddNmNNmdddddmdh- - odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: - `+mNho:` smmd/ sNNh :dmms` -+ymmo. --od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: -+sms -.` :so: .NN+ :os/ .-`mNh: -.-hyh+:////- -sNNd:` .--://ohNs- - `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ - -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: - //oydNMMMMydMMNysNMMmsMMMMMNyo/` - ../-yNMMy--/::/-.sMMmos+.` - -+oyhNsooo+omy/``` - `::ohdmds-` -EOF - ;; + "--cpu_display") cpu_display="$2" ;; + "--memory_display") memory_display="$2" ;; + "--battery_display") battery_display="$2" ;; + "--disk_display") disk_display="$2" ;; + + # Image backend + "--backend") image_backend="$2" ;; + "--source") image_source="$2" ;; + "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + image_backend="${1/--}" + case "$2" in + "-"* | "") ;; + *) image_source="$2" ;; + esac + ;; - "Linux Mint"* | "LinuxMint"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. -MMm----::-://////////////oymNMd+` -MMd ${c2}/++ ${c1}-sNMd: -MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: -ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm - NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM - NMm ${c2}dMM` ..` ... ydm. ${c1}dMM - hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM - -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM - -dMNs-${c2}``-::::-------.`` ${c1}dMM - `/dMNmy+/:-------------:/yMMM - ./ydNMMMMMMMMMMMMMMMMMMMMM - .MMMMMMMMMMMMMMMMMMM -EOF - ;; + # Image options + "--loop") image_loop="on" ;; + "--image_size" | "--size") image_size="$2" ;; + "--crop_mode") crop_mode="$2" ;; + "--crop_offset") crop_offset="$2" ;; + "--xoffset") xoffset="$2" ;; + "--yoffset") yoffset="$2" ;; + "--background_color" | "--bg_color") background_color="$2" ;; + "--gap") gap="$2" ;; + "--clean") + [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" + rm -rf "/Library/Caches/neofetch/" + rm -rf "/tmp/neofetch/" + exit + ;; - "MX"*) - set_colors 4 6 7 - read -rd '' ascii_data <<'EOF' -${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM -MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM -MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM -MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM -MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM -MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM -MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM -MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM -MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM -MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM -MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM -MMMMMMMNo` :mMMN+` `-hMMMMMMMM -MMMMMMh. `oNMMd: `/mMMMMMM -MMMMm/ -hMd- `sNMMMM -MMNs` - :dMMM -Mm: `oMM -MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM -EOF - ;; + "--ascii_colors") + unset ascii_colors + for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do + case "$arg" in + "-"*) break ;; + *) ascii_colors+=("$arg") + esac + done + ascii_colors+=(7 7 7 7 7 7) + ;; - "NetBSD"*) - set_colors 5 7 - read -rd '' ascii_data <<'EOF' -${c1} `-/oshdmNMNdhyo+:-` -${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` -${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` - ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` - ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` - ${c2}-N/${c1}hMMMMMMMMMmho:` - ${c2}-N/${c1}-:/++/:.` -${c2} :M+ - :Mo - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms - :Ms -EOF - ;; + "--ascii_distro") + image_backend="ascii" + ascii_distro="$2" + case "$2" in "-"* | "") ascii_distro="$distro" ;; esac + ;; - "Netrunner"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c1} .:oydmMMMMMMmdyo:` - -smMMMMMMMMMMMMMMMMMMds- - +mMMMMMMMMMMMMMMMMMMMMMMMMd+ - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ - `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` - .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` - dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh -+MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ -mMMMMMMMMd+:.` `mMMMMMMMMMMMMd -MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM -MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM -mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd -+MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ - dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh - `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` - `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy - /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: - +dMMMMMMMMMMMMMMMMMMMMMMMMd/ - -odMMMMMMMMMMMMMMMMMMdo- - `:+ydmNMMMMNmhy+-` -EOF - ;; + "--ascii_bold") ascii_bold="$2" ;; + "--logo" | "-L") + image_backend="ascii" + print_info() { info line_break; } + ;; - "Nitrux"*) - set_colors 4 - read -rd '' ascii_data <<'EOF' -${c1}`:/. -`/yo -`/yo -`/yo .+:. -`/yo .sys+:.` -`/yo `-/sys+:.` -`/yo ./sss+:.` -`/yo .:oss+:-` -`/yo ./o///:-` -`/yo `.-:///////:` -`/yo `.://///++//-`` -`/yo `.-:////++++/-` -`/yo `-://///++o+/-` -`/yo `-/+o+++ooo+/-` -`/s+:+oooossso/.` -`//+sssssso:. -`+syyyy+:` -:+s+- -EOF - ;; + # Screenshot + "--scrot" | "-s") + scrot_args "$@" + ;; + "--upload" | "-su") + scrot_upload="on" + scrot_args "$@" + ;; - "nixos_small") - set_colors 4 6 - read -rd '' ascii_data <<'EOF' - ${c1}\\\\ \\\\ // - ==\\\\__\\\\/ // - // \\\\// -==// //== - //\\\\___// -// /\\\\ \\\\== - // \\\\ \\\\ -EOF - ;; + "--image_host") image_host="$2" ;; + "--scrot_cmd") scrot_cmd="$2" ;; - "NixOS"*) - set_colors 4 6 - read -rd '' ascii_data <<'EOF' -${c1} ::::. ${c2}'::::: ::::' -${c1} '::::: ${c2}':::::. ::::' -${c1} ::::: ${c2}'::::.::::: -${c1} .......:::::..... ${c2}:::::::: -${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. - ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' -${c2} ..... ::::' ${c1}:::::' -${c2} ::::: '::' ${c1}:::::' -${c2} ........::::: ' ${c1}:::::::::::. -${c2}::::::::::::: ${c1}::::::::::::: -${c2} ::::::::::: ${c1}.. ${c1}::::: -${c2} .::::: ${c1}.::: ${c1}::::: -${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... - ::::: ${c1}':::::. ${c2}......:::::::::::::' - ::: ${c1}::::::. ${c2}':::::::::::::::::' -${c1} .:::::::: ${c2}':::::::::: -${c1} .::::''::::. ${c2}'::::. -${c1} .::::' ::::. ${c2}'::::. -${c1} .:::: :::: ${c2}'::::. -EOF - ;; + # Other + "--config") + case "$2" in + "none" | "off" | "") ;; + *) + config_file="$(get_full_path "$2")" + get_user_config + ;; + esac + ;; + "--stdout") stdout="on" ;; + "-v") verbose="on" ;; + "-vv") set -x; verbose="on" ;; + "--help") usage ;; + "--version") + printf "%s\\n" "Neofetch $version" + exit 1 + ;; + "--gen-man") + help2man -n "A fast, highly customizable system info script" \ + -N ./neofetch -o neofetch.1 + exit 1 + ;; - "Nurunner"*) - set_colors 4 - read -rd '' ascii_data <<'EOF' -${c1} ,xc - ;00cxXl - ;K0, .xNo. - :KO' .lXx. - cXk. ;xl cXk. - cXk. ;k:.,xo. cXk. - .lXx. :x::0MNl,dd. :KO, - .xNx. cx;:KMMMMMNo'dx. ;KK; - .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: -;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO - 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: - .kNo .xo'xWMMMMMM0;:O: ;KK; - .dXd. .do,oNMMO;ck: ;00, - oNd. .dx,;'cO; ;K0, - oNx. okk; ;K0, - lXx. :KO' - cKk' cXk. - ;00:lXx. - ,kd. -EOF - ;; + "--travis") + print_info() { + info title + info underline + + info "OS" distro + info "Host" model + info "Kernel" kernel + info "Uptime" uptime + info "Packages" packages + info "Shell" shell + info "Resolution" resolution + info "DE" de + info "WM" wm + info "WM Theme" wm_theme + info "Theme" theme + info "Icons" icons + info "Terminal" term + info "Terminal Font" term_font + info "CPU" cpu + info "GPU" gpu + info "GPU Driver" gpu_driver + info "Memory" memory - "NuTyX"*) - set_colors 4 1 - read -rd '' ascii_data <<'EOF' -${c1} . - . - ... - ... - .... .........--. - ..-++-----....--++++++---. - .-++++++-. .-++++++++++++-----.. - .--... .++..-+++--.....-++++++++++--.. - . .-+-. .**- .... ..-+----.. - .+++. .*+. + -++-----. - .+++++- ++. .*+. .....-+++-----. - -+++-++. .+. .-+***++***++--++++. . - -+-. -- -. -*- ...... ..--. -.-. .+- . -+. -. .+- +. - -- -- - -+----. .- - -++-.+. . - .++. -- - +. ----. - . .+. .. - - . - . -EOF - ;; + info "CPU Usage" cpu_usage + info "Disk" disk + info "Battery" battery + info "Font" font + info "Song" song + info "Local IP" local_ip + info "Public IP" public_ip + info "Users" users + info "Install Date" install_date - "OBRevenge"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} __ __ - _@@@@ @@@g_ - _@@@@@@ @@@@@@ - _@@@@@@M W@@@@@@_ - j@@@@P ^W@@@@ - @@@@L____ _____Q@@@@ -Q@@@@@@@@@@j@@@@@@@@@@ -@@@@@ T@j@ T@@@@@ -@@@@@ ___Q@J@ _@@@@@ -@@@@@fMMM@@j@jggg@@@@@@ -@@@@@ j@j@^MW@P @@@@ -Q@@@@@ggg@@f@ @@@@@@L -^@@@@WWMMP ^ Q@@@@ - @@@@@_ _@@@@l - W@@@@@g_____g@@@@@P - @@@@@@@@@@@@@@@@l - ^W@@@@@@@@@@@P - ^TMMMMTll -EOF - ;; + info line_break + info cols + info line_break - "openbsd_small") - set_colors 3 7 6 1 8 - read -rd '' ascii_data <<'EOF' -${c1} _____ - \\- -/ - \\_/ \\ - | ${c2}O O${c1} | - |_ < ) 3 ) - / \\ / - /-_____-\\ -EOF - ;; + # Testing. + prin "prin" + prin "prin" "prin" - "OpenBSD"*) - set_colors 3 7 6 1 8 - read -rd '' ascii_data <<'EOF' - ${c3} _ - (_) -${c1} | . -${c1} . |L /| . ${c3} _ -${c1} _ . |\ _| \--+._/| . ${c3}(_) -${c1} / ||\| Y J ) / |/| ./ - J |)'( | ` F`.'/ ${c3} _ -${c1} -<| F __ .-< ${c3}(_) -${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ - J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ -${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) -${c1} '-F -<_. \\ .-' `-' L__ -__J _ _. >-' ${c1})${c4}._. ${c1}|-' -${c1} `-|.' /_. ${c4}\_| ${c1} F - /.- . _.< - /' /.' .' `\\ - /L /' |/ _.-'-\\ - /'J ___.---'\| - |\ .--' V | `. ` - |/`. `-. `._) - / .-.\\ - \\ ( `\\ - `.\ -EOF - ;; + # Testing no subtitles. + info uptime + info disk + } - "OpenIndiana"*) - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} .sy/ - .yh+ + refresh_rate="on" + shell_version="on" + cpu_display="infobar" + memory_display="infobar" + disk_display="infobar" + cpu_temp="C" + ;; + esac - ${c1}-+syyyo+- ${c2} /+. - ${c1}+ddo/---/sdh/ ${c2} ym- - ${c1}`hm+ `sms${c2} ym-```````.-. - ${c1}sm+ sm/ ${c2} ym- +s - ${c1}hm. /mo ${c2} ym- /h - ${c1}omo ym: ${c2} ym- `os` - ${c1}smo` .ym+ ${c2} ym- .os- - `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. - ..` ${c1}`:+oo+/-` ${c2} -//oyo- - -:` .:oys/. -+- `./oyys/. -h+` `.-:+oyyyo/-` -`/ossssysso+/-.` -EOF - ;; + shift + done +} - "OpenMandriva"*) - set_colors 4 3 +get_distro_colors() { + # This function sets the text colors according + # to your OS/Distro's logo colors. + # + # $ascii_distro is the same as $distro. + case "$ascii_distro" in + "AIX"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c2} `` - `-. -${c1} ` ${c2}.--- -${c1} -/ ${c2}-::--` -${c1} `++ ${c2}`----...```-:::::. -${c1} `os. ${c2}.::::::::::::::-``` ` ` -${c1} +s+ ${c2}.::::::::::::::::---...--` -${c1}-ss: ${c2}`-::::::::::::::::-.``.`` -${c1}/ss- ${c2}.::::::::::::-.`` ` -${c1}+ss: ${c2}.::::::::::::- -${c1}/sso ${c2}.::::::-::::::- -${c1}.sss/ ${c2}-:::-.` .::::: -${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: -${c1} -ossso+/:://+/-` ${c2}.:` -${c1} -/+ooo+/-. ${c2}` +${c1} `:+ssssossossss+-` + .oys///oyhddddhyo///sy+. + /yo:+hNNNNNNNNNNNNNNNNh+:oy/ + :h/:yNNNNNNNNNNNNNNNNNNNNNNy-+h: + `ys.yNNNNNNNNNNNNNNNNNNNNNNNNNNy.ys + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oh + h+-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN.oy +/d`mNNNNNNN/::mNNNd::m+:/dNNNo::dNNNd`m: +h//NNNNNNN: . .NNNh mNo od. -dNNNNN:+y +N.sNNNNNN+ -N/ -NNh mNNd. sNNNNNNNo-m +N.sNNNNNs +oo /Nh mNNs` ` /mNNNNNNo-m +h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y +:d`mNNN+/yNNNNNd//y//h//oNNNNy//sNNNd`m- + yo-NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNm.ss + `h+-mNNNNNNNNNNNNNNNNNNNNNNNNNNNNm-oy + sy.yNNNNNNNNNNNNNNNNNNNNNNNNNNs.yo + :h+-yNNNNNNNNNNNNNNNNNNNNNNs-oh- + :ys:/yNNNNNNNNNNNNNNNmy/:sy: + .+ys///osyhhhhys+///sy+. + -/osssossossso/- EOF ;; - "OpenWrt"*) - set_colors 4 7 1 + "alpine_small") + set_colors 4 7 read -rd '' ascii_data <<'EOF' -${c1} _______ -| |.-----.-----.-----. -| - || _ | -__| | -|_______|| __|_____|__|__| - |__| - ________ __ -| | | |.----.| |_ -| | | || _|| _| -|________||__| |____| +${c1} /\\ /\\ + /${c2}/ ${c1}\\ \\ + /${c2}/ ${c1}\\ \\ +/${c2}// ${c1}\\ \\ +${c2}// ${c1}\\ \\ + \\ EOF ;; - "Open Source Media Center"* | "osmc") - set_colors 4 7 1 + "Alpine"*) + set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c1} -+shdmNNNNmdhs+- - .+hMNho/:..``..:/ohNMh+. - :hMdo. .odMh: - -dMy- -yMd- - sMd- -dMs - hMy +. .+ yMh - yMy dMs. .sMd yMy -:Mm dMNMs` `sMNMd `mM: -yM+ dM//mNs``sNm//Md +My -mM- dM: +NNNN+ :Md -Mm -mM- dM: `oNN+ :Md -Mm -yM+ dM/+NNo` :Md +My -:Mm` dMMNs` :Md `mM: - yMy dMs` -ms yMy - hMy +. yMh - sMd- -dMs - -dMy- -yMd- - :hMdo. .odMh: - .+hMNho/:..``..:/ohNMh+. - -+shdmNNNNmdhs+- +${c1} .hddddddddddddddddddddddh. + :dddddddddddddddddddddddddd: + /dddddddddddddddddddddddddddd/ + +dddddddddddddddddddddddddddddd+ + `sdddddddddddddddddddddddddddddddds` + `ydddddddddddd++hdddddddddddddddddddy` +.hddddddddddd+` `+ddddh:-sdddddddddddh. +hdddddddddd+` `+y: .sddddddddddh +ddddddddh+` `//` `.` -sddddddddd +ddddddh+` `/hddh/` `:s- -sddddddd +ddddh+` `/+/dddddh/` `+s- -sddddd +ddd+` `/o` :dddddddh/` `oy- .yddd +hdddyo+ohddyosdddddddddho+oydddy++ohdddh +.hddddddddddddddddddddddddddddddddddddh. + `yddddddddddddddddddddddddddddddddddy` + `sdddddddddddddddddddddddddddddddds` + +dddddddddddddddddddddddddddddd+ + /dddddddddddddddddddddddddddd/ + :dddddddddddddddddddddddddd: + .hddddddddddddddddddddddh. EOF ;; - "Oracle"*) - set_colors 1 7 3 + "Amazon"*) + set_colors 3 7 read -rd '' ascii_data <<'EOF' -${c1} - `-/+++++++++++++++++/-.` - `/syyyyyyyyyyyyyyyyyyyyyyys/. - :yyyyo/-...............-/oyyyy/ - /yyys- .oyyy+ -.yyyy` `syyy- -:yyyo /yyy/ -.yyyy` `syyy- - /yyys. .oyyyo - /yyyyo:-...............-:oyyyy/` - `/syyyyyyyyyyyyyyyyyyyyyyys+. - `.:/+ooooooooooooooo+/:.` +${c1} `-/oydNNdyo:.` + `.:+shmMMMMMMMMMMMMMMmhs+:.` + -+hNNMMMMMMMMMMMMMMMMMMMMMMNNho- +.`` -/+shmNNMMMMMMNNmhs+/- ``. +dNmhs+:. `.:/oo/:.` .:+shmNd +dMMMMMMMNdhs+:.. ..:+shdNMMMMMMMd +dMMMMMMMMMMMMMMNds odNMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd +.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. + `.:+shNMMMMMh yMMMMMNhs+:`` + `-+shy shs+:` EOF ;; - "PacBSD"*) - set_colors 1 7 3 + "Anarchy"*) + set_colors 7 4 read -rd '' ascii_data <<'EOF' -${c1} :+sMs. - `:ddNMd- -o--` - -sMMMMh: `+N+`` - yMMMMMs` .....-/-... `mNh/ - yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm - yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm - :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd - +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- - :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. - .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- - /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` -.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- -:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` -/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. -:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` -:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` - sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. - :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// - /dMMMMMMMMMMMMMs- ````````..`` - .oMMMMMMMMMMMMNs` ./y:` - +dNMMNMMMMMMMmy` ``./ys. - `/hMMMMMMMMMMMNo-`` `.+yy+-` - `-/hmNMNMMMMMMmmddddhhy/-` - `-+oooyMMMdsoo+/:. + ${c2}..${c1} + ${c2}..${c1} + ${c2}:..${c1} + ${c2}:+++.${c1} + .:::++${c2}++++${c1}+::. + .:+######${c2}++++${c1}######+:. + .+#########${c2}+++++${c1}##########:. + .+##########${c2}+++++++${c1}##${c2}+${c1}#########+. + +###########${c2}+++++++++${c1}############: + +##########${c2}++++++${c1}#${c2}++++${c1}#${c2}+${c1}###########+ + +###########${c2}+++++${c1}###${c2}++++${c1}#${c2}+${c1}###########+ + :##########${c2}+${c1}#${c2}++++${c1}####${c2}++++${c1}#${c2}+${c1}############: + ###########${c2}+++++${c1}#####${c2}+++++${c1}#${c2}+${c1}###${c2}++${c1}######+ +.##########${c2}++++++${c1}#####${c2}++++++++++++${c1}#######. +.##########${c2}+++++++++++++++++++${c1}###########. + #####${c2}++++++++++++++${c1}###${c2}++++++++${c1}#########+ + :###${c2}++++++++++${c1}#########${c2}+++++++${c1}#########: + +######${c2}+++++${c1}##########${c2}++++++++${c1}#######+ + +####${c2}+++++${c1}###########${c2}+++++++++${c1}#####+ + :##${c2}++++++${c1}############${c2}++++++++++${c1}##: + .${c2}++++++${c1}#############${c2}++++++++++${c1}+. + :${c2}++++${c1}###############${c2}+++++++${c1}:: + .${c2}++. .:+${c1}##############${c2}+++++++${c1}.. + ${c2}.:.${c1} ..::++++++::..:${c2}++++${c1}+. + ${c2}.${c1} ${c2}.:+++${c1}. + ${c2}.:${c1}: + ${c2}..${c1} + ${c2}..${c1} EOF ;; - "Parabola"*) - set_colors 5 7 + "Android"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} `.-. `. - `.` `:++. `-+o+. - `` `:+/. `:+/. `-+oooo+ - ``-::-.:+/. `:+/. `-+oooooo+ - `.-:///- ..` .-. `-+oooooooo- - `..-..` `+ooooooooo: -`` :oooooooo/ - `ooooooo: - `oooooo: - -oooo+. - +ooo/` - -ooo- - `+o/. - /+- - //` - -. +${c1} -o o- + +hydNNNNdyh+ + +mMMMMMMMMMMMMm+ + `dMM${c2}m:${c1}NMMMMMMN${c2}:m${c1}MMd` + hMMMMMMMMMMMMMMMMMMh + .. yyyyyyyyyyyyyyyyyyyy .. +.mMMm`MMMMMMMMMMMMMMMMMMMM`mMMm. +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +:MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM: +-MMMM-MMMMMMMMMMMMMMMMMMMM-MMMM- + +yy+ MMMMMMMMMMMMMMMMMMMM +yy+ + mMMMMMMMMMMMMMMMMMMm + `/++MMMMh++hMMMM++/` + MMMMo oMMMM + MMMMo oMMMM + oNMm- -mMNs EOF ;; - "Pardus"*) - set_colors 3 7 6 1 8 + "Antergos"*) + set_colors 4 6 read -rd '' ascii_data <<'EOF' -${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. -/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ -mN. oMdyy- -y `-dMo .Nm -.mN+` sMy hN+ -: yMs `+Nm. - `yMMddMs.dy `+` sMddMMy` - +MMMo .` . oMMM+ - `NM/ `````.` `.````` +MN` - yM+ `.-:yhomy ymohy:-.` +My - yM: yo oy :My - +Ms .N` `N. +h sM+ - `MN - -::::::- : :o:+`NM` - yM/ sh -dMMMMd- ho +y+My - .dNhsohMh-//: /mm/ ://-yMyoshNd` - `-ommNMm+:/. oo ./:+mMNmmo:` - `/o+.-somNh- :yy: -hNmos-.+o/` - ./` .s/`s+sMdd+``+ddMs+s`/s. `/. - : -y. -hNmddmNy. .y- : - -+ `..` +- +${c2} `.-/::/-`` + .-/osssssssso/. + :osyysssssssyyys+- + `.+yyyysssssssssyyyyy+. + `/syyyyyssssssssssyyyyys-` + `/yhyyyyysss${c1}++${c2}ssosyyyyhhy/` + .ohhhyyyys${c1}o++/+o${c2}so${c1}+${c2}syy${c1}+${c2}shhhho. + .shhhhys${c1}oo++//+${c2}sss${c1}+++${c2}yyy${c1}+s${c2}hhhhs. + -yhhhhs${c1}+++++++o${c2}ssso${c1}+++${c2}yyy${c1}s+o${c2}hhddy: + -yddhhy${c1}o+++++o${c2}syyss${c1}++++${c2}yyy${c1}yooy${c2}hdddy- + .yddddhs${c1}o++o${c2}syyyyys${c1}+++++${c2}yyhh${c1}sos${c2}hddddy` +`odddddhyosyhyyyyyy${c1}++++++${c2}yhhhyosddddddo +.dmdddddhhhhhhhyyyo${c1}+++++${c2}shhhhhohddddmmh. +ddmmdddddhhhhhhhso${c1}++++++${c2}yhhhhhhdddddmmdy +dmmmdddddddhhhyso${c1}++++++${c2}shhhhhddddddmmmmh +-dmmmdddddddhhys${c1}o++++o${c2}shhhhdddddddmmmmd- +.smmmmddddddddhhhhhhhhhdddddddddmmmms. + `+ydmmmdddddddddddddddddddmmmmdy/. + `.:+ooyyddddddddddddyyso+:.` EOF ;; - "Parrot"*) - set_colors 6 7 + "antiX"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} `:oho/-` -`mMMMMMMMMMMMNmmdhy- - dMMMMMMMMMMMMMMMMMMs` - +MMsohNMMMMMMMMMMMMMm/ - .My .+dMMMMMMMMMMMMMh. - + :NMMMMMMMMMMMMNo - `yMMMMMMMMMMMMMm: - /NMMMMMMMMMMMMMy` - .hMMMMMMMMMMMMMN+ - ``-NMMMMMMMMMd- - /MMMMMMMMMMMs` - mMMMMMMMsyNMN/ - +MMMMMMMo :sNh. - `NMMMMMMm -o/ - oMMMMMMM. - `NMMMMMM+ - +MMd/NMh - mMm -mN` - /MM `h: - dM` . - :M- - d: - -+ - - +${c1} + \ + , - ~ ^ ~ - \ / + , ' \ ' , / + , \ '/ + , \ / , + ,___, \/ , + / | _ _ _|_ o /\ , +|, | / |/ | | | / \ , + \,_/\_/ | |_/|_/|_/_/ \, + , / ,\ + , / , ' \ + ' - , _ _ _ , ' EOF ;; - "Parsix"*) - set_colors 3 1 7 8 + "AOSC"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - ${c2}-/+/:. - ${c2}.syssssys. - ${c1}.--. ${c2}ssssssssso${c1} ..--. - :++++++: ${c2}+ssssssss+${c1} ./++/+++: - /+++++++++.${c2}.yssooooy`${c1}-+///////o- - /++++++++++.${c2}+soooos:${c1}:+////////+- - :+++++////o-${c2}oooooo-${c1}+/////////- - `-/++//++-${c4}.-----.-${c1}:+/////:- - ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. -${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- -${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ -${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- - `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` - ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. - ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: - ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ - ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: - ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- - ${c1}`--` ${c2}+sssssssso ${c1}`--` - ${c2}+sssssy+` - ${c2}`.::-` +${c2} .:+syhhhhys+:. + .ohNMMMMMMMMMMMMMMNho. + `+mMMMMMMMMMMmdmNMMMMMMMMm+` + +NMMMMMMMMMMMM/ `./smMMMMMN+ + .mMMMMMMMMMMMMMMo -yMMMMMm. + :NMMMMMMMMMMMMMMMs .hMMMMN: + .NMMMMhmMMMMMMMMMMm+/- oMMMMN. + dMMMMs ./ymMMMMMMMMMMNy. sMMMMd +-MMMMN` oMMMMMMMMMMMN: `NMMMM- +/MMMMh NMMMMMMMMMMMMm hMMMM/ +/MMMMh NMMMMMMMMMMMMm hMMMM/ +-MMMMN` :MMMMMMMMMMMMy. `NMMMM- + dMMMMs .yNMMMMMMMMMMMNy/. sMMMMd + .NMMMMo -/+sMMMMMMMMMMMmMMMMN. + :NMMMMh. .MMMMMMMMMMMMMMMN: + .mMMMMMy- NMMMMMMMMMMMMMm. + +NMMMMMms/.` mMMMMMMMMMMMN+ + `+mMMMMMMMMNmddMMMMMMMMMMm+` + .ohNMMMMMMMMMMMMMMNho. + .:+syhhhhys+:. EOF ;; - "PCBSD"* | "TrueOS"*) - set_colors 1 7 3 + "Apricity"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} .. - s. - +y - yN - -MN `. - :NMs `m - .yMMm` `No - `-/+++sdMMMNs+-`+Ms - `:oo+-` .yMMMMy` `-+oNMh - -oo- +NMMMM/ oMMh- - .s+` ` oMMMMM/ - oMMMhy. - +s`- :: :MMMMMd -o `mMMMy`s+ - y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y - s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s --h .NM` `hMMMMMMMMMMMMMMNMMNy: h- -y- hMN` hMMmMMMMMMMMMNsdMNs. -y -m` mMMy` oMMNoNMMMMMMo` sMMMo `m -m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m -h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h -:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: - y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y - `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` - so -NMMMN /mmd+ `dMMMMMMMm- os - :y: `yMMM` `+NMMMMMMNo`:y: - /s+`.omy /NMMMMMNh/.+s: - .+oo:-. /mdhs+::oo+. - -/o+++++++++++/- +${c2} ./o- + ``...`` `:. -/: + `-+ymNMMMMMNmho-` :sdNNm/ + `+dMMMMMMMMMMMMMMMmo` sh:.:::- + /mMMMMMMMMMMMMMMMMMMMm/`sNd/ + oMMMMMMMMMMMMMMMMMMMMMMMs -` +:MMMMMMMMMMMMMMMMMMMMMMMMM/ +NMMMMMMMMMMMMMMMMMMMMMMMMMd +MMMMMMMmdmMMMMMMMMMMMMMMMMd +MMMMMMy` .mMMMMMMMMMMMmho:` +MMMMMMNo/sMMMMMMMNdy+-.`-/ +MMMMMMMMMMMMNdy+:.`.:ohmm: +MMMMMMMmhs+-.`.:+ymNMMMy. +MMMMMM/`.-/ohmNMMMMMMy- +MMMMMMNmNNMMMMMMMMmo. +MMMMMMMMMMMMMMMms:` +MMMMMMMMMMNds/. +dhhyys+/-` EOF ;; - "PCLinuxOS"*) - set_colors 4 7 1 + "ArcoLinux"*) + set_colors 7 4 read -rd '' ascii_data <<'EOF' - ${c1}mhhhyyyyhhhdN - dyssyhhhhhhhhhhhssyhN - Nysyhhyo/:-.....-/oyhhhssd - Nsshhy+. `/shhysm - dohhy/ -shhsy - dohhs` /hhys -N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy -ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ -+hho ${c2}ymm- /mmy+mms ${c1}:hhod -/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh -+hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m -yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ - ohhy` ${c2}://` -/+++/- ${c1}ohhom - N+hhy- `shhoh - sshho. `+hhyom - dsyhhs/. `:ohhhoy - dysyhhhso///://+syhhhssh - dhyssyhhhhhhyssyyhN - mddhdhdmN +${c2} /- + ooo: + yoooo/ + yooooooo + yooooooooo + yooooooooooo + .yooooooooooooo + .oooooooooooooooo + .oooooooarcoooooooo + .ooooooooo-oooooooooo + .ooooooooo- oooooooooo + :ooooooooo. :ooooooooo + :ooooooooo. :ooooooooo + :oooarcooo .oooarcooo + :ooooooooy .ooooooooo + :ooooooooo ${c1}/ooooooooooooooooooo${c2} + :ooooooooo ${c1}.-ooooooooooooooooo.${c2} + ooooooooo- ${c1}-ooooooooooooo.${c2} + ooooooooo- ${c1}.-oooooooooo.${c2} +ooooooooo. ${c1}-ooooooooo${c2} EOF ;; - "Peppermint"*) - set_colors 1 7 3 + "arch_small") + set_colors 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} 8ZZZZZZ${c2}MMMMM -${c1} .ZZZZZZZZZ${c2}MMMMMMM. -${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ -${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM -${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. -${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI -${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM -${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM -${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM -${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM -${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM -${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M -${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 -${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 -${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 -${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z -${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM -${c1} NZZZZZZZZZZZ${c2}MMMMM -${c1} ZZZZZZZZZ${c2}MM) +${c1} /\ + /^^\ + /\ \ + /${c2} __ \ + / ( ) \ + / __| |__\\\ +/// \\\\\ EOF ;; - "Pop!_OS"*) - set_colors 6 7 + "arch_old") + set_colors 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} ///////////// - ///////////////////// - ///////${c2}*767${c1}//////////////// - //////${c2}7676767676*${c1}////////////// - /////${c2}76767${c1}//${c2}7676767${c1}////////////// - /////${c2}767676${c1}///${c2}*76767${c1}/////////////// - ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// -/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// -//////////${c2}76767676767${c1}////${c2}76767${c1}///////// -///////////${c2}76767676${c1}//////${c2}7676${c1}////////// -////////////,${c2}7676${c1},///////${c2}767${c1}/////////// -/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// -///////////////${c2}7676${c1}//////////////////// - ///////////////${c2}7676${c1}///${c2}767${c1}//////////// - //////////////////////${c2}'${c1}//////////// - //////${c2}.7676767676767676767,${c1}////// - /////${c2}767676767676767676767${c1}///// - /////////////////////////// - ///////////////////// - ///////////// +${c1} __ + _=(SDGJT=_ + _GTDJHGGFCVS) + ,GTDJGGDTDFBGX0 +${c1} JDJDIJHRORVFSBSVL${c2}-=+=,_ +${c1} IJFDUFHJNXIXCDXDSV,${c2} "DEBL +${c1} [LKDSDJTDU=OUSCSBFLD.${c2} '?ZWX, +${c1} ,LMDSDSWH' `DCBOSI${c2} DRDS], +${c1} SDDFDFH' !YEWD,${c2} )HDROD +${c1} !KMDOCG &GSU|${c2}\_GFHRGO\' +${c1} HKLSGP'${c2} __${c1}\TKM0${c2}\GHRBV)' +${c1}JSNRVW'${c2} __+MNAEC${c1}\IOI,${c2}\BN' +${c1}HELK['${c2} __,=OFFXCBGHC${c1}\FD) +${c1}?KGHE ${c2}\_-#DASDFLSV='${c1} 'EF +'EHTI !H + `0F' '! EOF ;; - "Porteus"*) - set_colors 6 7 + "ArchBox"*) + set_colors 2 7 1 read -rd '' ascii_data <<'EOF' -${c1} `.-:::-.` - -+ydmNNNNNNNmdy+- - .+dNmdhs+//////+shdmdo. - .smmy+-` ./sdy: - `omdo. `.-/+osssso+/-` `+dy. - `yms. `:shmNmdhsoo++osyyo-``oh. - hm/ .odNmds/.` ``.....:::-+s -/m: `+dNmy:` `./oyhhhhyyooo++so -ys `yNmy- .+hmmho:-.` ``` -s: yNm+` .smNd+. -`` /Nm: +dNd+` - yN+ `smNy. - dm oNNy` - hy -mNm. - +y oNNo - `y` sNN: - `: +NN: - ` .mNo - /mm` - /my` - .sy` - .+: - ` +${c1} ...:+oh/:::.. + ..-/oshhhhhh` `::::-. + .:/ohhhhhhhhhhhh` `-::::. + .+shhhhhhhhhhhhhhhhh` `.::-. + /`-:+shhhhhhhhhhhhhh` .-/+shh + / .:/ohhhhhhhhh` .:/ohhhhhhhh + / `-:+shhh` ..:+shhhhhhhhhhhh + / .:ohhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / `hhhhhhhhhhhhhhhhhhhh + / .+o+ `hhhhhhhhhhhhhhhhhhhh + / -hhhhh `hhhhhhhhhhhhhhhhhhhh + / ohhhhho `hhhhhhhhhhhhhhhhhhhh + /:::+`hhhhoos` `hhhhhhhhhhhhhhhhhs+` + `--/:` /: `hhhhhhhhhhhho/- + -/:. `hhhhhhs+:-` + ::::/ho/-` EOF ;; - "PostMarketOS"*) - set_colors 2 7 + "ARCHlabs"*) + set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} ss - `hMMh` - .dMMMMd. - -NMMMMMMN- - /MMMMMMMMMN/ - hMMMMMMMMMMMo - y+`mMMmdNMMMMMMy - `dMM-.-:- .mMMMMMMh` - .mMMMMMMd` `dMMMMMMm. - :NMMMMMMy yMMMMMMN: - /MMMMMMMo oMMMmdmN/ - oMMMMMMM/ /MN.-/:-. - `yMMMMMMN- -:.NMMMMy` - `dMMMMMMM- -/////////////dMMMMMMd` - -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- - :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: -+MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ +${c1} 'c' + 'kKk, + .dKKKx. + .oKXKXKd. + .l0XXXXKKo. + c0KXXXXKX0l. + :0XKKOxxOKX0l. + :OXKOc. .c0XX0l. + :OK0o. ${c4}...${c1}'dKKX0l. + :OX0c ${c4};xOx'${c1}'dKXX0l. + :0KKo.${c4}.o0XXKd'.${c1}lKXX0l. + c0XKd.${c4}.oKXXXXKd..${c1}oKKX0l. + .c0XKk;${c4}.l0K0OO0XKd..${c1}oKXXKo. + .l0XXXk:${c4},dKx,.'l0XKo.${c1}.kXXXKo. + .o0XXXX0d,${c4}:x; .oKKx'${c1}.dXKXXKd. + .oKXXXXKK0c.${c4};. :00c'${c1}cOXXXXXKd. + .dKXXXXXXXXk,${c4}. cKx'${c1}'xKXXXXXXKx' + 'xKXXXXK0kdl:. ${c4}.ok; ${c1}.cdk0KKXXXKx' + 'xKK0koc,.. ${c4}'c, ${c1} ..,cok0KKk, + ,xko:'. ${c4}.. ${c1} .':okx; + .,'. .',. EOF ;; - "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) - set_colors 4 7 + *"XFerience"*) + set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} `-/osyyyysosyhhhhhyys+- - -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ - yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy -.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ --NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ -.Nm+shddyooo+/smNNNNmmmmNh. :mmd. - NNNNy:` ./hmmmmmmmNNNN: hNMh - NMN- -++- +NNNNNNNNNNm+..-sMMMM- -.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ -.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ - mMM+ .. `sNN+. hMMMMhhMMM- - +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy - yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` - sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` - :mMMMMMMMMMMMmddNMMMMMMMMmh/ - /dMMMMMMMMMMMMMMMMMMNdy/` - .+hNMMMMMMMMMNmdhs/. - .:/+ooo+/:-. +${c1} ``--:::::::-.` + .-/+++ooooooooo+++:-` + `-/+oooooooooooooooooo++:. + -/+oooooo/+ooooooooo+/ooo++:` + `/+oo++oo. .+oooooo+.-: +:-o+- + `/+o/. -o. :oooooo+ ```:.+oo+- +`:+oo- -/` :oooooo+ .`-`+oooo/. +.+ooo+. .` `://///+-+..oooooo+:` +-+ooo:` ``.-+oooooo+/` +-+oo/` :+oooo/. +.+oo: ..-/. . -+oo+/` +`/++- -:::++::/. -+oo+- + ./o: `:///+- `./ooo+:` + .++- `` /-` -:/+oooo+:` + .:+/:`` `-:ooooooo++- + ./+o+//:...../+oooooooo++:` + `:/++ooooooooooooo++/-` + `.-//++++++//:-.` + `````` EOF ;; - "Qubes"*) - set_colors 4 5 7 6 + "ArchMerge"*) + set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} `..--..` - `.----------.` - `..----------------..` - `.------------------------.`` - `..-------------....-------------..` -.::----------..`` ``..----------:+: -:////:----..` `..---:/ossso -:///////:` `/osssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:///////: /ssssssso -:////////-` .:sssssssso -:///////////-.` `-/osssssssssso -`//////////////:-```.:+ssssssssssssso- - .-://////////////sssssssssssssso/-` - `.:///////////sssssssssssssso:. - .-:///////ssssssssssssssssss/` - `.:////ssss+/+ssssssssssss. - `--//- `-/osssso/. +${c1} y: + sMN- + +MMMm` + /MMMMMd` + :NMMMMMMy + -NMMMMMMMMs + .NMMMMMMMMMM+ + .mMMMMMMMMMMMM+ + oNMMMMMMMMMMMMM+ + `+:-+NMMMMMMMMMMMM+ + .sNMNhNMMMMMMMMMMMM/ + `hho/sNMMMMMMMMMMMMMMM/ + `.`omMMmMMMMMMMMMMMMMMMM+ + .mMNdshMMMMd+::oNMMMMMMMMMo + .mMMMMMMMMM+ `yMMMMMMMMMs + .NMMMMMMMMM/ yMMMMMMMMMy + -NMMMMMMMMMh `mNMMMMMMMMd` + /NMMMNds+:.` `-/oymMMMm. + +Mmy/. `:smN: +/+. -o. EOF ;; - "Raspbian"*) - set_colors 2 1 + "Arch"*) + set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} `.::///+:/-. --///+//-:`` - `+oooooooooooo: `+oooooooooooo: - /oooo++//ooooo: ooooo+//+ooooo. - `+ooooooo:-:oo- +o+::/ooooooo: - `:oooooooo+`` `.oooooooo+- - `:++ooo/. :+ooo+/.` - ${c2}...` `.----.` ``.. - .::::-``:::::::::.`-:::-` - -:::-` .:::::::-` `-:::- - `::. `.--.` `` `.---.``.::` - .::::::::` -::::::::` ` - .::` .:::::::::- `::::::::::``::. --:::` ::::::::::. ::::::::::.`:::- -:::: -::::::::. `-:::::::: :::: --::- .-:::-.``....``.-::-. -::- - .. `` .::::::::. `..`.. - -:::-` -::::::::::` .:::::` - :::::::` -::::::::::` :::::::. - .::::::: -::::::::. :::::::: - `-:::::` ..--.` ::::::. - `...` `...--..` `...` - .:::::::::: - `.-::::-` +${c1} -` + .o+` + `ooo/ + `+oooo: + `+oooooo: + -+oooooo+: + `/:-:++oooo+: + `/++++/+++++++: + `/++++++++++++++: + `/+++o${c2}oooooooo${c1}oooo/` +${c2} ${c1}./${c2}ooosssso++osssssso${c1}+` +${c2} .oossssso-````/ossssss+` + -osssssso. :ssssssso. + :osssssss/ osssso+++. + /ossssssss/ +ssssooo/- + `/ossssso+/:- -:/+osssso+- + `+sso+:-` `.-/+oso: + `++:. `-/+/ + .` `/ EOF ;; - "Red Star"* | "Redstar"*) - set_colors 1 7 3 + "Artix"*) + set_colors 6 4 2 7 read -rd '' ascii_data <<'EOF' -${c1} .. - .oK0l - :0KKKKd. - .xKO0KKKKd - ,Od' .d0000l - .c;. .'''... ..'. -.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: -;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. - .okkkkd,.lko .......',;:cllc:;,,'''''. - .cdo. :xd' cd:. ..';'',,,'',,;;;,'. - . .ddl.;doooc'..;oc;'..';::;,'. - coo;.oooolllllllcccc:'. . - .ool''lllllccccccc:::::;. - ;lll. .':cccc:::::::;;;;' - :lcc:'',..';::::;;;;;;;,,. - :cccc::::;...';;;;;,,,,,,. - ,::::::;;;,'. ..',,,,'''. - ........ ...... +${c1} d${c2}c. +${c1} x${c2}dc. +${c1} '.${c4}.${c1} d${c2}dlc. +${c1} c${c2}0d:${c1}o${c2}xllc; +${c1} :${c2}0ddlolc,lc, +${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. +${c1} ;${c1}K${c2}kxoOddollc' cllc. +${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: +${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: +${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, +${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. +${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; +${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, +${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. +${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. +${c1} 0${c2}Okd''dc. .cll; +${c1} k${c2}Okd' .llc, +${c1} d${c2}Od, 'lc. +${c1} :,${c4}. ${c2}... EOF ;; - "Redhat"* | "Red Hat"* | "rhel"*) - set_colors 1 7 3 + "Arya"*) + set_colors 2 1 read -rd '' ascii_data <<'EOF' -${c1} `.-..........` - `////////::.`-/. - -: ....-////////. - //:-::///////////` - `--::: `-://////////////: - //////- ``.-:///////// .` - `://////:-.` :///////::///:` - .-/////////:---/////////////: - .-://////////////////////. -${c2} yMN+`.-${c1}::///////////////-` -${c2} .-`:NMMNMs` `..-------..` - MN+/mMMMMMhoooyysshsss -MMM MMMMMMMMMMMMMMyyddMMM+ - MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM - MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM - MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM +${c1} `oyyy/${c2}-yyyyyy+ +${c1} -syyyy/${c2}-yyyyyy+ +${c1} .syyyyy/${c2}-yyyyyy+ +${c1} :yyyyyy/${c2}-yyyyyy+ +${c1} `/ :yyyyyy/${c2}-yyyyyy+ +${c1} .+s :yyyyyy/${c2}-yyyyyy+ +${c1} .oys :yyyyyy/${c2}-yyyyyy+ +${c1} -oyys :yyyyyy/${c2}-yyyyyy+ +${c1} :syyys :yyyyyy/${c2}-yyyyyy+ +${c1} /syyyys :yyyyyy/${c2}-yyyyyy+ +${c1} +yyyyyys :yyyyyy/${c2}-yyyyyy+ +${c1} .oyyyyyyo. :yyyyyy/${c2}-yyyyyy+ --------- +${c1} .syyyyyy+` :yyyyyy/${c2}-yyyyy+-+syyyyyyyy +${c1} -syyyyyy/ :yyyyyy/${c2}-yyys:.syyyyyyyyyy +${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy EOF ;; - "Refracted Devuan"*) - set_colors 8 7 + "Bitrig"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c2} A - VW - VVW\\ - .yWWW\\ - ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ - *WWWWWWWWWWWWWWWW/ $VWWWWw , - ^*%WWWWWWVWWX $WWWW** ,yy - , "**WWW/' **' ,yy/WWW*` - &WWWWwy `*` <,ywWW%VWWW* - yWWWWWWWWWW* ., "**WW%W - ,&WWWWWM*"` ,y/ &WWWww ^* - XWWX*^ ,yWWWW09 .WWWWWWWWwy, - *` &WWWWWM WWWWWWWWWWWWWww, - (WWWWW` /#####WWW*********** - ^WWWW - VWW - Wh. - V/ +${c1} `hMMMMN+ + -MMo-dMd` + oMN- oMN` + yMd /NM: + .mMmyyhMMs + :NMMMhsmMh + +MNhNNoyMm- + hMd.-hMNMN: + mMmsssmMMMo + .MMdyyhNMMMd + oMN.`/dMddMN` + yMm/hNm+./MM/ +.dMMMmo.``.NMo +:NMMMNmmmmmMMh +/MN/-------oNN: +hMd. .dMh +sm/ /ms +EOF + ;; + + "BLAG"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} d + ,MK: + xMMMX: + .NMMMMMX; + lMMMMMMMM0clodkO0KXWW: + KMMMMMMMMMMMMMMMMMMX' + .;d0NMMMMMMMMMMMMMMMMMMK. + .;dONMMMMMMMMMMMMMMMMMMMMMMx +'dKMMMMMMMMMMMMMMMMMMMMMMMMl + .:xKWMMMMMMMMMMMMMMMMMMM0. + .:xNMMMMMMMMMMMMMMMMMK. + lMMMMMMMMMMMMMMMMMMK. + ,MMMMMMMMWkOXWMMMMMM0 + .NMMMMMNd. `':ldko + OMMMK: + oWk, + ;: EOF ;; - "Rosa"*) - set_colors 4 7 1 + "BlankOn"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} ROSAROSAROSAROSAR - ROSA AROS - ROS SAROSAROSAROSAR AROS - RO ROSAROSAROSAROSAROSAR RO - ARO AROSAROSAROSARO AROS ROS - ARO ROSAROS OSAR ROSA ROS - RO AROSA ROSAROSAROSA ROSAR RO -RO ROSAR ROSAROSAROSAR R ROSARO RO -RO ROSA AROSAROSAROSA AR ROSARO AR -RO AROS ROSAROSAROSA ROS AROSARO AR -RO AROS ROSAROSARO ROSARO ROSARO AR -RO ROS AROSAROS ROSAROSA AROSAR AR -RO ROSA ROS ROSAROSAR ROSARO RO - RO ROS AROSAROSAROSA ROSARO AR - ARO ROSA ROSAROSAROS AROSAR ARO - ARO OROSA R ROSAROS ROS - RO AROSAROS AROSAROSAR RO - AROS AROSAROSAROSARO AROS - ROSA SARO - ROSAROSAROSAROSAR +${c2} `./ohdNMMMMNmho+.` ${c1} .+oo:` +${c2} -smMMMMMMMMMMMMMMMMmy-` ${c1}`yyyyy+ +${c2} `:dMMMMMMMMMMMMMMMMMMMMMMd/` ${c1}`yyyyys +${c2} .hMMMMMMMNmhso/++symNMMMMMMMh- ${c1}`yyyyys +${c2} -mMMMMMMms-` -omMMMMMMN-${c1}.yyyyys +${c2}.mMMMMMMy. .yMMMMMMm:${c1}yyyyys +${c2}sMMMMMMy `sMMMMMMh${c1}yyyyys +${c2}NMMMMMN: .NMMMMMN${c1}yyyyys +${c2}MMMMMMm. NMMMMMN${c1}yyyyys +${c2}hMMMMMM+ /MMMMMMN${c1}yyyyys +${c2}:NMMMMMN: :mMMMMMM+${c1}yyyyys +${c2} oMMMMMMNs- .sNMMMMMMs.${c1}yyyyys +${c2} +MMMMMMMNho:.` `.:ohNMMMMMMNo ${c1}`yyyyys +${c2} -hMMMMMMMMNNNmmNNNMMMMMMMMh- ${c1}`yyyyys +${c2} :yNMMMMMMMMMMMMMMMMMMNy:` ${c1}`yyyyys +${c2} .:sdNMMMMMMMMMMNds/. ${c1}`yyyyyo +${c2} `.:/++++/:.` ${c1}:oys+. EOF ;; - "sabotage"*) - set_colors 4 7 1 + "BSD") + set_colors 1 7 4 3 6 read -rd '' ascii_data <<'EOF' -${c2} .|'''.| | '||''|. ..|''|| - ||.. ' ||| || || .|' || - ''|||. | || ||'''|. || || -. '|| .''''|. || || '|. || -|'....|' .|. .||. .||...|' ''|...|' - -|''||''| | ..|'''.| '||''''| - || ||| .|' ' || . - || | || || .... ||''| - || .''''|. '|. || || - .||. .|. .||. ''|...'| .||.....| +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) EOF ;; - "Sabayon"*) - set_colors 4 7 1 + "BunsenLabs"*) + set_colors fg 7 read -rd '' ascii_data <<'EOF' -${c1} ........... - .. .. - .. .. - .. ${c2}o ${c1}.. - .. ${c2}:W' ${c1}.. - .. ${c2}.d. ${c1}.. -:. ${c2}.KNO ${c1}.: -:. ${c2}cNNN. ${c1}.: -: ${c2}dXXX, ${c1}: -: ${c2}. dXXX, .cd, ${c1}: -: ${c2}'kc .. dKKK. ,ll;:' ${c1}: -: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: -:. ${c2}.,cdddddddddddddo:. ${c1}.: - .. ${c2}:lllllll: ${c1}.. - .. ${c2}',,,,, ${c1}.. - .. .. - .. .. - ............... +${c1} `++ + -yMMs + `yMMMMN` + -NMMMMMMm. + :MMMMMMMMMN- + .NMMMMMMMMMMM/ + yMMMMMMMMMMMMM/ +`MMMMMMNMMMMMMMN. +-MMMMN+ /mMMMMMMy +-MMMm` `dMMMMMM +`MMN. .NMMMMM. + hMy yMMMMM` + -Mo +MMMMN + /o +MMMMs + +MMMN` + hMMM: + `NMM/ + +MN: + mh. + -/ EOF ;; - "SailfishOS"*) - set_colors 4 5 7 6 + "Calculate"*) + set_colors 7 3 read -rd '' ascii_data <<'EOF' -${c1} .+eWWW - .+ee+++eee e. - .ee++eeeeeeee +e. - .e++ee++eeeeeee+eee+e+ - ee.e+.ee+eee++eeeeee+ - W.+e.e+.e++ee+eee - W.+e.W.ee.W++ee' - +e.W W.e+.W.W+ - W.e.+e.W W W. - e e e +e.W.W - .W W W. - W.+e.W. - W++e.ee+. - ++ +ee++eeeee++. - ' '+++e 'ee. - ee - ee - e +${c1} ...... + ,,+++++++,. + .,,,....,,,${c2}+**+,,.${c1} + ............,${c2}++++,,,${c1} + ............... + ......,,,........ + .....+*#####+,,,*+. + .....,*###############,..,,,,,,.. + ......,*#################*..,,,,,..,,,.. + .,,....*####################+***+,,,,...,++, + .,,..,..*#####################*, + ,+,.+*..*#######################. + ,+,,+*+..,########################* +.,++++++. ..+##**###################+ +..... ..+##***#################*. + .,.*#*****##############*. + ..,,*********#####****+. + ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} + ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} + ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} EOF ;; - "SalentOS"*) - set_colors 2 1 3 7 + "CentOS"*) + set_colors 3 2 4 5 7 read -rd '' ascii_data <<'EOF' -${c1} ``..`` - .-:+oshdNMMMMMMNdhyo+:-.` - -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ -${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` -${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- -${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` -${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` -${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd -${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy -${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo -${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ -${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- -${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` -${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm -${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy -${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: -${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. -${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: -${c2} `:smMM${c4}yy${c3}MMNy/` - ${c2}.- ${c4}`${c3}:. +${c1} .. + .PLTJ. + <><><><> + ${c2}KKSSV' 4KKK ${c1}LJ${c4} KKKL.'VSSKK + ${c2}KKV' 4KKKKK ${c1}LJ${c4} KKKKAL 'VKK + ${c2}V' ' 'VKKKK ${c1}LJ${c4} KKKKV' ' 'V + ${c2}.4MA.' 'VKK ${c1}LJ${c4} KKV' '.4Mb. +${c4} . ${c2}KKKKKA.' 'V ${c1}LJ${c4} V' '.4KKKKK ${c3}. +${c4} .4D ${c2}KKKKKKKA.'' ${c1}LJ${c4} ''.4KKKKKKK ${c3}FA. +${c4} +${c4} 'VD ${c3}KKKKKKKK'.. ${c2}LJ ${c1}..'KKKKKKKK ${c3}FV +${c4} ' ${c3}VKKKKK'. .4 ${c2}LJ ${c1}K. .'KKKKKV ${c3}' + ${c3} 'VK'. .4KK ${c2}LJ ${c1}KKA. .'KV' + ${c3}A. . .4KKKK ${c2}LJ ${c1}KKKKA. . .4 + ${c3}KKA. 'KKKKK ${c2}LJ ${c1}KKKKK' .4KK + ${c3}KKSSA. VKKK ${c2}LJ ${c1}KKKV .4SSKK +${c2} <><><><> + 'MKKM' + '' EOF ;; - "Scientific"*) - set_colors 4 7 1 + "Chakra"*) + set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c1} =/;;/- - +: // - /; /; - -X H. -.//;;;:;;-, X= :+ .-;:=;:;#;. -M- ,=;;;#:, ,:#;;:=, ,@ -:# :#.=/++++/=.$= #= - ,#; #/:+/;,,/++:+/ ;+. - ,+/. ,;@+, ,#H;, ,/+, - ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; - ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. - ,;: :@#= =$H: .+#- - ,#= #;-///==///-// =#, -;+ :#-;;;:;;;;-X- +: -@- .-;;;;M- =M/;;;-. -X - :;;::;;-. #- :+ ,-;;-;:== - ,X H. - ;/ #= - // +; - '////' +${c1} _ _ _ "kkkkkkkk. + ,kkkkkkkk., 'kkkkkkkkk, + ,kkkkkkkkkkkk., 'kkkkkkkkk. + ,kkkkkkkkkkkkkkkk,'kkkkkkkk, + ,kkkkkkkkkkkkkkkkkkk'kkkkkkk. + "''"''',;::,,"''kkk''kkkkk; __ + ,kkkkkkkkkk, "k''kkkkk' ,kkkk + ,kkkkkkk' ., ' .: 'kkkk',kkkkkk + ,kkkkkkkk'.k' , ,kkkk;kkkkkkkkk + ,kkkkkkkk';kk 'k "'k',kkkkkkkkkkkk +.kkkkkkkkk.kkkk.'kkkkkkkkkkkkkkkkkk' +;kkkkkkkk''kkkkkk;'kkkkkkkkkkkkk'' +'kkkkkkk; 'kkkkkkkk.,""''"''"" + ''kkkk; 'kkkkkkkkkk., + ';' 'kkkkkkkkkkkk., + ';kkkkkkkkkk' + ';kkkkkk' + "''" EOF ;; - "Siduction"*) - set_colors 4 4 + "ChaletOS"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} _aass, - jQh: =$w - QWmwawQW - )$QQQQ@( .. - _a_a. ~??^ syDY?Sa, - _mW>-<$c jWmi imm. - ]QQwayQE 4QQmgwmQQ` - ?WWQWP' -9QQQQQ@'._aas, - _a%is. .adYYs,. -"?!` aQB*~^3$c -_Qh;.nm .QWc. {QL ]QQp;..vmQ/ -"QQmmQ@ -QQQggmQP ]QQWmggmQQ( - -???" "$WQQQY` __, ?QQQQQQW! - _yZ!?q, - .yWY!!Sw, "???^ - .QQa_=qQ mQm>..vmm - $QQWQQP $QQQgmQQ@ - "???" _aa, -9WWQQWY` - _mB>~)$a -~~ - mQms_vmQ. - ]WQQQQQP - -?T??" +${c1} `.//+osso+/:`` + `/sdNNmhyssssydmNNdo:` + :hNmy+-` .-+hNNs- + /mMh/` `+:` `+dMd: + .hMd- -sNNMNo. /yyy /mMs` + -NM+ `/dMd/--omNh::dMM `yMd` + .NN+ .sNNs:/dMNy:/hNmo/s yMd` + hMs `/hNd+-smMMMMMMd+:omNy- `dMo +:NM. .omMy:/hNMMMMMMMMMMNy:/hMd+` :Md` +/Md` `sm+.omMMMMMMMMMMMMMMMMd/-sm+ .MN: +/Md` MMMMMMMMMMMMMMMMMMMN .MN: +:NN. MMMMMMm....--NMMMMMN -Mm. +`dMo MMMMMMd mMMMMMN hMs + -MN: MMMMMMd mMMMMMN oMm` + :NM: MMMMMMd mMMMMMN +Mm- + -mMy. mmmmmmh dmmmmmh -hMh. + oNNs- :yMm/ + .+mMdo:` `:smMd/` + -ohNNmhsoo++osshmNNh+. + `./+syyhhyys+:`` EOF ;; - "Slackware"*) - set_colors 4 7 1 + "Chapeau"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} ::::::: - ::::::::::::::::::: - ::::::::::::::::::::::::: - ::::::::${c2}cllcccccllllllll${c1}:::::: - :::::::::${c2}lc dc${c1}::::::: - ::::::::${c2}cl clllccllll oc${c1}::::::::: - :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: - ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: - :::::::::::${c2}lc cclccclc${c1}::::::::::::: -::::::::::::::${c2}lcclcc lc${c1}:::::::::::: -::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: -::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: - :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: - :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: - ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: - :::${c2}oclcccccccccccccllllllllllllll${c1}::::: - ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: - :::::::::::::::::::::::::::::::: - :::::::::::::::::::::::::::: - :::::::::::::::::::::: - :::::::::::: +${c1} .-/-. + ////////. + ////////${c2}y+${c1}//. + ////////${c2}mMN${c1}/////. + ////////${c2}mMN+${c1}////////. + ////////////////////////. + /////////+${c2}shhddhyo${c1}+////////. + ////////${c2}ymMNmdhhdmNNdo${c1}///////. +///////+${c2}mMms${c1}////////${c2}hNMh${c1}///////. +///////${c2}NMm+${c1}//////////${c2}sMMh${c1}/////// +//////${c2}oMMNmmmmmmmmmmmmMMm${c1}/////// +//////${c2}+MMmssssssssssssss+${c1}/////// +`//////${c2}yMMy${c1}//////////////////// + `//////${c2}smMNhso++oydNm${c1}//////// + `///////${c2}ohmNMMMNNdy+${c1}/////// + `//////////${c2}++${c1}////////// + `////////////////. + -////////- EOF ;; - "SliTaz"*) - set_colors 3 3 + "Chrom"*) + set_colors 2 1 3 4 7 read -rd '' ascii_data <<'EOF' -${c1} @ @( @ - @@ @@ @ @/ - @@ @@ @@ @@ - @@ %@@ @@ @@ - @@ %@@@ @@@@@. @@@@ @@ - @@@ @@@@ @@@@@@@ &@@@ @@@ - @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ - ,@@@@@@@@@@@@@@@@@@@@@@@@@ - .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ -@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ -@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ -@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. -@@ ,@@ @@@@@@@@@@@@@ @@@ @@ -@ @@. @@@@@@@@@@@@@ @@@ *@ -@ @@ @@@@@@@@@@@@ @@ @ - @ @@@@@@@@@. #@ - @ ,@@@@@ @ +${c2} .,:loool:,. + .,coooooooooooooc,. + .,lllllllllllllllllllll,. + ;ccccccccccccccccccccccccc; +${c1} '${c2}ccccccccccccccccccccccccccccc. +${c1} ,oo${c2}c::::::::okO${c5}000${c3}0OOkkkkkkkkkkk: +${c1}.ooool${c2};;;;:x${c5}K0${c4}kxxxxxk${c5}0X${c3}K0000000000. +${c1}:oooool${c2};,;O${c5}K${c4}ddddddddddd${c5}KX${c3}000000000d +${c1}lllllool${c2};l${c5}N${c4}dllllllllllld${c5}N${c3}K000000000 +${c1}lllllllll${c2}o${c5}M${c4}dccccccccccco${c5}W${c3}K000000000 +${c1};cllllllllX${c5}X${c4}c:::::::::c${c5}0X${c3}000000000d +${c1}.ccccllllllO${c5}Nk${c4}c;,,,;cx${c5}KK${c3}0000000000. +${c1} .cccccclllllxOO${c5}OOO${c1}Okx${c3}O0000000000; +${c1} .:ccccccccllllllllo${c3}O0000000OOO, +${c1} ,:ccccccccclllcd${c3}0000OOOOOOl. +${c1} '::ccccccccc${c3}dOOOOOOOkx:. +${c1} ..,::cccc${c3}xOOOkkko;. +${c1} ..,:${c3}dOkxl:. EOF ;; - "SmartOS"*) - set_colors 6 7 + "Clover"*) + set_colors 2 6 read -rd '' ascii_data <<'EOF' -${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyys oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy -yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyy syyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy -yyyyyyyyyyyyyyyy syyyyyyyyy syyyy -yyyyyyyyyyyyyyyy yyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy -yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +${c1} `omo``omo` + `oNMMMNNMMMNo` + `oNMMMMMMMMMMMMNo` + oNMMMMMMMMMMMMMMMMNo + `sNMMMMMMMMMMMMMMNs` + `omo` `sNMMMMMMMMMMNs` `omo` + `oNMMMNo` `sNMMMMMMNs` `oNMMMNo` + `oNMMMMMMMNo` `oNMMNs` `oNMMMMMMMNo` +oNMMMMMMMMMMMNo` `sy` `oNMMMMMMMMMMMNo +`sNMMMMMMMMMMMMNo.${c2}oNNs${c1}.oNMMMMMMMMMMMMNs` +`oNMMMMMMMMMMMMNs.${c2}oNNs${c1}.oNMMMMMMMMMMMMNo` +oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo + `oNMMMMMMMNs` `oNMMNo` `oNMMMMMMMNs` + `oNMMMNs` `sNMMMMMMNs` `oNMMMNs` + `oNs` `sNMMMMMMMMMMNs` `oNs` + `sNMMMMMMMMMMMMMMNs` + +NMMMMMMMMMMMMMMMMNo + `oNMMMMMMMMMMMMNo` + `oNMMMNNMMMNs` + `omo``oNs` EOF ;; - "Solus"*) + "Container Linux by CoreOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c2} -``````````` - `-+/------------.` - .---:mNo---------------. - .-----yMMMy:---------------. - `------oMMMMMm/----------------` - .------/MMMMMMMN+----------------. - .------/NMMMMMMMMm-+/--------------. -`------/NMMMMMMMMMN-:mh/-------------` -.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. ------/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- -----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. -.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` -`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. -`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ - .------------:://+-/++++++${c1}oshddys: - -hhhhyyyyyyyyyyyhhhhddddhysssso- - `:ossssssyysssssssssssssssso:` - `:+ssssssssssssssssssss+- - `-/+ssssssssssso+/-` - `.-----..` +${c1} ..... + .';:cccccccc:;'. + ':ccccclc${c3}lllllllll${c1}cc:. + .;cccccccc${c3}lllllllllllllll${c1}c, + ;clllccccc${c3}llllllllllllllllll${c1}c, + .cllclccccc${c3}lllll${c2}lll${c3}llllllllllll${c1}c: + ccclclcccc${c3}cllll${c2}kWMMNKk${c3}llllllllll${c1}c: + :ccclclcccc${c3}llll${c2}oWMMMMMMWO${c3}lllllllll${c1}c, +.ccllllllccc${c3}clll${c2}OMMMMMMMMM0${c3}lllllllll${c1}c +.lllllclcccc${c3}llll${c2}KMMMMMMMMMMo${c3}llllllll${c1}c. +.lllllllcccc${c3}clll${c2}KMMMMMMMMN0${c3}lllllllll${c1}c. +.cclllllcccc${c3}lllld${c2}xkkxxdo${c3}llllllllllc${c1}lc + :cccllllllcccc${c3}lllccllllcclccc${c1}cccccc; + .ccclllllllcccccccc${c3}lll${c1}ccccclccccccc + .cllllllllllclcccclccclccllllcllc + :cllllllllccclcllllllllllllcc; + .cccccccccccccclcccccccccc:. + .;cccclccccccllllllccc,. + .';ccccclllccc:;.. + ..... EOF ;; - "Source Mage"*) - set_colors 4 7 1 + "crux_small") + set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c2} :ymNMNho. -.+sdmNMMMMMMMMMMy` -.-::/yMMMMMMMMMMMm- - sMMMMMMMMMMMm/ - /NMMMMMMMMMMMMMm: - .MMMMMMMMMMMMMMMMM: - `MMMMMMMMMMMMMMMMMN. - NMMMMMMMMMMMMMMMMMd - mMMMMMMMMMMMMMMMMMMo - hhMMMMMMMMMMMMMMMMMM. - .`/MMMMMMMMMMMMMMMMMs - :mMMMMMMMMMMMMMMMN` - `sMMMMMMMMMMMMMMM+ - /NMMMMMMMMMMMMMN` - oMMMMMMMMMMMMM+ - ./sd.-hMMMMMMMMmmN` - ./+oyyyh- `MMMMMMMMMmNh - sMMMMMMMMMmmo - `NMMMMMMMMMd: - -dMMMMMMMMMo - -shmNMMms. +${c1} ___ + (${c3}.· ${c1}| + (${c2}<> ${c1}| + / ${c3}__ ${c1}\\ + ( ${c3}/ \\ ${c1}/| +${c2}_${c1}/\\ ${c3}__)${c1}/${c2}_${c1}) +${c2}\/${c1}-____${c2}\/ +EOF + ;; + + "CRUX"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} odddd + oddxkkkxxdoo + ddcoddxxxdoool + xdclodod olol + xoc xdd olol + xdc ${c2}k00${c1}Okdlol + xxd${c2}kOKKKOkd${c1}ldd + xdco${c2}xOkdlo${c1}dldd + ddc:cl${c2}lll${c1}oooodo + odxxdd${c3}xkO000kx${c1}ooxdo + oxdd${c3}x0NMMMMMMWW0od${c1}kkxo + oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx +docldkXW${c3}MMMMMMMWWN${c1}Odolco +xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c +${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l +${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd +${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo +${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; - "Sparky"*) - set_colors 1 7 + "debian_small") + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} - . `-:-` - .o` .-///-` - `oo` .:/++:. - os+` -/+++:` ``.........``` - /ys+`./+++/-.-::::::----......`` - `syyo`++o+--::::-::/+++/-`` - -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` -::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` -`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` - -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- - .sdddy::syo--/:. `.:dy+-ohhho ./: - :yddds/:+oo+//:-`- /+ +hy+.shhy: `` - `:ydmmdysooooooo-.ss`/yss--oyyo - `./ossyyyyo+:-/oo:.osso- .oys - ``..-------::////.-oooo/ :so - `...----::::::::--.`/oooo: .o: - ``````` ++o+:` `:` - ./+/-` ` - `-:-. - `` + ${c1}_____ + / __ \\ +| / | +| \\___- +-_ + --_ EOF ;; - "SteamOS"*) - set_colors 5 7 + "Debian"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} .,,,,. - .,'onNMMMMMNNnn',. - .'oNMANKMMMMMMMMMMMNNn'. - .'ANMMMMMMMXKNNWWWPFFWNNMNn. - ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, - ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, -,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, -'${c2}+#############, +. ,+' ${c1}+NMMM -${c2} '*#########*' '*,,*' ${c1}.+NMMMM. -${c2} `'*###*' ,.,;###${c1}+WNM, -${c2} .,;;, .;##########${c1}+W -${c2},',. '; ,+##############' - '###+. :,. .,; ,###############' - '####.. `'' .,###############' - '#####+++################' - '*##################*' - ''*##########*'' - '''''' +${c2} _,met$$$$$gg. + ,g$$$$$$$$$$$$$$$P. + ,g$$P" """Y$$.". + ,$$P' `$$$. +',$$P ,ggs. `$$b: +`d$$' ,$P"' ${c1}.${c2} $$$ + $$P d$' ${c1},${c2} $$P + $$: $$. ${c1}-${c2} ,d$$' + $$; Y$b._ _,d$P' + Y$$. ${c1}`.${c2}`"Y$$$$P"' +${c2} `$$b ${c1}"-.__ +${c2} `Y$$ + `Y$$. + `$$b. + `Y$$b. + `"Y$b._ + `""" EOF ;; - "SunOS" | "Solaris") - set_colors 3 7 + "Deepin"*) + set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} `- ` - `-- `+- .: - .+: `++: -/+- . - `.::` -++/``:::`./+/ `.-/. - `++/-`.` ` /++:` - `` ./:` .: `..`.- -``./+/:- -+++:- - -/+` :. +${c1} ............ + .';;;;;. .,;,. + .,;;;;;;;. ';;;;;;;. + .;::::::::' .,::;;,''''',. + ,'.:::::::: .;;'. '; + ;' 'cccccc, ,' :: '.. .: + ,, :ccccc. ;: .c, '' :. ,; +.l. cllll' ., .lc :; .l' l. +.c :lllc ;cl: .l' .ll. :' +.l 'looc. . ,o: 'oo' c, +.o. .:ool::coc' .ooo' o. + :: ..... .;dddo ;c + l:... .';lddddo. ,o + lxxxxxdoolllodxxxxxxxxxc :l + ,dxxxxxxxxxxxxxxxxxxl. 'o, + ,dkkkkkkkkkkkkko;. .;o; + .;okkkkkdl;. .,cl:. + .,:cccccccc:,. EOF ;; - "openSUSE Tumbleweed"*) + "DesaOS") set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c2} ...... - .,cdxxxoc,. .:kKMMMNWMMMNk:. - cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. - ;WMK;. .lKMMNM, :NMK, .OMW; - cMW; 'WMMMN ,XMK, oMM' -.MMc ..;l. xMN: KM0 -'MM. 'NMO oMM -.MM, .kMMl xMN - KM0 .kMM0. .dl:,.. .WMd - .XM0. ,OMMK, OMMMK. .XMK - oWMO:. .;xNMMk, NNNMKl. .xWMx - :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, - ..... .:dOOXXKOxl, +${c1}███████████████████████ +███████████████████████ +███████████████████████ +███████████████████████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +████████ ███████ +██████████████████████████████ +██████████████████████████████ +████████████████████████ +████████████████████████ +████████████████████████ EOF ;; - "openSUSE"* | "open SUSE"* | "SUSE"*) - set_colors 2 7 + "Devuan"*) + set_colors 5 7 read -rd '' ascii_data <<'EOF' -${c2} .;ldkO0000Okdl;. - .;d00xl:^''''''^:ok00d;. - .d00l' 'o00d. - .d0Kd'${c1} Okxol:;,. ${c2}:O0d. - .OK${c1}KKK0kOKKKKKKKKKKOxo:, ${c2}lKO. - ,0K${c1}KKKKKKKKKKKKKKK0P^${c2},,,${c1}^dx:${c2} ;00, -.OK${c1}KKKKKKKKKKKKKKKk'${c2}.oOPPb.${c1}'0k.${c2} cKO. -:KK${c1}KKKKKKKKKKKKKKK: ${c2}kKx..dd ${c1}lKd${c2} 'OK: -dKK${c1}KKKKKKKKKOx0KKKd ${c2}^0KKKO' ${c1}kKKc${c2} dKd -dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd -:KK${c1}KKKKKKKKKK0o;...^cdxxOK0O/^^' ${c2}.0K: - kKK${c1}KKKKKKKKKKKKK0x;,,......,;od ${c2}lKk - '0K${c1}KKKKKKKKKKKKKKKKKKKK00KKOo^ ${c2}c00' - 'kK${c1}KKOxddxkOO00000Okxoc;'' ${c2}.dKk' - l0Ko. .c00l' - 'l0Kk:. .;xK0l' - 'lkK0xl:;,,,,;:ldO0kl' - '^:ldxkkkkxdl:^' +${c1} ..,,;;;::;,.. + `':ddd;:,. + `'dPPd:,. + `:b$$b`. + 'P$$$d` + .$$$$$` + ;$$$$$P + .:P$$$$$$` + .,:b$$$$$$$;' + .,:dP$$$$$$$$b:' + .,:;db$$$$$$$$$$Pd'` + ,db$$$$$$$$$$$$$$b:'` +:$$$$$$$$$$$$b:'` + `$$$$$bd:''` + `'''` EOF ;; - "SwagArch"*) - set_colors 4 7 1 + "DracOS"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c2} .;ldkOKXXNNNNXXK0Oxoc,. - ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; - 'K0xo ..,;:c:. `'lKMMMMM0 - .lONMMMMMM' `lNMk' -${c2} ;WMMMMMMMMMO. ${c1}....::... -${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, -${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. -${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. -${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: -${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. -${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: -${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. -${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. - :ccc:' `cccccccc:, - '' +${c1} `-:/- + -os: + -os/` + :sy+-` + `/yyyy+. + `+yyyyo- + `/yyyys: +`:osssoooo++- +yyyyyy/` + ./yyyyyyo yo`:syyyy+. + -oyyy+ +- :yyyyyo- + `:sy: `. `/yyyyys: + ./o/.` .oyyso+oo:` + :+oo+//::::///:-.` `.` EOF ;; - "Tails"*) - set_colors 5 7 + "dragonfly_old"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} `` - ./yhNh -syy/Nshh `:o/ -N:dsNshh █ `ohNMMd -N-/+Nshh `yMMMMd -N-yhMshh yMMMMd -N-s:hshh █ yMMMMd so//. -N-oyNsyh yMMMMd d Mms. -N:hohhhd:. yMMMMd syMMM+ -Nsyh+-..+y+- yMMMMd :mMM+ -+hy- -ss/`yMMMM `+d+ - :sy/. ./yNMMMMm `` - .+ys- `:+hNMMMMMMy/` - `hNmmMMMMMMMMMMMMdo. - dMMMMMMMMMMMMMMMMMNh: - +hMMMMMMMMMMMMMMMMMmy. - -oNMMMMMMMMMMmy+.` - `:yNMMMds/.` - .//` + ${c1} | + .-. + ${c3} ()${c1}I${c3}() + ${c1} "==.__:-:__.==" + "==.__/~|~\__.==" + "==._( Y )_.==" + ${c2}.-'~~""~=--...,__${c1}\/|\/${c2}__,...--=~""~~'-. +( ..=${c1}\\=${c1}/${c2}=.. ) + `'-. ,.-"`;${c1}/=\\${c2};"-.,_ .-'` + `~"-=-~` .-~` ${c1}|=|${c2} `~-. `~-=-"~` + .-~` /${c1}|=|${c2}\ `~-. + .~` / ${c1}|=|${c2} \ `~. + .-~` .' ${c1}|=|${c2} `. `~-. + (` _,.-="` ${c1} |=|${c2} `"=-.,_ `) + `~"~"` ${c1} |=|${c2} `"~"~` + ${c1} /=\\ + \\=/ + ^ EOF ;; - "Trisquel"*) - set_colors 4 6 + "dragonfly_small"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} ▄▄▄▄▄▄ - ▄█████████▄ - ▄▄▄▄▄▄ ████▀ ▀████ - ▄██████████▄ ████▀ ▄▄ ▀███ - ▄███▀▀ ▀▀████ ███▄ ▄█ ███ -▄███ ▄▄▄ ████▄ ▀██████ ▄███ -███ █▀▀██▄ █████▄ ▀▀ ▄████ -▀███ ███ ███████▄▄ ▄▄██████ -${c1} ▀███▄ ▄███ █████████████${c2}████▀ -${c1} ▀█████████ ███████${c2}███▀▀▀ - ▀▀███▀▀ ██████▀▀ - ██████▀ ▄▄▄▄ - █████▀ ████████ - █████ ███▀ ▀███ - ████▄ ██▄▄▄ ███ - █████▄ ▀▀ ▄██ - ██████▄▄▄████ - ▀▀█████▀▀ +${c2}(\${c3}"${c2}/) +${c2}(/${c1}|${c2}\) +${c1} | + | EOF ;; - "Ubuntu-Budgie"*) - set_colors 4 7 1 + "DragonFly"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c2} ./oydmMMMMMMmdyo/. - :smMMMMMMMMMMMhs+:++yhs: - `omMMMMMMMMMMMN+` `odo` - /NMMMMMMMMMMMMN- `sN/ - `hMMMMmhhmMMMMMMh sMh` - .mMmo- /yMMMMm` `MMm. - mN/ yMMMMMMMd- MMMm -oN- oMMMMMMMMMms+//+o+: :MMMMo -m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm -M` .NMMMMMMMMMMMMMMMNodMMMMMMM -M- sMMMMMMMMMMMMMMMMMMMMMMMMM -mm` mMMMMMMMMMNdhhdNMMMMMMMMMm -oMm/ .dMMMMMMMMh: :dMMMMMMMo - mMMNyo/:/sdMMMMMMMMM+ sMMMMMm - .mMMMMMMMMMMMMMMMMMs `NMMMm. - `hMMMMMMMMMMM.oo+. `MMMh` - /NMMMMMMMMMo sMN/ - `omMMMMMMMMy. :dmo` - :smMMMMMMMh+-` `.:ohs: - ./oydmMMMMMMdhyo/. +${c2},--, ${c1}| ${c2},--, +${c2}| `-, ${c1},^, ${c2},-' | +${c2} `, `-, ${c3}(/ \) ${c2},-' ,' +${c2} `-, `-,${c1}/ \${c2},-' ,-' +${c2} `------${c1}( )${c2}------' +${c2} ,----------${c1}( )${c2}----------, +${c2} | _,-${c1}( )${c2}-,_ | +${c2} `-,__,-' ${c1}\ /${c2} `-,__,-' +${c1} | | + | | + | | + | | + | | + | | + `|' EOF ;; - "Ubuntu-GNOME"*) - set_colors 4 5 7 6 + "Elementary"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c3} ./o. - .oooooooo - .oooo```soooo - .oooo` `soooo - .ooo` ${c4}.o.${c3} `\/ooo. - :ooo ${c4}:oooo.${c3} `\/ooo. - sooo ${c4}`ooooo${c3} \/oooo - \/ooo ${c4}`soooo${c3} `ooooo - `soooo ${c4}`\/ooo${c3} `soooo -${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo -${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` -${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` -${c4} `ooooo ${c3}`` ${c4}.oooo -${c4} `soooo. .oooo` - `\/oooooooooo` - ``\/oo`` +${c2} eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee eeeeeeeeeeee eeeee + eeee eeeee eee eeee + eeee eeee eee eeee +eee eee eee eee +eee eee eee eee +ee eee eeee eeee +ee eee eeeee eeeeee +ee eee eeeee eeeee ee +eee eeee eeeeee eeeee eee +eee eeeeeeeeee eeeeee eee + eeeeeeeeeeeeeeeeeeeeeeee eeeee + eeeeeeee eeeeeeeeeeee eeee + eeeee eeeee + eeeeeee eeeeeee + eeeeeeeeeeeeeeeee EOF ;; - "Ubuntu-MATE"*) - set_colors 2 7 + "Endless"*) + set_colors 1 7 read -rd '' ascii_data <<'EOF' -${c1} `:+shmNNMMNNmhs+:` - .odMMMMMMMMMMMMMMMMMMdo. - /dMMMMMMMMMMMMMMMmMMMMMMMMd/ - :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: - `yMMMMMMMMMms:..-::oM: -omMMMMMy` - `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` - hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh -/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ -hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh -/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ - hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh - `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` - yMMMMMMMMMms/..-::oM: .+dMMMMMy - :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: - /dMMMMMMMMMMMMMMMdNMMMMMMMd/ - .odMMMMMMMMMMMMMMMMMMdo. - `:+shmNNMMNNmhs+:` +${c1} `:+yhmNMMMMNmhy+:` + -odMMNhso//////oshNMMdo- + /dMMh+. .+hMMd/ + /mMNo` `oNMm: + `yMMo` `oMMy` + `dMN- -NMd` + hMN. .NMh +/MM/ -os` /MM/ +dMm `smNmmhs/- `:sNMd+ `` mMd +MMy oMd--:+yMMMMMNo.:ohmMMMNy` yMM +MMy -NNyyhmMNh+oNMMMMMy:. dMo yMM +dMm `/++/-``/yNNh+/sdNMNddMm- mMd +/MM/ `dNy: `-::- /MM/ + hMN. .NMh + `dMN- -NMd` + `yMMo` `oMMy` + /mMNo` `oNMm/ + /dMMh+. .+hMMd/ + -odMMNhso//////oshNMMdo- + `:+yhmNMMMMNmhy+:` EOF ;; - "ubuntu_old") - set_colors 1 7 3 + "Exherbo"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} ./+o+- -${c2} yyyyy- ${c1}-yyyyyy+ -${c2} ${c2}://+//////${c1}-yyyyyyo -${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` -${c3} .:++o: ${c2}/++++++++/:--:/- -${c3} o:+o+:++.${c2}`..```.-/oo+++++/ -${c3} .:+o:+o/.${c2} `+sssoo+/ -${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. -${c2}/+++//+:${c3}`oo+o${c2} /::--:. -${c2}+/+o+++${c3}`o++o${c1} ++////. -${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. -${c3} .+.o+oo:.${c1} `oddhhhh+ -${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ -${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: -${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` -${c1} /osyyyyyyo${c3}++ooo+++/ -${c1} ````` ${c3}+oo+++o: -${c3} `oo++. +${c2} , +OXo. +NXdX0: .cok0KXNNXXK0ko:. +KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... +'NO..xWkMMx kMMM cMMMMMX,NMWOxOXd. + cNMk NK .oXM. OMMMMO. 0MMNo kW. + lMc o: ., .oKNk; ;NMMWlxW' + ;Mc .. .,,' .0M${c1}g;${c2}WMN'dWMMMMMMO + XX ,WMMMMW. cM${c1}cfli${c2}WMKlo. .kMk +.Mo .WM${c1}GD${c2}MW. XM${c1}WO0${c2}MMk oMl +,M: ,XMMWx::,''oOK0x; NM. +'Ml ,kNKOxxxxxkkO0XXKOd:. oMk + NK .0Nxc${c3}:::::::::::::::${c2}fkKNk, .MW + ,Mo .NXc${c3}::${c2}qXWXb${c3}::::::::::${c2}oo${c3}::${c2}lNK. .MW + ;Wo oMd${c3}:::${c2}oNMNP${c3}::::::::${c2}oWMMMx${c3}:${c2}c0M; lMO + 'NO;W0c${c3}:::::::::::::::${c2}dMMMMO${c3}::${c2}lMk .WM' + xWONXdc${c3}::::::::::::::${c2}oOOo${c3}::${c2}lXN. ,WMd + 'KWWNXXK0Okxxo,${c3}:::::::${c2},lkKNo xMMO + :XMNxl,';:lodxkOO000Oxc. .oWMMo + 'dXMMXkl;,. .,o0MMNo' + ':d0XWMMMMWNNNNMMMNOl' + ':okKXWNKkl' EOF ;; - "Ubuntu-Studio") - set_colors 6 7 + "Fedora"* | "RFRemix"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} ..-::::::-.` - `.:+++++++++++${c2}ooo${c1}++:.` - ./+++++++++++++${c2}sMMMNdyo${c1}+/. - .++++++++++++++++${c2}oyhmMMMMms${c1}++. - `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` - `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` - +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` - :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: - ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. -`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. - ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ - :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: - +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ - `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` - `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ - ./+++++++++++++++${c2}oyhdNMMMms${c1}++. - ./+++++++++++++${c2}hMMMNdyo${c1}+/. - `.:+++++++++++${c2}sso${c1}++:. - ..-::::::-.. +${c1} /:-------------:\\ + :-------------------:: + :-----------${c2}/shhOHbmp${c1}---:\\ + /-----------${c2}omMMMNNNMMD ${c1}---: + :-----------${c2}sMMMMNMNMP${c1}. ---: + :-----------${c2}:MMMdP${c1}------- ---\\ +,------------${c2}:MMMd${c1}-------- ---: +:------------${c2}:MMMd${c1}------- .---: +:---- ${c2}oNMMMMMMMMMNho${c1} .----: +:-- .${c2}+shhhMMMmhhy++${c1} .------/ +:- -------${c2}:MMMd${c1}--------------: +:- --------${c2}/MMMd${c1}-------------; +:- ------${c2}/hMMMy${c1}------------: +:--${c2} :dMNdhhdNMMNo${c1}------------; +:---${c2}:sdNMMMMNds:${c1}------------: +:------${c2}:://:${c1}-------------:: +:---------------------:// EOF ;; - "Ubuntu"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} .-/+oossssoo+/-. - `:+ssssssssssssssssss+:` - -+ssssssssssssssssssyyssss+- - .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ - +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ -.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. -+ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ -oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso -oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso -+ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ -.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ - +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ - /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ - .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - -+sssssssssssssssss${c2}yyy${c1}ssss+- - `:+ssssssssssssssssss+:` - .-/+oossssoo+/-. + "freebsd_small") + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} /\\ _____ /\\ + \\_) (_/ + / \ +| | +| | + \ / + --_____-- EOF ;; - "void_small") - set_colors 2 8 + "FreeBSD"*) + set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} _______ - _ \______ - -| \ ___ \ | -| | / \ | | -| | \___/ | | -| \______ \_| - -_______\ + ${c2}``` ${c1}` + ${c2}` `.....---...${c1}....--.``` -/ + ${c2}+o .--` ${c1}/y:` +. + ${c2} yo`:. ${c1}:o `+- + ${c2}y/ ${c1}-/` -o/ + ${c2}.- ${c1}::/sy+:. + ${c2}/ ${c1}`-- / + ${c2}`: ${c1}:` + ${c2}`: ${c1}:` + ${c2}/ ${c1}/ + ${c2}.- ${c1}-. + ${c2}-- ${c1}-. + ${c2}`:` ${c1}`:` + .-- `--. + .---.....----. EOF ;; - "Void"*) - set_colors 2 8 + "FreeMiNT"*) + # Don't explicitly set colors since + # TosWin2 doesn't reset well. read -rd '' ascii_data <<'EOF' -${c1} __.;=====;.__ - _.=+==++=++=+=+===;. - -=+++=+===+=+=+++++=_ - . -=:`` `--==+=++==. - _vi, ` --+=++++: - .uvnvi. _._ -==+==+. - .vvnvnI` .;==|==;. :|=||=|. -${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL -${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE -${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' -${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! -${c1} -1vvnvv. `~+++` ++|+++ - +vnvnnv, `-|=== - +vnvnvns. . :=- - -Invnvvnsi..___..=sv=. ` - +Invnvnvnnnnnnnnvvnn;. - ~|Invnvnvvnvvvnnv}+` - -~|{*l}*|~ +${c1} ## + ## ######### + #### ## + #### #### ## +#### #### ## ## + #### #### ## ## + #### #### ## ## ## + #### ###### + ###### ## ## #### + #### ################ + #### ## #### + ## #### ###### + ## ## #### #### + ## ## ## ## ## #### + #### ## ## ## EOF ;; - *"[Windows 10]"* | *"on Windows 10"* | "Windows 8"* |\ - "Windows 10"* | "windows10" | "windows8" ) - set_colors 6 7 + "Frugalware"*) + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} .., - ....,,:;+ccllll - ...,,+:; cllllllllllllllllll -,cclllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll - -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -llllllllllllll lllllllllllllllllll -`'ccllllllllll lllllllllllllllllll - `' \\*:: :ccllllllllllllllll - ````''*::cll - `` +${c1} `++/::-.` + /o+++++++++/::-.` + `o+++++++++++++++o++/::-.` + /+++++++++++++++++++++++oo++/:-.`` + .o+ooooooooooooooooooosssssssso++oo++/:-` + ++osoooooooooooosssssssssssssyyo+++++++o: + -o+ssoooooooooooosssssssssssssyyo+++++++s` + o++ssoooooo++++++++++++++sssyyyyo++++++o: + :o++ssoooooo${c2}/-------------${c1}+syyyyyo+++++oo + `o+++ssoooooo${c2}/-----${c1}+++++ooosyyyyyyo++++os: + /o+++ssoooooo${c2}/-----${c1}ooooooosyyyyyyyo+oooss + .o++++ssooooos${c2}/------------${c1}syyyyyyhsosssy- + ++++++ssooooss${c2}/-----${c1}+++++ooyyhhhhhdssssso + -s+++++syssssss${c2}/-----${c1}yyhhhhhhhhhhhddssssy. + sooooooyhyyyyyh${c2}/-----${c1}hhhhhhhhhhhddddyssy+ + :yooooooyhyyyhhhyyyyyyhhhhhhhhhhdddddyssy` + yoooooooyhyyhhhhhhhhhhhhhhhhhhhddddddysy/ +-ysooooooydhhhhhhhhhhhddddddddddddddddssy + .-:/+osssyyyysyyyyyyyyyyyyyyyyyyyyyyssy: + ``.-/+oosysssssssssssssssssssssss + ``.:/+osyysssssssssssssh. + `-:/+osyyssssyo + .-:+++` EOF ;; - "Windows"*) - set_colors 1 2 4 3 + "Funtoo"*) + set_colors 5 7 read -rd '' ascii_data <<'EOF' -${c1} ,.=:!!t3Z3z., - :tt:::tt333EE3 -${c1} Et:::ztt33EEEL${c2} @Ee., .., -${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# -${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL -${c1} it::::tt333EEF${c2} @EEEEEEttttt33F -${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. -${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF -${c3} ;::::::::zt33)${c2} "4EEEtttji3P* -${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. -${c3} i::::::::zt33F${c4} AEEEtttt::::ztF -${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 -${c3} E::::::::zt33L${c4} @EEEtttt::::z3F -${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` -${c3} `${c4} :EEEEtttt::::z7 - "VEzjt:;;z>*` +${c2} _______ ____ + /MMMMMMM/ /MMMM| _____ _____ + __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ +|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ +|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| +|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ + |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| + |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ + |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ EOF ;; - "Xubuntu"*) + "GalliumOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} `-/osyhddddhyso/-` - .+yddddddddddddddddddy+. - :yddddddddddddddddddddddddy: - -yddddddddddddddddddddhdddddddy- - odddddddddddyshdddddddh`dddd+ydddo - `yddddddhshdd- ydddddd+`ddh.:dddddy` - sddddddy /d. :dddddd-:dy`-ddddddds -:ddddddds /+ .dddddd`yy`:ddddddddd: -sdddddddd` . .-:/+ssdyodddddddddds -ddddddddy `:ohddddddddd -dddddddd. +dddddddd -sddddddy ydddddds -:dddddd+ .oddddddd: - sdddddo ./ydddddddds - `yddddd. `:ohddddddddddy` - oddddh/` `.:+shdddddddddddddo - -ydddddhyssyhdddddddddddddddddy- - :yddddddddddddddddddddddddy: - .+yddddddddddddddddddy+. - `-/osyhddddhyso/-` +${c1}sooooooooooooooooooooooooooooooooooooo+: +yyooooooooooooooooooooooooooooooooo+/::: +yyysoooooooooooooooooooooooooooo+/:::::: +yyyyyoooooooooooooooooooooooo+/::::::::: +yyyyyysoooooooooooooooooo++/:::::::::::: +yyyyyyysoooooooooooooo++/::::::::::::::: +yyyyyyyyysoooooo${c2}sydddys${c1}+/::::::::::::::: +yyyyyyyyyysooo${c2}smMMMMMMMNd${c1}+:::::::::::::: +yyyyyyyyyyyyo${c2}sMMMMMMMMMMMN${c1}/::::::::::::: +yyyyyyyyyyyyy${c2}dMMMMMMMMMMMM${c1}o//::::::::::: +yyyyyyyyyyyyy${c2}hMMMMMMMMMMMm${c1}--//:::::::::: +yyyyyyyyyyyyyy${c2}hmMMMMMMMNy${c1}:..-://:::::::: +yyyyyyyyyyyyyyy${c2}yyhhyys+:${c1}......://::::::: +yyyyyyyyyyyyyyys+:--...........-///::::: +yyyyyyyyyyyys+:--................://:::: +yyyyyyyyyo+:-.....................-//::: +yyyyyyo+:-..........................://: +yyyo+:-..............................-// +o/:-...................................: EOF ;; - "Zorin"*) - set_colors 4 6 + "gentoo_small") + set_colors 5 7 read -rd '' ascii_data <<'EOF' -${c1} `osssssssssssssssssssso` - .osssssssssssssssssssssso. - .+oooooooooooooooooooooooo+. - - - `::::::::::::::::::::::. .:` - `+ssssssssssssssssss+:.` `.:+ssso` -.ossssssssssssssso/. `-+ossssssso. -ssssssssssssso/-` `-/osssssssssssss -.ossssssso/-` .-/ossssssssssssssso. - `+sss+:. `.:+ssssssssssssssssss+` - `:. .::::::::::::::::::::::` - - - .+oooooooooooooooooooooooo+. - -osssssssssssssssssssssso- - `osssssssssssssssssssso` +${c1} _-----_ +( \\ +\ 0 \\ +${c2} \ ) + / _/ +( _- +\____- EOF ;; - *) - case "$kernel_name" in - *"BSD") - set_colors 1 7 4 3 6 - read -rd '' ascii_data <<'EOF' -${c1} , , - /( )` - \ \___ / | - /- _ `-/ ' - (${c2}/\/ \ ${c1}\ /\ - ${c2}/ / | ` ${c1}\ - ${c3}O O ${c2}) ${c1}/ | - ${c2}`-^--'${c1}`< ' - (_.) _ ) / - `.___/` / - `-----' / -${c4}<----. __ / __ \ -${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| -<----' ${c1}`--' `.__,' \ - | | - \ / /\ - ${c5}______${c1}( (_ / \______/ - ${c5},' ,-----' | - `--{__________) + "Gentoo"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} -/oyddmdhs+:. + -o${c2}dNMMMMMMMMNNmhy+${c1}-` + -y${c2}NMMMMMMMMMMMNNNmmdhy${c1}+- + `o${c2}mMMMMMMMMMMMMNmdmmmmddhhy${c1}/` + om${c2}MMMMMMMMMMMN${c1}hhyyyo${c2}hmdddhhhd${c1}o` +.y${c2}dMMMMMMMMMMd${c1}hs++so/s${c2}mdddhhhhdm${c1}+` + oy${c2}hdmNMMMMMMMN${c1}dyooy${c2}dmddddhhhhyhN${c1}d. + :o${c2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${c1}Mh + .:${c2}+sydNMMMMMNNNmmmdddhhhhhhmM${c1}my + /m${c2}MMMMMMNNNmmmdddhhhhhmMNh${c1}s: + `o${c2}NMMMMMMMNNNmmmddddhhdmMNhs${c1}+` + `s${c2}NMMMMMMMMNNNmmmdddddmNMmhs${c1}/. + /N${c2}MMMMMMMMNNNNmmmdddmNMNdso${c1}:` ++M${c2}MMMMMMNNNNNmmmmdmNMNdso${c1}/- +yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` +/h${c2}MMNNNNNNNNMNdhs++/${c1}-` +`/${c2}ohdmmddhys+++/:${c1}.` + `-//////:--. EOF - ;; + ;; - "Darwin") - set_colors 2 3 1 1 5 4 - read -rd '' ascii_data <<'EOF' -${c1} 'c. - ,xNMM. - .OMMMMo - OMMM0, - .;loddo:' loolloddol;. - cKMMMMMMMMMMNWMMMMMMMMMM0: -${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. - XMMMMMMMMMMMMMMMMMMMMMMMX. -${c3};MMMMMMMMMMMMMMMMMMMMMMMM: -:MMMMMMMMMMMMMMMMMMMMMMMM: -${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. - kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. - ${c6}kMMMMMMMMMMMMMMMMMMMMMMd - ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. + "gNewSense"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} ..,,,,.. + .oocchhhhhhhhhhccoo. + .ochhlllllllc hhhhhh ollllllhhco. + ochlllllllllll hhhllllllhhh lllllllllllhco + .cllllllllllllll hlllllo +hllh llllllllllllllc. +ollllllllllhco'' hlllllo +hllh ``ochllllllllllo +hllllllllc' hllllllllllllh `cllllllllh +ollllllh +llllllllllll+ hllllllo + `cllllh. ohllllllho .hllllc' + ochllc. ++++ .cllhco + `+occooo+. .+ooocco+' + `+oo++++ ++++oo+' EOF - ;; + ;; - "GNU"*) - set_colors fg 7 - read -rd '' ascii_data <<'EOF' + "GNU") + set_colors fg 7 + read -rd '' ascii_data <<'EOF' ${c1} _-`````-, ,- '- . .' .- - | | - -. `. /.' / `. \ @@ -7686,982 +6388,2280 @@ ${c1} _-`````-, ,- '- . '/'/' `; EOF - ;; - - "Linux") - set_colors fg 8 3 - read -rd '' ascii_data <<'EOF' -${c2} ##### -${c2} ####### -${c2} ##${c1}O${c2}#${c1}O${c2}## -${c2} #${c3}#####${c2}# -${c2} ##${c1}##${c3}###${c1}##${c2}## -${c2} #${c1}##########${c2}## -${c2} #${c1}############${c2}## -${c2} #${c1}############${c2}### -${c3} ##${c2}#${c1}###########${c2}##${c3}# -${c3}######${c2}#${c1}#######${c2}#${c3}###### -${c3}#######${c2}#${c1}#####${c2}#${c3}####### -${c3} #####${c2}#######${c3}##### -EOF - ;; - - "SunOS") - set_colors 3 7 - read -rd '' ascii_data <<'EOF' -${c1} `- ` - `-- `+- .: - .+: `++: -/+- . - `.::` -++/``:::`./+/ `.-/. - `++/-`.` ` /++:` - `` ./:` .: `..`.- -``./+/:- -+++:- - -/+` :. -EOF - ;; + ;; - "IRIX"*) - set_colors 4 7 - read -rd '' ascii_data <<'EOF' -${c1} ./ohmNd/ +dNmho/- - `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. - `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` - -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. - `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` -+mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ -dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd -oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ -.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. - hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh - /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: - `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd - `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` - `yNMMNho-yMMMM` NMMMm.+hNMMNh` - -MMMMd: oMMMM. NMMMh :hMMMM- - -yNMMMmooMMMM- NMMMyomMMMNy- - .omMMMMMMMM-`NMMMMMMMmo. - `:hMMMMMM. NMMMMMh/` - .odNm+ /dNms. + "GoboLinux"*) + set_colors 5 4 6 2 + read -rd '' ascii_data <<'EOF' +${c1}_____ _ +/ ____| | | +| | __ ___ | |__ ___ +| | |_ |/ _ \| '_ \ / _ \ +| |__| | (_) | |_) | (_) | + \_____|\___/|_.__/ \___/ EOF - ;; - esac ;; - esac - - # Overwrite distro colors if '$ascii_colors' doesn't - # equal 'distro'. - if [[ "${ascii_colors[0]}" != "distro" ]]; then - color_text="off" - set_colors "${ascii_colors[@]}" - fi -} - -set_colors() { - c1="$(color "$1")${ascii_bold}" - c2="$(color "$2")${ascii_bold}" - c3="$(color "$3")${ascii_bold}" - c4="$(color "$4")${ascii_bold}" - c5="$(color "$5")${ascii_bold}" - c6="$(color "$6")${ascii_bold}" - - [[ "$color_text" != "off" ]] && set_text_colors "$@" -} - -set_text_colors() { - if [[ "${colors[0]}" == "distro" ]]; then - title_color="$(color "$1")" - at_color="$reset" - underline_color="$reset" - subtitle_color="$(color "$2")" - colon_color="$reset" - info_color="$reset" - - # If the ascii art uses 8 as a color, make the text the fg. - ((${1:-1} == 8)) && title_color="$reset" - ((${2:-7} == 8)) && subtitle_color="$reset" - - # If the second color is white use the first for the subtitle. - ((${2:-7} == 7)) && subtitle_color="$(color "$1")" - ((${1:-1} == 7)) && title_color="$reset" - else - title_color="$(color "${colors[0]}")" - at_color="$(color "${colors[1]}")" - underline_color="$(color "${colors[2]}")" - subtitle_color="$(color "${colors[3]}")" - colon_color="$(color "${colors[4]}")" - info_color="$(color "${colors[5]}")" - fi - - # Bar colors. - if [[ "$bar_color_elapsed" == "distro" ]]; then - bar_color_elapsed="$(color fg)" - else - bar_color_elapsed="$(color "$bar_color_elapsed")" - fi - - case "$bar_color_total $1" in - "distro "[736]) bar_color_total="$(color "$1")" ;; - "distro "[0-9]) bar_color_total="$(color "$2")" ;; - *) bar_color_total="$(color "$bar_color_total")" ;; - esac -} - -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" ;; - esac -} - -# OTHER - -stdout() { - image_backend="off" - unset subtitle_color - unset colon_color - unset info_color - unset underline_color - unset bold - unset title_color - unset at_color - unset text_padding - unset zws - unset reset - unset color_blocks - unset get_line_break -} - -err() { - err+="$(color 1)[!]\e[0m $1\n" -} - -get_full_path() { - # This function finds the absolute path from a relative one. - # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" - - # If the file exists in the current directory, stop here. - [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - - if ! cd "${1%/*}"; then - err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" - err " Check that the directory exists or try another directory." - exit 1 - fi - - local full_dir="${1##*/}" - - # Iterate down a (possible) chain of symlinks. - while [[ -L "$full_dir" ]]; do - full_dir="$(readlink "$full_dir")" - cd "${full_dir%/*}" || exit - full_dir="${full_dir##*/}" - done - # Final directory. - full_dir="$(pwd -P)/${1/*\/}" + "Grombyang"*) + set_colors 4 2 1 + read -rd '' ascii_data <<'EOF' +${c1} eeeeeeeeeeee + eeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeeeeeeeee + eeeee ${c2}.o+ ${c1}eeee + eeee ${c2}`ooo/ ${c1}eeee + eeee ${c2}`+oooo: ${c1}eeee +eee ${c2}`+oooooo: ${c1}eee +eee ${c2}-+oooooo+: ${c1}eee +ee ${c2}`/:oooooooo+: ${c1}ee +ee ${c2}`/+ +++ +: ${c1}ee +ee ${c2}+o+\ ${c1}ee +eee ${c2}+o+\ ${c1}eee +eee ${c2}// \\ooo/ \\\ ${c1}eee + eee ${c2}//++++oooo++++\\\ ${c1}eee + eeee ${c2}::::++oooo+::::: ${c1}eeee + eeeee ${c3}Grombyang OS ${c1} eeee + eeeeeeeeeeeeeeeeeeeeeee + eeeeeeeeeeeeeeeee +EOF + ;; - [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" -} + "GuixSD"*) + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1} .. `. + `--..```..` `..```..--` + .-:///-:::. `-:::///:-. + ````.:::` `:::.```` + -//:` -::- + ://: -::- + `///- .:::` + -+++-:::. + :+/:::- + `-....` +EOF + ;; -get_user_config() { - # Check $config_file. - if [[ -f "$config_file" ]]; then - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options - return - fi - mkdir -p "${XDG_CONFIG_HOME}/neofetch/" + "Haiku"*) + set_colors 2 8 + read -rd '' ascii_data <<'EOF' +${c2} :dc' + 'l:;'${c1},${c2}'ck. .;dc:. + co ${c1}..${c2}k. .;; ':o. + co ${c1}..${c2}k. ol ${c1}.${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. + co ${c1}..${c2}k. oc ${c1}..${c2}0. +.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. + ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; + ..${c1}oOolllllccccccc:::::${c2}od; + cx:ooc${c1}:::::::;${c2}cooolcX. + cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. + cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. + .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. + '::c'${c1}...${c2}do${c1}..... .${c2}K, + cd,.${c1}....:${c2}O,${c1} + ':clod:'${c1} + ${c1} +EOF + ;; - # Check ${XDG_CONFIG_HOME}/neofetch and create the - # dir/files if they don't exist. - if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config" + "Hyperbola"*) + set_colors 8 + read -rd '' ascii_data <<'EOF' +${c1} WW + KX W + WO0W NX0O + NOO0NW WNXK0OOKW + W0OOOOOOOOOOOOKN + N0OOOOOOO0KXW + WNXXXNW + NXK00000KN + WNK0OOOOOOOOOO0W + NK0OOOOOOOOOOOOOO0W + X0OOOOOOO00KK00OOOOOK + X0OOOO0KNWW WX0OO0W + X0OO0XNW KOOW + N00KNW KOW + NKXN W0W +WW W +EOF + ;; - elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + "Kali"*) + set_colors 4 8 + read -rd '' ascii_data <<'EOF' +${c1}.............. + ..,;:ccc,. + ......''';lxO. +.....''''..........,:ld; + .';;;:::;,,.x, + ..'''. 0Xxoc:,. ... + .... ,ONkc;,;cokOdc',. + . OMo ':${c2}dd${c1}o. + dMc :OO; + 0M. .:o. + ;Wd + ;XO, + ,d0Odlc;,.. + ..',;:cdOOd::,. + .:d;.':;. + 'd, .' + ;l .. + .o + c + .' + . +EOF + ;; - else - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + "KaOS"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} .. + ..... ..OSSAAAAAAA.. + .KKKKSS. .SSAAAAAAAAAAA. +.KKKKKSO. .SAAAAAAAAAA... +KKKKKKS. .OAAAAAAAA. +KKKKKKS. .OAAAAAA. +KKKKKKS. .SSAA.. +.KKKKKS..OAAAAAAAAAAAA........ + DKKKKO.=AA=========A===AASSSO.. + AKKKS.==========AASSSSAAAAAASS. + .=KKO..========ASS.....SSSSASSSS. + .KK. .ASS..O.. =SSSSAOSS: + .OK. .ASSSSSSSO...=A.SSA. + .K ..SSSASSSS.. ..SSA. + .SSS.AAKAKSSKA. + .SSS....S.. +EOF + ;; - # The config file doesn't exist, create it. - printf "%s\n" "$config" > "$config_file" - fi + "KDE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} `..---+/---..` + `---.`` `` `.---.` + .--.` `` `-:-. + `:/: `.----//----.` :/- + .:. `---` `--.` .:` + .:` `--` .:- `:. + `/ `:. `.-::-.` -:` `/` + /. /. `:++++++++:` .: .: +`/ .: `+++++++++++/ /` `+` +/+` -- .++++++++++++` :. .+: +`/ .: `+++++++++++/ /` `+` + /` /. `:++++++++:` .: .: + ./ `:. `.:::-.` -:` `/` + .:` `--` .:- `:. + .:. `---` `--.` .:` + `:/: `.----//----.` :/- + .-:.` `` `-:-. + `---.`` `` `.---.` + `..---+/---..` +EOF + ;; - source "$config_file" - err "Config: Sourced user config. (${config_file})" - old_options -} + "Kogaion"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ;; ,; + ;;; ,;; + ,;;;; ;;;; + ,;;;;;;;; ;;;; + ;;;;;;;;;;; ;;;;; + ,;;;;;;;;;;;; ';;;;;, + ;;;;;;;;;;;;;;, ';;;;;;; + ;;;;;;;;;;;;;;;;;, ';;;;; +; ';;;;;;;;;;;;;;;;;;, ;;; +;;;, ';;;;;;;;;;;;;;;;;;;,;; +;;;;;, ';;;;;;;;;;;;;;;;;;, +;;;;;;;;, ';;;;;;;;;;;;;;;;, +;;;;;;;;;;;;, ';;;;;;;;;;;;;; +';;;;;;;;;;;;; ';;;;;;;;;;;;; + ';;;;;;;;;;;;;, ';;;;;;;;;;; + ';;;;;;;;;;;;; ;;;;;;;;;; + ';;;;;;;;;;;; ;;;;;;;; + ';;;;;;;; ;;;;;; + ';;;;; ;;;; + ';;; ;; +EOF + ;; -bar() { - # Get the values. - elapsed="$(($1 * bar_length / $2))" + "Korora"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} ____________ + _add55555555554${c1}: + _w?'${c1}``````````'${c2})k${c1}: + _Z'${c1}`${c2} ]k${c1}: + m(${c1}`${c2} )k${c1}: + _.ss${c1}`${c2}m[${c1}`${c2}, ]e${c1}: + .uY"^`${c1}`${c2}Xc${c1}`${c2}?Ss. d(${c1}` + jF'${c1}`${c2} `@. ${c1}`${c2}Sc .jr${c1}` + jr${c1}`${c2} `?n_ ${c1}`${c2}$; _a2"${c1}` +.m${c1}:${c2} `~M${c1}`${c2}1k${c1}`${c2}5?!`${c1}` +:#${c1}:${c2} ${c1}`${c2})e${c1}``` +:m${c1}:${c2} ,#'${c1}` +:#${c1}:${c2} .s2'${c1}` +:m,________.aa7^${c1}` +:#baaaaaaas!J'${c1}` + ``````````` +EOF + ;; - # Create the bar with spaces. - printf -v prog "%${elapsed}s" - printf -v total "%$((bar_length - elapsed))s" + "KSLinux"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} K K U U RRRR ooo + K K U U R R o o + KKK U U RRRR o o + K K U U R R o o + K K UUU R R ooo - # Set the colors and swap the spaces for $bar_char_. - bar+="${bar_color_elapsed}${prog// /${bar_char_elapsed}}" - bar+="${bar_color_total}${total// /${bar_char_total}}" +${c2} SSS AAA W W AAA + S A A W W A A + SSS AAAAA W W W AAAAA + S A A WW WW A A + SSS A A W W A A +EOF + ;; - # Borders. - [[ "$bar_border" == "on" ]] && \ - bar="$(color fg)[${bar}$(color fg)]" + "Kubuntu"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `.:/ossyyyysso/:. + .:oyyyyyyyyyyyyyyyyyyo:` + -oyyyyyyyo${c2}dMMy${c1}yyyyyyysyyyyo- + -syyyyyyyyyy${c2}dMMy${c1}oyyyy${c2}dmMMy${c1}yyyys- + oyyys${c2}dMy${c1}syyyy${c2}dMMMMMMMMMMMMMy${c1}yyyyyyo + `oyyyy${c2}dMMMMy${c1}syysoooooo${c2}dMMMMy${c1}yyyyyyyyo` + oyyyyyy${c2}dMMMMy${c1}yyyyyyyyyyys${c2}dMMy${c1}sssssyyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- +oyyyysoo${c2}dMy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyysosyyyyyyyy +yyys${c2}dMMMMMy${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyy +oyyyyysos${c2}dy${c1}yyyyyyyyyyyyyyyyyy${c2}dMMMMy${c1}syyyo +-yyyyyyyy${c2}dMy${c1}syyyyyyyyyyyyyys${c2}dMMMMMy${c1}syyy- + oyyyyyy${c2}dMMMy${c1}syyyyyyyyyyys${c2}dMMy${c1}oyyyoyyyo + `oyyyy${c2}dMMMy${c1}syyyoooooo${c2}dMMMMy${c1}oyyyyyyyyo + oyyysyyoyyyys${c2}dMMMMMMMMMMMy${c1}yyyyyyyo + -syyyyyyyyy${c2}dMMMy${c1}syyy${c2}dMMMy${c1}syyyys- + -oyyyyyyy${c2}dMMy${c1}yyyyyysosyyyyo- + ./oyyyyyyyyyyyyyyyyyyo/. + `.:/oosyyyysso/:.` +EOF + ;; - printf "%b" "${bar}${info_color}" -} + "LEDE"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' + ${c1} _________ + / /\ + / LE / \ + / DE / \ + /________/ LE \ + \ \ DE / + \ LE \ / + \ DE \ / + \________\/ +EOF + ;; -cache() { - if [[ "$2" ]]; then - mkdir -p "${cache_dir}/neofetch" - printf "%s" "${1/*-}=\"$2\"" > "${cache_dir}/neofetch/${1/*-}" - fi -} + "Linux") + set_colors fg 8 3 + read -rd '' ascii_data <<'EOF' +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### +EOF + ;; -get_cache_dir() { - case "$os" in - "Mac OS X") cache_dir="/Library/Caches" ;; - *) cache_dir="/tmp" ;; - esac -} + "LMDE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' + ${c2}`.-::---.. +${c1} .:++++ooooosssoo:. + .+o++::. `.:oos+. +${c1} :oo:.` -+oo${c2}: +${c1} ${c2}`${c1}+o/` .${c2}::::::${c1}-. .++-${c2}` +${c1}${c2}`${c1}/s/ .yyyyyyyyyyo: +o-${c2}` +${c1}${c2}`${c1}so .ss ohyo` :s-${c2}: +${c1}${c2}`${c1}s/ .ss h m myy/ /s`${c2}` +${c1}`s: `oo s m Myy+-o:` +`oo :+sdoohyoydyso/. + :o. .:////////++: +${c1} `/++ ${c2}-:::::- +${c1} ${c2}`${c1}++- +${c1} ${c2}`${c1}/+- +${c1} ${c2}.${c1}+/. +${c1} ${c2}.${c1}:+-. + `--.`` +EOF + ;; -kde_config_dir() { - # If the user is using KDE get the KDE - # configuration directory. - if [[ "$kde_config_dir" ]]; then - return + "Lubuntu"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `-/+oyyhhhhyyo+/-` + ./shhhhhhhhhhhhhhhhhhs/. + `:shhhhhhhhhhhhhhhhhhhhhhhhs:` + :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: + `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` + `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` + shhhhhhhhy+. .ohhhhhhhhhhhhhs +:hhhhhhy/. /hhhhhhhhhhhhh: +shhhy/. :hhhhhhhhhhhhs +hy+. ` `+yhs/` +hhhhhhhhhhhh +-.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh +shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs +:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: + shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs + `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` + +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` + :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: + :shhhhhhhhhhhhhhhhhhhhhy`+s:` + .+shhhhhhhhhhhhhhhhhhs:` + `-/+oyyhhhhyys+/-` +EOF + ;; - elif type -p kf5-config >/dev/null 2>&1; then - kde_config_dir="$(kf5-config --path config)" + "Lunar"*) + set_colors 4 7 3 + read -rd '' ascii_data <<'EOF' +${c1}`-. `-. + -ohys/-` `:+shy/` + -omNNdyo/` :+shmNNy/` + ${c3} - + /mMmo + hMMMN` + .NMMs + ${c1} -:+oooo+//: ${c3}/MN${c1}. -///oooo+/-` + /:.` ${c3}/${c1} `.:/` +${c3} __ + | | _ _ ___ ___ ___ + | |__| | | | .'| _| + |_____|___|_|_|__,|_| +EOF + ;; - elif type -p kde4-config >/dev/null 2>&1; then - kde_config_dir="$(kde4-config --path config)" + "mac"*"_small") + set_colors 2 3 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} .:' + _ :'_ +${c2} .'`_`-'_``. +:________.-' +${c3}:_______: +:_______: +${c4} :_______`-; +${c5} `._.-._.' +EOF + ;; - elif type -p kde-config >/dev/null 2>&1; then - kde_config_dir="$(kde-config --path config)" + "mac" | "Darwin") + set_colors 2 3 1 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. +EOF + ;; - elif [[ -d "${HOME}/.kde4" ]]; then - kde_config_dir="${HOME}/.kde4/share/config" + "Mageia"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} .°°. + °° .°°. + .°°°. °° + . . + °°° .°°°. + .°°°. '___' +${c2} .${c1}'___' ${c2} . + :dkxc;'. ..,cxkd; + .dkk. kkkkkkkkkk .kkd. +.dkk. ';cloolc;. .kkd +ckk. .kk; +xO: cOd +xO: lOd +lOO. .OO: +.k00. .00x + .k00; ;00O. + .lO0Kc;,,,,,,;c0KOc. + ;d00KKKKKK00d; + .,KKKK,. +EOF + ;; - elif [[ -d "${HOME}/.kde3" ]]; then - kde_config_dir="${HOME}/.kde3/share/config" - fi + "MagpieOS"*) + set_colors 2 1 3 5 + read -rd '' ascii_data <<'EOF' +${c1} ;00000 :000Ol + .x00kk00: O0kk00k; + l00: :00. o0k :O0k. + .k0k. x${c2}d$dddd${c1}k' .d00; + k0k. ${c2}.dddddl ${c1}o00, + o00. ${c2}':cc:. ${c1}d0O +.00l ,00. +l00. d0x +k0O .:k0o +O0k ;dO0000d. +k0O .O0O${c2}xxxxk${c1}00: +o00. k0O${c2}dddddd${c1}occ +'00l x0O${c2}dddddo${c3};..${c1} + x00. .x00${c2}kxxd${c3}:..${c1} + .O0x .:oxxx${c4}Okl.${c1} + .x0d ${c4},xx,${c1} + .:o. ${c4}.xd ckd${c1} + .. ${c4}dxl .xx; + :xxolldxd' + ;oxdl. +EOF + ;; - kde_config_dir="${kde_config_dir/$'/:'*}" -} + "Manjaro"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1}██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +████████ ████████ ████████ +EOF + ;; -get_term_padding() { - # Terminal info. - # - # Parse terminal config files to get - # info about padding. Due to how w3m-img - # works padding around the terminal throws - # off the cursor placement calculation in - # specific terminals. - # - # Note: This issue only seems to affect - # URxvt. - ((term_run != 1)) && get_term + "Maui"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} `.-://////:--` + .:/oooooooooooooooo+:. + `:+ooooooooooooooooooooooo:` + `:oooooooooooooooooooooooooooo/` + ..```-oooooo/-`` `:oooooo+:.` `-- + :. +oo+-` /ooo/` -/ + -o. `o+- +o/` -o: +`oo` ::` :o/ `+. .+o` /oo. +/o+ . -+oo- ` /oo/ `ooo/ ++o- /ooo+` .+ooo. :ooo+ +++ .+oooo: -oooo+ `oooo+ +:. .oooooo` :ooooo- :oooo: +` .oooooo: :ooooo+ `ooo+-` + .+oooooo` -oooooo: `o/- + +oooooo: .ooooooo. + /ooooooo` /ooooooo/ .. + `:oooooooo/:::/ooooooooo+:--:/:` + `:+oooooooooooooooooooooo+:` + .:+oooooooooooooooo+:. + `.-://////:-.` +EOF + ;; - case "$term" in - "URxvt"*) - border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" + "Mer"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} dMs + .-` + `y`-o+` + ``NMMy + .--`:++. + .hNNNNs + /MMMMMN + `ommmd/ +/ + ```` +/ + `:+sssso/-` + .-::. `-::-` `smNMNmdmNMNd/ .://-` +.ymNMNNdmNMMNm+` -dMMh:.....+dMMs `sNNMMNo +dMN+::NMMy::hMM+ mMMo `ohhy/ `dMM+ yMMy::- +MMm yMM- :MMs NMN` `:::::--sMMh dMM` +MMm yMM- -MMs mMM+ `ymmdsymMMMs dMM` +NNd sNN- -NNs -mMNs-.--..:dMMh` dNN +--- .--` `--. .smMMmdddmMNdo` .-- + ./ohddds+:` + +h- `.:-. + ./`.dMMMN+ + +MMMMMd + `+dmmy- + ``` .+` + .dMNo-y. + `hmm/ + .:` + dMs +EOF ;; - esac -} -dynamic_prompt() { - case "$image_backend" in - "ascii") printf "\n" ;; - "off") return ;; - *) - get_term_padding - lines="$(((border + height + yoffset) / font_height))" - image_prompt="on" + "Minix"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c2} -sdhyo+:-` -/syymm: + sdyooymmNNy. `` .smNmmdysNd + odyoso+syNNmysoyhhdhsoomNmm+/osdm/ + :hhy+-/syNNmddhddddddmNMNo:sdNd: + `smNNdNmmNmddddddddddmmmmmmmy` + `ohhhhdddddmmNNdmddNmNNmdddddmdh- + odNNNmdyo/:/-/hNddNy-`..-+ydNNNmd: + `+mNho:` smmd/ sNNh :dmms` -+ymmo. +-od/ -m${c1}mm${c2}mo -NN+ +m${c1}mm${c2}m- yms: ++sms -.` :so: .NN+ :os/ .-`mNh: +.-hyh+:////- -sNNd:` .--://ohNs- + `:hNNNNNNNMMd/sNMmhsdMMh/ymmNNNmmNNy/ + -+sNNNNMMNNNsmNMo: :NNmymNNNNMMMms: + //oydNMMMMydMMNysNMMmsMMMMMNyo/` + ../-yNMMy--/::/-.sMMmos+.` + -+oyhNsooo+omy/``` + `::ohdmds-` +EOF ;; - esac - # If the info is higher than the ascii/image place the prompt - # based on the info height instead of the ascii/image height. - if ((lines < info_height)); then - [[ "$image_prompt" ]] && printf "\n" - return - else - [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" - lines="$((lines - info_height + 1))" - fi + "Linux Mint"* | "LinuxMint"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. +MMm----::-://////////////oymNMd+` +MMd ${c2}/++ ${c1}-sNMd: +MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: +ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm + NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM + NMm ${c2}dMM` ..` ... ydm. ${c1}dMM + hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM + -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM + -dMNs-${c2}``-::::-------.`` ${c1}dMM + `/dMNmy+/:-------------:/yMMM + ./ydNMMMMMMMMMMMMMMMMMMMMM + .MMMMMMMMMMMMMMMMMMM +EOF + ;; - # Set the prompt location. - if ((lines > 1)); then - case "$kernel_name" in - "OpenBSD") tput cud "$lines" ;; - *) printf "%b" "\e[${lines}B" ;; - esac - fi -} + "MX"*) + set_colors 4 6 7 + read -rd '' ascii_data <<'EOF' +${c3}MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMNMMMMMMMMM +MMMMMMMMMMNs..yMMMMMMMMMMMMMm: +NMMMMMMM +MMMMMMMMMN+ :mMMMMMMMMMNo` -dMMMMMMMM +MMMMMMMMMMMs. `oNMMMMMMh- `sNMMMMMMMMM +MMMMMMMMMMMMN/ -hMMMN+ :dMMMMMMMMMMM +MMMMMMMMMMMMMMh- +ms. .sMMMMMMMMMMMMM +MMMMMMMMMMMMMMMN+` ` +NMMMMMMMMMMMMMM +MMMMMMMMMMMMMMNMMd: .dMMMMMMMMMMMMMMM +MMMMMMMMMMMMm/-hMd- `sNMMMMMMMMMMMMM +MMMMMMMMMMNo` -` :h/ -dMMMMMMMMMMMM +MMMMMMMMMd: /NMMh- `+NMMMMMMMMMM +MMMMMMMNo` :mMMN+` `-hMMMMMMMM +MMMMMMh. `oNMMd: `/mMMMMMM +MMMMm/ -hMd- `sNMMMM +MMNs` - :dMMM +Mm: `oMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM +EOF + ;; -old_functions() { - # Deprecated functions. - # Neofetch 2.0 changed the names of a few variables. - # This function adds backwards compatibility for the - # old variable names. - if type printinfo >/dev/null 2>&1; then - print_info() { printinfo ; } - get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } - get_termfont() { get_term_font; termfont="$term_font"; } - get_localip() { get_local_ip; localip="$local_ip"; } - get_publicip() { get_public_ip; publicip="$public_ip"; } - get_linebreak() { get_line_break; linebreak="$line_break"; } - fi + "NetBSD"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} `-/oshdmNMNdhyo+:-` +${c2}y${c1}/s+:-`` `.-:+oydNMMMMNhs/-`` +${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMNdhmNMMMmdhs+/-` + ${c2}-m+${c1}NMMMMMMMMMMMMMMMMMMMMmy+:` + ${c2}-N/${c1}dMMMMMMMMMMMMMMMds:` + ${c2}-N/${c1}hMMMMMMMMMmho:` + ${c2}-N/${c1}-:/++/:.` +${c2} :M+ + :Mo + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms + :Ms +EOF + ;; - get_birthday() { get_install_date; birthday="$install_date"; } -} + "Netrunner"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} .:oydmMMMMMMmdyo:` + -smMMMMMMMMMMMMMMMMMMds- + +mMMMMMMMMMMMMMMMMMMMMMMMMd+ + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm/ + `hMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMy` + .mMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd` + dMMMMMMMMMMMMMMMMMMMMMMNdhmMMMMMMMMMMh ++MMMMMMMMMMMMMNmhyo+/-. -MMMMMMMMMMMM/ +mMMMMMMMMd+:.` `mMMMMMMMMMMMMd +MMMMMMMMMMMdy/. yMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMNh+` +MMMMMMMMMMMMMMM +mMMMMMMMMMMMMMMMMMs -NMMMMMMMMMMMMMMd ++MMMMMMMMMMMMMMMMMN. `mMMMMMMMMMMMMMMM/ + dMMMMMMMMMMMMMMMMMy hMMMMMMMMMMMMMMMh + `dMMMMMMMMMMMMMMMMM-+MMMMMMMMMMMMMMMd` + `hMMMMMMMMMMMMMMMMmMMMMMMMMMMMMMMMy + /mMMMMMMMMMMMMMMMMMMMMMMMMMMMMm: + +dMMMMMMMMMMMMMMMMMMMMMMMMd/ + -odMMMMMMMMMMMMMMMMMMdo- + `:+ydmNMMMMNmhy+-` +EOF + ;; -old_options() { - [[ -n "$osx_buildversion" ]] && \ - err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." - [[ -n "$osx_codename" ]] && \ - err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." - [[ "$cpu_cores" == "on" ]] && \ - err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." - [[ -n "$image" ]] && \ - { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } + "Nitrux"*) + set_colors 4 + read -rd '' ascii_data <<'EOF' +${c1}`:/. +`/yo +`/yo +`/yo .+:. +`/yo .sys+:.` +`/yo `-/sys+:.` +`/yo ./sss+:.` +`/yo .:oss+:-` +`/yo ./o///:-` +`/yo `.-:///////:` +`/yo `.://///++//-`` +`/yo `.-:////++++/-` +`/yo `-://///++o+/-` +`/yo `-/+o+++ooo+/-` +`/s+:+oooossso/.` +`//+sssssso:. +`+syyyy+:` +:+s+- +EOF + ;; - # All progress_ variables were changed to bar_. - [[ -n "$progress_char" ]] && \ - err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." - [[ -n "$progress_border" ]] && \ - { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ - bar_border="$progress_border"; } - [[ -n "$progress_length" ]] && \ - { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ - bar_length="$progress_length"; } - [[ -n "$progress_color_elapsed" ]] && \ - { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ - bar_color_elapsed="$progress_color_elapsed"; } - [[ -n "$progress_color_total" ]] && \ - { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ - bar_color_total="$progress_color_total"; } + "nixos_small") + set_colors 4 6 + read -rd '' ascii_data <<'EOF' + ${c1}\\\\ \\\\ // + ==\\\\__\\\\/ // + // \\\\// +==// //== + //\\\\___// +// /\\\\ \\\\== + // \\\\ \\\\ +EOF + ;; - # All cpufreq values were changed in 3.0. - [[ "$speed_type" == "current" ]] && \ - err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." - [[ "$speed_type" == "min" ]] && \ - err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." - [[ "$speed_type" == "max" ]] && \ - err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." - [[ "$speed_type" == "bios" ]] && \ - err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." + "NixOS"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' +${c1} ::::. ${c2}'::::: ::::' +${c1} '::::: ${c2}':::::. ::::' +${c1} ::::: ${c2}'::::.::::: +${c1} .......:::::..... ${c2}:::::::: +${c1} ::::::::::::::::::. ${c2}:::::: ${c1}::::. + ::::::::::::::::::::: ${c2}:::::. ${c1}.::::' +${c2} ..... ::::' ${c1}:::::' +${c2} ::::: '::' ${c1}:::::' +${c2} ........::::: ' ${c1}:::::::::::. +${c2}::::::::::::: ${c1}::::::::::::: +${c2} ::::::::::: ${c1}.. ${c1}::::: +${c2} .::::: ${c1}.::: ${c1}::::: +${c2} .::::: ${c1}::::: ${c1}''''' ${c2}..... + ::::: ${c1}':::::. ${c2}......:::::::::::::' + ::: ${c1}::::::. ${c2}':::::::::::::::::' +${c1} .:::::::: ${c2}':::::::::: +${c1} .::::''::::. ${c2}'::::. +${c1} .::::' ::::. ${c2}'::::. +${c1} .:::: :::: ${c2}'::::. +EOF + ;; - # Ascii_logo_size was removed in 3.0. - [[ "$ascii_logo_size" ]] && \ - err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." + "Nurunner"*) + set_colors 4 + read -rd '' ascii_data <<'EOF' +${c1} ,xc + ;00cxXl + ;K0, .xNo. + :KO' .lXx. + cXk. ;xl cXk. + cXk. ;k:.,xo. cXk. + .lXx. :x::0MNl,dd. :KO, + .xNx. cx;:KMMMMMNo'dx. ;KK; + .dNl. cd,cXMMMMMMMMMWd,ox' 'OK: +;WK. 'K,.KMMMMMMMMMMMMMWc.Kx lMO + 'OK: 'dl'xWMMMMMMMMMM0::x: 'OK: + .kNo .xo'xWMMMMMM0;:O: ;KK; + .dXd. .do,oNMMO;ck: ;00, + oNd. .dx,;'cO; ;K0, + oNx. okk; ;K0, + lXx. :KO' + cKk' cXk. + ;00:lXx. + ,kd. +EOF + ;; - # $start and $end were replaced with ${block_range[@]} in 3.0. - [[ "$start" && "$end" ]] && \ - { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ - block_range=("$start" "$end"); } + "NuTyX"*) + set_colors 4 1 + read -rd '' ascii_data <<'EOF' +${c1} . + . + ... + ... + .... .........--. + ..-++-----....--++++++---. + .-++++++-. .-++++++++++++-----.. + .--... .++..-+++--.....-++++++++++--.. + . .-+-. .**- .... ..-+----.. + .+++. .*+. + -++-----. + .+++++- ++. .*+. .....-+++-----. + -+++-++. .+. .-+***++***++--++++. . + -+-. -- -. -*- ...... ..--. +.-. .+- . -+. +. .+- +. + -- -- + -+----. .- + -++-.+. . + .++. -- + +. ----. + . .+. .. + - . + . +EOF + ;; - # Fahrenheit support was added to CPU so the options were changed. - [[ "$cpu_temp" == "on" ]] && \ - { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; - cpu_temp="C"; } + "OBRevenge"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} __ __ + _@@@@ @@@g_ + _@@@@@@ @@@@@@ + _@@@@@@M W@@@@@@_ + j@@@@P ^W@@@@ + @@@@L____ _____Q@@@@ +Q@@@@@@@@@@j@@@@@@@@@@ +@@@@@ T@j@ T@@@@@ +@@@@@ ___Q@J@ _@@@@@ +@@@@@fMMM@@j@jggg@@@@@@ +@@@@@ j@j@^MW@P @@@@ +Q@@@@@ggg@@f@ @@@@@@L +^@@@@WWMMP ^ Q@@@@ + @@@@@_ _@@@@l + W@@@@@g_____g@@@@@P + @@@@@@@@@@@@@@@@l + ^W@@@@@@@@@@@P + ^TMMMMTll +EOF + ;; - # Birthday was renamed to Install Date in 3.0 - [[ -n "$birthday_time" ]] && \ - { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ - install_time="$birthday_time"; } + "openbsd_small") + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1} _____ + \\- -/ + \\_/ \\ + | ${c2}O O${c1} | + |_ < ) 3 ) + / \\ / + /-_____-\\ +EOF + ;; - # Scrot dir was removed in 3.1.0. - [[ -n "$scrot_dir" ]] && scrot_dir= + "OpenBSD"*) + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' + ${c3} _ + (_) +${c1} | . +${c1} . |L /| . ${c3} _ +${c1} _ . |\ _| \--+._/| . ${c3}(_) +${c1} / ||\| Y J ) / |/| ./ + J |)'( | ` F`.'/ ${c3} _ +${c1} -<| F __ .-< ${c3}(_) +${c1} | / .-'${c3}. ${c1}`. /${c3}-. ${c1}L___ + J \\ < ${c3}\ ${c1} | | ${c5}O${c3}\\${c1}|.-' ${c3} _ +${c1} _J \\ .- \\${c3}/ ${c5}O ${c3}| ${c1}| \\ |${c1}F ${c3}(_) +${c1} '-F -<_. \\ .-' `-' L__ +__J _ _. >-' ${c1})${c4}._. ${c1}|-' +${c1} `-|.' /_. ${c4}\_| ${c1} F + /.- . _.< + /' /.' .' `\\ + /L /' |/ _.-'-\\ + /'J ___.---'\| + |\ .--' V | `. ` + |/`. `-. `._) + / .-.\\ + \\ ( `\\ + `.\ +EOF + ;; - # cpu_shorthand was deprecated in 3.3.0 - [[ -n "$cpu_shorthand" ]] && \ - { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and - \$cpu_speed instead."; } -} + "OpenIndiana"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} .sy/ + .yh+ -cache_uname() { - # Cache the output of uname so we don't - # have to spawn it multiple times. - IFS=" " read -ra uname <<< "$(uname -sr)" + ${c1}-+syyyo+- ${c2} /+. + ${c1}+ddo/---/sdh/ ${c2} ym- + ${c1}`hm+ `sms${c2} ym-```````.-. + ${c1}sm+ sm/ ${c2} ym- +s + ${c1}hm. /mo ${c2} ym- /h + ${c1}omo ym: ${c2} ym- `os` + ${c1}smo` .ym+ ${c2} ym- .os- + `` ${c1}:ymy+///oyms- ${c2} ym- .+s+. + ..` ${c1}`:+oo+/-` ${c2} -//oyo- + -:` .:oys/. ++- `./oyys/. +h+` `.-:+oyyyo/-` +`/ossssysso+/-.` +EOF + ;; - kernel_name="${uname[0]}" - kernel_version="${uname[1]}" -} + "OpenMandriva"*) + set_colors 4 3 + read -rd '' ascii_data <<'EOF' +${c2} `` + `-. +${c1} ` ${c2}.--- +${c1} -/ ${c2}-::--` +${c1} `++ ${c2}`----...```-:::::. +${c1} `os. ${c2}.::::::::::::::-``` ` ` +${c1} +s+ ${c2}.::::::::::::::::---...--` +${c1}-ss: ${c2}`-::::::::::::::::-.``.`` +${c1}/ss- ${c2}.::::::::::::-.`` ` +${c1}+ss: ${c2}.::::::::::::- +${c1}/sso ${c2}.::::::-::::::- +${c1}.sss/ ${c2}-:::-.` .::::: +${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: +${c1} -ossso+/:://+/-` ${c2}.:` +${c1} -/+ooo+/-. ${c2}` +EOF + ;; -convert_time() { - # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. - year="$1" - day="${3#0}" + "OpenWrt"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} _______ +| |.-----.-----.-----. +| - || _ | -__| | +|_______|| __|_____|__|__| + |__| + ________ __ +| | | |.----.| |_ +| | | || _|| _| +|________||__| |____| +EOF + ;; - # Split time into hours/minutes. - hour="${4/:*}" - min="${4/${hour}}" + "Open Source Media Center"* | "osmc") + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} -+shdmNNNNmdhs+- + .+hMNho/:..``..:/ohNMh+. + :hMdo. .odMh: + -dMy- -yMd- + sMd- -dMs + hMy +. .+ yMh + yMy dMs. .sMd yMy +:Mm dMNMs` `sMNMd `mM: +yM+ dM//mNs``sNm//Md +My +mM- dM: +NNNN+ :Md -Mm +mM- dM: `oNN+ :Md -Mm +yM+ dM/+NNo` :Md +My +:Mm` dMMNs` :Md `mM: + yMy dMs` -ms yMy + hMy +. yMh + sMd- -dMs + -dMy- -yMd- + :hMdo. .odMh: + .+hMNho/:..``..:/ohNMh+. + -+shdmNNNNmdhs+- +EOF + ;; - # Get month. (Month code is used for day of week) - # Due to different versions of 'ls', the month can be 1, 01 or Jan. - case "$2" in - 1 | 01 | "Jan") month="Jan"; month_code=0 ;; - 2 | 02 | "Feb") month="Feb"; month_code=3 ;; - 3 | 03 | "Mar") month="Mar"; month_code=3 ;; - 4 | 04 | "Apr") month="Apr"; month_code=6 ;; - 5 | 05 | "May") month="May"; month_code=1 ;; - 6 | 06 | "Jun") month="Jun"; month_code=4 ;; - 7 | 07 | "Jul") month="Jul"; month_code=6 ;; - 8 | 08 | "Aug") month="Aug"; month_code=2 ;; - 9 | 09 | "Sep") month="Sep"; month_code=5 ;; - 10 | "Oct") month="Oct"; month_code=0 ;; - 11 | "Nov") month="Nov"; month_code=3 ;; - 12 | "Dec") month="Dec"; month_code=5 ;; - esac + "Oracle"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} + `-/+++++++++++++++++/-.` + `/syyyyyyyyyyyyyyyyyyyyyyys/. + :yyyyo/-...............-/oyyyy/ + /yyys- .oyyy+ +.yyyy` `syyy- +:yyyo /yyy/ +.yyyy` `syyy- + /yyys. .oyyyo + /yyyyo:-...............-:oyyyy/` + `/syyyyyyyyyyyyyyyyyyyyyyys+. + `.:/+ooooooooooooooo+/:.` +EOF + ;; - # Get leap year. - # Source: http://stackoverflow.com/questions/725098/leap-year-calculation - [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ - [[ "$month" =~ (Jan|Feb) ]] && \ - leap_code=1 + "PacBSD"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} :+sMs. + `:ddNMd- -o--` + -sMMMMh: `+N+`` + yMMMMMs` .....-/-... `mNh/ + yMMMMMmh+-`:sdmmmmmmMmmmmddy+-``./ddNMMm + yNMMNMMMMNdyyNNMMMMMMMMMMMMMMMhyshNmMMMm + :yMMMMMMMMMNdooNMMMMMMMMMMMMMMMMNmy:mMMd + +MMMMMMMMMmy:sNMMMMMMMMMMMMMMMMMMMmshs- + :hNMMMMMMN+-+MMMMMMMMMMMMMMMMMMMMMMMs. + .omysmNNhy/+yNMMMMMMMMMMNMMMMMMMMMNdNNy- + /hMM:::::/hNMMMMMMMMMMMm/-yNMMMMMMN.mMNh` +.hMMMMdhdMMMMMMMMMMMMMMmo `sMMMMMMN mMMm- +:dMMMMMMMMMMMMMMMMMMMMMdo+ oMMMMMMN`smMNo` +/dMMMMMMMMMMMMMMMMMMMMMNd/` :yMMMMMN:-hMMM. +:dMMMMMMMMMMMMMMMMMMMMMNh` oMMMMMMNo/dMNN` +:hMMMMMMMMMMMMMMMMMMMMMMNs--sMMMMMMMNNmy++` + sNMMMMMMMMMMMMMMMMMMMMMMMmmNMMMMMMNho::o. + :yMMMMMMMMMMMMMNho+sydNNNNNNNmysso/` -// + /dMMMMMMMMMMMMMs- ````````..`` + .oMMMMMMMMMMMMNs` ./y:` + +dNMMNMMMMMMMmy` ``./ys. + `/hMMMMMMMMMMMNo-`` `.+yy+-` + `-/hmNMNMMMMMMmmddddhhy/-` + `-+oooyMMMdsoo+/:. +EOF + ;; - # Calculate day of week. - # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html - year_code="$((${year/??} + (${year/??} / 4) % 7))" - week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" + "Parabola"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} `.-. `. + `.` `:++. `-+o+. + `` `:+/. `:+/. `-+oooo+ + ``-::-.:+/. `:+/. `-+oooooo+ + `.-:///- ..` .-. `-+oooooooo- + `..-..` `+ooooooooo: +`` :oooooooo/ + `ooooooo: + `oooooo: + -oooo+. + +ooo/` + -ooo- + `+o/. + /+- + //` + -. +EOF + ;; - case "$week_day" in - 0) week_day="Sun" ;; - 1) week_day="Mon" ;; - 2) week_day="Tue" ;; - 3) week_day="Wed" ;; - 4) week_day="Thu" ;; - 5) week_day="Fri" ;; - 6) week_day="Sat" ;; - esac + "Pardus"*) + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1} .smNdy+- `.:/osyyso+:.` -+ydmNs. +/Md- -/ymMdmNNdhso/::/oshdNNmdMmy/. :dM/ +mN. oMdyy- -y `-dMo .Nm +.mN+` sMy hN+ -: yMs `+Nm. + `yMMddMs.dy `+` sMddMMy` + +MMMo .` . oMMM+ + `NM/ `````.` `.````` +MN` + yM+ `.-:yhomy ymohy:-.` +My + yM: yo oy :My + +Ms .N` `N. +h sM+ + `MN - -::::::- : :o:+`NM` + yM/ sh -dMMMMd- ho +y+My + .dNhsohMh-//: /mm/ ://-yMyoshNd` + `-ommNMm+:/. oo ./:+mMNmmo:` + `/o+.-somNh- :yy: -hNmos-.+o/` + ./` .s/`s+sMdd+``+ddMs+s`/s. `/. + : -y. -hNmddmNy. .y- : + -+ `..` +- +EOF + ;; - # Convert 24 hour time to 12 hour time + AM/PM. - case "$install_time_format" in - "12h") - case "$hour" in - [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; - *) time="$((hour - 12))${min} PM" ;; - esac + "Parrot"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} `:oho/-` +`mMMMMMMMMMMMNmmdhy- + dMMMMMMMMMMMMMMMMMMs` + +MMsohNMMMMMMMMMMMMMm/ + .My .+dMMMMMMMMMMMMMh. + + :NMMMMMMMMMMMMNo + `yMMMMMMMMMMMMMm: + /NMMMMMMMMMMMMMy` + .hMMMMMMMMMMMMMN+ + ``-NMMMMMMMMMd- + /MMMMMMMMMMMs` + mMMMMMMMsyNMN/ + +MMMMMMMo :sNh. + `NMMMMMMm -o/ + oMMMMMMM. + `NMMMMMM+ + +MMd/NMh + mMm -mN` + /MM `h: + dM` . + :M- + d: + -+ + - +EOF ;; - *) time="$4" ;; - esac - # Toggle showing the time. - [[ "$install_time" == "off" ]] && unset time + "Parsix"*) + set_colors 3 1 7 8 + read -rd '' ascii_data <<'EOF' + ${c2}-/+/:. + ${c2}.syssssys. + ${c1}.--. ${c2}ssssssssso${c1} ..--. + :++++++: ${c2}+ssssssss+${c1} ./++/+++: + /+++++++++.${c2}.yssooooy`${c1}-+///////o- + /++++++++++.${c2}+soooos:${c1}:+////////+- + :+++++////o-${c2}oooooo-${c1}+/////////- + `-/++//++-${c4}.-----.-${c1}:+/////:- + ${c3}-://::--${c1}-:/:${c4}.--.````.--.${c1}:::-${c3}--::::::. +${c3}-/:::::::://:${c4}.:-` `-:${c3}`:/:::::::--/- +${c3}/::::::::::/-${c4}--. .-.${c3}-/://///::::/ +${c3}-/:::::::::/:${c4}`:-. .-:${c3}`:///////////- + `${c3}-::::--${c1}.-://.${c4}---....---${c1}`:+/:-${c3}--::::-` + ${c1}-/+///+o/-${c4}.----.${c1}.:oo+++o+. + ${c1}-+/////+++o:${c2}syyyyy.${c1}o+++++++++: + ${c1}.+////+++++-${c2}+sssssy+${c1}.++++++++++\ + ${c1}.+:/++++++.${c2}.yssssssy-${c1}`+++++++++: + ${c1}:/+++++- ${c2}+sssssssss ${c1}-++++++- + ${c1}`--` ${c2}+sssssssso ${c1}`--` + ${c2}+sssssy+` + ${c2}`.::-` +EOF + ;; - # Print the install date. - printf "%s" "$week_day $day $month $year $time" -} + "PCBSD"* | "TrueOS"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} .. + s. + +y + yN + -MN `. + :NMs `m + .yMMm` `No + `-/+++sdMMMNs+-`+Ms + `:oo+-` .yMMMMy` `-+oNMh + -oo- +NMMMM/ oMMh- + .s+` ` oMMMMM/ - oMMMhy. + +s`- :: :MMMMMd -o `mMMMy`s+ + y+ h .Ny+oNMMMMMN/ sh+NMMMMo +y + s+ .ds -NMMMMMMMMMMNdhdNMMMMMMh` +s +-h .NM` `hMMMMMMMMMMMMMMNMMNy: h- +y- hMN` hMMmMMMMMMMMMNsdMNs. -y +m` mMMy` oMMNoNMMMMMMo` sMMMo `m +m` :NMMMdyydMMMMo+MdMMMs sMMMd` `m +h- `+ymMMMMMMMM--M+hMMN/ +MMMMy -h +:y `.sMMMMM/ oMM+.yMMNddNMMMMMm y: + y: `s dMMN- .MMMM/ :MMMMMMMMMMh :y + `h: `mdmMMM/ yMMMMs sMMMMMMMMN- :h` + so -NMMMN /mmd+ `dMMMMMMMm- os + :y: `yMMM` `+NMMMMMMNo`:y: + /s+`.omy /NMMMMMNh/.+s: + .+oo:-. /mdhs+::oo+. + -/o+++++++++++/- +EOF + ;; -get_ppid() { - # Get parent process ID of PID. - case "$os" in - "Windows") - ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" - ppid="${ppid/'PPID'}" + "PCLinuxOS"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' + ${c1}mhhhyyyyhhhdN + dyssyhhhhhhhhhhhssyhN + Nysyhhyo/:-.....-/oyhhhssd + Nsshhy+. `/shhysm + dohhy/ -shhsy + dohhs` /hhys +N+hho ${c2}+ssssss+- .+syhys+ ${c1}/hhsy +ohhh` ${c2}ymmo++hmm+`smmy/::+y` ${c1}shh+ ++hho ${c2}ymm- /mmy+mms ${c1}:hhod +/hh+ ${c2}ymmhhdmmh.smm/ ${c1}.hhsh ++hhs ${c2}ymm+::-` /mmy` ` ${c1}/hh+m +yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ + ohhy` ${c2}://` -/+++/- ${c1}ohhom + N+hhy- `shhoh + sshho. `+hhyom + dsyhhs/. `:ohhhoy + dysyhhhso///://+syhhhssh + dhyssyhhhhhhyssyyhN + mddhdhdmN +EOF ;; - "Linux") - ppid="$(grep -i -F "PPid:" "/proc/${1:-$PPID}/status")" - ppid="$(trim "${ppid/PPid:}")" + "Peppermint"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} 8ZZZZZZ${c2}MMMMM +${c1} .ZZZZZZZZZ${c2}MMMMMMM. +${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ +${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM +${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. +${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI +${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM +${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM +${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM +${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM +${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM +${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M +${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 +${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 +${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 +${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z +${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM +${c1} NZZZZZZZZZZZ${c2}MMMMM +${c1} ZZZZZZZZZ${c2}MM) +EOF ;; - *) - ppid="$(ps -p "${1:-$PPID}" -o ppid=)" + "Pop!_OS"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} ///////////// + ///////////////////// + ///////${c2}*767${c1}//////////////// + //////${c2}7676767676*${c1}////////////// + /////${c2}76767${c1}//${c2}7676767${c1}////////////// + /////${c2}767676${c1}///${c2}*76767${c1}/////////////// + ///////${c2}767676${c1}///${c2}76767${c1}.///${c2}7676*${c1}/////// +/////////${c2}767676${c1}//${c2}76767${c1}///${c2}767676${c1}//////// +//////////${c2}76767676767${c1}////${c2}76767${c1}///////// +///////////${c2}76767676${c1}//////${c2}7676${c1}////////// +////////////,${c2}7676${c1},///////${c2}767${c1}/////////// +/////////////*${c2}7676${c1}///////${c2}76${c1}//////////// +///////////////${c2}7676${c1}//////////////////// + ///////////////${c2}7676${c1}///${c2}767${c1}//////////// + //////////////////////${c2}'${c1}//////////// + //////${c2}.7676767676767676767,${c1}////// + /////${c2}767676767676767676767${c1}///// + /////////////////////////// + ///////////////////// + ///////////// +EOF ;; - esac - - printf "%s" "$ppid" -} -get_process_name() { - # Get PID name. - case "$os" in - "Windows") - name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" - name="${name/'COMMAND'}" - name="${name/*\/}" + "Porteus"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} `.-:::-.` + -+ydmNNNNNNNmdy+- + .+dNmdhs+//////+shdmdo. + .smmy+-` ./sdy: + `omdo. `.-/+osssso+/-` `+dy. + `yms. `:shmNmdhsoo++osyyo-``oh. + hm/ .odNmds/.` ``.....:::-+s +/m: `+dNmy:` `./oyhhhhyyooo++so +ys `yNmy- .+hmmho:-.` ``` +s: yNm+` .smNd+. +`` /Nm: +dNd+` + yN+ `smNy. + dm oNNy` + hy -mNm. + +y oNNo + `y` sNN: + `: +NN: + ` .mNo + /mm` + /my` + .sy` + .+: + ` +EOF ;; - "Linux") - name="$(< "/proc/${1:-$PPID}/comm")" + "PostMarketOS"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} ss + `hMMh` + .dMMMMd. + -NMMMMMMN- + /MMMMMMMMMN/ + hMMMMMMMMMMMo + y+`mMMmdNMMMMMMy + `dMM-.-:- .mMMMMMMh` + .mMMMMMMd` `dMMMMMMm. + :NMMMMMMy yMMMMMMN: + /MMMMMMMo oMMMmdmN/ + oMMMMMMM/ /MN.-/:-. + `yMMMMMMN- -:.NMMMMy` + `dMMMMMMM- -/////////////dMMMMMMd` + -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- + :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: ++MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ +EOF ;; - *) - name="$(ps -p "${1:-$PPID}" -o comm=)" + "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} `-/osyyyysosyhhhhhyys+- + -ohmNNmh+/hMMMMMMMMNNNNd+dMMMMNM+ + yMMMMNNmmddo/NMMMNNNNNNNNNo+NNNNNy +.NNNNNNmmmddds:MMNNNNNNNNNNNh:mNNN/ +-NNNdyyyhdmmmd`dNNNNNmmmmNNmdd/os/ +.Nm+shddyooo+/smNNNNmmmmNh. :mmd. + NNNNy:` ./hmmmmmmmNNNN: hNMh + NMN- -++- +NNNNNNNNNNm+..-sMMMM- +.MMo oNNNNo hNNNNNNNNmhdNNNMMMMM+ +.MMs /NNNN/ dNmhs+:-` yMMMMMMMM+ + mMM+ .. `sNN+. hMMMMhhMMM- + +MMMmo:...:sNMMMMMms:` hMMMMm.hMMy + yMMMMMMMMMMMNdMMMMMM::/+o+//dMMd` + sMMMMMMMMMMN+:oyyo:sMMMNNMMMNy` + :mMMMMMMMMMMMmddNMMMMMMMMmh/ + /dMMMMMMMMMMMMMMMMMMNdy/` + .+hNMMMMMMMMMNmdhs/. + .:/+ooo+/:-. +EOF ;; - esac - - printf "%s" "$name" -} - -decode_url() { - decode="${1//+/ }" - printf "%b" "${decode//%/\\x}" -} - -# FINISH UP - -usage() { printf "%s" "\ -Usage: neofetch --option \"value\" --option \"value\" - -Neofetch is a CLI system information tool written in BASH. Neofetch -displays information about your system next to an image, your OS logo, -or any ASCII file of your choice. - -NOTE: Every launch flag has a config option. - -Options: - -INFO: - --disable infoname Allows you to disable an info line from appearing - in the output. - - NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - - --os_arch on/off Hide/Show OS architecture. - --speed_type type Change the type of cpu speed to display. - Possible values: current, min, max, bios, - scaling_current, scaling_min, scaling_max - - NOTE: This only supports Linux with cpufreq. - - --speed_shorthand on/off Whether or not to show decimals in CPU speed. - - NOTE: This flag is not supported in systems with CPU speed less than - 1 GHz. - - --cpu_brand on/off Enable/Disable CPU brand in output. - --cpu_cores type Whether or not to display the number of CPU cores - Possible values: logical, physical, off - - NOTE: 'physical' doesn't work on BSD. - - --cpu_speed on/off Hide/Show cpu speed. - --cpu_temp C/F/off Hide/Show cpu temperature. - - NOTE: This only works on Linux and BSD. - - NOTE: For FreeBSD and NetBSD-based systems, you need to enable - coretemp kernel module. This only supports newer Intel processors. - - --distro_shorthand on/off Shorten the output of distro (tiny, on, off) - - NOTE: This option won't work in Windows (Cygwin) - - --kernel_shorthand on/off Shorten the output of kernel - - NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) - - --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) - --refresh_rate on/off Whether to display the refresh rate of each monitor - Unsupported on Windows - --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) - --gpu_type type Which GPU to display. (all, dedicated, integrated) - - NOTE: This only supports Linux. - - --gtk_shorthand on/off Shorten output of gtk theme/icons - --gtk2 on/off Enable/Disable gtk2 theme/font/icons output - --gtk3 on/off Enable/Disable gtk3 theme/font/icons output - --shell_path on/off Enable/Disable showing \$SHELL path - --shell_version on/off Enable/Disable showing \$SHELL version - --disk_show value Which disks to display. - Possible values: '/', '/dev/sdXX', '/path/to/mount point' - - NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') - - --disk_subtitle type What information to append to the Disk subtitle. - Takes: name, mount, dir - - 'name' shows the disk's name (sda1, sda2, etc) - - 'mount' shows the disk's mount point (/, /mnt/Local Disk, etc) - - 'dir' shows the basename of the disks's path. (/, Local Disk, etc) - - --ip_host url URL to query for public IP - --song_shorthand on/off Print the Artist/Title on separate lines - --music_player player-name Manually specify a player to use. - Available values are listed in the config file - --install_time on/off Enable/Disable showing the time in Install Date output. - --install_time_format 12h/24h - Set time format in Install Date to be 12 hour or 24 hour. - -TEXT FORMATTING: - --colors x x x x x x Changes the text colors in this order: - title, @, underline, subtitle, colon, info - --underline on/off Enable/Disable the underline. - --underline_char char Character to use when underlining title - --bold on/off Enable/Disable bold text -COLOR BLOCKS: - --color_blocks on/off Enable/Disable the color blocks - --block_width num Width of color blocks in spaces - --block_height num Height of color blocks in lines - --block_range num num Range of colors to print as blocks + "Qubes"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} `..--..` + `.----------.` + `..----------------..` + `.------------------------.`` + `..-------------....-------------..` +.::----------..`` ``..----------:+: +:////:----..` `..---:/ossso +:///////:` `/osssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:///////: /ssssssso +:////////-` .:sssssssso +:///////////-.` `-/osssssssssso +`//////////////:-```.:+ssssssssssssso- + .-://////////////sssssssssssssso/-` + `.:///////////sssssssssssssso:. + .-:///////ssssssssssssssssss/` + `.:////ssss+/+ssssssssssss. + `--//- `-/osssso/. +EOF + ;; -BARS: - --bar_char 'elapsed char' 'total char' - Characters to use when drawing bars. - --bar_border on/off Whether or not to surround the bar with '[]' - --bar_length num Length in spaces to make the bars. - --bar_colors num num Colors to make the bar. - Set in this order: elapsed, total - --cpu_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --memory_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --battery_display mode Bar mode. - Possible values: bar, infobar, barinfo, off - --disk_display mode Bar mode. - Possible values: bar, infobar, barinfo, off + "Raspbian"*) + set_colors 2 1 + read -rd '' ascii_data <<'EOF' +${c1} `.::///+:/-. --///+//-:`` + `+oooooooooooo: `+oooooooooooo: + /oooo++//ooooo: ooooo+//+ooooo. + `+ooooooo:-:oo- +o+::/ooooooo: + `:oooooooo+`` `.oooooooo+- + `:++ooo/. :+ooo+/.` + ${c2}...` `.----.` ``.. + .::::-``:::::::::.`-:::-` + -:::-` .:::::::-` `-:::- + `::. `.--.` `` `.---.``.::` + .::::::::` -::::::::` ` + .::` .:::::::::- `::::::::::``::. +-:::` ::::::::::. ::::::::::.`:::- +:::: -::::::::. `-:::::::: :::: +-::- .-:::-.``....``.-::-. -::- + .. `` .::::::::. `..`.. + -:::-` -::::::::::` .:::::` + :::::::` -::::::::::` :::::::. + .::::::: -::::::::. :::::::: + `-:::::` ..--.` ::::::. + `...` `...--..` `...` + .:::::::::: + `.-::::-` +EOF + ;; -IMAGE BACKEND: - --backend backend Which image backend to use. - Possible values: 'ascii', 'caca', 'catimg', '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/' - --ascii source Shortcut to use 'ascii' backend. - --caca source Shortcut to use 'caca' backend. - --catimg source Shortcut to use 'catimg' backend. - --iterm2 source Shortcut to use 'iterm2' backend. - --jp2a source Shortcut to use 'jp2a' backend. - --kitty source Shortcut to use 'kitty' backend. - --pixterm source Shortcut to use 'pixterm' backend. - --sixel source Shortcut to use 'sixel' backend. - --termpix source Shortcut to use 'termpix' backend. - --tycat source Shortcut to use 'tycat' backend. - --w3m source Shortcut to use 'w3m' backend. - --off Shortcut to use 'off' backend. + "Red Star"* | "Redstar"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} .. + .oK0l + :0KKKKd. + .xKO0KKKKd + ,Od' .d0000l + .c;. .'''... ..'. +.,:cloddxxxkkkkOOOOkkkkkkkkxxxxxxxxxkkkx: +;kOOOOOOOkxOkc'...',;;;;,,,'',;;:cllc:,. + .okkkkd,.lko .......',;:cllc:;,,'''''. + .cdo. :xd' cd:. ..';'',,,'',,;;;,'. + . .ddl.;doooc'..;oc;'..';::;,'. + coo;.oooolllllllcccc:'. . + .ool''lllllccccccc:::::;. + ;lll. .':cccc:::::::;;;;' + :lcc:'',..';::::;;;;;;;,,. + :cccc::::;...';;;;;,,,,,,. + ,::::::;;;,'. ..',,,,'''. + ........ ...... +EOF + ;; - NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', - '/path/to/ascii', '/path/to/dir/' + "Redhat"* | "Red Hat"* | "rhel"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} `.-..........` + `////////::.`-/. + -: ....-////////. + //:-::///////////` + `--::: `-://////////////: + //////- ``.-:///////// .` + `://////:-.` :///////::///:` + .-/////////:---/////////////: + .-://////////////////////. +${c2} yMN+`.-${c1}::///////////////-` +${c2} .-`:NMMNMs` `..-------..` + MN+/mMMMMMhoooyysshsss +MMM MMMMMMMMMMMMMMyyddMMM+ + MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM + MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM + MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM +EOF + ;; -ASCII: - --ascii_colors x x x x x x Colors to print the ascii art - --ascii_distro distro Which Distro's ascii art to print + "Refracted Devuan"*) + set_colors 8 7 + read -rd '' ascii_data <<'EOF' +${c2} A + VW + VVW\\ + .yWWW\\ + ,;,,u,;yy;;v;uyyyyyyy ,WWWWW^ + *WWWWWWWWWWWWWWWW/ $VWWWWw , + ^*%WWWWWWVWWX $WWWW** ,yy + , "**WWW/' **' ,yy/WWW*` + &WWWWwy `*` <,ywWW%VWWW* + yWWWWWWWWWW* ., "**WW%W + ,&WWWWWM*"` ,y/ &WWWww ^* + XWWX*^ ,yWWWW09 .WWWWWWWWwy, + *` &WWWWWM WWWWWWWWWWWWWww, + (WWWWW` /#####WWW*********** + ^WWWW + VWW + Wh. + V/ +EOF + ;; - NOTE: Arch and Ubuntu have 'old' logo variants. + "Rosa"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ROSAROSAROSAROSAR + ROSA AROS + ROS SAROSAROSAROSAR AROS + RO ROSAROSAROSAROSAROSAR RO + ARO AROSAROSAROSARO AROS ROS + ARO ROSAROS OSAR ROSA ROS + RO AROSA ROSAROSAROSA ROSAR RO +RO ROSAR ROSAROSAROSAR R ROSARO RO +RO ROSA AROSAROSAROSA AR ROSARO AR +RO AROS ROSAROSAROSA ROS AROSARO AR +RO AROS ROSAROSARO ROSARO ROSARO AR +RO ROS AROSAROS ROSAROSA AROSAR AR +RO ROSA ROS ROSAROSAR ROSARO RO + RO ROS AROSAROSAROSA ROSARO AR + ARO ROSA ROSAROSAROS AROSAR ARO + ARO OROSA R ROSAROS ROS + RO AROSAROS AROSAROSAR RO + AROS AROSAROSAROSARO AROS + ROSA SARO + ROSAROSAROSAROSAR +EOF + ;; - NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. + "sabotage"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} .|'''.| | '||''|. ..|''|| + ||.. ' ||| || || .|' || + ''|||. | || ||'''|. || || +. '|| .''''|. || || '|. || +|'....|' .|. .||. .||...|' ''|...|' - NOTE: Ubuntu has flavor variants. +|''||''| | ..|'''.| '||''''| + || ||| .|' ' || . + || | || || .... ||''| + || .''''|. '|. || || + .||. .|. .||. ''|...'| .||.....| +EOF + ;; - NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. + "Sabayon"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ........... + .. .. + .. .. + .. ${c2}o ${c1}.. + .. ${c2}:W' ${c1}.. + .. ${c2}.d. ${c1}.. +:. ${c2}.KNO ${c1}.: +:. ${c2}cNNN. ${c1}.: +: ${c2}dXXX, ${c1}: +: ${c2}. dXXX, .cd, ${c1}: +: ${c2}'kc .. dKKK. ,ll;:' ${c1}: +: ${c2}.xkkxc;..dkkkc',cxkkl ${c1}: +:. ${c2}.,cdddddddddddddo:. ${c1}.: + .. ${c2}:lllllll: ${c1}.. + .. ${c2}',,,,, ${c1}.. + .. .. + .. .. + ............... +EOF + ;; - NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, - OpenBSD, and Void have a smaller logo variant. + "SailfishOS"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} .+eWWW + .+ee+++eee e. + .ee++eeeeeeee +e. + .e++ee++eeeeeee+eee+e+ + ee.e+.ee+eee++eeeeee+ + W.+e.e+.e++ee+eee + W.+e.W.ee.W++ee' + +e.W W.e+.W.W+ + W.e.+e.W W W. + e e e +e.W.W + .W W W. + W.+e.W. + W++e.ee+. + ++ +ee++eeeee++. + ' '+++e 'ee. + ee + ee + e +EOF + ;; - NOTE: Use '{distro name}_small' to use the small variants. + "SalentOS"*) + set_colors 2 1 3 7 + read -rd '' ascii_data <<'EOF' +${c1} ``..`` + .-:+oshdNMMMMMMNdhyo+:-.` + -oydmMMMMMMMMMMMMMMMMMMMMMMMMMMNdhs/ +${c4} +hdddm${c1}NMMMMMMMMMMMMMMMMMMMMMMMMN${c4}mdddh+` +${c2}`MMMMMN${c4}mdddddm${c1}MMMMMMMMMMMM${c4}mdddddm${c3}NMMMMM- +${c2} mMMMMMMMMMMMN${c4}ddddhyyhhddd${c3}NMMMMMMMMMMMM` +${c2} dMMMMMMMMMMMMMMMMM${c4}oo${c3}MMMMMMMMMMMMMMMMMN` +${c2} yMMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMd +${c2} +MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMy +${c2} :MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMMo +${c2} .MMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM/ +${c2} `NMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMM- +${c2} mMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMN` +${c2} hMMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMm +${c2} /MMMMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMMMMy +${c2} .+hMMMMMMMMMMMMM${c4}hh${c3}MMMMMMMMMMMMMms: +${c2} `:smMMMMMMMMM${c4}hh${c3}MMMMMMMMMNh+. +${c2} .+hMMMMMM${c4}hh${c3}MMMMMMdo: +${c2} `:smMM${c4}yy${c3}MMNy/` + ${c2}.- ${c4}`${c3}:. +EOF + ;; - --ascii_bold on/off Whether or not to bold the ascii logo. - -L, --logo Hide the info text and only show the ascii logo. + "Scientific"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} =/;;/- + +: // + /; /; + -X H. +.//;;;:;;-, X= :+ .-;:=;:;#;. +M- ,=;;;#:, ,:#;;:=, ,@ +:# :#.=/++++/=.$= #= + ,#; #/:+/;,,/++:+/ ;+. + ,+/. ,;@+, ,#H;, ,/+, + ;+;;/= @. ${c3}.H${c2}#${c3}#X ${c1}-X :///+; + ;+=;;;.@, ${c2}.X${c3}M${c2}@$. ${c1}=X.//;=#/. + ,;: :@#= =$H: .+#- + ,#= #;-///==///-// =#, +;+ :#-;;;:;;;;-X- +: +@- .-;;;;M- =M/;;;-. -X + :;;::;;-. #- :+ ,-;;-;:== + ,X H. + ;/ #= + // +; + '////' +EOF + ;; - Possible values: bar, infobar, barinfo, off + "Siduction"*) + set_colors 4 4 + read -rd '' ascii_data <<'EOF' +${c1} _aass, + jQh: =$w + QWmwawQW + )$QQQQ@( .. + _a_a. ~??^ syDY?Sa, + _mW>-<$c jWmi imm. + ]QQwayQE 4QQmgwmQQ` + ?WWQWP' -9QQQQQ@'._aas, + _a%is. .adYYs,. -"?!` aQB*~^3$c +_Qh;.nm .QWc. {QL ]QQp;..vmQ/ +"QQmmQ@ -QQQggmQP ]QQWmggmQQ( + -???" "$WQQQY` __, ?QQQQQQW! + _yZ!?q, - .yWY!!Sw, "???^ + .QQa_=qQ mQm>..vmm + $QQWQQP $QQQgmQQ@ + "???" _aa, -9WWQQWY` + _mB>~)$a -~~ + mQms_vmQ. + ]WQQQQQP + -?T??" +EOF + ;; -IMAGE: - --loop Redraw the image constantly until Ctrl+C is used. This fixes issues - in some terminals emulators when using image mode. - --size 00px | --size 00% How to size the image. - Possible values: auto, 00px, 00%, none - --crop_mode mode Which crop mode to use - Takes the values: normal, fit, fill - --crop_offset value Change the crop offset for normal mode. - Possible values: northwest, north, northeast, - west, center, east, southwest, south, southeast + "Slackware"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ::::::: + ::::::::::::::::::: + ::::::::::::::::::::::::: + ::::::::${c2}cllcccccllllllll${c1}:::::: + :::::::::${c2}lc dc${c1}::::::: + ::::::::${c2}cl clllccllll oc${c1}::::::::: + :::::::::${c2}o lc${c1}::::::::${c2}co oc${c1}:::::::::: + ::::::::::${c2}o cccclc${c1}:::::${c2}clcc${c1}:::::::::::: + :::::::::::${c2}lc cclccclc${c1}::::::::::::: +::::::::::::::${c2}lcclcc lc${c1}:::::::::::: +::::::::::${c2}cclcc${c1}:::::${c2}lccclc oc${c1}::::::::::: +::::::::::${c2}o l${c1}::::::::::${c2}l lc${c1}::::::::::: + :::::${c2}cll${c1}:${c2}o clcllcccll o${c1}::::::::::: + :::::${c2}occ${c1}:${c2}o clc${c1}::::::::::: + ::::${c2}ocl${c1}:${c2}ccslclccclclccclclc${c1}::::::::::::: + :::${c2}oclcccccccccccccllllllllllllll${c1}::::: + ::${c2}lcc1lcccccccccccccccccccccccco${c1}:::: + :::::::::::::::::::::::::::::::: + :::::::::::::::::::::::::::: + :::::::::::::::::::::: + :::::::::::: +EOF + ;; - --xoffset px How close the image will be to the left edge of the - window. This only works with w3m. - --yoffset px How close the image will be to the top edge of the - window. This only works with w3m. - --bg_color color Background color to display behind transparent image. - This only works with w3m. - --gap num Gap between image and text. + "SliTaz"*) + set_colors 3 3 + read -rd '' ascii_data <<'EOF' +${c1} @ @( @ + @@ @@ @ @/ + @@ @@ @@ @@ + @@ %@@ @@ @@ + @@ %@@@ @@@@@. @@@@ @@ + @@@ @@@@ @@@@@@@ &@@@ @@@ + @@@@@@@ %@@@@@@@@@@@@ &@@@% @@@@@@@/ + ,@@@@@@@@@@@@@@@@@@@@@@@@@ + .@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@/ +@@@@@@. @@@@@@@@@@@@@@@@@@@@@ /@@@@@@ +@@ @@@@@ @@@@@@@@@@@@, @@@@@ @@@ +@@ @@@@. @@@@@@@@@@@@@% #@@@@ @@. +@@ ,@@ @@@@@@@@@@@@@ @@@ @@ +@ @@. @@@@@@@@@@@@@ @@@ *@ +@ @@ @@@@@@@@@@@@ @@ @ + @ @@@@@@@@@. #@ + @ ,@@@@@ @ +EOF + ;; - NOTE: --gap can take a negative value which will move the text - closer to the left side. + "SmartOS"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1}yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyys oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyy oyyyyyyyyyyyyyyyy +yyyys yyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyy syyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy oyyyyyyyyy syyyy +yyyyyyyyyyyyyyyy syyyyyyyyy syyyy +yyyyyyyyyyyyyyyy yyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +EOF + ;; - --clean Delete cached files and thumbnails. + "Solus"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} -``````````` + `-+/------------.` + .---:mNo---------------. + .-----yMMMy:---------------. + `------oMMMMMm/----------------` + .------/MMMMMMMN+----------------. + .------/NMMMMMMMMm-+/--------------. +`------/NMMMMMMMMMN-:mh/-------------` +.-----/NMMMMMMMMMMM:-+MMd//oso/:-----. +-----/NMMMMMMMMMMMM+--mMMMh::smMmyo:-- +----+NMMMMMMMMMMMMMo--yMMMMNo-:yMMMMd/. +.--oMMMMMMMMMMMMMMMy--yMMMMMMh:-yMMMy-` +`-sMMMMMMMMMMMMMMMMh--dMMMMMMMd:/Ny+y. +`-/+osyhhdmmNNMMMMMm-/MMMMMMMmh+/ohm+ + .------------:://+-/++++++${c1}oshddys: + -hhhhyyyyyyyyyyyhhhhddddhysssso- + `:ossssssyysssssssssssssssso:` + `:+ssssssssssssssssssss+- + `-/+ssssssssssso+/-` + `.-----..` +EOF + ;; -SCREENSHOT: - -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- - shot function will use \$scrot_dir and \$scrot_name. - -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. - --image_host imgur/teknik Website to upload scrots to. - --scrot_cmd cmd Screenshot program to launch + "Source Mage"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} :ymNMNho. +.+sdmNMMMMMMMMMMy` +.-::/yMMMMMMMMMMMm- + sMMMMMMMMMMMm/ + /NMMMMMMMMMMMMMm: + .MMMMMMMMMMMMMMMMM: + `MMMMMMMMMMMMMMMMMN. + NMMMMMMMMMMMMMMMMMd + mMMMMMMMMMMMMMMMMMMo + hhMMMMMMMMMMMMMMMMMM. + .`/MMMMMMMMMMMMMMMMMs + :mMMMMMMMMMMMMMMMN` + `sMMMMMMMMMMMMMMM+ + /NMMMMMMMMMMMMMN` + oMMMMMMMMMMMMM+ + ./sd.-hMMMMMMMMmmN` + ./+oyyyh- `MMMMMMMMMmNh + sMMMMMMMMMmmo + `NMMMMMMMMMd: + -dMMMMMMMMMo + -shmNMMms. +EOF + ;; -OTHER: - --config /path/to/config Specify a path to a custom config file - --config none Launch the script without a config file - --stdout Turn off all colors and disables any ASCII/image backend. - --help Print this text and exit - --version Show neofetch version - -v Display error messages. - -vv Display a verbose log for error reporting. + "Sparky"*) + set_colors 1 7 + read -rd '' ascii_data <<'EOF' +${c1} + . `-:-` + .o` .-///-` + `oo` .:/++:. + os+` -/+++:` ``.........``` + /ys+`./+++/-.-::::::----......`` + `syyo`++o+--::::-::/+++/-`` + -yyy+.+o+`:/:-:sdmmmmmmmmdy+-` +::-` :yyy/-oo.-+/`ymho++++++oyhdmdy/` +`/yy+-`.syyo`+o..o--h..osyhhddhs+//osyy/` + -ydhs+-oyy/.+o.-: ` ` :/::+ydhy+```-os- + .sdddy::syo--/:. `.:dy+-ohhho ./: + :yddds/:+oo+//:-`- /+ +hy+.shhy: `` + `:ydmmdysooooooo-.ss`/yss--oyyo + `./ossyyyyo+:-/oo:.osso- .oys + ``..-------::////.-oooo/ :so + `...----::::::::--.`/oooo: .o: + ``````` ++o+:` `:` + ./+/-` ` + `-:-. + `` +EOF + ;; -DEVELOPER: - --gen-man Generate a manpage for Neofetch in your PWD. (Requires GNU help2man) + "SteamOS"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} .,,,,. + .,'onNMMMMMNNnn',. + .'oNMANKMMMMMMMMMMMNNn'. + .'ANMMMMMMMXKNNWWWPFFWNNMNn. + ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, + ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, +,VNNWP+${c2}######${c1}+WW, ${c2}+: ${c1}:+, +MMM, +'${c2}+#############, +. ,+' ${c1}+NMMM +${c2} '*#########*' '*,,*' ${c1}.+NMMMM. +${c2} `'*###*' ,.,;###${c1}+WNM, +${c2} .,;;, .;##########${c1}+W +${c2},',. '; ,+##############' + '###+. :,. .,; ,###############' + '####.. `'' .,###############' + '#####+++################' + '*##################*' + ''*##########*'' + '''''' +EOF + ;; + "SunOS" | "Solaris") + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. +EOF + ;; -Report bugs to https://github.com/dylanaraps/neofetch/issues + "openSUSE Tumbleweed"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c2} ...... + .,cdxxxoc,. .:kKMMMNWMMMNk:. + cKMMN0OOOKWMMXo. ; ;0MWk:. .:OMMk. + ;WMK;. .lKMMNM, :NMK, .OMW; + cMW; 'WMMMN ,XMK, oMM' +.MMc ..;l. xMN: KM0 +'MM. 'NMO oMM +.MM, .kMMl xMN + KM0 .kMM0. .dl:,.. .WMd + .XM0. ,OMMK, OMMMK. .XMK + oWMO:. .;xNMMk, NNNMKl. .xWMx + :ONMMNXMMMKx; . ,xNMWKkxllox0NMWk, + ..... .:dOOXXKOxl, +EOF + ;; -" -exit 1 -} + "openSUSE"* | "open SUSE"* | "SUSE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c2} .;ldkO0000Okdl;. + .;d00xl:^''''''^:ok00d;. + .d00l' 'o00d. + .d0Kd'${c1} Okxol:;,. ${c2}:O0d. + .OK${c1}KKK0kOKKKKKKKKKKOxo:, ${c2}lKO. + ,0K${c1}KKKKKKKKKKKKKKK0P^${c2},,,${c1}^dx:${c2} ;00, +.OK${c1}KKKKKKKKKKKKKKKk'${c2}.oOPPb.${c1}'0k.${c2} cKO. +:KK${c1}KKKKKKKKKKKKKKK: ${c2}kKx..dd ${c1}lKd${c2} 'OK: +dKK${c1}KKKKKKKKKOx0KKKd ${c2}^0KKKO' ${c1}kKKc${c2} dKd +dKK${c1}KKKKKKKKKK;.;oOKx,..${c2}^${c1}..;kKKK0.${c2} dKd +:KK${c1}KKKKKKKKKK0o;...^cdxxOK0O/^^' ${c2}.0K: + kKK${c1}KKKKKKKKKKKKK0x;,,......,;od ${c2}lKk + '0K${c1}KKKKKKKKKKKKKKKKKKKK00KKOo^ ${c2}c00' + 'kK${c1}KKOxddxkOO00000Okxoc;'' ${c2}.dKk' + l0Ko. .c00l' + 'l0Kk:. .;xK0l' + 'lkK0xl:;,,,,;:ldO0kl' + '^:ldxkkkkxdl:^' +EOF + ;; -get_args() { - # Check the commandline flags early for '--config'. - [[ "$*" != *--config* ]] && get_user_config + "SwagArch"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} .;ldkOKXXNNNNXXK0Oxoc,. + ,lkXMMNK0OkkxkkOKWMMMMMMMMMM; + 'K0xo ..,;:c:. `'lKMMMMM0 + .lONMMMMMM' `lNMk' +${c2} ;WMMMMMMMMMO. ${c1}....::... +${c2} OMMMMMMMMMMMMKl. ${c1}.,;;;;;ccccccc, +${c2} `0MMMMMMMMMMMMMM0: ${c1}.. .ccccccc. +${c2} 'kWMMMMMMMMMMMMMNo. ${c1}.,:' .ccccccc. +${c2} `c0MMMMMMMMMMMMMN,${c1},:c; :cccccc: +${c2} ckl. `lXMMMMMMMMMX${c1}occcc:.. ;ccccccc. +${c2}dMMMMXd, `OMMMMMMWk${c1}ccc;:''` ,ccccccc: +${c2}XMMMMMMMWKkxxOWMMMMMNo${c1}ccc; .cccccccc. +${c2} `':ldxO0KXXXXXK0Okdo${c1}cccc. :cccccccc. + :ccc:' `cccccccc:, + '' +EOF + ;; - while [[ "$1" ]]; do - case "$1" in - # Info - "--os_arch") os_arch="$2" ;; - "--cpu_cores") cpu_cores="$2" ;; - "--cpu_speed") cpu_speed="$2" ;; - "--speed_type") speed_type="$2" ;; - "--speed_shorthand") speed_shorthand="$2" ;; - "--distro_shorthand") distro_shorthand="$2" ;; - "--kernel_shorthand") kernel_shorthand="$2" ;; - "--uptime_shorthand") uptime_shorthand="$2" ;; - "--cpu_brand") cpu_brand="$2" ;; - "--gpu_brand") gpu_brand="$2" ;; - "--gpu_type") gpu_type="$2" ;; - "--refresh_rate") refresh_rate="$2" ;; - "--gtk_shorthand") gtk_shorthand="$2" ;; - "--gtk2") gtk2="$2" ;; - "--gtk3") gtk3="$2" ;; - "--shell_path") shell_path="$2" ;; - "--shell_version") shell_version="$2" ;; - "--ip_host") public_ip_host="$2" ;; - "--song_shorthand") song_shorthand="$2" ;; - "--music_player") music_player="$2" ;; - "--install_time") install_time="$2" ;; - "--install_time_format") install_time_format="$2" ;; - "--cpu_temp") - cpu_temp="$2" - [[ "$cpu_temp" == "on" ]] && cpu_temp="C" - ;; + "Tails"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} `` + ./yhNh +syy/Nshh `:o/ +N:dsNshh █ `ohNMMd +N-/+Nshh `yMMMMd +N-yhMshh yMMMMd +N-s:hshh █ yMMMMd so//. +N-oyNsyh yMMMMd d Mms. +N:hohhhd:. yMMMMd syMMM+ +Nsyh+-..+y+- yMMMMd :mMM+ ++hy- -ss/`yMMMM `+d+ + :sy/. ./yNMMMMm `` + .+ys- `:+hNMMMMMMy/` + `hNmmMMMMMMMMMMMMdo. + dMMMMMMMMMMMMMMMMMNh: + +hMMMMMMMMMMMMMMMMMmy. + -oNMMMMMMMMMMmy+.` + `:yNMMMds/.` + .//` +EOF + ;; - "--disk_subtitle") disk_subtitle="$2" ;; - "--disk_show") - unset disk_show - for arg in "$@"; do - case "$arg" in - "--disk_show") ;; - "-"*) break ;; - *) disk_show+=("$arg") ;; - esac - done - ;; + "Trisquel"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' +${c1} ▄▄▄▄▄▄ + ▄█████████▄ + ▄▄▄▄▄▄ ████▀ ▀████ + ▄██████████▄ ████▀ ▄▄ ▀███ + ▄███▀▀ ▀▀████ ███▄ ▄█ ███ +▄███ ▄▄▄ ████▄ ▀██████ ▄███ +███ █▀▀██▄ █████▄ ▀▀ ▄████ +▀███ ███ ███████▄▄ ▄▄██████ +${c1} ▀███▄ ▄███ █████████████${c2}████▀ +${c1} ▀█████████ ███████${c2}███▀▀▀ + ▀▀███▀▀ ██████▀▀ + ██████▀ ▄▄▄▄ + █████▀ ████████ + █████ ███▀ ▀███ + ████▄ ██▄▄▄ ███ + █████▄ ▀▀ ▄██ + ██████▄▄▄████ + ▀▀█████▀▀ +EOF + ;; - "--disable") - for func in "$@"; do - case "$func" in - "--disable") continue ;; - "-"*) break ;; - *) - ((bash_version >= 4)) && func="${func,,}" - unset -f "get_$func" - ;; - esac - done - ;; + "Ubuntu-Budgie"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} ./oydmMMMMMMmdyo/. + :smMMMMMMMMMMMhs+:++yhs: + `omMMMMMMMMMMMN+` `odo` + /NMMMMMMMMMMMMN- `sN/ + `hMMMMmhhmMMMMMMh sMh` + .mMmo- /yMMMMm` `MMm. + mN/ yMMMMMMMd- MMMm +oN- oMMMMMMMMMms+//+o+: :MMMMo +m/ +NMMMMMMMMMMMMMMMMm. :NMMMMm +M` .NMMMMMMMMMMMMMMMNodMMMMMMM +M- sMMMMMMMMMMMMMMMMMMMMMMMMM +mm` mMMMMMMMMMNdhhdNMMMMMMMMMm +oMm/ .dMMMMMMMMh: :dMMMMMMMo + mMMNyo/:/sdMMMMMMMMM+ sMMMMMm + .mMMMMMMMMMMMMMMMMMs `NMMMm. + `hMMMMMMMMMMM.oo+. `MMMh` + /NMMMMMMMMMo sMN/ + `omMMMMMMMMy. :dmo` + :smMMMMMMMh+-` `.:ohs: + ./oydmMMMMMMdhyo/. +EOF + ;; - # Text Colors - "--colors") - unset colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) colors+=("$arg") ;; - esac - done - colors+=(7 7 7 7 7 7) - ;; + "Ubuntu-GNOME"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c3} ./o. + .oooooooo + .oooo```soooo + .oooo` `soooo + .ooo` ${c4}.o.${c3} `\/ooo. + :ooo ${c4}:oooo.${c3} `\/ooo. + sooo ${c4}`ooooo${c3} \/oooo + \/ooo ${c4}`soooo${c3} `ooooo + `soooo ${c4}`\/ooo${c3} `soooo +${c4}./oo ${c3}`\/ooo ${c4}`/oooo.${c3} `/ooo +${c4}`\/ooo. ${c3}`/oooo. ${c4}`/oooo.${c3} `` +${c4} `\/ooo. ${c3}/oooo ${c4}/ooo` +${c4} `ooooo ${c3}`` ${c4}.oooo +${c4} `soooo. .oooo` + `\/oooooooooo` + ``\/oo`` +EOF + ;; - # Text Formatting - "--underline") underline_enabled="$2" ;; - "--underline_char") underline_char="$2" ;; - "--bold") bold="$2" ;; + "Ubuntu-MATE"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} `:+shmNNMMNNmhs+:` + .odMMMMMMMMMMMMMMMMMMdo. + /dMMMMMMMMMMMMMMMmMMMMMMMMd/ + :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: + `yMMMMMMMMMms:..-::oM: -omMMMMMy` + `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` + hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh +/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ +hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN +hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh +/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ + hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh + `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` + yMMMMMMMMMms/..-::oM: .+dMMMMMy + :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: + /dMMMMMMMMMMMMMMMdNMMMMMMMd/ + .odMMMMMMMMMMMMMMMMMMdo. + `:+shmNNMMNNmhs+:` +EOF + ;; - # Color Blocks - "--color_blocks") color_blocks="$2" ;; - "--block_range") block_range=("$2" "$3") ;; - "--block_width") block_width="$2" ;; - "--block_height") block_height="$2" ;; + "ubuntu_old") + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} ./+o+- +${c2} yyyyy- ${c1}-yyyyyy+ +${c2} ${c2}://+//////${c1}-yyyyyyo +${c3} .++ ${c2}.:/++++++/-${c1}.+sss/` +${c3} .:++o: ${c2}/++++++++/:--:/- +${c3} o:+o+:++.${c2}`..```.-/oo+++++/ +${c3} .:+o:+o/.${c2} `+sssoo+/ +${c2} .++/+:${c3}+oo+o:`${c2} /sssooo. +${c2}/+++//+:${c3}`oo+o${c2} /::--:. +${c2}+/+o+++${c3}`o++o${c1} ++////. +${c2} .++.o+${c3}++oo+:`${c1} /dddhhh. +${c3} .+.o+oo:.${c1} `oddhhhh+ +${c3} +.++o+o`${c1}`-````.:ohdhhhhh+ +${c3} `:o+++ ${c1}`ohhhhhhhhyo++os: +${c3} .o:${c1}`.syhhhhhhh/${c3}.oo++o` +${c1} /osyyyyyyo${c3}++ooo+++/ +${c1} ````` ${c3}+oo+++o: +${c3} `oo++. +EOF + ;; - # Bars - "--bar_char") - bar_char_elapsed="$2" - bar_char_total="$3" - ;; + "Ubuntu-Studio") + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} ..-::::::-.` + `.:+++++++++++${c2}ooo${c1}++:.` + ./+++++++++++++${c2}sMMMNdyo${c1}+/. + .++++++++++++++++${c2}oyhmMMMMms${c1}++. + `/+++++++++${c2}osyhddddhys${c1}+${c2}osdMMMh${c1}++/` + `+++++++++${c2}ydMMMMNNNMMMMNds${c1}+${c2}oyyo${c1}++++` + +++++++++${c2}dMMNhso${c1}++++${c2}oydNMMmo${c1}++++++++` + :+${c2}odmy${c1}+++${c2}ooysoohmNMMNmyoohMMNs${c1}+++++++: + ++${c2}dMMm${c1}+${c2}oNMd${c1}++${c2}yMMMmhhmMMNs+yMMNo${c1}+++++++ +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMs${c1}++++${c2}sMMN${c1}++${c2}NMMs${c1}+++++++. +`++${c2}NMMy${c1}+${c2}hMMd${c1}+${c2}oMMMo${c1}++++${c2}sMMN${c1}++${c2}mMMs${c1}+++++++. + ++${c2}dMMd${c1}+${c2}oNMm${c1}++${c2}yMMNdhhdMMMs${c1}+y${c2}MMNo${c1}+++++++ + :+${c2}odmy${c1}++${c2}oo${c1}+${c2}ss${c1}+${c2}ohNMMMMmho${c1}+${c2}yMMMs${c1}+++++++: + +++++++++${c2}hMMmhs+ooo+oshNMMms${c1}++++++++ + `++++++++${c2}oymMMMMNmmNMMMMmy+oys${c1}+++++` + `/+++++++++${c2}oyhdmmmmdhso+sdMMMs${c1}++/ + ./+++++++++++++++${c2}oyhdNMMMms${c1}++. + ./+++++++++++++${c2}hMMMNdyo${c1}+/. + `.:+++++++++++${c2}sso${c1}++:. + ..-::::::-.. +EOF + ;; - "--bar_border") bar_border="$2" ;; - "--bar_length") bar_length="$2" ;; - "--bar_colors") - bar_color_elapsed="$2" - bar_color_total="$3" - ;; + "Ubuntu"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} .-/+oossssoo+/-. + `:+ssssssssssssssssss+:` + -+ssssssssssssssssssyyssss+- + .ossssssssssssssssss${c2}dMMMNy${c1}sssso. + /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ + +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ +.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. ++ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ +oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso +oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso ++ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ +.ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ + +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ + /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ + .ossssssssssssssssss${c2}dMMMNy${c1}sssso. + -+sssssssssssssssss${c2}yyy${c1}ssss+- + `:+ssssssssssssssssss+:` + .-/+oossssoo+/-. +EOF + ;; - "--cpu_display") cpu_display="$2" ;; - "--memory_display") memory_display="$2" ;; - "--battery_display") battery_display="$2" ;; - "--disk_display") disk_display="$2" ;; + "void_small") + set_colors 2 8 + read -rd '' ascii_data <<'EOF' +${c1} _______ + _ \______ - +| \ ___ \ | +| | / \ | | +| | \___/ | | +| \______ \_| + -_______\ +EOF + ;; - # Image backend - "--backend") image_backend="$2" ;; - "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ - "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") - image_backend="${1/--}" - case "$2" in - "-"* | "") ;; - *) image_source="$2" ;; - esac - ;; + "Void"*) + set_colors 2 8 + read -rd '' ascii_data <<'EOF' +${c1} __.;=====;.__ + _.=+==++=++=+=+===;. + -=+++=+===+=+=+++++=_ + . -=:`` `--==+=++==. + _vi, ` --+=++++: + .uvnvi. _._ -==+==+. + .vvnvnI` .;==|==;. :|=||=|. +${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL +${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE +${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' +${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! +${c1} -1vvnvv. `~+++` ++|+++ + +vnvnnv, `-|=== + +vnvnvns. . :=- + -Invnvvnsi..___..=sv=. ` + +Invnvnvnnnnnnnnvvnn;. + ~|Invnvnvvnvvvnnv}+` + -~|{*l}*|~ +EOF + ;; - # Image options - "--loop") image_loop="on" ;; - "--image_size" | "--size") image_size="$2" ;; - "--crop_mode") crop_mode="$2" ;; - "--crop_offset") crop_offset="$2" ;; - "--xoffset") xoffset="$2" ;; - "--yoffset") yoffset="$2" ;; - "--background_color" | "--bg_color") background_color="$2" ;; - "--gap") gap="$2" ;; - "--clean") - [[ -d "$thumbnail_dir" ]] && rm -rf "$thumbnail_dir" - rm -rf "/Library/Caches/neofetch/" - rm -rf "/tmp/neofetch/" - exit - ;; + *"[Windows 10]"* | *"on Windows 10"* | "Windows 8"* |\ + "Windows 10"* | "windows10" | "windows8" ) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} .., + ....,,:;+ccllll + ...,,+:; cllllllllllllllllll +,cclllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll - "--ascii_colors") - unset ascii_colors - for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in - "-"*) break ;; - *) ascii_colors+=("$arg") - esac - done - ascii_colors+=(7 7 7 7 7 7) - ;; +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +llllllllllllll lllllllllllllllllll +`'ccllllllllll lllllllllllllllllll + `' \\*:: :ccllllllllllllllll + ````''*::cll + `` +EOF + ;; - "--ascii_distro") - image_backend="ascii" - ascii_distro="$2" - case "$2" in "-"* | "") ascii_distro="$distro" ;; esac - ;; + "Windows"*) + set_colors 1 2 4 3 + read -rd '' ascii_data <<'EOF' +${c1} ,.=:!!t3Z3z., + :tt:::tt333EE3 +${c1} Et:::ztt33EEEL${c2} @Ee., .., +${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# +${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL +${c1} it::::tt333EEF${c2} @EEEEEEttttt33F +${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. +${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF +${c3} ;::::::::zt33)${c2} "4EEEtttji3P* +${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. +${c3} i::::::::zt33F${c4} AEEEtttt::::ztF +${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 +${c3} E::::::::zt33L${c4} @EEEtttt::::z3F +${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` +${c3} `${c4} :EEEEtttt::::z7 + "VEzjt:;;z>*` +EOF + ;; + + "Xubuntu"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `-/osyhddddhyso/-` + .+yddddddddddddddddddy+. + :yddddddddddddddddddddddddy: + -yddddddddddddddddddddhdddddddy- + odddddddddddyshdddddddh`dddd+ydddo + `yddddddhshdd- ydddddd+`ddh.:dddddy` + sddddddy /d. :dddddd-:dy`-ddddddds +:ddddddds /+ .dddddd`yy`:ddddddddd: +sdddddddd` . .-:/+ssdyodddddddddds +ddddddddy `:ohddddddddd +dddddddd. +dddddddd +sddddddy ydddddds +:dddddd+ .oddddddd: + sdddddo ./ydddddddds + `yddddd. `:ohddddddddddy` + oddddh/` `.:+shdddddddddddddo + -ydddddhyssyhdddddddddddddddddy- + :yddddddddddddddddddddddddy: + .+yddddddddddddddddddy+. + `-/osyhddddhyso/-` +EOF + ;; - "--ascii_bold") ascii_bold="$2" ;; - "--logo" | "-L") - image_backend="ascii" - print_info() { info line_break; } - ;; + "Zorin"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' +${c1} `osssssssssssssssssssso` + .osssssssssssssssssssssso. + .+oooooooooooooooooooooooo+. - # Screenshot - "--scrot" | "-s") - scrot_args "$@" - ;; - "--upload" | "-su") - scrot_upload="on" - scrot_args "$@" - ;; - "--image_host") image_host="$2" ;; - "--scrot_cmd") scrot_cmd="$2" ;; + `::::::::::::::::::::::. .:` + `+ssssssssssssssssss+:.` `.:+ssso` +.ossssssssssssssso/. `-+ossssssso. +ssssssssssssso/-` `-/osssssssssssss +.ossssssso/-` .-/ossssssssssssssso. + `+sss+:. `.:+ssssssssssssssssss+` + `:. .::::::::::::::::::::::` - # Other - "--config") - case "$2" in - "none" | "off" | "") ;; - *) - config_file="$(get_full_path "$2")" - get_user_config - ;; - esac - ;; - "--stdout") stdout="on" ;; - "-v") verbose="on" ;; - "-vv") set -x; verbose="on" ;; - "--help") usage ;; - "--version") - printf "%s\\n" "Neofetch $version" - exit 1 - ;; - "--gen-man") - help2man -n "A fast, highly customizable system info script" \ - -N ./neofetch -o neofetch.1 - exit 1 - ;; - "--travis") - print_info() { - info title - info underline + .+oooooooooooooooooooooooo+. + -osssssssssssssssssssssso- + `osssssssssssssssssssso` +EOF + ;; - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "GPU Driver" gpu_driver - info "Memory" memory + *) + case "$kernel_name" in + *"BSD") + set_colors 1 7 4 3 6 + read -rd '' ascii_data <<'EOF' +${c1} , , + /( )` + \ \___ / | + /- _ `-/ ' + (${c2}/\/ \ ${c1}\ /\ + ${c2}/ / | ` ${c1}\ + ${c3}O O ${c2}) ${c1}/ | + ${c2}`-^--'${c1}`< ' + (_.) _ ) / + `.___/` / + `-----' / +${c4}<----. __ / __ \ +${c4}<----|====${c1}O)))${c4}==${c1}) \) /${c4}====| +<----' ${c1}`--' `.__,' \ + | | + \ / /\ + ${c5}______${c1}( (_ / \______/ + ${c5},' ,-----' | + `--{__________) +EOF + ;; - info "CPU Usage" cpu_usage - info "Disk" disk - info "Battery" battery - info "Font" font - info "Song" song - info "Local IP" local_ip - info "Public IP" public_ip - info "Users" users - info "Install Date" install_date + "Darwin") + set_colors 2 3 1 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} 'c. + ,xNMM. + .OMMMMo + OMMM0, + .;loddo:' loolloddol;. + cKMMMMMMMMMMNWMMMMMMMMMM0: +${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. + XMMMMMMMMMMMMMMMMMMMMMMMX. +${c3};MMMMMMMMMMMMMMMMMMMMMMMM: +:MMMMMMMMMMMMMMMMMMMMMMMM: +${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. + kMMMMMMMMMMMMMMMMMMMMMMMMWd. + ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk + .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c6}kMMMMMMMMMMMMMMMMMMMMMMd + ;KMMMMMMMWXXWMMMMMMMk. + .cooc,. .,coo:. +EOF + ;; - info line_break - info cols - info line_break + "GNU"*) + set_colors fg 7 + read -rd '' ascii_data <<'EOF' +${c1} _-`````-, ,- '- . + .' .- - | | - -. `. + /.' / `. \ +:/ : _... ..._ `` : +:: : /._ .`:'_.._\. || : +:: `._ ./ ,` : \ . _.'' . +`:. / | -. \-. \\_ / + \:._ _/ .' .@) \@) ` `\ ,.' + _/,--' .- .\,-.`--`. + ,'/'' (( \ ` ) + /'/' \ `-' ( + '/'' `._,-----' + ''/' .,---' + ''/' ;: + ''/'' ''/ + ''/''/'' + '/'/' + `; +EOF + ;; - # Testing. - prin "prin" - prin "prin" "prin" + "Linux") + set_colors fg 8 3 + read -rd '' ascii_data <<'EOF' +${c2} ##### +${c2} ####### +${c2} ##${c1}O${c2}#${c1}O${c2}## +${c2} #${c3}#####${c2}# +${c2} ##${c1}##${c3}###${c1}##${c2}## +${c2} #${c1}##########${c2}## +${c2} #${c1}############${c2}## +${c2} #${c1}############${c2}### +${c3} ##${c2}#${c1}###########${c2}##${c3}# +${c3}######${c2}#${c1}#######${c2}#${c3}###### +${c3}#######${c2}#${c1}#####${c2}#${c3}####### +${c3} #####${c2}#######${c3}##### +EOF + ;; - # Testing no subtitles. - info uptime - info disk - } + "SunOS") + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} `- ` + `-- `+- .: + .+: `++: -/+- . + `.::` -++/``:::`./+/ `.-/. + `++/-`.` ` /++:` + `` ./:` .: `..`.- +``./+/:- -+++:- + -/+` :. +EOF + ;; - refresh_rate="on" - shell_version="on" - cpu_display="infobar" - memory_display="infobar" - disk_display="infobar" - cpu_temp="C" - ;; - esac + "IRIX"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} ./ohmNd/ +dNmho/- + `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. + `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` + -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. + `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` ++mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ +dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd +oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ +.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. + hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh + /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: + `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd + `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` + `yNMMNho-yMMMM` NMMMm.+hNMMNh` + -MMMMd: oMMMM. NMMMh :hMMMM- + -yNMMMmooMMMM- NMMMyomMMMNy- + .omMMMMMMMM-`NMMMMMMMmo. + `:hMMMMMM. NMMMMMh/` + .odNm+ /dNms. +EOF + ;; + esac + ;; + esac - shift - done + # Overwrite distro colors if '$ascii_colors' doesn't + # equal 'distro'. + if [[ "${ascii_colors[0]}" != "distro" ]]; then + color_text="off" + set_colors "${ascii_colors[@]}" + fi } main() { From 5a8b2405f5a90a51271de2b9c31c464deec0a405 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 09:18:52 +1000 Subject: [PATCH 0294/1133] misc: whitespace --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index e7f011902..f5251548d 100755 --- a/neofetch +++ b/neofetch @@ -50,7 +50,6 @@ shopt -s nocasematch reset="\e[0m" # Neofetch default config. - read -rd '' config <<'EOF' # See this wiki page for more info: # https://github.com/dylanaraps/neofetch/wiki/Customizing-Info From d49e6ca7d78cd40026276257cd5064f93cae28c0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 09:35:28 +1000 Subject: [PATCH 0295/1133] travis: Fix command. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 532ca462e..8b6755922 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi script: - - time ./neofetch --ascii --config config/travis.conf -v + - time ./neofetch --travis -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,SC1091,SC1117; fi From 2384e6f7b996946e43fedaf5ee1ea3ff9ba4f945 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 11:46:55 +1000 Subject: [PATCH 0296/1133] docs: update --- neofetch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index f5251548d..d1fe6b58b 100755 --- a/neofetch +++ b/neofetch @@ -5067,9 +5067,8 @@ get_args() { done } -get_distro_colors() { - # This function sets the text colors according - # to your OS/Distro's logo colors. +get_distro_ascii() { + # This function gets the distro ascii art and colors. # # $ascii_distro is the same as $distro. case "$ascii_distro" in @@ -8674,7 +8673,7 @@ main() { [[ "$verbose" != "on" ]] && exec 2>/dev/null get_distro get_bold - get_distro_colors + get_distro_ascii [[ "$stdout" == "on" ]] && stdout # Minix doesn't support these sequences. From a4b39b5b6981af69956ceb29d83d564218196ca4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 12:01:55 +1000 Subject: [PATCH 0297/1133] travis: Add back line length enforcement. --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 8b6755922..aac1b2fc5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,3 +14,9 @@ script: # 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,SC1091,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. + # Check for lines longer than 100 chars. + # There are 3 lines that must be longer than 100 chars. + - if (("$(grep '.\{101\}' neofetch | wc -l)" > 3)); then (exit 1); else (exit 0); fi From 48402232e952e6edd54d005e1c89b627bdd9e1b3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 15:58:48 +1000 Subject: [PATCH 0298/1133] misc: whitespace. --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index d1fe6b58b..c271356e4 100755 --- a/neofetch +++ b/neofetch @@ -821,7 +821,6 @@ stdout="off" config_version="3.4.1-git" EOF - # DETECT INFORMATION get_os() { From 881ae1f226f759c33a69bf2f221fd370b42e9dd8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 16:19:14 +1000 Subject: [PATCH 0299/1133] docs: CHANGELOG.md --- CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7a385c7da..a6f3f61e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,18 @@ +This release bumps the version number up to `4.0.0` as it contains major +changes to how Neofetch is packaged and installed. + +The entirety of Neofetch is now contained within a single executable. +Everything has been in-lined. Installing Neofetch is now as easy as +downloading the script and running it. + +Packaging Neofetch is now easier as well. We were using `sed` in the +`Makefile` to replace specific paths and we have had to work around +different system hierarchies. None of this is necessary anymore. + +Those using distributions with an outdated Neofetch version in their repos +can now easily install the latest version. + + ## Contributors @@ -18,6 +33,7 @@ ## General +- Neofetch is now a single executable. - Simplified `--version` output. - Fixed theme issues by setting `GIO_EXTRA_MODULES`. From 7d57ba02470b5c7f182c3b46973b61d6197d5447 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 16:22:05 +1000 Subject: [PATCH 0300/1133] docs: CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a6f3f61e8..2fe537bac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ different system hierarchies. None of this is necessary anymore. Those using distributions with an outdated Neofetch version in their repos can now easily install the latest version. +Thanks to those who contributed this time around and thanks to those who +discussed proposed changes in the bug tracker. I appreciate it. :+1: + ## Contributors From 881094f1d620983048b8896fbdeb7e47bc3f7c29 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 16:25:05 +1000 Subject: [PATCH 0301/1133] misc: whitespace --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c271356e4..1254ba209 100755 --- a/neofetch +++ b/neofetch @@ -4270,7 +4270,7 @@ get_user_config() { # Check $config_file. if [[ -f "$config_file" ]]; then source "$config_file" - err "Config: Sourced user config. (${config_file})" + err "Config: Sourced user config. (${config_file})" old_options return fi From 4f4f2373953df00696f91eba744449200a00a560 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 16:36:01 +1000 Subject: [PATCH 0302/1133] version: bump --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 1254ba209..dc65de715 100755 --- a/neofetch +++ b/neofetch @@ -27,7 +27,7 @@ # SOFTWARE. # Neofetch version. -version="3.4.1-git" +version="4.0.0-git" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" @@ -818,7 +818,7 @@ stdout="off" # # NOTE: Don't change this value, neofetch reads this to determine # how to handle backwards compatibility. -config_version="3.4.1-git" +config_version="4.0.0-git" EOF # DETECT INFORMATION From 736b45a9ed2dd901e1b1f945f21d57872eb1e879 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 16:59:21 +1000 Subject: [PATCH 0303/1133] docs: Initial CONTRIBUTING.md --- CONTRIBUTING.md | 80 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..8952749dd --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,80 @@ +# How to Contribute + + +## ShellCheck + +For your contribution to be accepted, your changes need to pass +ShellCheck. + +Run ShellCheck with the following command: + +```sh +# Why do we exclude numerous tests? +# See: https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions +shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1091,SC1117 +``` + +**Note**: If you have trouble installing ShellCheck. You can open a pull +request on the repo and our Travis.ci hook will run ShellCheck for you. + + +## Coding Conventions + +- Indent 4 spaces. +- Use [snake_case](https://en.wikipedia.org/wiki/Snake_case) for function + and variable names. +- Keep lines below `100` characters long. +- Use `[[ ]]` for tests. + + +## No no's + +- Don’t use `bc`. +- Don’t use `sed`. + - Use `bash`'s built-in [parameter expansion](http://wiki.bash-hackers.org/syntax/pe). +- Don’t use `cat`. + - Use `bash`'s built-in syntax (`file="$(< /path/to/file.txt)")`). +- Don’t use `grep "pattern" | awk '{ printf }'`. + - Use `awk '/pattern/ { printf }'` + + +## If Statements + +If the test only has one command inside of it; use the compact `if` +syntax. Otherwise the normal `if`/`fi` is just fine. + +```sh +# Bad +if [[ "$var" ]]; then + echo "$var" +fi + +# Good +[[ "$var" ]] && echo "$var" + +# Also good (Use this for longer lines. +[[ "$var" ]] && \ + echo "$var" +``` + + +## Case Statements + +Case statements need to be formatted in a specific way. + +```sh +# Good example (Notice the indentation). +case "$var" in + 1) echo 1 ;; + 2) + echo 1 + echo 2 + ;; + + *) + echo 1 + echo 2 + echo 3 + ;; +esac +``` From ffd711a4ea581c747363f5ceb90b14fe172d0c32 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 17:02:31 +1000 Subject: [PATCH 0304/1133] docs: update --- CONTRIBUTING.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8952749dd..08e5a934b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,18 @@ # How to Contribute +## Table of Contents + + +* [ShellCheck](#shellcheck) +* [Coding Conventions](#coding-conventions) +* [No no's](#no-nos) +* [If Statements](#if-statements) +* [Case Statements](#case-statements) + + + + ## ShellCheck For your contribution to be accepted, your changes need to pass @@ -52,7 +64,7 @@ fi # Good [[ "$var" ]] && echo "$var" -# Also good (Use this for longer lines. +# Also good (Use this for longer lines). [[ "$var" ]] && \ echo "$var" ``` From 1a3c8638e1b09a691cf92279e08a69e63b1d6d90 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 17:05:13 +1000 Subject: [PATCH 0305/1133] docs: update --- CONTRIBUTING.md | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 08e5a934b..5858df737 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -41,6 +41,8 @@ request on the repo and our Travis.ci hook will run ShellCheck for you. ## No no's +- Don’t use `echo`. + - Use `printf "%s\n"` - Don’t use `bc`. - Don’t use `sed`. - Use `bash`'s built-in [parameter expansion](http://wiki.bash-hackers.org/syntax/pe). @@ -52,21 +54,21 @@ request on the repo and our Travis.ci hook will run ShellCheck for you. ## If Statements -If the test only has one command inside of it; use the compact `if` +If the test only has one command inside of it; use the compact test syntax. Otherwise the normal `if`/`fi` is just fine. ```sh # Bad if [[ "$var" ]]; then - echo "$var" + printf "%s\n" "$var" fi # Good -[[ "$var" ]] && echo "$var" +[[ "$var" ]] && printf "%s\n" "$var" # Also good (Use this for longer lines). [[ "$var" ]] && \ - echo "$var" + printf "%s\n" "$var" ``` @@ -77,16 +79,16 @@ Case statements need to be formatted in a specific way. ```sh # Good example (Notice the indentation). case "$var" in - 1) echo 1 ;; + 1) printf "%s\n" 1 ;; 2) - echo 1 - echo 2 + printf "%s\n" "1" + printf "%s\n" "2" ;; *) - echo 1 - echo 2 - echo 3 + printf "%s\n" "1" + printf "%s\n" "2" + printf "%s\n" "3" ;; esac ``` From ac5bc01f6ab3be42352dfa0fcf4b2d276b6807c3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 17:29:06 +1000 Subject: [PATCH 0306/1133] docs: update --- CONTRIBUTING.md | 87 +++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 70 insertions(+), 17 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5858df737..d39bb14f3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,16 +4,26 @@ ## Table of Contents -* [ShellCheck](#shellcheck) * [Coding Conventions](#coding-conventions) -* [No no's](#no-nos) -* [If Statements](#if-statements) -* [Case Statements](#case-statements) + * [ShellCheck](#shellcheck) + * [No no's](#no-nos) + * [If Statements](#if-statements) + * [Case Statements](#case-statements) +* [Making changes to Neofetch](#making-changes-to-neofetch) + * [Adding support for a new Operating System / Distribution.](#adding-support-for-a-new-operating-system--distribution) -## ShellCheck +## Coding Conventions + +- Indent 4 spaces. +- Use [snake_case](https://en.wikipedia.org/wiki/Snake_case) for function + and variable names. +- Keep lines below `100` characters long. +- Use `[[ ]]` for tests. + +### ShellCheck For your contribution to be accepted, your changes need to pass ShellCheck. @@ -30,16 +40,7 @@ shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,S request on the repo and our Travis.ci hook will run ShellCheck for you. -## Coding Conventions - -- Indent 4 spaces. -- Use [snake_case](https://en.wikipedia.org/wiki/Snake_case) for function - and variable names. -- Keep lines below `100` characters long. -- Use `[[ ]]` for tests. - - -## No no's +### No no's - Don’t use `echo`. - Use `printf "%s\n"` @@ -52,7 +53,7 @@ request on the repo and our Travis.ci hook will run ShellCheck for you. - Use `awk '/pattern/ { printf }'` -## If Statements +### If Statements If the test only has one command inside of it; use the compact test syntax. Otherwise the normal `if`/`fi` is just fine. @@ -72,7 +73,7 @@ fi ``` -## Case Statements +### Case Statements Case statements need to be formatted in a specific way. @@ -92,3 +93,55 @@ case "$var" in ;; esac ``` + +## Making changes to Neofetch + +### Adding support for a new Operating System / Distribution. + +Adding support for a new OS/Distro requires adding the Name, Logo and +Colors of the OS/Distro to the `get_distro_ascii()` function. + +The function is located right at the bottom of the script, one function +above `main()`. Inside this function you’ll find an alphabetical list of +each OS/Distro. + +Find the spot in the list your new OS/Distro fits into and start +implementing your changes. + +If your OS/Distro requires changes to the actual information gathering +functions then you can make these changes in the `get_*` functions. + +**Syntax**: + +- You have to escape back-slashes (`\`). (eg `\\`) +- You can use `${c1}` to `${c6}`to color the ascii. + - These are evaluated *after* we read the file. + + +**Example**: + +```sh + "CRUX"*) + set_colors 4 5 7 6 + read -rd '' ascii_data <<'EOF' +${c1} odddd + oddxkkkxxdoo + ddcoddxxxdoool + xdclodod olol + xoc xdd olol + xdc ${c2}k00${c1}Okdlol + xxd${c2}kOKKKOkd${c1}ldd + xdco${c2}xOkdlo${c1}dldd + ddc:cl${c2}lll${c1}oooodo + odxxdd${c3}xkO000kx${c1}ooxdo + oxdd${c3}x0NMMMMMMWW0od${c1}kkxo + oooxd${c3}0WMMMMMMMMMW0o${c1}dxkx +docldkXW${c3}MMMMMMMWWN${c1}Odolco +xx${c2}dx${c1}kxxOKN${c3}WMMWN${c1}0xdoxo::c +${c2}xOkkO${c1}0oo${c3}odOW${c2}WW${c1}XkdodOxc:l +${c2}dkkkxkkk${c3}OKX${c2}NNNX0Oxx${c1}xc:cd +${c2} odxxdx${c3}xllod${c2}ddooxx${c1}dc:ldo +${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo +EOF + ;; +``` From c57da4cf72a5da32d4c91e89ff436be72fc5304d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 17:29:52 +1000 Subject: [PATCH 0307/1133] docs: update --- CONTRIBUTING.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d39bb14f3..89d413ba5 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,7 +1,5 @@ # How to Contribute - -## Table of Contents * [Coding Conventions](#coding-conventions) From 5bad6ea5d98e7c5a5f858946ea5668b5087f1949 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 17:40:33 +1000 Subject: [PATCH 0308/1133] docs: update --- CONTRIBUTING.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 89d413ba5..cf35decc6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -20,6 +20,8 @@ and variable names. - Keep lines below `100` characters long. - Use `[[ ]]` for tests. +- Double Quote **EVERYTHING**. +- Don’t use single quotes, except for special cases. ### ShellCheck From 22a43204fc2b52be6312b10b8154ac415439e629 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 17:51:53 +1000 Subject: [PATCH 0309/1133] docs: update --- CONTRIBUTING.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index cf35decc6..5d3aaf56c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -15,6 +15,9 @@ ## Coding Conventions +- Use `bash` built-ins wherever possible. +- Try not to pipe (`|`) at all. +- Limit usage of external commands `$(cmd)`. - Indent 4 spaces. - Use [snake_case](https://en.wikipedia.org/wiki/Snake_case) for function and variable names. @@ -42,6 +45,10 @@ request on the repo and our Travis.ci hook will run ShellCheck for you. ### No no's +- Don’t use GNU conventions in commands. + - Use POSIX arguments and flags. +- Don’t use `cut`. + - Use `bash`'s built-in [parameter expansion](http://wiki.bash-hackers.org/syntax/pe). - Don’t use `echo`. - Use `printf "%s\n"` - Don’t use `bc`. From a46e43a8169eeb02e0ca87428699c94454b25709 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 18:23:33 +1000 Subject: [PATCH 0310/1133] docs: Keep full changelog in repo. --- CHANGELOG.md | 2579 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 2579 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2fe537bac..e794d8948 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# Changelog + +All notable changes to this project will be documented in this file. + +The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) +and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). + +## [Unreleased] + This release bumps the version number up to `4.0.0` as it contains major changes to how Neofetch is packaged and installed. @@ -83,3 +92,2573 @@ discussed proposed changes in the bug tracker. I appreciate it. :+1: **Window Manager** - Added support for detecting `dwm`. + + +## [3.4.0] - 2018-04-05 + +This release adds support for a large number of Linux distros as well as support for the latest macOS and iOS devices. This release also contains a large number of bug fixes and some minor features. + +I'm pretty sure that this release is the largest in terms of number of contributors. Thanks to everyone who contributed this release! + +## Contributors + +- [**@yslgirl**](https://github.com/yslgirl) +- [**@iandrewt**](https://github.com/iandrewt) +- [**@chrisweeksnz**](https://github.com/chrisweeksnz) +- [**@dawidd6**](https://github.com/dawidd6) +- [**@MitchWeaver**](https://github.com/MitchWeaver) +- [**@StarryTony**](https://github.com/StarryTony) +- [**@rage311**](https://github.com/rage311) +- [**@matoro**](https://github.com/matoro) +- [**@szfcbr**](https://github.com/szfcbr) +- [**@ArmstrongJ**](https://github.com/ArmstrongJ) +- [**@robertwolter**](https://github.com/robertwolter) +- [**@JadeMatrix**](https://github.com/JadeMatrix) +- [**@MindTooth**](https://github.com/MindTooth) +- [**@aidanharris**](https://github.com/aidanharris) +- [**@khoacao96**](https://github.com/khoacao96) + + +## OS + +- Added support for ArchMerge. +- Added support for MagpieOS. +- Added support for PostMarketOS. +- Added support for Hyperbola GNU/Linux-libre [**@mstraube**](https://github.com/mstraube) +- Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) +- Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) +- Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) +- Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) +- Added support for Pop!\_OS. [**@jliles**](https://github.com/jliles) +- Added support for Lunar Linux. +- Added support for 32-bit IRIX. [**@szfcbr**](https://github.com/szfcbr) +- Added support for FreeMINT. [**@ArmstrongJ**](https://github.com/ArmstrongJ) +- Added support for Anarchy Linux. [**@robertwolter**](https://github.com/robertwolter) +- Added support for Calculate Linux. [**@robertwolter**](https://github.com/robertwolter) +- Added support for NuTyX. [**@robertwolter**](https://github.com/robertwolter) +- Added support for openSUSE Tumbleweed. [**@robertwolter**](http://github.com/robertwolter) +- Fixed detection bug with Gentoo. +- Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) +- Fixed detection bug with Windows Subsystem for Linux and Crouton when an OS without lsb_release is installed. +- Fixed ChromeOS detection. + + +## General + +- Added more info to verbose mode for debugging. +- Fixed bug in prompt location calculation. +- Fixed prompt bug in OpenBSD. +- Fixed broken AppleScript blocks. [**@JadeMatrix**](https://github.com/JadeMatrix) +- Fixed function not working in bash 3. [**@JadeMatrix**](https://github.com/JadeMatrix) +- Swapped sequences from `\033` to `\e`. +- Fixed Pacman name conflict with the game. [**@MitchWeaver**](https://github.com/MitchWeaver) +- Removed the last `echo` in the script. +- Fixed typo. [**@khoacao96**](https://github.com/khoacao96) + + +## Ascii + +- Added color updates for Kubuntu logo. **Maulik Mistry** +- Added new DragonflyBSD logo. [**@MitchWeaver**](https://github.com/MitchWeaver) + + +## Images + +- [MacOS/iTerm2] Fixed thumbnail not appearing. [**@StarryTony**](https://github.com/StarryTony) +- Fixed bug with getting wallpaper from feh. +- Added `pixterm` backend. +- Don't force resolution in `catimg`. + +## Info + +**Desktop Environment** + +- Added GNOME version. +- Added support for TDE. + +**Window Manager** + +- Added support for most (*if not all*) current Wayland compositors/window manager's. +- Added support for some non-EWMH window managers. +- [macOS] Fixed `chunkwm` being detected as `Kwm`. [**@iandrewt**](https://github.com/iandrewt) + +**Window Manager Theme** + +- Fixed `sawfish` detection. +- [macOS] Now detects Light/Dark theme. [**@JadeMatrix**](https://github.com/JadeMatrix) + +**Install Date** + +- [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt) + +**Theme** + +- Fixed KDE font issue. [**@mstraube**](https://github.com/mstraube) + +**CPU** + +- [linux] Detect the correct temperature file to use. +- [windows] Removed `$temp` usage as it's an envar. +- [OpenBSD] Fixed CPU temperature that fails to appear in some systems. [**@rage311**](https://github.com/rage311) + +**GPU** + +- [linux] Added driver version to NVIDIA output. +- [linux] Added driver version to Intel output. +- [macOS] Added NVIDIA support. [**@iandrewt**](https://github.com/iandrewt) + +**Memory** + +- [OpenBSD] Fixed memory usage values. [**@rage311**](https://github.com/rage311) + +**Package Manager** + +- Added detection for Sabotage Linux's `butch` [**@MitchWeaver**](https://github.com/MitchWeaver) +- Changed `pacman` detection to fix issues in other distros. [**@MitchWeaver**](https://github.com/MitchWeaver) + +**Resolution** + +- [macOS] Fixed errors on non-retina screens. [**@iandrewt**](https://github.com/iandrewt) + +**Song** + +- Added option to manually specify the player to use. +- Added support for Elisa. [**@mstraube**](https://github.com/mstraube) +- macOS detection is now more reliable. [**@JadeMatrix**](https://github.com/JadeMatrix) + +**Model** + +- Remove more unneeded outputs. [**@konimex**](https://github.com/konimex) + +**Disk** + +- Update Haiku's detection. [**@dawidd6**](https://github.com/dawidd6) + +**Battery** + +- Fixed Windows detection. [**@matoro**](https://github.com/matoro) + +**Shell** + +- Added support for `tcsh`. [**@szfcbr**](https://github.com/szfcbr) + +**Terminal Font** + +- Added more paths for Alacritty. +- Added font support for Kitty. [**@MindTooth**](https://github.com/MindTooth) +- Fixed Kitty `font_size` regex. [**@aidanharris**](https://github.com/aidanharris) +- Added support for `XTerm.vt11.facename`. [**@aidanharris**](https://github.com/aidanharris) + + +## [3.3.0] - 2017-09-14 + +Thanks to everyone who contributed this release, I appreciate ya! + +## Contributors + +- **[@konimex](https://github.com/konimex)** +- **[@mstraube](https://github.com/mstraube)** +- **[@dominiklohmann](https://github.com/dominiklohmann)** +- **[@ybden](https://github.com/ybden)** +- **[@lexruee](https://github.com/lexruee)** +- **[@AMDmi3](https://github.com/AMDmi3)** +- **[@deadda7a](https://github.com/deadda7a)** +- **[@winneon](https://github.com/winneon)** +- **[@DamnWidget](https://github.com/DamnWidget)** + + +## General + +- Config file now has a `.conf` suffix. +- Neofetch now assumes target directories (config file and ASCII directory) at install time, this fixes problems with systems such as NixOS. +- `stdout` mode is now reimplemented. + - This mode prints the information in plain text. + - You can use it with `--stdout`. + - Example: https://gist.github.com/dylanaraps/151c205322cf3acae62661b76464a3f7 +- Fixed prompt location if color blocks are disabled. +- Make makefile more portable. **[@AMDmi3](https://github.com/AMDmi3)** + + +## Operating System + +- Added support for AryaLinux. **[@mstraube](https://github.com/mstraube)** +- Added support for Amazon Linux AMI. +- Added support for Artix Linux. **[@DamnWidget](https://github.com/DamnWidget)** +- Added support for Endless OS. +- Added support for Sabotage Linux. +- Added support for Siduction. **[@lexruee](https://github.com/lexruee)** +- Added support for Source Mage. +- Added support for Parsix GNU/Linux. **[@mstraube](https://github.com/mstraube)** +- Added support for Nurunner. **[@mstraube](https://github.com/mstraube)** +- Fixed Raspbian being detected as ChromeOS. + + +## Images + +- [w3m] Fixed w3m-img not found on NixOS. +- Added support for using all image types as input. + - Neofetch now supports `svg`, `tiff` etc. + + +## ASCII + +- Added small Debian. +- Added small FreeBSD. +- Added small macOS. +- Added small NixOS. + + +## Info + +**GPU Driver** + +- [Linux] Added a new info function (*off by default*) to display the GPU Driver currently in use. +- Add `info "GPU Driver" gpu_driver` to your config to use it. + +**CPU** + +- [Linux] Fixed inaccurate output on ARM SoC devices. +- [Linux] Fixed CPU speed not appearing on PowerPC systems. +- [NetBSD] Added support for CPU temperature. (NOTE: This only supports newer Intel processors) +- Fixed inaccurate speed output in systems with CPU speed less than 1 GHz. +- Deprecated `cpu_shorthand` in favor of `cpu_brand`. + +**GPU** + +- [Linux] Filter out duplicate entries. + +**Model** + +- Added support for QEMU/KVM. +- Renamed subtitle to `Host:`. + +**Uptime** + +- [AIX/IRIX] Fixed Neofetch crashing when calculating uptime. + +**Terminal** + +- [SSH] Fixed infinite loop if neofetch is run on non-interactive shells. + +**Terminal Font** + +- Added support for LXTerminal. **[@mstraube](https://github.com/mstraube)** +- Added support for GNUStep Terminal. **[@mstraube](https://github.com/mstraube)** +- Fixed Xfce4-terminal font output when system-wide font is used. **[@mstraube](https://github.com/mstraube)** +- Fixed MATE-Terminal issue. **[@mstraube](https://github.com/mstraube)** +- Fixed URxvt font detection failing if `.` is used. **[@winneon](https://github.com/winneon)** + +**Theme** + +- [Qt/KDE] Fixed inaccurate theme naming. **[@mstraube](https://github.com/mstraube)** +- [Qt/KDE] GTK theme is now shows as well. + +**Window Manager** + +- [macOS] Added support for `chunkwm`. **[@dominiklohmann](https://github.com/dominiklohmann)** +- Fix incorrect output when using WindowMaker. **[@mstraube](https://github.com/mstraube)** + +**Song** + +- Added support for Pogo. **[@mstraube](https://github.com/mstraube)** +- Fixed bug with players not being found. + +**Battery** + +- Added battery support for Thinkpads and other devices that use the `CMB` naming for batteries. **[@deadda7a](https://github.com/deadda7a)** + + +## Images + +- Fixed division by 0 error in XTerm. + +## Screenshot + +- Use `maim` over `scrot`. **[@ybden](https://github.com/ybden)** +- Fixed `scrot_cmd` arguments not being used. **[@winneon](https://github.com/winneon)** + + +## [3.2.0] - 2017-06-21 + +This release was long overdue and I apologise for the delay. I've been busy with study among other things. This update is smaller than usual but fixes some important bugs. + + +Thanks once again to everyone that contributed! + + +## Contributors + +- **[@MatthewCox](https://github.com/MatthewCox)** +- **[@dawidd6](https://github.com/dawidd6)** +- **[@erikdubois](https://github.com/erikdubois)** +- **[@konimex](https://github.com/konimex)** +- **[@mstraube](https://github.com/mstraube)** +- **[@Artoriuz](https://github.com/Artoriuz)** +- **[@WilsonRU](https://github.com/WilsonRU)** +- **[@Takeya-Yuki](https://github.com/Takeya-Yuki)** +- **[@iandrewt](https://github.com/iandrewt)** +- **[@LER0ever](https://github.com/LER0ever)** + + +## Operating System + +- Added support for IRIX. +- Added support for Arch XFerience. **[@mstraube](https://github.com/mstraube)** +- Added support for CloverOS. +- Added support for Maui. **[@mstraube](https://github.com/mstraube)** +- Added support for KS Linux. **[@Takeya-Yuki](https://github.com/Takeya-Yuki)** + + +## General + +- Minimum required BASH version is now 3.2. + - (Neofetch has always used 3.2+ features, I've just made it obvious now in the documentation.) +- Fixed config file not being created on first install. + + +## Images + +- [w3m] Added `--loop` flag which makes Neofetch draw the image once per second. + - This is a workaround to the images disappearing on resize and workspace switch. + - Use Ctrl+C to exit. +- [w3m] Fixed w3m-img not found on FreeBSD 12. **[@Artoriuz](https://github.com/Artoriuz)** + + +## Ascii + +- Added Ubuntu-MATE ascii art. +- Fixed ArchLabs ascii art. **[@erikdubois](https://github.com/erikdubois)** +- Updated GoboLinux ascii art. **[@WilsonRU](https://github.com/WilsonRU)** +- Fixed `--ascii_distro windows10` not working. + + +## Info + +**Distro** + +- [Solaris, AIX, Haiku] The machine architecture will now be shown properly instead of machine ID. + +**Terminal Emulator** + +- Added support for Neovim terminal emulator. **[@LER0ever](https://github.com/LER0ever)** +- Added font support for mate-terminal. **[@mstraube](https://github.com/mstraube)** +- [Termite] Fix font mismatch. **[@MatthewCox](https://github.com/MatthewCox)** +- Use `$SSH_TTY` for terminal detection if machine is connected via SSH. +- Break from loop if PPID can't be accessed/not found. + +**GPU** + +- [Linux] Fixed GPU sort. + +**Song** + +- Do not detect ibus\* or indicator\* as player. **[@dawidd6](https://github.com/dawidd6)** + +**Model** + +- Specify when running on a Hackintosh. **[@LER0ever](https://github.com/LER0ever)** + + +**Memory** + +- [FreeBSD]: Fix inaccurate free memory calculation. + + +## [3.1.0] - 2017-04-25 + +Hi, It's been quite a while since the last release. I've been extremely busy with university and I finally found some time to flag a new release. (I've been meaning to do this for a few weeks now) + +Though I haven't worked on Neofetch as much as I'd have liked, most of the changes this time round come from some familiar faces as well as some new contributors! Thanks to everyone for contributing, I appreciate it. + + +## Contributors + +- **[@konimex](https://github.com/konimex)** +- **[@mstraube](https://github.com/mstraube)** +- **[@jorgegonzalez](https://github.com/jorgegonzalez)** +- **[@ikeydoherty](https://github.com/ikeydoherty)** +- **[@eliezio](https://github.com/eliezio)** +- **[@nilesr](https://github.com/nilesr)** +- **[@dritter](https://github.com/dritter)** +- **[@HebaruSan](https://github.com/HebaruSan)** +- **[@LER0ever](https://github.com/LER0ever)** +- **[@obrevenge](https://github.com/obrevenge)** +- **[@ajjames31](https://github.com/ajjames31)** +- Eliezio Oliveira + + +## Operating System + +- Added Chrome OS Crouton support. **[@LER0ever](https://github.com/LER0ever)** +- Added support for SliTaz. **[@nilesr](https://github.com/nilesr)** +- Added support for Nitrux. **[@mstraube](https://github.com/mstraube)** +- Added support for DesaOS. +- Added support for MinGW. +- Added support for OBRevenge. **[@obrevenge](https://github.com/obrevenge)** +- Added support for ArchLabs. **[@obrevenge](https://github.com/obrevenge)** + + +## Screenshot + +The screenshot feature no longer requires any configuration before working. We no longer hardcode `${HOME}/Pictures/neofetch` as the screenshot location. Here's how the `-s` and `-su` flags now function: + +- `neofetch -s` will save a file in the current directory named: `neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png` +- `neofetch -s test.png` will save a file in the current directory called `test.png` +- `neofetch -s ~/` will save a file in `~` called `neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png` +- `neofetch -s ~/test.png` will save a file in `~` called `test.png`. + + +## ASCII + +- Arch ASCII art now uses lighter colors. +- Fixed Ubuntu-Studio ASCII setting. **[@@HebaruSan](https://github.com/HebaruSan)** +- Updated Parabola logo. **[@mstraube](https://github.com/mstraube)** +- Updated Raspbian ASCII art. + + +## Images + +- Added `libsixel` backend. +- Added `termpix` backend. +- Only use a zero width space in the `w3m` backend. +- Fixed bug causing terminal size to not be found. +- [iTerm2] Fixed images not appearing inside `tmux`. + + +## Info + +**Locale** + +- Added a new function to display system locale. (Disabled by default) + +**CPU** + +- Added option to show decimals in CPU speed. + +**Terminal Font** + +- Added \*experimental\* font detection for iTerm2. **[@dritter](https://github.com/dritter)** + +**Window Manager** + +- [MacOS] Added support for Kwm. **[@jorgegonzalez](https://github.com/jorgegonzalez)** +- [MacOS] Added support for Spectacle. **[@jorgegonzalez](https://github.com/jorgegonzalez)** +- [MacOS] Added support for Amethyst. **[@jorgegonzalez](https://github.com/jorgegonzalez)** + +**Battery** + +- Added battery support for Bay Trail devices. **[@mstraube](https://github.com/mstraube)** + +**Disk** + +- Added new option to only show dir name in subtitle. + +**Song** + +- Added support for Deepin Music. **[@mstraube](https://github.com/mstraube)** +- Added support for Tomahawk. **[@mstraube](https://github.com/mstraube)** +- Fixed Audacious song output when `dbus-send` fails. **[@mstraube](https://github.com/mstraube)** + +**Local IP** + +- [Linux] Fixed UID showing instead of Local IP on several versions/configs of iproute2. + +**Packages** + +- [eopkg] Use a faster detection method. **[@ikeydoherty](https://github.com/ikeydoherty)** + +**Resolution** + +- [macOS] Fixed `screenresolution` not appearing at all on newer versions. **[@eliezio](https://github.com/eliezio)** +- [Linux] Show decimals. + +**GPU** + +- [Linux] Hide duplicate GPU lines (Only display 1). + + +## [3.0.1] - 2017-01-30 + +This minor release fixes all of the bugs that were found in the 3.0 release. + +Thanks for all of the bug reports and contributions. :) + +## Contributors +- **[@SomaUlte](https://github.com/SomaUlte)** +- **[@jorgegonzalez](https://github.com/jorgegonzalez)** +- **[@dawidd6](https://github.com/dawidd6)** +- **[@mstraube](https://github.com/mstraube)** +- **[@YellowApple](https://github.com/YellowApple)** +- **[@siiptuo](https://github.com/siiptuo)** +- **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** +- **[@konimex](https://github.com/konimex)** + +## Operating System +- Added support for ArchBox Linux. + +## General +- Fixed output if subtitles are disabled and `prin` is used in an info function. +- Fixed underlines not working when used with `prin`. +- Fixed HAIKU install path. **[@YellowApple](https://github.com/YellowApple)** + +## Config +- Fixed default config not found. +- Don't set locale in config file. + +## Info + +**Memory**
+- Changed memory label to `MiB` on OS that output memory in Mebibytes. + +**Shell**
+- Fixed a crash when the user has `bash 3` installed. + +**Packages**
+- Added support for Chromebrew. + +**GPU**
+- [Linux] Display detailed information about Intel GPUs. **[@SomaUlte](https://github.com/SomaUlte)** + +**Color Blocks**
+- Fixed issue with `color_blocks="off"` adding an extra newline to the output. + +**Song**
+- Don't print `$song` if it's empty and `song_shorthand` is on. **[@mstraube](https://github.com/mstraube)** +- Fixed `mpd` detection when `mpd` is on a different host. **[@dawidd6](https://github.com/dawidd6)** +- Use `get_song_dbus` for Audacious. **[@mstraube](https://github.com/mstraube)** + +**Terminal Font**
+- [Alacritty] Fixed font detection. **[@siiptuo](https://github.com/siiptuo)** + +## Images +- [iTerm2] Fixed issue with line-breaks printing spaces over the image. **[@jorgegonzalez](https://github.com/jorgegonzalez)** +- Fixed issue with images not working in Terminology. +- Fixed issue when `image_source` was set to `wall`. +- [w3m-img] Fixed issues with `w3m-img` and `tmux`. + +## Ascii +- [Windows 10] Fixed `ascii_distro` not working. +- Fixed a bug where the backend is `ascii` but the image_source is an image file. +- Fixed custom ascii files not working. +- Removed extra backslashes from OpenBSD ascii art. **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** + +## Scrot +- Added message to let users know that a screenshot was taken. + + +## [3.0] - 2017-01-23 + +This is another large release containing over `550` commits from 7 contributors. Due to the size and large amount of changes made this release expect at least one minor release to fix any bugs that come up. + +The version number has been bumped to `3.0` due to the large amount of breaking changes introduced this update. I've added backwards compatibility for all of the new changes but there may still be some breakage. I highly recommend starting with a new config to avoid any issues that may arise. + +Neofetch now supports displaying images using `catimg`, `libcaca` and `jp2a`. See this wiki page for screenshots. https://github.com/dylanaraps/neofetch/wiki/Image-Backends + +Thanks to everyone who contributed this release, there were a lot of new faces this time around. :) + +## Contributors +- **[@konimex](https://github.com/konimex)** +- **[@iandrewt](https://github.com/iandrewt)** +- **[@jorgegonzalez](https://github.com/jorgegonzalez)** +- **[@z33ky](https://github.com/z33ky)** +- **[@mstraube](https://github.com/mstraube)** +- **[@gavinhungry](https://github.com/gavinhungry)** + +## IRC + +Neofetch now has an IRC channel at `#neofetch` on Freenode. If you have any questions, issues or ideas feel free to join the IRC channel and I'll be happy to assist you. I know that we've already got the Gitter chat but hopefully this makes things easier for those without a GitHub account. :) + +[![Freenode](https://img.shields.io/badge/%23neofetch-%20on%20Freenode-brightgreen.svg)](http://irc.lc/freenode/neofetch) + +## Collaborators + +I have given collaborator access to both **[@konimex](https://github.com/konimex)** and **[@iandrewt](https://github.com/iandrewt)**. In short this allows them to push directly to the master branch of the repo, manage the issue tracker and also merge pull requests. They've been a huge help the past year so this made sense to me. + +## OS +- Added support for AIX. +- Added support for AntiX. +- Added support for GNU/kFreeBSD. +- Added support for Gentoo FreeBSD. +- Added support for GrombyangOS. +- Added support for Joyent SmartOS. +- Added support for Mer. +- Added support for MINIX. +- Added support for MX. +- Added support for Open Source Media Center (OSMC). +- Added support for SalentOS. +- Added support for TrueOS. +- Added support for Windows (MSYS2). + +## General +- The default config file is now installed to `/etc/neofetch/config` and acts as a system-wide config file for Neofetch. Editing this file will make the changes available to all users on the system. Those packaging Neofetch **without** using the Makefile will need to make changes to support this. +- The Makefile was rewritten to remove GNU-isms. +- Removed executable permission from config files. BASH can source them even if they're un-executable. +- Travis now runs [shellcheck](https://github.com/koalaman/shellcheck) on every commit and pull request. + - We've had to exclude around 10 lint errors, see this wiki page for why we did this: + - https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions +- Neofetch now supports relative path values when specifying the location to images, ascii files and config files. + - For example, `neofetch --w3m Pictures/Wallpapers/10.jpg` and `neofetch --w3m 10.jpg` now work. +- Optimize usage of `get_de()`, `get_wm()` and `get_term(). + - We were calling these multiple times, we now only run them once and check to see if they were run previously. +- Optimize info caching, only check for cache files in functions that use caching. +- The manpage is now generated using `help2man`. `help2man` parses the output of `--help` and `--version` to create a manpage. This ensures that our manpage stays 1:1 with the script documentation. We actually found a lot of outdated info in the old manpage thanks to this. + - A new flag was added called `--gen-man` which generates a neofetch manpage in your current directory. +- Delete most of `info()` and instead call `prin()`. + - This removes a lot of duplicate code between `info()` and `prin()`. +- Remove `printf` subshells and instead use `printf -v` to declare the variables. +- Fixed artifacts when using line-breaks in TTYs. +- All errors are now sent to `stderr`. +- Renamed `XFCE` --> `Xfce`. **[@gavinhungry](https://github.com/gavinhungry)** +- Cleanup `main()`. +- Renamed `old_flags()` --> `old_options()`. + +## Info + +**Shell**
+- [Fish] Fixed memory leak caused by Fish. +- Added support for `xonsh`. +- Fixed version output on `ksh`. +- Rewrote the function to remove duplicate code. + +**Uptime**
+- Moved duplicate code to a function. +- Changed `$uptime_shorthand` to `on` by default. + +**Desktop Environment**
+- Fixed issues where MATE wouldn't be detected properly. +- Added fallback to `$DESKTOP_SESSION`, `$MATE_DESKTOP_SESSION_ID` and `$GNOME_DESKTOP_SESSION_ID`. +- Hide Desktop Environment if it matches Window Manager. + +**CPU**
+- [Linux] Don't simplify `cpufreq` speed option names for no reason. +- [Linux] Fixed issues with CPU name detection for architectures other than x86/amd64/ARM. +- [NetBSD] Remove case statement in favor of 1 line test. +- Simplify check for low CPU speeds. +- Expanded `cpu_temp` to take the values `C` and `F`. This means you can now display the CPU temperature as Fahrenheit. + +**CPU Usage**
+- Added Haiku cores command. +- Updated Linux and macOS commands to the match the commands in the `get_cpu()` function. + +**GPU**
+- [Linux] Each GPU is now printed on a separate line. +- [Linux] Added `--gpu_type` / `$gpu_type` which lets you display `all`, `dedicated` or `integrated` GPUs. + +**Memory**
+- [Solaris] Fixed inaccurate used memory size. + +**Resolution**
+- [Windows] Declare variables locally to fix conflicts in other functions. + +**~~Birthday~~ Install Date**
+- Renamed `get_birthday()` -- > `get_install_date()` +- Removed all `date` command usage from `get_install_date()`. +- Added a new function called `convert_time()` which takes the time stamped `ls` output and converts it to a pretty format. The function only uses bash so its much faster than calling `date`. This makes things simple and keeps the output consistent across all Operating Systems. Example: `2016-12-06 16:58:58.000000000` --> `Tue 06 Dec 2016 4:58 PM` +- Added an option so users can choose between using 24-hour and 12-hour time format +- `get_install_date()` will detect which `ls` program is being used instead of hardcoding them per OS. + +**Disk**
+- Rewrote function from scratch. + - The function is `40` lines smaller than before and works on all [1] versions of `df` we tested on [2]. +- Added the option/flag `disk_show` which allows you to specify which disks, mount points or directories to show the disk info of. (One per line) +- Added the option/flag `disk_subtitle` which allows you to specify how we label each disk. (Mount point or Disk name) +- Removed all percentage calculation since `df` already provides us with the percentage. +- Warn the user if `df` isn't installed. +- Fixed broken output if `df` wasn't installed but the function was enabled. + +[1] The function doesn't work on Haiku since their `df` is wildly non-standard. (The output format and flags are 100% different from all of the other `df` versions floating around.) + +[2] Tested on `GNU`, `Busybox`, `BSD`, `Solaris` and `macOS` `df` versions. + +**Theme**
+- [KDE] Don't display GTK Themes if KDE is detected. +- [KDE] If `kde[0-9]-config` isn't found, try and look for `$HOME/.kde`. + +**Window Manager Theme**
+- Fixed WM Theme not detected on MATE. **[@mstraube](https://github.com/mstraube)** +- Fixed WM Theme detection on KDE. **[@mstraube](https://github.com/mstraube)** + +**Song**
+- Added support for xmms2. **[@z33ky](https://github.com/z33ky)** +- Added support for Exaile music player. **[@mstraube](https://github.com/mstraube)** +- Added support for JuK .**[@mstraube](https://github.com/mstraube)** +- Added support for Bluemindo. **[@mstraube](https://github.com/mstraube)** +- Added support for Guayadeque Player. **[@mstraube](https://github.com/mstraube)** +- Added support for Yarock. **[@mstraube](https://github.com/mstraube)** +- Added support for Qmmp. **[@mstraube](https://github.com/mstraube)** +- Added support for QuodLibet. **[@mstraube](https://github.com/mstraube)** +- Added support for Mopidy. **[@d3rrial](https://github.com/d3rrial)** +- [cmus] Simplify block and fix `artistsort` bug. +- Removed `state` detection. +- Removed duplicate `dbus-send` commands. **[@mstraube](https://github.com/mstraube)** +- Hide output if no song is playing. +- Enforce order `artist - title` in `get_song_dbus()`. **[@mstraube](https://github.com/mstraube)** + +**Terminal Font**
+- Added support for Alacritty. +- Added support for Konsole. **[@mstraube](https://github.com/mstraube)** +- Added support for Sakura Terminal. **[@mstraube](https://github.com/mstraube)** +- Added support for Pantheon Terminal. **[@mstraube](https://github.com/mstraube)** +- Added support for deepin-terminal. **[@mstraube](https://github.com/mstraube)** +- [Termite] Fixed incorrect font chosen. **[@mstraube](https://github.com/mstraube)** +- [Termite] Also look at default config. **[@mstraube](https://github.com/mstraube)** + +**Battery**
+- [MacOS] Fixed issue where battery always appears as charging. **[@jorgegonzalez](https://github.com/jorgegonzalez)** + +**Local IP**
+- [BSD and Solaris] Merged the detection to Linux. +- [Windows] Support multiple interfaces. + +**Color Blocks**
+- Use `start++` instead of adding it manually after case. **[@konimex](https://github.com/konimex)** +- Fixed bug where color blocks wouldn't respect width in TTYs. +- Cursor positioning now takes `$block_height` into account. +- Fixed all artifacts in virtual consoles. +- Merged `$start` and `$end` into an array called `block_range`. + - This makes the config option match the command-line flag `--block_range`. + +## Images +- [iTerm2] Fixed blank images. +- Fixed bug where image mode would attempt to run in a TTY. +- All of the image/ascii backend handling was rewritten. Backend and Image/File/Directory selection is universal now and should make usage easier. + - Added `catimg` backend. + - Added `caca` backend. + - Added `jp2a` backend. + - `--image` has been replaced with `--backend`. + - `--backend` takes `ascii`, `caca`, `catimg`, `jp2a`, `iterm2`, `off`, `tycat`, `w3m`. + - Shortcut flags were added for easy picking of backends. + - Each flag can take a file, image or directory as an argument. + - For example: `neofetch --w3m /path/to/img.jpg` `neofetch --ascii /path/to/file` + - `--w3m` + - `--iterm2` + - `--tycat` + - `--ascii` + - `--off` + - `--catimg` + - `--caca` + - `--jp2a` + - All image and ascii file selection has been replaced with the universal `--source`. + - The value of `--source` can be any of the following: + - `auto`, `ascii`, `wallpaper`, `/path/to/img`, `/path/to/ascii`, `/path/to/dir/`. +- Fixed bugs with image shuffle mode. + +## Wallpaper +- Decode URI filenames. + +## Ascii +- Simplified ascii file handling. + - Removed a call to `tr` for those using `bash 3`. + - Fixed distro detection issues. + - Removed the assumption that `first word in distro --> ascii file name` +- Added Ubuntu-Studio. **[@konimex](https://github.com/konimex)** +- Fixed bug causing macOS ascii art to be used on other Operating Systems. +- Display warning about 'ascii' being the new default mode. +- Removed `ascii_logo_size` in favor of `ascii_distro='{arch,crux,gentoo}_small'`. +- [PCBSD] Use TrueOS ascii art. +- Added Void Linux (small) and Alpine Linux (small). + +## Screenshot +- Use arrays for `$scrot_program` + +## Args +- Fixed bug where `neofetch --config` sourced the user config twice. +- Cleaned up config arg handling. + + +## [2.0.2] - 2016-12-07 + +This minor release fixes some issues related to new features added in 2.0. These issues weren't picked up in the time between 2.0 and 2.1 and another minor release is needed due to the Packages issue being rather important. + +These issues were fixed by reverting the GPU caching and Packages optimizations. These issues occurred because not enough testing was done before these were implemented in master. In the future I'll take more care with testing these larger changes before they hit the master branch and I apologize for there being yet another release in one week. + +I also want to apologize to those packaging Neofetch for this unexpected release. + +## Info + +**Packages**
+- Fixed issue where package output was off by one. + +**GPU**
+- Fixed bug with `--gpu_brand` not working. + +**Theme**
+- [Cinnamon] Fixed incorrect information. + + +## [2.0.1] - 2016-12-06 + +This release of Neofetch fixes some important bugs that were found after 2.0 was release. This includes: Detection issues on CentOS and Linux Mint systems, Incorrect Memory usage on BSD, Linux GPU detection issues and more. + +This release also includes a rewrite of the screenshot functions. You no longer have to set the program to use in your config. Neofetch now automatically finds and uses whatever screenshot tool is available on your machine. + +See the screenshot section below for more info. + +The `get_packages()` function was optimized. Neofetch's packages function works by detecting which package managers are installed on your system and then using a sum of those as the packages output. + +Previously the function would call `wc -l` for every package manager, instead we now call `wc -l` only once at the end of the function. + +Thanks for reporting these bugs and also suggesting these features. Don't be shy, report any bugs, annoyances or etc with Neofetch and I'll happily help you out. + +Thanks to **[@konimex](https://github.com/konimex)** for all of his contributions this release. :) + +## Contributors +- **[@konimex](https://github.com/konimex)** + +## General +- Use `$kernel_name` instead of `$distro` in some functions. **[@konimex](https://github.com/konimex)** + +## Info + +**Distro**
+- Added support for Apricity OS. +- Added support for GoboLinux. **[@konimex](https://github.com/konimex)** +- Added support for SwagArch. +- Added support for AOSC OS. +- Added support for Parrot Security. +- Fixed bug that caused Linux Mint systems to be identified as Ubuntu. +- Fixed bug that caused CentOS systems to not be detected. + +**Memory**
+- [BSD] Fixed high memory output. + +**GPU**
+- [Linux] Fixed bug where sound card was detected as GPU. + +**Packages**
+- Only call `wc -l` once at the end of the function instead of calling it once per package manager. + +**Desktop Environment**
+- Show Cinnamon version. + +## Image +- Changed default image mode to `ascii`. + - See: [Images in the terminal](https://github.com/dylanaraps/neofetch/wiki/Images-in-the-terminal#enabling-image-mode) + +## Wallpaper +- Rewrote wallpaper function. +- Prioritize DE wallpaper setters before falling back to `feh`/`nitrogen`. +- Added support for XFCE's wallpaper setter. +- Added support for Solaris and GNU Hurd. **[@konimex](https://github.com/konimex)** + +## Ascii + +![ubuntu](https://u.teknik.io/zILeY.png) +
Old Ubuntu Logo vs New Ubuntu Logo +- Updated Ubuntu logo to the latest version. + - You can use the old logo by launching neofetch with `--ascii_distro ubuntu_old` or by changing `$ascii_distro` to `ubuntu_old` in your config file. +- `--ascii_colors` no longer changes text colors. +- Added ascii art for Ubuntu-Budgie. + - You can use the ascii art by launching Neofetch with `--ascii_distro ubuntu-budgie` or by changing `$ascii_distro` to `ubuntu-budgie` in your config file. +- Fixed bug causing RFRemix to use the incorrect ascii art. + +## Screenshots + +Neofetch will now automatically find and use whatever screenshot tool is available on your system. The screenshot tool is no longer hardcoded and you don't have to edit your config file to specify what program to use. + +On Haiku and macOS, Neofetch will use the built-in tools to take screenshots. On systems with an X server Neofetch will look for and use the following programs: `scrot`, `maim`, `import (imagemagick)`, `imlib2_grab` and `gnome-screenshot`. + +The config option `scrot_cmd` and the commandline flag `--scrot_cmd` are still there for those who want to use custom flags, programs or scripts to take screenshots. +- Automatically use whatever screenshot tool is available. +- Added screenshot support to macOS +- Added screenshot support to Haiku + +## Screenshot Upload +- [teknik.io] Fixed images not uploading with the right filetype. +- Changed default image upload host to `teknik.io`. + - teknik doesn't compress images whereas imgur does. + - You can change this back to imgur by using `--image_host imgur` or by editing your config file. + + +## [2.0] - 2016-12-02 + +This is the biggest release of Neofetch in a long time. 97 files were changed with 2700~ additions to 2900~ deletions. Although the changelog isn't as interesting this time majority of the script has been rewritten, restructered and cleaned up. Every function and variable name follows a proper naming scheme and a large number of bugs were fixed. + +Since this version of Neofetch differs so much from the previous versions expect a 2.0.1 release a few days later to fix any bugs that are found after release. + +The ascii file handling was rewritten, ascii art is now stored/read as plain text! All `eval` usage was removed from Neofetch, vim fold markers/comments are no longer enforced and we now run on GNU Hurd, Haiku and more. + +When I was rewriting parts of the script I thought to myself; Neofetch is using the bash shebang and does depend on bash so why not take full advantage of the features bash has to offer? All tests were changed from `[` to `[[`, arithmetic tests now use `(())` and C style for loops are used where possible. + +All of the config file documentation was rewritten and multiple wiki pages were created to hopefully make using/configuring Neofetch easier than ever before. You can see the wiki here: [Neofetch Wiki](https://github.com/dylanaraps/neofetch/wiki) + +Some of the config options/arguments were renamed/changed and Neofetch will warn you on run if you're using deprecated options (`neofetch -v`). For this release Neofetch **will** include backwards compatibility with the old config file but I'd like to remove this stuff in ~~2.1~~ 3.0. I recommend using this release with a fresh config file so that you can make use of the new documentation. + +I say this every release; This changelog is incomplete, for a full list of changes take a look through the commit history. Neofetch now has an unspoken commit style so reading the commit history won't hurt as much as it used to. + +Thanks to all of the contributors this time around, you guys are a big help and I really appreciate your work towards making Neofetch better and better each release. :) + +## Contributors +- **[@konimex](https://github.com/konimex)** +- **[@TonCherAmi](https://github.com/TonCherAmi)** +- **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** +- **[@iandrewt](https://github.com/iandrewt)** +- **[@iwamatsu](https://github.com/iwamatsu)** +- **[@Brottweiler](https://github.com/Brottweiler)** + +## Packages +- Neofetch is now in Debian's official repos. +- Neofetch is now in Ubuntu's official repos. + +## General +- All functions/variables now follow the same naming scheme. `example_func_name` +- Call `uname` once and cache the output instead of calling `uname` 4-5 times. +- Cleaned up and rewrote large chunks of the script. +- Convert math tests to correct syntax. +- Fixed `--disable` and capitalized arguments. +- Fixed issue where `bold=off` wouldn't work. +- Fixed issue where info wasn't detected properly but the subtitle was still displayed. +- Fixed issue where using `--disable func func` broke other args. +- Removed all traces of `eval` from Neofetch. +- Removed all vim fold markers and stopped enforcing folding for vim users. + - See [#431](https://github.com/dylanaraps/neofetch/pull/431) +- Rewrote all of config file documentation. +- Swap all tests from `[` to `[[`. + +## Operating System +- Added support for ChaletOS. +- Added support for DracOS. +- Added support for GNU Hurd. **[@konimex](https://github.com/konimex)** +- Added support for Haiku. **[@konimex](https://github.com/konimex)** +- Added support for Korora. **[@konimex](https://github.com/konimex)** +- Added support for Netrunner. **[@konimex](https://github.com/konimex)** +- Added support for Pardus. +- Added support for iPhone 7 and 7 Plus. + +## Ascii +- Ascii art is no longer read as a script and is now read as plain text. + - See this wiki page about the new ascii art format. + - https://github.com/dylanaraps/neofetch/wiki/Custom-Ascii-art-file-format +- Neofetch now displays your OS's ascii logo if your distro's logo isn't found. **[@konimex](https://github.com/konimex)** + - Example: [Linux] Tux is displayed if there's no distro ascii. +- `neofetch --ascii_distro x` now sets the mode to ascii for you. You no longer have to use a combination of `--ascii` and `--ascii_distro`. +- [Arch Linux] Changed default ascii colors. +- [Bunsenlabs] Changed default ascii colors. +- Fixed issue with Solarized and certain ascii art. +- Remove all duplicates from `get_distro_colors()`. +- Remove execution permission flag from ascii art files. **[@iwamatsu](https://github.com/iwamatsu)** +- Rename `colors()` to `get_distro_colors()`. +- Rename `setcolors()` to `set_colors()`. +- Update Netrunner ascii art. +- Added old arch ascii logo. **[@Brottweiler](https://github.com/Brottweiler)** + - Useable by using `--ascii_distro arch_old` or by editing the config. + +## Images +- Fixed images not appearing in st. +- Added `to_ascii()` and `to_off()`. + - These functions are used when falling back to different image modes. +- Renamed `check_old_flags()` to `old_flags()` to match `old_functions()`. +- Split `get_image()` into `get_term_size()`, `get_image_size()`, `get_image_program()` and `make_thumbnail()`. +- Use `$XDG_CACHE_HOME` as the thumbnail dir if available. + +## Wallpaper +- Added support for Cinnamon. + +## Bars +- Rename all `progress_` variables to `bar_` to match the function name. + +## Info + +**Distro**
+- [Linux] Source `/etc/*-release` files instead of having a dozen separate `awk` commands. + - We source `/etc/os-release` before falling back to `/etc/*-release`. +- Remove lsb_release detection. + - This change was made since lsb_release prints innacurate results on some distros. +- Added fallback when distro isn't found. **[@konimex](https://github.com/konimex)** + - Example: `Linux (Unknown)` + +**Packages**
+- [Solus] If `pisi` is unavailable, use `eopkg`. +- Added package detection for Lunar Linux. **[@konimex](https://github.com/konimex)** +- Added package detection for TinyCore. **[@konimex](https://github.com/konimex)** +- Remove `/usr/games` from `$PATH` to fix issues with pacman game. + +**GPU**
+- GPU is now cached till reboot. +- [Linux] Prefer dedicated GPU over integrated GPU. + +**Terminal**
+- Added support for HyperTerm. **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** + +**Terminal Font**
+- Added support for HyperTerm. **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** + +**CPU**
+- [BSD] Added cpu_temp support. **[@konimex](https://github.com/konimex)** + +**CPU Usage**
+- [iOS] Fixed CPU usage. + +**Shell**
+- [bash] Simplify bash version. + +**Song**
+- Added support for Clementine. **[@konimex](https://github.com/konimex)** +- Added support for GNOME Music. **[@konimex](https://github.com/konimex)** +- Added support for Lollypop. **[@konimex](https://github.com/konimex)** +- Added support for Pragha. **[@konimex](https://github.com/konimex)** + +**Public IP**
+- Cache the output of the command. **[@konimex](https://github.com/konimex)** +- [dig] Fixed connection timed out with public_ip. **[@iandrewt](https://github.com/iandrewt)** + +**Resolution**
+- [MacOS] If refresh rate is empty don't append Hz. + + +## [1.9.1] - 2016-11-04 + +This is a small release which fixes various issues found in 1.9. + +Note: Those packaging neofetch can ignore the new file: `config/travis` + +## Contributors +- **[@konimex](https://github.com/konimex)** +- **[@fornwall](https://github.com/fornwall)** +- **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** + +## Packages +- Neofetch is now in Termux`s repos. + +## General +- [Cursor Position] Fix cursor position in URxvt when using terminal padding. +- [Termux] Fix default ascii location. **[@konimex](https://github.com/konimex)** +- [Termux] Fix default config location. **[@fornwall](https://github.com/fornwall)** +- If a function fails to detect info, let the user know in verbose mode. (`-v`) +- Removed `--test` in favor of a separate config file. Travis.ci now uses `neofetch --config travis` instead of a hacked together arg. + +## Operating System +- Added support for BlankOn Linux. + +## Images +- Fix division by 0 error. + +## Ascii +- [Tails] Update ascii art. +- [OpenBSD] Made ascii art thinner + +## Info + +**Prin**
+- Fix color breakage. +- Fix bold not working. + +**Terminal**
+- Fix whitespace error. + +**Terminal Font**
+- [Termite] Fix incorrect Termite font chosen. +- [Termite] Simplify `awk` command. +- [xfce4-terminal] Simplify `awk` command. + +**Theme**
+- [Budgie] Fix incorrect GTK Theme/Icons + +**Window Manager Theme**
+- [Budgie (Mutter)] Don't print WM Theme. + +**Memory**
+- [OpenBSD] Fixed used memory usage. **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** + + +## [1.9] - 2016-11-01 + +This change log won't cover everything that's changed. Have a look through the commit +history for more info. + +There were a lot of major changes made to how things work in this release so I'm expecting +bugs/things not working for people. Expect a 1.9.X release. + +I'm also looking for neofetch screenshots for the Readme, see this issue: [#405](https://github.com/dylanaraps/neofetch/issues/405) + +Thanks to everyone below who contributed, it's nice to see some new faces too. :) + +## Contributors +- **[@konimex](https://github.com/konimex)** +- **[@iandrewt](https://github.com/iandrewt)** +- **[@coypoop](https://github.com/coypoop)** +- **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** +- **[@koreacomputercenter](https://github.com/koreacomputercenter)** + +## General +- Added new function called `checkoldflags` which informs users about deprecated config options. +- Change all `OS X` references to `macOS`. **[@iandrewt](https://github.com/iandrewt)** +- Fix corrupted text when long lines are cut-off. +- Don't dynamically place prompt in `image=off` mode. +- Cursor Position: Fix issues when using URxvt+Padding + +## Operating System + +![android](https://u.teknik.io/4XdJy.png) +- Added support for Android. + - Dependencies: + - Required: `bash` and `busybox` + - Note: I recommend installing `termux` from the Play Store or F-Droid. Termux provides you with a fully + working Linux environment, doesn't require root acess and includes all dependencies. + - Note2: Neofetch will be packaged in `termux` thanks to **[@konimex](https://github.com/konimex)** + - PR [#351](https://github.com/termux/termux-packages/pull/531) +- Added support for Bitrig. **[@konimex](https://github.com/konimex)** +- Added support for Sparky Linux. +- Added support for Porteus. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** +- Added support for Red Star OS. **[@koreacomputercenter](https://github.com/koreacomputercenter)** + +## Packages +- Neofetch is now in Gentoo's official repos. + +## Images + +**Fixed rendering issues in URxvt when using an XFT font.** + +![scrot](https://i.sli.mg/6qp9Cg.png) + +This was first thought to be an issue between URxvt and W3m-img and I apologize for immediately closing bug reports and dismissing comments about this. + +I spent yesterday trying to fix this issue and found out that launching neofetch with `--bold off` +reduced the rendering problems. I did more digging and found out that removing all text formatting fixes the issue entirely. I later found out that adding a single unformatted character before the formatted text fixed the issue while keeping the formatting the same. + +I opened up this PR https://github.com/dylanaraps/neofetch/pull/358 which added options to enable a border between the image and the text to fix the issue. **[@konimex](https://github.com/konimex)** later commented informing me that we could just use a `zero-width space` to fix the issue and that we didn't need a new function/args/ugly border. doh + +The final fix was as simple as adding a zero-width space before the info, here's the commit. + +https://github.com/dylanaraps/neofetch/commit/3e9c3d648cb4c6f0d5fe5f0b96f9e29429af39d9 + +**Removed hard dependency on `\033[14t`** + +Neofetch no longer requires a terminal emulator that supports `\033[14t` this means that neofetch now works in Konsole. Instead of using the escape sequence users now have three options for getting the terminal size in pixels. +- `xdotool` +- `xwininfo` + `xprop` +- `xwininfo` + `xdpyinfo` + +Neofetch will detect whatever combination you have insalled and use these programs. + +Note: `\033[14t` is still supported, if images already work for you then you don't have to install anything else. +- [w3m-img] Draw the image twice to fix rendering issues in Konsole. +- [w3m-img] Fix cursor position when using `yoffset`. +- [w3m-img] Add `-bg` support with the new option `--bg_color`. + - `neofetch --bg_color blue` will make the background behind the image blue. + - Note: The background color is only visible behind transparent parts of the image. +- If the terminal width is found as `0`, fallback to ascii mode. + +## Ascii +- Bold ascii art by default. +- Fixed incorrect prompt location when using `ascii_logo_size small`. +- Fixed incorrect colors used on light terminals. +- Update Void Linux ascii art. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** +- Update Solus ascii art. + +## Info + +**Distro**
+- Expanded `distro_shorthand` to macOS, BSD and Solaris. **[@konimex](https://github.com/konimex)** +- Removed `osx_buildversion` and `osx_codename` in favour of `distro_shorthand`. **[@konimex](https://github.com/konimex)** + +**Desktop Environment**
+- [Windows] Added support for showing DE. + - Windows 8 and above: `Modern UI/Metro` + - Windows 7 and below: `Aero` + +**Window Manager**
+- [Windows] Added support for custom WMs/Shells. + - Neofetch now detects `blackbox`, `bugn`, `Windawesome`, `emerge` and `litestep`. + +**Window Manager Theme**
+- [Windows] Added support for Blackbox themes. + +**CPU**
+- Added `cpu_speed` which lets you hide/show the speed in the output. +- Expanded `cpu_cores` option by adding two new values, `logical` and `physical`. + - `logical`: Show all virtual cores (hyperthreaded). + - `physical`: Only show physical cores. +- [Linux] Added support for showing CPU temperature. + - Added new option called `cpu_temp`. + - Note: This is disabled by default and can be enabled by changing the value of `cpu_temp` in your config to `on`. +- [macOS] Print physical cores instead of hyper-threaded cores. **[@iandrewt](https://github.com/iandrewt)** +- [iOS] Rewrite CPU function. + +**GPU** +- [iOS] Rewrite GPU function. +- [Linux] Rewrite GPU function. + - Neofetch also caches the info until reboot. + +**Uptime**
+- Rewrote uptime function to use seconds since boot instead of the `uptime` command. + - Every OS/Distro now has the pretty `uptime -p` output! +- Remove `up` from output. + +**Resolution**
+- [macOS] Add @2x label for retina resolutions. **[@iandrewt](https://github.com/iandrewt)** + +**Memory**
+- [Linux] Correctly calculate used memory. + - The output should now match `conky`, `htop` and etc. + - Source: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716 +- [NetBSD] Fix memory output for sizes over 4GB. **[@coypoop](https://github.com/coypoop)** + +**Shell**
+- Hide shell path by default. +- Show shell version by default. + +**Battery**
+- [Linux] Rewrote and simplified battery function. +- Removed `battery_shorthand` +- Removed `battery_num` + +**Theme Font**
+- [XFCE] Fixed incorrect font output. + +**Color Blocks**
+- Fixed `block_width` not working. +- Fixed `% s` appearing in color blocks when neofetch is run from `tty` +- Fixed `block_width` being off by one. A value of `2` made the blocks `3` wide instead of `2` wide. + +**Terminal and Terminal Font**
+- [Linux] Use `/proc/$PPID/comm` instead of parsing `ps`. +- Uppercase first letter of `termfont` output. +- Don't print broken output of busybox's `ps`. +- Remove path from output. + +**Song**
+- [macOS] Fix iTunes automatically opening. **[@iandrewt](https://github.com/iandrewt)** +- Added support for Audacious. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** +- Rewrote song function, it's now much faster/cleaner. + + +## [1.8.1] - 2016-10-04 + +This release fixes various bugs found in 1.8. + +**General**
+- Fixed issues with single args (`-s` `-su`) being treated as values for other args. + +## Info + +**GPU**
+- Added `gpu_brand` to enable/disable showing GPU brand in output. (AMD/NVIDIA/Intel) + +**DE**
+- Added Cinnamon version number to output. + +**WM Theme**
+- Fix GNOME showing wrong WM Theme. + +**Battery**
+- Fixed battery not appearing when set to `all`. + +**Terminal Font**
+- [Termite] Ignore lines starting with `;`. + +**Progress Bars**
+- Fixed progress bars displaying incorrectly in image mode. + +## Screenshot +- Added support for uploading screenshots to Imgur and Teknik. + - Adds two new identical flags `--upload` and `-su`. +- Changed default screenshot name so that it works on Windows. + +## Images + +**General**
+- Added a tiny delay before running w3m-img which suprisingly fixed all flickering issues in VTE based terminals. See [#349](https://github.com/dylanaraps/neofetch/pull/349) + +**Wallpaper**
+- Fix wallpapers with spaces in the filename from not showing up. + +## Ascii +- Added logo mode which only displays the ascii art. + - Adds two new identical flags `--logo` and `-L`. + + +## [1.8] - 2016-10-02 + +This version of neofetch is vastly different from the previous versions and this +changelog won't cover everything that's changed. Have a look through the commit +history for more info. + +There were a lot of major changes to how things work in this release so I'm expecting +bugs/things not working for people. Depending on what comes up we my release a few 1.8.X +versions. + +This changelog is a bit of a mess this time around and I apologize but it should at least +get the message across. + +Android support didn't make it into this release as it requires testing on more devices. +If you've got a device running android and would like to help test out the branch, check +out the open PR here: [#322](https://github.com/dylanaraps/neofetch/pull/322) + +This release also saw a lot more contributors which makes me really happy. Thanks to those +below for helping out. :) + +### Contributors +- **[@hashhar](https://github.com/hashhar)** +- **[@williamkray](https://github.com/williamkray)** +- **[@dar-irl](https://github.com/dar-irl)** +- **[@gabe565](https://github.com/gabe565)** +- **[@maddcoder](https://github.com/maddcoder)** +- **[@iandrewt](https://github.com/iandrewt)** +- **[@aranega](https://github.com/aranega)** +- **[@vendion](https://github.com/vendion)** +- **[@konimex](https://github.com/konimex)** +- **[@undrskr](https://github.com/undrskr)** + +### General +- Added `--version` to print the neofetch version. +- Fix issue when title and background were both color `7`. +- Fix issue with incorrect text color when `barinfo` is set. +- Fixed various Travis.ci bugs. +- Fix lint errors. +- Moved all whitespace trimming to a dedicated function. + - Neofetch will no longer have any whitespace issues in the output. + - See [trim()](https://github.com/dylanaraps/neofetch/commit/d3c87cdaacf1ea9fbf245146c910dc53b49dba08#diff-e863270127ca6116fd30e708cdc582fcR2789) +- Quote all variable/command substitutions. +- Removed `line_wrap` as having it set to `on` broke the output. +- Removed `stdout` mode since it's been broken for a while now and I don't see the + point in fixing it. +- Removed in-script config in favor of sourcing the default user config. +- Remove all instances of `! -z` since they're pointless. +- Remove all `bc` usage by simplifying math. +- Suppress `getconfig` and `getscriptdir` errors. +- Suppress `xprop` errors since it's now an optional dependency. +- The prompt is now dynamically set in image mode instead of being anchored to the
+ bottom of the window. See [#279](https://github.com/dylanaraps/neofetch/pull/279) and [#299](https://github.com/dylanaraps/neofetch/pull/299) for examples. +- The title at the top is now much more colorful. +- Moved commands near the bottom of the script to a new function called `main`. +- Use `read -s` instead of `stty -echo` and `stty +echo`. +- Use faster `$(())` syntax for index variables. +- `-v` now shows where the config files were sourced from. +- Cleanup +- Neofetch no longer clears the screen when run in ascii or image=off modes. + - You can use the old behavior by aliasing `clear && neofetch` to `neofetch`. + +### OS +- Added support for Windows 10 Linux subsystem. **[@konimex](https://github.com/konimex)** +- Added support for GuixSD. **[@konimex](https://github.com/konimex)** +- Added support for Devuan Linux. +- Added support for GalliumOS. +- Added support for Openwrt. +- Added support for PacBSD. **[@vendion](https://github.com/vendion)** +- Added support for Rosa. +- Added support for Solaris (Oracle / OpenIndiana). **[@konimex](https://github.com/konimex)** +- Added support for macOS Sierra. **[@iandrewt](https://github.com/iandrewt)** +- Fixed various iOS related issues. + +### Packages +- Added Cydia package for iOS. + - See https://github.com/dylanaraps/neofetch#ios-1 + +### Info + +**Terminal and Terminal Font**
+ +![img](https://ipfs.pics/ipfs/QmR39ScLi56Yt73pA3YWri9ayatN6mpwSTEmM8RVdeRsB1) +- Added `term` function to display current terminal emulator. [1] +- Added `termfont` function to display current terminal font. [2] + +[1] Both of these functions are enabled by default. +[2] See this wiki page for more info about the functions: [Link](https://github.com/dylanaraps/neofetch/wiki/Terminal-and-Terminal-Font-detection) + +**Model**
+- Added `model` a new function which displays your device's product vendor/name. + +![Mode](https://ipfs.pics/ipfs/Qmcy2o5xZCELxroNLHAhY96ZsrwBFR86NGDCu5e2UPVn4b) + +**Distro**
+- Added `distro_shorthand` **[@konimex](https://github.com/konimex)** + +**Title**
+- Added additional fallback which gets the current username from `$HOME`. + +**Color Blocks**
+- Added `--block_height` / `$block_height` to change the number of lines high each
+ block will be. + +![Big Blocks](https://ipfs.pics/ipfs/QmZpR8ukZNfGXkhXjTwAy3eWVRCeHdrurhgAdV5CSiTVvR) + +**Resolution**
+- [Windows] Fix resolution on Windows 10. **[@dar-irl](https://github.com/dar-irl)** +- [Mac OS X] Hide refresh rate if `0`. **[@iandrewt](https://github.com/iandrewt)** +- Fixed `xrandr` output on systems not using gawk. +- [Linux / BSD] Shortened refresh rate output. + +**Shell**
+- Show `fish` shell version. **[@maddcoder](https://github.com/maddcoder)** + +**Song**
+- Added support for Deadbeef. **[@konimex](https://github.com/konimex)** +- Added support for Amarok. **[@konimex](https://github.com/konimex)** +- Added support for Banshee. **[@konimex](https://github.com/konimex)** +- Added support for Rhythmbox. **[@konimex](https://github.com/konimex)** +- [Cmus] Prevent `tag artistsort` from showing up in song title. **[@williamkray](https://github.com/williamkray)** +- [Cmus] Fix order of music tags. **[@iandrewt](https://github.com/iandrewt)** +- [Cmus] The function now works on both OS X and Linux. +- [iTunes] Fix song not displaying. **[@iandrewt](https://github.com/iandrewt)** + +**CPU**
+- Simplify CPU Core command. + +**CPU Usage**
+- Fixed broken CPU usage output on BSD and Windows. +- Fixed misleading output on Linux / Mac OS X. +- Moved CPU Usage to its own dedicated function. + +### Image + +![terminology](https://ipfs.pics/ipfs/QmbVEUREBg4hMG22WrQ2bkt2sZZzyTEP5EEXmHRw7MHD6A) +- Added image support for terminology with `tycat`. **[@aranega](https://github.com/aranega)** [1] +- Fixed issues with lines getting drawn through images. See [#296](https://github.com/dylanaraps/neofetch/pull/296) +- Added `--crop_mode none` / `crop_mode=none` to disable cropping the images. +- Added `--size none` / `size=none` to disable resizing / cropping the images. +- Removed `image_position` +- `--image off` now behaves like the other image modes. + +[1] `tycat` is a terminology builtin that works similarly to w3m-img. Those using terminology
+now have working image support. + +##### Shuffle mode +- Fixed directory going out of bounds causing a fallback to ascii mode. **[@gabe565](https://github.com/gabe565)** +- Simplified shuffle function. +- Path no longer requires a `/` at the end. **[@aranega](https://github.com/aranega)** + +### Ascii +- Add `ascii_bold` which allows you to bold the ascii art. +- Added `--ascii_distro mac` as a shorter way of using the OS X ascii. +- Added missing `$ascii_distro` config option. +- Better `Ubuntu-GNOME` ascii art. **[@hashhar](https://github.com/hashhar)** +- Custom ascii files (`--ascii path/to/ascii_file`) now follow the same format as the + distro ascii files. See this wiki page that explains the syntax. [Link](https://github.com/dylanaraps/neofetch/wiki/Custom-Ascii-art-file-format) +- Fix a color issue with Debian's ascii logo. +- Fix an error with an unescaped char in Windows' ascii art. +- Use a pure bash solution to getting ascii size. +- Updated Solus ascii art to match new logo. **[@undrskr](https://github.com/undrskr)** + + +## [1.7] - 2016-05-14 + +Hello, sorry this release took so long. I've been extremely busy with uni and +haven't had as much time to work on neofetch. + +As always, check the `Following HEAD` wiki page for all breaking changes +this release. + +I'm also looking for some new Readme screenshots, see this github issue: **https://github.com/dylanaraps/neofetch/issues/245** + +### Contributers + +Thanks to the following people for contributing this release. +- **[@dawidd6](https://github.com/dawidd6)** +- **[@tudurom](https://github.com/tudurom)** +- **[@iandrewt](https://github.com/iandrewt)** + +### General +- Made it easier to get verbose logs. +- Added issue template for github. +- New repo for Crux. **[@tudurom](https://github.com/tudurom)** +- Added release badge to readme. **[@dawidd6](https://github.com/dawidd6)** +- Updated man page and usage with newest flags. +- Font is now enabled by default to match Screenfetch's default config. +- Fixed `bold` option not working. + +### OS / Distro Support +- Added support for Kogaion Linux. +- Added support for Apple iOS. **[@iandrewt](https://github.com/iandrewt)** + - Neofetch should now work on your iPhone, iPod and iPad. +- Added support for DragonflyBSD. +- Added support for PCBSD. + +![iOS screenshot](https://ipfs.pics/ipfs/QmYmPhwpFrxwySW2phdxH1TyQ6tCgCnxtYtbEEe3RY5TwZ) + +### Error Messages + +Neofetch now supports displaying error messages and saving a verbose log for +troubleshooting. + +![log](https://ipfs.pics/ipfs/QmeTWGKozY79zcxbrgXueyTRfQcTUe7ZmDqLv4ASgJB4G4) +- Added `-v` to print error messages to stdout. +- Added `-vv` to print a verbose log to stdout. [1] + +[1] Use `neofetch -vv 2> file` to save a verbose log for bug reporting. + +### Info +- Rewrote most BSD info functions, they're now much smaller and work on more + BSD distros. + +**prin** +- Format changes to fix issues with colons in string. This change also makes + `prin` use the same args as `info`. + +``` sh +# OLD Format +prin "Subtitle: Text goes here" + +# NEW Format +prin "Subtitle" "Text goes here" +``` + +**Title** +- Made title faster by using `$HOSTNAME` when available. + +**Underline** +- Fixed bug with `--underline on/off` not working. +- Underlining is no longer hardcoded to title length meaning you can now + underline any part of the output and the length will match. +- `$underline` was renamed to `$underline_enabled`. + +``` sh +# OLD Variable +underline="on" + +# NEW Variable +underline_enabled="on" +``` + +**Distro** +- Fix arch issues with ARM cpus. +- We now use `uname -m` to get the arch instead of hardcoding `x86`. +- Moved distro detection to a function called `getdistro`. +- Fixed issue with `ascii_distro` not working. + +**CPU** +- Fixed issues when cpu speed was < 1Ghz +- Cleanup of CPU function. +- Don't print `Dual-Core` or `Quad-Core` in CPU output. + +**GPU** +- [Linux] More GPU substitutions for AMD cards. +- Added BSD support using `glxinfo`. + +**Memory** +- [Linux / Windows] Use `memavail` if available for a more accurate output. + +**Packages** +- Package count now works when the user has multiple package managers installed. + For example, if the user has both `dpkg` and `pacman` installed the function will + add up the packages from both package managers to get a grand total. (`dpkg pkgs` + `pacman pkgs`) + +**Uptime** +- Fixed various issues with OS X and BSD. + +**Desktop Environment** +- [ Linux ] Fallback to using `xprop` if `$XDG_CURRENT_DESKTOP` is empty. +- Use `$de` instead of `$XDG_CURRENT_DESKTOP` for wallpaper and theme detection. +- Fixed xprop bug with DE detection when X wasn't running. +- Don't assume that user is using MATE if marco wm is detected. + +**Window Manager Theme** +- Fixed bug when `$de` was unset. + +**Color Blocks** +- Fixed bug when the blocks wrap a line causing a large white strip to appear. + +### Ascii +- Added KDE neon ascii art. +- Added small OpenBSD ascii art. + - Credit goes to ufetch. +- Reduced the size of NetBSD's ascii art. +- [Windows 8/8.1] Use modern windows ascii art. + +### Colors +- Fixed bug with `--colors` not working with all 256 terminal colors. +- `--colors 7` now uses the color white. [1] +- `--colors fg` now uses the foreground color. [1] + +[1] Neofetch tried to be smart before by assuming that the foreground color +would be white or black. This caused issues for those setting the foreground +color to red or etc. This change adds a new value for `--colors` and `colors=()` +called `fg` which will set the color to your foreground color. + +### Progress Bars +- The default progress bar look was changed to `[=====-----]` instead of `━━━━━━━━━━` + fix issues with older systems. +- You can now enable/disable a border around the progress bars with `progress_border`. + +``` sh +# $progress_border on +[=====-----] + +# $progress_border off +=====----- +``` +- You can now individually set the progress bar characters by using + `progress_char_elapsed` and `progress_char_total`. This means that you can + have a seperate character for the elapsed and total portions of the bar. + +``` sh +# Examples with $progress_border on + +# Elapsed: = +# Total: - +[=====-----] + +# Elapsed: . +# Total: " " +[..... ] + +# Elapsed: / +# Total: " " +[///// ] +``` + + +## [1.6] - 2016-04-01 + +# Neofetch 1.6 + +Another ~~week~~ another release of Neofetch. + +This release focused on cleanup, bug fixes and optimization. Neofetch +is now much much faster than last release and more bug free than ever +before! + +This release surprisingly didn't break much at all, see the latest entry in +the wiki page `Following HEAD`. + +https://github.com/dylanaraps/neofetch/wiki/Following-HEAD + +![scrot](https://ipfs.pics/ipfs/QmTD6cRmYfLdrvvyLfGdUfBDCzE5uYNsRpLUx7vLUFkYxM) + +### Contributors + +Thanks to the following people for contributing this release. +- **[@iandrewt](https://github.com/iandrewt)** +- **[@dawidd6](https://github.com/dawidd6)** +- **[@onodera-punpun](https://github.com/onodera-punpun)** +- **[@onespaceman](https://github.com/onespaceman)** +- **[@firstEncounter](https://github.com/firstEncounter)** +- **[@konimex](https://github.com/konimex)** + +### General +- Added Travis CI support. +- Added `--test` which is meant for testing and prints all functions. +- Cleanup of Distro, Uptime, Memory and CPU functions. +- We now use a more reliable white-space trimming substitution for CPU/GPU etc. +- Use `stty` instead of `read -s` to fix an issue with escape sequences
+ appearing in the output. +- Line wrap is now disabled by default. +- Implement base support for caching specific info. This will eventually
+ allow us to speed up the script by caching info that won't change for a
+ long period of time like the CPU/GPU. [1] +- Fixed a locale issue when `LC_ALL` is unset on the user's system. +- Change all usage of `$HOME/.config` to `$XDG_CONFIG_HOME` with a fallback to `$HOME/.config`. + +[1] You can clear the cache with `--clean`. + +### Colors + +![vs](https://ipfs.pics/ipfs/QmNVw4zm78tgBGdhDJ1FZ1aktpEtVapVtNWWMMKh5aitrZ) + +

Neofetch 1.5 vs Neofetch 1.6

+ +

Neofetch now works with bright color schemes and uses the foreground color instead of hard-coding white.

+ +
+- Fixed buggy colors in older versions of *BSD, OS X and Linux. +- The default text colors now work on bright color schemes. We no longer force
+ the color white, it's now based on your foreground color. +- Progress bars are now by default colored based on your distro's logo colors. +- Color blocks now work in older systems and in Travis CI. + +### Packages +- Neofetch is now is Void Linux's official repos. **[@konimex](https://github.com/konimex)** + +### Info +- Functions now no longer print `Unknown` when they fail, they now don't appear at all. + +**Window Manager Theme**
+- Added new `WM Theme` function to print window manager themes. + +**OS**
+- [ CRUX ] Also print the CRUX version. **[@onodera-punpun](https://github.com/onodera-punpun)** +- [ Fedora ] Fixed a weird detection bug. + +**CPU**
+- [ Windows ] Don't print CPU cores if detection fails. +- [ BSD ] Fixed extremely long output. +- Fixed broken CPU speed when source is `/proc/cpuinfo`. + +**GPU**
+- Don't show GPU output on unsupported OS. +- `Nvidia` is now displayed as `NVIDIA`. **[@firstEncounter](https://github.com/firstEncounter)** +- Intel GPUs now all appear as `Intel Integrated Graphics`. to avoid naming issues. +- [ OS X ] We now cache the GPU value. + +**Battery**
+- Show charging state in battery output. **[@dawidd6](https://github.com/dawidd6)** and **[@iandrewt](https://github.com/iandrewt)** +- [ Windows / OpenBSD ] Fix blank battery output when battery isn't found. + +**Resolution**
+- [ Windows ] Don't print resolution if detection fails. +- [ Linux / OSX / BSD ] Print refresh rate next to resolutions. +- [ Linux ] Multi monitor support using `xorg-xrandr`. +- [ Linux ] Refresh rate support using `xorg-xrandr`. +- [ OSX ] Added support for using `screenresolution` to print the output.
+ This is much faster than the default method. + +**Packages**
+- Listing homebrew packages is now super fast. **[@iandrewt](https://github.com/iandrewt)** + +**Public IP**
+- Made public IP function faster by using `dig` if available. **[@iandrewt](https://github.com/iandrewt)** +- Each source now has a timeout to avoid a hang. +- If the IP detection fails we try another method. + +**Theme**
+- Use `$GTK2_RC_FILES` if the envar is set. **[@onespaceman](https://github.com/onespaceman)** + +**Desktop Environment**
+- Added OS X detection. + +**Song**
+- [ MPD ] Fixed function when mpd is running on another PC and not your own. +- Song now displays `Not Playing` instead of `Unknown` when no music player is found. +- Added support for Google Play Music Desktop Player (adds optional dependency of [`gpmdp-bash`](https://github.com/iandrewt/gpmdp-bash)) **[@iandrewt](https://github.com/iandrewt)** + +**Disk**
+- Added new display option `perc` to display just the percentage with the progress bar. +- [ FreeBSD ] Fixed disk usage not working. + +**Memory**
+- [ OpenBSD ] Fixed completely broken memory output on OpenBSD. +- [ Linux ] Rewrote memory function so that it works on old kernel versions. + +**Uptime**
+- [ OSX / BSD ] Performance improvements. **[@iandrewt](https://github.com/iandrewt)** +- [ OpenBSD ] Fixed duplicate `up` in output. + +**Birthday**
+- Fix stray `+` sign in output. + +### Image +- Remove `shuffledir` in favor of '--image path/to/dir/' +- Use `printf` instead of `shuf` to pick a random image. +- [ OS X ] Fixed issues with wallpaper detection. +- [ OS X ] Wallpaper detection now works on a per desktop basis. +- Removed `image_backend` and instead use iterm2 mode only when iterm2 is detected. + +### Ascii +- Added ascii art for Qubes OS. +- Added ascii art for Travis CI. +- Revamped Alpine Linux's ascii art. +- Fixed missing ascii colors for Puppy Linux. +- [ OSX ] Fixed incorrect text colors. +- Sped up ascii function by dropping `wc` usage. + +### Scrot +- Fixed scrot function not using user defined options. + + +## [1.5] - 2016-03-17 + +# Neofetch 1.5 + +![Xubuntu](https://ipfs.pics/ipfs/QmWPvwW3nQoKVffHSZUu57MwCpQDZoMVTHQVwwCom2ChqM) + +### Contributers + +Thanks to the following people for helping me to improve neofetch. +- **[@iandrewt](https://github.com/iandrewt)** +- **[@konimex](https://github.com/konimex)** +- **[@CousinMachu](https://github.com/CousinMachu)** + +### General +- Remove all `echo` usage inside the script. +- More cleanup and misc bug fixes. + +### Packages +- Neofetch is now packaged for `Fedora` and `Fedora` based distros. **[@konimex](https://github.com/konimex)**. +- Added installation instructions for RHEL and CentOS. **[@konimex](https://github.com/konimex)**. +- Added stable package to the AUR. **[neofetch](https://aur.archlinux.org/packages/neofetch/)** + +### Progress Bars + +This has finally been merged to master, a big thanks to **[@iandrewt](https://github.com/iandrewt)** for helping +me finish up with this PR. + +![bars](https://ipfs.pics/ipfs/Qmbj8S7pi4CVw12XTawtRwRpLvkiZ9cxRxCUPMLQ1Nhhkb) +- Added progress bar support to CPU, Memory, Disk, Battery. +- Added `progress_char` which allows you to change the character used when drawing the bars. +- Added `progress_length` which allows you to set the max length in spaces of the bars. +- Added `progress_elapsed_color` which sets the elapsed color. +- Added `progress_total_color` which sets the total color. +- Added `--progress_colors` which takes two color values: `elapsed`, `total`. +- Added `cpu_display`, `memory_display`, `disk_display` and `battery_display` which allow you
+ to customize where or if the progress bar will appear. + - Takes these values: `info`, `bar`, `infobar`, `barinfo` + +### OS +- Added support for `SteamOS`. + +### Images +- Using `xoffset` now also moves the text over. +- Changed default gap size to `2`. +- Fixed an issue with Nitrogen and multi monitor wallpaper setups. **[@CousinMachu](https://github.com/CousinMachu)** + +### Ascii +- Kaos: Update ascii logo to the new logo. +- Added ascii logos for `Kubuntu`, `Lubuntu`, `Xubuntu` and `ubuntu-gnome`. + - You can enable them with `--ascii_distro kubuntu`, `--ascii_distro lubuntu` and etc. + +### Info + +**OS**
+- [ OSX ] Fix buildversion displaying regardless of on/off. **[@iandrewt](https://github.com/iandrewt)** +- [ OSX ] Added `osx_codename` (on by default) which prints the OSX codename. **[@iandrewt](https://github.com/iandrewt)** + +**Disk Usage**
+- Only display usage of local disks. +- Fixed disk usage progress bars when the used value was larger than the total. **[@iandrewt](https://github.com/iandrewt)** + +**Theme**
+- Added `/usr/share` as another theme directory to fix an issue with no theme being found. **[@iandrewt](https://github.com/iandrewt)** + +**CPU**
+- Added `cpu_shorthand` to shorten the output of CPU. **[@iandrewt](https://github.com/iandrewt)** + - Takes these values: `name`, `speed`, `tiny`, `on`, `off` +- Added the ability to print the CPU Usage by using `cpu_display="info"` or `--cpu_display off/on info`. +- Added `cpu_cores` to enable/disable showing the number of CPU cores in the output. **[@iandrewt](https://github.com/iandrewt)** + +**GPU**
+- Added new `tiny` option to `gpu_shorthand` to further shorten the GPU output. **[@iandrewt](https://github.com/iandrewt)** + +**Memory**
+- Fix hang on older systems. + +**Desktop Environment**
+- Fixed bug where `i3` would show up as both a DE and a WM. + +**Birthday**
+- Fixed the birthday function on OS X, it apparently wasn't working from the start. **[@iandrewt](https://github.com/iandrewt)** + +**Song**
+- [ OSX ] Added Spotify support to song. **[@iandrewt](https://github.com/iandrewt)** +- [ OSX ] Added Itunes support to song. **[@iandrewt](https://github.com/iandrewt)** +- Fix bug with `song_shorthand` and songs with more than one occurence of `-`. + +**Battery**
+- Fixed a naming error when multiple batteries are displayed. **[@iandrewt](https://github.com/iandrewt)** + +### Stdout Mode +- Fixed issues with functions that use `prin`. + + +## [1.4] - 2016-03-09 + +Lots of bugs were fixed and a lot of code was cleaned up, this changelog just lists +the major changes made to neofetch. For a full list, checkout the git commit history. + +Thanks to everyone for contributing, I appreciate it! +- Renamed `fetch` to `neofetch`. Thanks for voting. +- Neofetch now has a man page. (man neofetch) Thanks **[@konimex](https://github.com/konimex)** +- Added support for `Alpine Linux`. +- Fix issue with color blocks ending up on the same line as the prompt. + +### Packages +- Added Debian/Ubuntu package. Thanks **[@dawidd6](https://github.com/dawidd6)** +- Added Homebrew package for OS X. Thanks **[@iandrewt](https://github.com/iandrewt)** + +### Info +- Reimplement `color` function. + +**Battery**
+- Added support for NetBSD + +**Song**
+- [Linux] Added support for Spotify. + +**Birthday**
+- Added `--birthday_format` and `$birthday_format` to change the date format of the
+ birthday function. The flag uses the `date` cmd's format options so see `man date`
+ for a list. + +**Packages**
+- Fix 0 package count in Slackware. Thanks **[@h3xx](https://github.com/h3xx)** + +**GPU**
+- Added more GPU substitutions. + +Example: + +``` sh +neofetch --birthday_format "%D" +neofetch --birthday_format "%a %d %b %Y %l:%M %p" +neofetch --birthday_format "%c" +``` + +**Theme**
+- Fix incorrect theme detection on Cinnamon. + +### Ascii +- Added small ascii logo variants for Arch, Crux and Gentoo. [1] +- Added new flag/option `ascii_logo_size` that takes the values `normal` and `small`. +- Optimized all ascii art fixing all leading whitespace issues. + +[1] The small ascii art was taken from [ufetch](https://github.com/jschx/ufetch). + +Example of small ascii logo: + +![CRUX](https://ipfs.pics/ipfs/QmSpadVHtBPRBUJEiiztqkXqfhE2fuGS5t8bzsbxWUYaXA) + +### Stdout +- Don't create config file when using `--stdout`. +- Simplified stdout function. +- Reimplent `--stdout_separator` and `$stdout_separator` which allow you to change
+ the separator between the info. + +Example: + +``` sh +# Display memory, battery and disk in a single line separated by " | " +# This output can then be used in lemonbar etc. +neofetch --stdout memory battery disk --stdout_separator " | " +``` + + +## [1.3] - 2016-02-26 + +# Fetch 1.3 + +Hey guys, + +This update brought some breaking changes, see this wiki page for what you'll +need to update in your config file. + +https://github.com/dylanaraps/fetch/wiki/Following-HEAD + +We're in the middle of renaming 'fetch' to something else as there are +already other programs using the name and we don't appear in any searches. + +You can help out by voting in our poll here: + +http://strawpoll.me/6894425 +- Fetch now supports **bash 3.0+**. +- More cleanup +- The text is now by default colored according to your distro's logo. +- Removed `$*_color` variables/flags in favour of a general `$colors` + variable/flag. See my writeup here: **https://github.com/dylanaraps/fetch/pull/96** + +### Image +- You no longer need to set the font_width value, your font size + is now calculated by fetch automatically. +- Image sizing now takes terminal height into account. +- `--size` now also takes a percentage as a value, for example. + +``` sh +# Image takes up 70% of the terminal size. +fetch --size 70% + +# Size the image in pixels. +fetch --size 200px +``` + +### Packages +- Fetch now has a `crux` port. Thanks **[@ix](https://github.com/ix)**. + +### OS +- Added support for `BunsenLabs`. +- Added support for `SailfishOS`. (Untested) + +### Info +- Don't display Theme, Icons, Font or Window Manager if X isn't running. +- Added function to show currently logged in users. + +**Window Manager** +- Add support for Wayland window managers. (Hardcoded) + +**Song** +- Added `song_shorthand` which prints the Artist/Title on seperate lines. + +**Theme** +- Windows Visual Style is now a part of `getstyle`. +- Disabled theme output on OS X to fix a `gsetttings` related crash. +- Uppercase the first letter of the theme. + +**Resolution** +- Added Windows support. +- Enabled by default but only displays info if the dependency is found. + +**Battery** +- Added FreeBSD and OpenBSD support. Thanks **[@tudurom](https://github.com/tudurom)**. + +**GPU** +- Added more substitutions/ + +### Stdout + +Printing to stdout in a plaintext format for use in scripts is now +much faster and cleaner. +- Removed `--stdout_separator` (Separator is now 2 spaces) +- Removed `--stdout_subtitles` +- Removed `--stdout_title` + + +## [1.2] - 2016-02-17 + +# Fetch 1.2 + +This new release comes with a few config breaking changes, see this wiki page +for info on how you can workaround the issues. + +https://github.com/dylanaraps/fetch/wiki/Following-HEAD +- Fetch now has a **gitter** chatroom. [![Gitter](https://badges.gitter.im/dylanaraps/fetch.svg)](https://gitter.im/dylanaraps/fetch?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) +- Fixed text padding when the user didn't have the locale `en_US.UTF8` installed. +- Cleaned up parts of the script. + +### OS + +We now support almost all the Linux distros Screenfetch supports excluding +the distros that have been discontinued. + +Added support for these distros: +- `Puppy Linux` +- `Kali Linux` +- `openSUSE` +- `Raspbian` +- `Mageia` +- `PCLinuxOS` +- `Zorin OS` +- `Tails` +- `BLAG` +- `Void Linux` +- `Trisquel` +- `Solus` +- `Peppermint` +- `NixOS` +- `Chakra` +- `Mandriva` +- `gNewSense` +- `LMDE` +- `KaOS` +- `Sabayon` +- `Frugalware` +- `Chapeau` +- `Slackware` +- `Scientific Linux` +- `Exherbo` +- `Chrome OS` +- `Chromium OS` + +### Makefile +- Fixed makefile on OS X El Captain. +- `$PREFIX` is now also used when installing ascii art and the default config + +### Wallpaper +- Fetch now supports using `MATE` desktop's wallpapers. +- Fetch now fallsback to ascii mode if the found wallpaper is an xml file. This + fixes issues where the wallpaper set by gsettings is an xml file. + +### Info + +**Desktop Environment**: +- Added support for showing the user's DE. + +**Window Manager**: +- `xprop` is now a required dependency. See **[#79](https://github.com/dylanaraps/fetch/pull/79)**. +- Renamed 'windowmanager' to 'wm' + +**IP Address**: +- Added function to get your local IP +- Added function to get your public IP [1] +- Added `--ip_host` and `$public_ip_host` which allow you to change the website we + ping for the public IP. + +[1] Public IP requires an internet connection as we ping a website. + +**Packages**: +- Check for packages based on which package manager is installed instead of + using a hardcoded list of distros. + +**Theme**: +- Added support for getting DE theme. +- Added support for getting KDE theme. +- Renamed `getgtk` to `getstyle`. +- Dropped the `gtk` from these printinfo functions `gtktheme`, `gtkicons` + and `gtkfont`. Theme output will be blank until you make these changes: + +``` sh +# Old Naming +info "GTK Theme" gtktheme +info "Icons" gtkicons +info "Font" gtkfont + +# New Naming +info "Theme" theme +info "Icons" icons +info "Font" font +``` + +**GPU**: +- `gpu_shorthand` is now enabled by default. +- We now favor showing the dedicated GPU over the integrated one. + +**Song**: +- Added support for `MOC`. +- We now check to see if the player is running before printing anything. +- We now check playback state and show it if relevent. + +**Uptime**: +- [Linux] Fixed uptime when it's under 1 minute. + +### Ascii Art +- `--ascii_distro` now also enables ascii mode. +- Fix missing ascii art when fetch is installed in /usr/local +- Update Deepin's ascii art to their new logo + + +## [1.1] - 2016-02-06 + +# Fetch 1.1 changelog + +Over the past 10~ days over **190** more commits have been pushed to master and the +script has had some big changes. Thanks to everyone who has contributed, you've been +a big help. + +![screenfetch mode](http://i.imgur.com/nW3HiNP.png) +New screenfetch mode +- If `w3m` or `imagemagick` aren't installed we gracefully fallback to ascii mode. +- Automatically find the `w3m-img` path and fallback to ascii mode if not found. [1] +- Fix padding escape codes on BSD systems. +- Swap escape codes from `\e` to `\033` for consistency. +- We only move the cursor to the bottom of the terminal in w3m/iterm2 rendering modes. +- Cursor position is now dynamic in ascii mode based on the height of the ascii and info text. +- If images and ascii are off, don't clear the terminal +- The script now exits correctly instead of always exiting with status code `1` +- If the script exits for any reason, unhide the cursor. +- Removed duplicate blocks inside `getcpu` and `getmemory`. +- Removed `--colors` as it was apparently broken from day 1. +- Usage has been reformatted so that every flag has a value. + +[1] Setting `$w3m_img_path` will make the script look there first. + +### Image +- Added support for displaying ascii art inside of text files. +- Added "screenfetch mode" which will display your distro's ascii art next to the info. [1] +- Added `--ascii_distro` to choose which distro's ascii logo to display. +- Added `--ascii_colors` and `$ascii_colors` which allow you to change the colors of the ascii art + and distro logos. [2] +- Added `--size` and `$image_size` to set the image size in pixels. +- Rename `--shuffledir` and `$shuffledir` to `shuffle_dir`. +- Rename `--imgtempdir` and `$imgtempdir` to `thumbnail_dir` +- Removed `--split_size` and `$split_size` as they were weird and confusing to use. +- Default thumbnail directory is now `$HOME/.cache/thumbnails/fetch`. Thanks @tudurom +- If `--image` and `--ascii` are left empty we fallback to ascii distro mode. + +Example usage of ascii from file: + +``` sh +fetch --ascii "path/to/ascii" --ascii_color 2 + +``` + +[1] **[How do I enable screenfetch mode?](http://github.com/dylanaraps/fetch#how-do-i-enable-screenfetch-mode)** +[2] `ascii_colors` takes a range of colors which allows you to color every aspect of +distro and OS ascii art. For custom art the script will color the entirety of it using +the first value of `ascii_colors`. If `ascii_colors` is left empty, color will be disabled. + +### Config file +- Fetch now has a config file that you can share with people and keep between + script versions! [1] +- Added `--config` and `$config_file` to specify a custom config location. +- Added `--config off`, `--config none` and `$config` to enable / disable config files + at launch or in script. + +[1] https://github.com/dylanaraps/fetch#using-the-config-file + +### Makefile +- Fetch now has a make file due to the increasing number of files, + this allows the script to be easily installed and uninstalled on + systems it isn't packaged for yet! [1] + +[1] The script will still work just fine on its own, you'll just be missing +the distro ascii art and the automatic config creation. + +### Packages +- Fetch now has a Gentoo/Funtoo e-build courtesy of **@z1lt0id** + +### Stdout +- Added `stdout` mode which allows you to fetch info in a plain text format that works + with lemonbar and in your scripts. You can use it by launching fetch with `--stdout` to print all + functions enabled in your `printinfo` function. You can selectively print functions by passing + arguments to `--stdout` like so: + +``` sh +# Print the output of all info functions enabled in printinfo +fetch --stdout + +# Print the output of memory +fetch --stdout memory + +# Print the output of memory and disk +fetch --stdout disk + +# Print the output of all functions excluding x +fetch --stdout --disable kernel packages gtktheme + +``` +- Added `--stdout_separator` and `$stdout_separator` which takes a string and adds it + as a separator between the output. +- Added `--stdout_title` and `$stdout_title` which allow you to toggle the `title@hostname` + from appearing in the output. +- Added `--stdout_subtitles` which allow you to toggle the `Info:` titles from appearing in + the output. + +``` sh +# Hiding subtitles +fetch --stdout --stdout_subtitles off + +# Custom separator +fetch --stdout disk gpu --stdout_separator " | " + +``` + +**NOTE:** `stdout_subtitles` and `stdout_title` only work when `--stdout` is used on its own +without any args. + +### Info +- You can now display info without a subtitle. eg. `info memory` +- Added `--disable` which allows you to stop an info line from appearing at launch. +- Added `--underline` and `$underline` which allow you to toggle visibility of the + underline at launch and in your config. + +``` sh +# Stop cpu, gpu, disk and shell functions from being called +fetch --disable cpu gpu disk shell +``` + +**Kernel:** Added `--kernel_shorthand` and `$kernel_shorthand` to print less or more kernel info +**Window Manager:** Added support for `$XINITRC` +**GTK:** Fix incorrect GTK3 theme being displayed +**CPU:** `cpu_shorthand`: New substitutions +**GPU:** `[Linux]` Count the number of identical GPUs. eg. `Nvidia Geforce GTX 970 x 2` +**Memory:** `[Mac OS X]` Added wired memory to memory usage. + +**Distro:** +- Added support for showing OS architecture. eg `Arch Linux x86_64`, `Windows 7 Ultimate 64-bit` [1] +- Mac OS X: Added support for showing Max OS X build version. [2] +- Windows: Distro now displays Windows edition. eg. `Windows 7 Ultimate` + +[1] You can toggle this using `--os_arch` and `$os_arch`. +[2] You can toggle it using `--osx_buildversion` and `$osx_buildversion`. + +**Shell:** +- Added `--shell_version` and `$shell_version` to hide/show your shell's version. +- Added `--shell_path` and `$shell_path` to hide/show the path to your shell + +**Birthday:** +- Added `birthday` which prints the age of your OS install. +- Added `--birthday_shorthand` and `$birthday_shorthand` to shorten/lengthen + the output of birthday. +- Added `--birthday_time` and `$birthday_time` to show/hide the time in the output. + +**Battery:** +- Added `battery` which prints the battery usage percentage for each battery + in your system. +- Linux: Added `battery_num` which allows you to choose which battery to display, + it also takes the value `all` which will print all batteries line by line. +- Linux: Added `battery_shorthand` which when set to `on` prints each battery on the + same line like so: + +``` sh +# battery_shorthand="on" +Battery: 10%, 5%, 67% + +# battery_shorthand="off" +Battery0: 10% +Battery1: 5% +Battery2: 67% + +# If there's only a single battery in the system +# we ommit the numbered title. +Battery: 10% +``` +- **NOTE:** This currently doesn't support BSD systems as we have no one to help us test + - See **[Issue #46](https://github.com/dylanaraps/fetch/issues/46)** + + +## [1.0] - 2016-01-27 + +# Fetch 1.0 + +There have been over **260** commits to master since I last made a release +and the script is at a point now where I can say that it's feature complete +so I'm releasing 1.0. The script now supports many more OS/distros and has +had lots of bug fixes, changes and features added. + +I'm probably missing a bunch of stuff from this changelog so if i've +forgotten anything, let me know! + +I'm also slowly adding pages to the wiki so check it out! + +# Here's what's new: +- Added full support for **Windows**, **BSD** and **Mac OS X**. +- Fetch is now MIT licensed +- Dropped the `.sh` from the filename and title. +- Dropped support for `mksh` so we can support some `bash` only features. +- Cleanup of everything +- Added `--prompt_height` and `$prompt_height` to fix the script going
+ offscreen due to multi-line shell prompts. This option should be set to
+ your prompt height in lines. +- The script now supports bash **4.0**. It turns out that we only
+ supported bash **4.3** +- Restore cursor and clear screen on ctrl+c. +- Swap `tput` cmds for `ansi escape sequences` where possible. +- Added folds to make the script easier to navigate in *vim. +- Added `-F` to grep where possible for a speedup where possible. +- Fix whitespace issues with different distros. +- Remove uneeded `$` symbols. +- Remove double negative tests. +- Added note about needing `procps` or `procps-ng` for uptime support. +- Fix syntax errors in script and readme. +- All vars now use `on/off` instead of `1/0`. +- Quote things that should be quoted. + +**Linux:** +- Fix issues with `Elementary OS` and `CentOS`. + +**Mac OS X:** +- Added support for other package managers. +- Fix issue with multiple resolutions in `getresolution` + +**Windows:** +- Added `getvisualstyle` function to get the current Windows theme. +- Added `choclatey` support to package count. + +**BSD:** +- Fix tput commands not working on BSD + +## Info: + +As of commit 9daacdd the info array at the top of the script has changed +to a regular function. The benefits of this are pretty cool, you can now +use any bash syntax to customize what gets displayed. You could have an +if statment and only print window manager and gtk themes if X is running +or only show current song if there's one playing. + +You can see some examples and read more about it here: + +https://github.com/dylanaraps/fetch/wiki/Customizing-Info + +
+ +**All:** +- All functions return `Unknown` or `None` instead of printing nothing.
+ +**Title:** +- You can now color the `@` symbol in the title using `--at_color`,
+ `$at_color` and `--colors x x x x x x`. + +**OS:** +- We now check `lsb_release` before looking inside of files, this fixes
+ detection for some *buntu based distros. +- We now exit if the OS type wasn't detected. + +**Window Manager:** +- `wmctrl` is now used by default if found. + +**Uptime:** +- Added `--uptime_shorthand` and `$uptime_shorthand` to make the output
+ of `uptime` smaller and prettier. +- Added new `--uptime_shorthand` and `$uptime_shorthand` value
+ called `tiny`. This makes the output even tinier. eg. `1d 10h 32m` + +**GTK:** +- Added functions to get GTK Theme, Icons and Font +- Added `--gtk{2,3}` and `$gtk{2,3}` to enable/disable gtk2 or gtk3 from
+ being displayed. +- Added `--gtk_shorthand` and `$gtk_shorthand` to make the output of
+ `gtk*` smaller and prettier. + +**Packages:** +- Remove package version and color from `Pacman` output +- All distros are now wildcarded so that version numbers from
+ `lsb_release` are ignored. + +**CPU:** +- Added more cpu speed types to `--speed_type` and `$speed_type`. +- Use `cpufreq` when available instead of hardcoding it for specific distros. + +**GPU:** + +See **[issue #21](https://github.com/dylanaraps/fetch/issues/21)** +- Added function to get the current Graphics Card. +- Added support for VirtualBox GPU. +- Added `--gpu_shorthand` and `$gpu_shorthand` to make the output of `gpu`
+ smaller and prettier. + +**Disk:** + +See **[issue #27](https://github.com/dylanaraps/fetch/issues/27)** +- Added function to get current/total disk usage. + +**Song:** +- Added `cmus` support. + +## Images: +- Added support for **iTerm2's** image rendering. +- Added `--image_backend` and `$image_backend` to change which program
+ is used to render the images. +- The image is now displayed **before** the text, this fixes image
+ rendering issues with **vte** based terminal emulators. +- Added `$w3m_img_path` to set the location of `w3mimgdisplay`. +- Unified all image options, the new var `$image` takes these
+ values: `wall`, `shuffle`, `path/to/img.png`, `off`. +- Added `shuffle` to image modes. The script can now pick a random
+ image from a specified folder to display. You can pick the shuffle
+ directory with `--shuffle_dir` and `$shuffle_dir` +- Fixed images getting cut off at the top. +- Added image size to filename which allowed us to remove a _really_
+ slow check. + +**Wallpaper:** +- Added `nitrogen` and `gsettings` support. +- Added wallpaper support to `Mac OS X` and `Windows`. +- Fix hang when wallpaper isn't found. +- We now check to see that `feh` set the wallpaper. +- Fixed wallpapers with spaces in the filename. +- `wall` is now the default image source. + +## Screenshot: + +The script can now take a screenshot on script finish. You can use +the flags `--scrot` or `-s` to take a screenshot. + +`--scrot` and `-s` can also take a path/filename so you can choose +where and what to name the file at launch. + +If left empty `--scrot` and `-s` will use `$scrot_dir` and +`$scrot_name` when saving the screenshot. + +By default the script uses `scrot` as the screenshot program. +You can use the launch flag `--scrot_cmd` or the option `$srot_cmd` +to set the program to use to take the screenshot. + +## Wiki: + +Added `Customizing Info` page which has info/examples about +the new printinfo function. + +https://github.com/dylanaraps/fetch/wiki/Customizing-Info + +Added `Customization` which lists all options and their values. + +https://github.com/dylanaraps/fetch/wiki/Customization + + +## [0.2.1] - 2016-01-04 + +Here's what's new: +- Mac OS X support (It's done now) +- Resolution Detection (Off by default) +- Song info is now off by default. +- You can now display the image on the right with: + - `--image_position left/right` +- Fixed bug with multiple colons +- Fixed underlines not being drawn the full width. +- Functions now fallback to "Unknown" instead of printing nothing. +- `getos` now gets os type and `getdistro` gets the distro. + - This makes it even easier to add other os types. + +Here's what I'm working on: +- Finishing OpenBSD support +- Cygwin support + +Enjoy + + +## [0.2] - 2016-01-03 + +I finished my rewrite! + +## Here's what's new: +- The script is now way faster. +- You can now pick what gets displayed and where using an array + at the top of the script. This also allows you to: + - underline anything + - print custom info + - print a custom title + - add linebreaks +- Mac OS X support and a base that allows us to add other OS later. +- You can now specify split size. +- Fixed issue with 2 line prompts +- Fixed image not displaying in vte based terminals +- Move all config options to the top of the script +- Moved almost everything to a function. +- Removed wmctrl dependency +- Made variable names more consistent +- Added shell substitution for cpu output. This means + that the cpu output won't include: (tm) (r) "Processor" "CPU" +- Optimized all get\* functions +- Use variable substitution where possible as it's faster than sed/awk +- Moved crop and smart_crop to crop_mode +- Removed --size and --padding in favor of --split_size + +## Here's what I'm currently working on: +- Window support (I'm almost done) +- Option to swap the image and text around +- Imagemagick optimizations +- Cleanup of info array handling +- More info outputs. Now that it's easy to customize what's printed and + everything is a function we can add optional support for pretty much anything. + - Resolution + - GTK themes + - Terminal Font + - GPU + - IP + - etc + +## Issues: +- Uptime doesn't work in OS X yet. +- If the customizable info includes a third colon then it breaks. + +I'd love to hear your thoughts. + + +## 0.1 - 2015-12-31 + +Changelog: +- Added flag to disable bold text `--nobold` +- Added flag to disable text wrapping `--nowrap` +- Moved to using only printf instead of a mix of echo/printf +- The script now aligns the cursor to the bottom of the + terminal instead of using a hardcoded amount of newlines +- Image size and padding is now dynamic, the only difference on the user + side is that instead of setting a long line of spaces as + padding, you set your font width. This means that you set the + var once and the script will just work at any window size. +- You can disable dynamic images and go back to the old + behaviour with by using the `--size` or the in config var. + $img_auto +- Manual padding now takes a count, so `--padding 10` will pad + the text 10 spaces. +- tput is now a dependency because we need (tput cols/lines/cup) + for the dynamic images and it allows us to support more terminals. +- Color block width can now be changed with the flag `--blockwidth`. + It takes a count like `--padding` so `--blockwidth 10` will make + the color blocks 10 spaces wide. + +Let me know if you're having issues. + + +[Unreleased]: https://github.com/dylanaraps/neofetch/compare/3.4.0...HEAD +[3.4.0]: https://github.com/dylanaraps/neofetch/compare/3.3.0...3.4.0 +[3.3.0]: https://github.com/dylanaraps/neofetch/compare/3.2.0...3.3.0 +[3.2.0]: https://github.com/dylanaraps/neofetch/compare/3.1.0...3.2.0 +[3.1.0]: https://github.com/dylanaraps/neofetch/compare/3.0.1...3.1.0 +[3.0.1]: https://github.com/dylanaraps/neofetch/compare/3.0...3.0.1 +[3.0]: https://github.com/dylanaraps/neofetch/compare/2.0.2...3.0 +[2.0.2]: https://github.com/dylanaraps/neofetch/compare/2.0.1...2.0.2 +[2.0.1]: https://github.com/dylanaraps/neofetch/compare/2.0...2.0.1 +[2.0]: https://github.com/dylanaraps/neofetch/compare/1.9.1...2.0 +[1.9.1]: https://github.com/dylanaraps/neofetch/compare/1.9...1.9.1 +[1.9]: https://github.com/dylanaraps/neofetch/compare/1.8.1...1.9 +[1.8.1]: https://github.com/dylanaraps/neofetch/compare/1.8...1.8.1 +[1.8]: https://github.com/dylanaraps/neofetch/compare/1.7...1.8 +[1.7]: https://github.com/dylanaraps/neofetch/compare/1.6...1.7 +[1.6]: https://github.com/dylanaraps/neofetch/compare/1.5...1.6 +[1.5]: https://github.com/dylanaraps/neofetch/compare/1.4...1.5 +[1.4]: https://github.com/dylanaraps/neofetch/compare/1.3...1.4 +[1.3]: https://github.com/dylanaraps/neofetch/compare/1.2...1.3 +[1.2]: https://github.com/dylanaraps/neofetch/compare/1.1...1.2 +[1.1]: https://github.com/dylanaraps/neofetch/compare/1.0...1.1 +[1.0]: https://github.com/dylanaraps/neofetch/compare/0.2.1...1.0 +[0.2.1]: https://github.com/dylanaraps/neofetch/compare/0.2...0.2.1 +[0.2]: https://github.com/dylanaraps/neofetch/compare/0.1...0.2 From e4d3ad1f4203a6cb01cae8995353062491e0f46e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 May 2018 19:52:08 +1000 Subject: [PATCH 0311/1133] general: Add back Makefile. --- Makefile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 000000000..4adbd5f6f --- /dev/null +++ b/Makefile @@ -0,0 +1,16 @@ +PREFIX ?= /usr +MANDIR ?= $(PREFIX)/share/man + +all: + @echo Run \'make install\' to install Neofetch. + +install: + @mkdir -p $(DESTDIR)$(PREFIX)/bin + @mkdir -p $(DESTDIR)$(MANDIR)/man1 + @cp -p neofetch $(DESTDIR)$(PREFIX)/bin/neofetch + @cp -p neofetch.1 $(DESTDIR)$(MANDIR)/man1 + @chmod 755 $(DESTDIR)$(PREFIX)/bin/neofetch + +uninstall: + @rm -rf $(DESTDIR)$(PREFIX)/bin/neofetch + @rm -rf $(DESTDIR)$(MANDIR)/man1/neofetch.1* From 27df891ab90238c7765a54e880aa428d7e1a40f4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 5 May 2018 08:51:29 +1000 Subject: [PATCH 0312/1133] docs: update --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 621c11460..f958665bc 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) [![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch) +[![Discord](https://img.shields.io/discord/102860784329052160.svg)](https://discord.gg/BtnTPFF) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) From 01721da4813190a082868f4145f60b931732b2dc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 5 May 2018 08:54:11 +1000 Subject: [PATCH 0313/1133] docs: update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f958665bc..0c86bf8eb 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) [![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch) -[![Discord](https://img.shields.io/discord/102860784329052160.svg)](https://discord.gg/BtnTPFF) +[![Discord](https://user-images.githubusercontent.com/7288322/34429152-141689f8-ecb9-11e7-8003-b5a10a5fcb29.png)](https://discord.gg/BtnTPFF) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) From 6d003b2f2a96ce662423cc065120b006077399f1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 5 May 2018 08:57:17 +1000 Subject: [PATCH 0314/1133] docs: update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0c86bf8eb..fe11bb162 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) [![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch) -[![Discord](https://user-images.githubusercontent.com/7288322/34429152-141689f8-ecb9-11e7-8003-b5a10a5fcb29.png)](https://discord.gg/BtnTPFF) +[![Discord](https://img.shields.io/discord/102860784329052160.svg?style=social)](https://discord.gg/BtnTPFF) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) From 5dbc0a27481d39b2195e68f24a8896a4b98c2fc7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 5 May 2018 08:58:40 +1000 Subject: [PATCH 0315/1133] docs: update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fe11bb162..c2395e48b 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) [![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch) -[![Discord](https://img.shields.io/discord/102860784329052160.svg?style=social)](https://discord.gg/BtnTPFF) +[![Discord](https://img.shields.io/discord/440354555197128704.svg?style=for-the-badge)](https://discord.gg/BtnTPFF) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) From 862a4c96dbfa173d0a033b3f3821422194eb2050 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 5 May 2018 08:59:09 +1000 Subject: [PATCH 0316/1133] docs: update --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c2395e48b..8bd32f21d 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) [![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch) -[![Discord](https://img.shields.io/discord/440354555197128704.svg?style=for-the-badge)](https://discord.gg/BtnTPFF) +[![Discord](https://img.shields.io/discord/440354555197128704.svg?style=plastic)](https://discord.gg/BtnTPFF) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) From a9c4db2b54eb3bec86d57413052ec28f394825cc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 5 May 2018 09:01:24 +1000 Subject: [PATCH 0317/1133] docs: update --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 8bd32f21d..4be61f4d3 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,8 @@ Packaging status +[![Discord](https://img.shields.io/discord/440354555197128704.svg)](https://discord.gg/BtnTPFF) [![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) -[![GitHub last commit](https://img.shields.io/github/last-commit/google/skia.svg)](https://github.com/dylanaraps/neofetch) -[![Discord](https://img.shields.io/discord/440354555197128704.svg?style=plastic)](https://discord.gg/BtnTPFF) [![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) [![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) [![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) From 8fe3130cbec6afefe8b43fdffa4c52938bc2e860 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 6 May 2018 16:16:27 +1000 Subject: [PATCH 0318/1133] gtk: Fix config file read order. Closes #972 --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index dc65de715..a702ff11f 100755 --- a/neofetch +++ b/neofetch @@ -2652,11 +2652,12 @@ get_style() { if [[ -f "${GTK2_RC_FILES:-${HOME}/.gtkrc-2.0}" ]]; then gtk2_theme="$(grep "^[^#]*${name}" "${GTK2_RC_FILES:-${HOME}/.gtkrc-2.0}")" + elif [[ -f "/etc/gtk-2.0/gtkrc" ]]; then + gtk2_theme="$(grep "^[^#]*${name}" /etc/gtk-2.0/gtkrc)" + elif [[ -f "/usr/share/gtk-2.0/gtkrc" ]]; then gtk2_theme="$(grep "^[^#]*${name}" /usr/share/gtk-2.0/gtkrc)" - elif [[ -f "/etc/gtk-2.0/gtkrc" ]]; then - gtk2_theme="$(grep "^[^#]*${name}" /etc/gtk-2.0/gtkrc)" fi gtk2_theme="${gtk2_theme/${name}*=}" From f765caa03815aff2db5cdaa3b9fd0c9f447cb8c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Birger=20J=2E=20Nord=C3=B8lum?= Date: Sun, 6 May 2018 14:02:04 +0200 Subject: [PATCH 0319/1133] Tweak kitty font regex --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index a702ff11f..93f47b36f 100755 --- a/neofetch +++ b/neofetch @@ -2906,7 +2906,7 @@ END fi term_font="$(awk '/font_family/ { $1 = ""; gsub(/^[[:space:]]/, ""); font = $0 } \ - /\s?font_size\s/ { size = $2 } END { print font " " size}' \ + /\^[\S\n_#]+?font_size\s+?\d+?/ { size = $2 } END { print font " " size}' \ "${kitty_file}")" ;; From 859dc69b20acea4635024ed59904b10e64f9cb5c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 May 2018 12:26:42 +1000 Subject: [PATCH 0320/1133] wm: Detect 2bwm manually --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index a702ff11f..360fa83a7 100755 --- a/neofetch +++ b/neofetch @@ -1580,6 +1580,7 @@ get_wm() { wm="$(ps -e | grep -m 1 -o -F \ -e "catwm" \ -e "dwm" \ + -e "2bwm" \ -e "monsterwm" \ -e "tinywm")" From 3ece779d4778e906d26d9126596307cd5b499e57 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 May 2018 18:26:31 +1000 Subject: [PATCH 0321/1133] song: Fix issues with splitting. --- neofetch | 61 ++++++++++++++++++++++++++------------------------------ 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/neofetch b/neofetch index f8c7691ee..aa9975a1d 100755 --- a/neofetch +++ b/neofetch @@ -1423,18 +1423,18 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' \ string:'Metadata' |\ awk -F 'string "' '/string|array/ {printf "%s",$2; next}{print ""}' |\ - awk -F '"' '/artist/ {a=$2} /album"/ {b=$2} /title/ {t=$2} END{print a " - " b " - " t}' + awk -F '"' '/artist/ {a=$2} /album"/ {b=$2} /title/ {t=$2} END{print a " ‡ " b " ‡ " t}' )" } case "${player/*\/}" in - "mpd"* | "mopidy"*) song="$(mpc -f '%artist% - %album% - %title%' current)" ;; - "mocp"*) song="$(mocp -Q "%artist - %album - %song")" ;; + "mpd"* | "mopidy"*) song="$(mpc -f '%artist% ‡ %album% ‡ %title%' current)" ;; + "mocp"*) song="$(mocp -Q "%artist ‡ %album ‡ %song")" ;; "google play"*) song="$(gpmdp-remote current)" ;; - "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta - %at - %tt')" ;; - "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% - %album% - %title%')" ;; - "xmms2d"*) song="$(xmms2 current -f '${artist} - ${album} - ${title}')" ;; - "qmmp"*) song="$(qmmp --nowplaying '%p - %a - %t')" ;; + "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta ‡ %at ‡ %tt')" ;; + "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% ‡ %album% ‡ %title%')" ;; + "xmms2d"*) song="$(xmms2 current -f '${artist} ‡ ${album} ‡ ${title}')" ;; + "qmmp"*) song="$(qmmp --nowplaying '%p ‡ %a ‡ %t')" ;; "gnome-music"*) get_song_dbus "GnomeMusic" ;; "lollypop"*) get_song_dbus "Lollypop" ;; "clementine"*) get_song_dbus "clementine" ;; @@ -1456,7 +1456,7 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " /tag artist/ {$1=$2=""; sub(" ", ""); a=$0}\ /tag album / {$1=$2=""; sub(" ", ""); b=$0}\ /tag title/ {$1=$2=""; sub(" ", ""); t=$0}\ - END { print a " - " b " - " t }')" + END { print a " ‡ " b " ‡ " t }')" ;; "spotify"*) @@ -1465,75 +1465,70 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " "Mac OS X") song="$(osascript -e 'tell application "Spotify" to artist of current track as¬ - string & " - " & album of current track as¬ - string & " - " & name of current track as string')" + string & " ‡ " & album of current track as¬ + string & " ‡ " & name of current track as string')" ;; esac ;; "itunes"*) song="$(osascript -e 'tell application "iTunes" to artist of current track as¬ - string & " - " & album of current track as¬ - string & " - " & name of current track as string')" + string & " ‡ " & album of current track as¬ + string & " ‡ " & name of current track as string')" ;; "banshee"*) song="$(banshee --query-artist --query-album --query-title |\ awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} - END{print a " - " b " - "t}')" + END{print a " ‡ " b " ‡ "t}')" ;; "amarok"*) song="$(qdbus org.kde.amarok /Player GetMetadata |\ awk -F':' '/^artist:/ {a=$2} /^album:/ {b=$2} /^title:/ {t=$2} - END{print a " - " b " - " t}')" + END{print a " ‡ " b " ‡ " t}')" ;; "pragha"*) song="$(pragha -c | awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} - END{print a " - " b " - " t}')" + END{print a " ‡ " b " ‡ " t}')" ;; "exaile"*) song="$(dbus-send --print-reply --dest=org.exaile.Exaile /org/exaile/Exaile \ org.exaile.Exaile.Query | - awk -F':|,' '{if ($6 && $8 && $4) printf $6 " -" $8 " -" $4}')" + awk -F':|,' '{if ($6 && $8 && $4) printf $6 " ‡" $8 " ‡" $4}')" ;; "quodlibet"*) song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \ /net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\ awk -F'"' '/artist/ {getline; a=$2} /album/ {getline; b=$2} - /title/ {getline; t=$2} END{print a " - " b " - " t}')" + /title/ {getline; t=$2} END{print a " ‡ " b " ‡ " t}')" ;; "pogo"*) song="$(dbus-send --print-reply --dest=org.mpris.pogo /Player \ org.freedesktop.MediaPlayer.GetMetadata | awk -F'"' '/string "artist"/ {getline; a=$2} /string "album"/ {getline; b=$2} \ - /string "title"/ {getline; t=$2} END{print a " - " b " - " t}')" + /string "title"/ {getline; t=$2} END{print a " ‡ " b " ‡ " t}')" ;; - *) mpc >/dev/null 2>&1 && song="$(mpc -f '%artist% - %album% - %title%' current)" ;; + *) mpc >/dev/null 2>&1 && song="$(mpc -f '%artist% ‡ %album% ‡ %title%' current)" ;; esac - # TODO: adjust for album: "$(trim "$song")" == "- -" - [[ "$(trim "$song")" == "-" ]] && unset -v song + [[ "$song" != *[a-z]* ]] && unset -v song # Display Artist, Album and Title on separate lines. if [[ "$song_shorthand" == "on" && "$song" ]]; then - artist="${song/ -*}" - album="${song#*- }" - album="${album% -*}" - song="${song/*-}" - - if [[ "$song" != "$artist" ]]; then - prin "Artist" "$artist" - prin "Album" "$album" - prin "Song" "$song" - else - prin "$subtitle" "$song" - fi + artist="${song/ ‡*}" + album="${song#*‡ }" + album="${album% ‡*}" + song="${song/*‡}" + + [[ "$(trim "$artist")" ]] && prin "Artist" "$artist" + [[ "$(trim "$album")" ]] && prin "Album" "$album" + [[ "$(trim "$song")" ]] && prin "Song" "$song" fi } From cfcd6fff17d1457099685c800f12132b679b0596 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 May 2018 18:28:17 +1000 Subject: [PATCH 0322/1133] song: Fix separator when printed. --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index aa9975a1d..c9150cfdc 100755 --- a/neofetch +++ b/neofetch @@ -1530,6 +1530,8 @@ guayadeque|yarock|qmmp|quodlibet|deepin-music|tomahawk|pogo|elisa/ {printf $5 " [[ "$(trim "$album")" ]] && prin "Album" "$album" [[ "$(trim "$song")" ]] && prin "Song" "$song" fi + + song="${song//‡/-}" } get_resolution() { From b6f0460b3581ec7a259c70d2875c4201ab46ebf2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 May 2018 21:23:10 +1000 Subject: [PATCH 0323/1133] song: Better splitting. --- neofetch | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 0189a1a09..29cbab24a 100755 --- a/neofetch +++ b/neofetch @@ -2490,10 +2490,7 @@ get_song() { # Display Artist, Album and Title on separate lines. if [[ "$song_shorthand" == "on" && "$song" ]]; then - artist="${song/ ‡*}" - album="${song#*‡ }" - album="${album% ‡*}" - song="${song/*‡}" + LC_ALL="$sys_locale" IFS="‡" read -r artist album song <<< "$song" [[ "$(trim "$artist")" ]] && prin "Artist" "$artist" [[ "$(trim "$album")" ]] && prin "Album" "$album" From a7c67455072fbf032b9fd086a99655de73e918a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Birger=20J=2E=20Nord=C3=B8lum?= Date: Wed, 9 May 2018 14:15:24 +0200 Subject: [PATCH 0324/1133] kitty: fix regression in regex --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 23a3ffa23..30909c259 100755 --- a/neofetch +++ b/neofetch @@ -2906,8 +2906,8 @@ END fi - term_font="$(awk '/font_family/ { $1 = ""; gsub(/^[[:space:]]/, ""); font = $0 } \ - /\^[\S\n_#]+?font_size\s+?\d+?/ { size = $2 } END { print font " " size}' \ + term_font="$(awk '/^[\S\n_#]+?font_family\s+?/ { $1 = ""; gsub(/^[[:space:]]/, ""); font = $0 } \ + /^[\S\n_#]+?font_size\s+?\d+?/ { size = $2 } END { print font " " size}' \ "${kitty_file}")" ;; From ccced8d99731fde8efed30ea08817583e03aaae9 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 9 May 2018 15:52:51 +0200 Subject: [PATCH 0325/1133] song: fix audacious album fallback to get_song_dbus() when song_shorthand is on audtool won't work due to the '-' separator in it's output --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 29cbab24a..7742e91dd 100755 --- a/neofetch +++ b/neofetch @@ -2417,7 +2417,7 @@ get_song() { "audacious"*) song="$(audtool current-song)" - [[ -z "$song" ]] && get_song_dbus "audacious" + [[ -z "$song" || "$song_shorthand" == "on" ]] && get_song_dbus "audacious" ;; "cmus"*) From b5a2323144a51c78a0a6867bd9077aa8e3378707 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 10 May 2018 08:49:05 +1000 Subject: [PATCH 0326/1133] song: Added song_format. --- neofetch | 30 ++++++++++++++++++++++-------- neofetch.1 | 7 +++++-- 2 files changed, 27 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index 7742e91dd..14239b65c 100755 --- a/neofetch +++ b/neofetch @@ -437,6 +437,16 @@ disk_subtitle="mount" # yarock music_player="auto" +# Format to display song information. +# +# Default: '%artist% - %album% - %title%' +# Values: '%artist%', '%album%', '%title%' +# Flag: --song_format +# +# Example: +# on: 'Song: Jet - Get Born - Sgt Major' +song_format="%artist% - %album% - %title%" + # Print the Artist and Title on separate lines # # Default: 'off' @@ -2486,18 +2496,20 @@ get_song() { *) mpc >/dev/null 2>&1 && song="$(mpc -f '%artist% ‡ %album% ‡ %title%' current)" ;; esac - [[ "$song" != *[a-z]* ]] && unset -v song + [[ "$song" != *[a-z]* ]] && { unset -v song; return; } - # Display Artist, Album and Title on separate lines. - if [[ "$song_shorthand" == "on" && "$song" ]]; then - LC_ALL="$sys_locale" IFS="‡" read -r artist album song <<< "$song" + LC_ALL="$sys_locale" IFS="‡" read -r artist album title <<< "$song" + # Display Artist, Album and Title on separate lines. + if [[ "$song_shorthand" == "on" ]]; then [[ "$(trim "$artist")" ]] && prin "Artist" "$artist" [[ "$(trim "$album")" ]] && prin "Album" "$album" - [[ "$(trim "$song")" ]] && prin "Song" "$song" + [[ "$(trim "$song")" ]] && prin "Song" "$title" + else + song="${song_format/\%artist\%/${artist}}" + song="${song/\%album\%/${album}}" + song="${song/\%title\%/${title}}" fi - - song="${song//‡/-}" } get_resolution() { @@ -4678,7 +4690,8 @@ INFO: 'dir' shows the basename of the disks's path. (/, Local Disk, etc) --ip_host url URL to query for public IP - --song_shorthand on/off Print the Artist/Title on separate lines + --song_format format Print the song data in a specific format (see config file). + --song_shorthand on/off Print the Artist/Album/Title on separate lines. --music_player player-name Manually specify a player to use. Available values are listed in the config file --install_time on/off Enable/Disable showing the time in Install Date output. @@ -4835,6 +4848,7 @@ get_args() { "--shell_path") shell_path="$2" ;; "--shell_version") shell_version="$2" ;; "--ip_host") public_ip_host="$2" ;; + "--song_format") song_format="$2" ;; "--song_shorthand") song_shorthand="$2" ;; "--music_player") music_player="$2" ;; "--install_time") install_time="$2" ;; diff --git a/neofetch.1 b/neofetch.1 index b0bcd8ac1..44886a15d 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "May 2018" "Neofetch 3.4.1-git" "User Commands" +.TH NEOFETCH "1" "May 2018" "Neofetch 4.0.0-git" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -115,8 +115,11 @@ Takes: name, mount, dir \fB\-\-ip_host\fR url URL to query for public IP .TP +\fB\-\-song_format\fR format +Print the song data in a specific format (see config file). +.TP \fB\-\-song_shorthand\fR on/off -Print the Artist/Title on separate lines +Print the Artist/Album/Title on separate lines. .TP \fB\-\-music_player\fR player\-name Manually specify a player to use. From 7d259e8ef973666f02b8266f44404316cc64b7b1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 10 May 2018 08:52:06 +1000 Subject: [PATCH 0327/1133] song: Added song_format. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 14239b65c..a22e45682 100755 --- a/neofetch +++ b/neofetch @@ -444,7 +444,7 @@ music_player="auto" # Flag: --song_format # # Example: -# on: 'Song: Jet - Get Born - Sgt Major' +# default: 'Song: Jet - Get Born - Sgt Major' song_format="%artist% - %album% - %title%" # Print the Artist and Title on separate lines From f882c486850e541ba1bbcb8094a1d0e013551ef1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 10 May 2018 09:56:01 +1000 Subject: [PATCH 0328/1133] docs: update --- CHANGELOG.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e794d8948..76cfa8529 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,15 +14,12 @@ The entirety of Neofetch is now contained within a single executable. Everything has been in-lined. Installing Neofetch is now as easy as downloading the script and running it. -Packaging Neofetch is now easier as well. We were using `sed` in the -`Makefile` to replace specific paths and we have had to work around -different system hierarchies. None of this is necessary anymore. - Those using distributions with an outdated Neofetch version in their repos -can now easily install the latest version. +can now easily install the latest version themselves. Thanks to those who contributed this time around and thanks to those who -discussed proposed changes in the bug tracker. I appreciate it. :+1: +discussed proposed changes in the bug tracker and Discord. I appreciate +it. :+1: ## Contributors @@ -36,6 +33,8 @@ discussed proposed changes in the bug tracker. I appreciate it. :+1: - [**@TsundereBug**](https://github.com/TsundereBug) - [**@dawidd6**](https://github.com/dawidd6) - [**@mstraube**](https://github.com/mstraube) +- [**@iandrewt**](https://github.com/iandrewt) +- [**@MindTooth**](https://github.com/MindTooth) ## Operating System @@ -64,6 +63,12 @@ discussed proposed changes in the bug tracker. I appreciate it. :+1: ## Info +**Song** + +- Added album data to song output. [**@mstraube**](https://github.com/mstraube), [**@iandrewt**](https://github.com/iandrewt) +- Added `song_format` to change the display format of the data. + - Default: `%artist% - %album% - %title%`. + **Title** - Fixed unexpected backslash being inserted on some systems. @@ -80,6 +85,7 @@ discussed proposed changes in the bug tracker. I appreciate it. :+1: - Added support for `st`. [**@aidanharris**](https://github.com/aidanharris) - Added support for `qterminal`. [**@mstraube**](https://github.com/mstraube) +- Fixed `kitty` font bug. [**@MindTooth**](https://github.com/MindTooth) **Packages** From 94bf52ecd4aa784355ac9fe9ba29c19fb24b62df Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 10 May 2018 09:58:46 +1000 Subject: [PATCH 0329/1133] misc: Fix travis --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c9424e8d1..3efa3f3bf 100755 --- a/neofetch +++ b/neofetch @@ -2907,7 +2907,7 @@ END fi - term_font="$(awk '/^[\S\n_#]+?font_family\s+?/ { $1 = ""; gsub(/^[[:space:]]/, ""); font = $0 } \ + term_font="$(awk '/^[\S\n_#]+?font_family\s+?/ {$1="";gsub(/^[[:space:]]/,"");font=$0}\ /^[\S\n_#]+?font_size\s+?\d+?/ { size = $2 } END { print font " " size}' \ "${kitty_file}")" ;; From 1480b833b0c2349b69806580e73555499f58869b Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 10 May 2018 09:14:39 +0200 Subject: [PATCH 0330/1133] song: add support for sayonara --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 3efa3f3bf..9234630e7 100755 --- a/neofetch +++ b/neofetch @@ -435,6 +435,7 @@ disk_subtitle="mount" # tomahawk # xmms2d # yarock +# sayonara music_player="auto" # Format to display song information. @@ -2389,7 +2390,8 @@ get_song() { -e "spotify" \ -e "tomahawk" \ -e "xmms2d" \ - -e "yarock")" + -e "yarock" \ + -e "sayonara")" [[ "$music_player" && "$music_player" != "auto" ]] && \ player="$music_player" @@ -2424,6 +2426,7 @@ get_song() { "deepin-music"*) get_song_dbus "deepinmusic" ;; "tomahawk"*) get_song_dbus "tomahawk" ;; "elisa"*) get_song_dbus "elisa" ;; + "sayonara"*) get_song_dbus "sayonara" ;; "audacious"*) song="$(audtool current-song)" From f93da07f36dff27a4b7e75c868ccf000a8555efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Birger=20J=2E=20Nord=C3=B8lum?= Date: Thu, 10 May 2018 14:05:27 +0200 Subject: [PATCH 0331/1133] kitty: style tweaks on regex --- neofetch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 9234630e7..ea4384b0c 100755 --- a/neofetch +++ b/neofetch @@ -2910,9 +2910,11 @@ END fi - term_font="$(awk '/^[\S\n_#]+?font_family\s+?/ {$1="";gsub(/^[[:space:]]/,"");font=$0}\ - /^[\S\n_#]+?font_size\s+?\d+?/ { size = $2 } END { print font " " size}' \ - "${kitty_file}")" + term_font="$(awk '/^[\S\n_#]+?font_family\s+?/ + { $1 = ""; gsub(/^[[:space:]]/, ""); font = $0 } + /^[\S\n_#]+?font_size\s+?\d+?/ + { size = $2 } END { print font " " size}' \ + "${kitty_file}")" ;; "konsole"*) From 358006dd924f23535b4d6a2104e3b0f264282d0c Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 11 May 2018 18:37:37 +0200 Subject: [PATCH 0332/1133] song: fix deepin-music --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index ea4384b0c..b689191b6 100755 --- a/neofetch +++ b/neofetch @@ -2423,7 +2423,7 @@ get_song() { "bluemindo"*) get_song_dbus "Bluemindo" ;; "guayadeque"*) get_song_dbus "guayadeque" ;; "yarock"*) get_song_dbus "yarock" ;; - "deepin-music"*) get_song_dbus "deepinmusic" ;; + "deepin-music"*) get_song_dbus "DeepinMusic" ;; "tomahawk"*) get_song_dbus "tomahawk" ;; "elisa"*) get_song_dbus "elisa" ;; "sayonara"*) get_song_dbus "sayonara" ;; From 670161e13a6733d75bd51f21aaea0a78a8fd3d06 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 11 May 2018 19:22:34 +0200 Subject: [PATCH 0333/1133] song: simplify get_song_dbus --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index ea4384b0c..cfd2ecf14 100755 --- a/neofetch +++ b/neofetch @@ -2403,8 +2403,8 @@ get_song() { dbus-send --print-reply --dest=org.mpris.MediaPlayer2."${1}" /org/mpris/MediaPlayer2 \ org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' \ string:'Metadata' |\ - awk -F 'string "' '/string|array/ {printf "%s",$2; next}{print ""}' |\ - awk -F '"' '/artist/ {a=$2} /album"/ {b=$2} /title/ {t=$2} END{print a " ‡ " b " ‡ " t}' + awk -F '"' 'BEGIN {RS=" entry"}; /xesam:artist/ {a = $4} /xesam:album/ {b = $4} + /xesam:title/ {t = $4} END {print a " ‡ " b " ‡ " t}' )" } From 7e4ec9f09d2f47690093e14cf00d9fe7cdc2d61e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Birger=20J=2E=20Nord=C3=B8lum?= Date: Fri, 11 May 2018 19:41:46 +0200 Subject: [PATCH 0334/1133] kitty: This got to be the last fix... --- neofetch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index ea4384b0c..24267edf8 100755 --- a/neofetch +++ b/neofetch @@ -2910,10 +2910,11 @@ END fi - term_font="$(awk '/^[\S\n_#]+?font_family\s+?/ - { $1 = ""; gsub(/^[[:space:]]/, ""); font = $0 } - /^[\S\n_#]+?font_size\s+?\d+?/ - { size = $2 } END { print font " " size}' \ + term_font="$(awk '/^([[:space:]]*|[^#_])font_family[[:space:]]+/ \ + { $1 = ""; gsub(/^[[:space:]]/, ""); font = $0 } \ + /^([[:space:]]*|[^#_])font_size[[:space:]]+/ \ + { size = $2 } \ + END { print font " " size}' \ "${kitty_file}")" ;; From 8513b62259375eeddc1f0b03e402b5275b9e9244 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 12 May 2018 10:54:56 +0200 Subject: [PATCH 0335/1133] song: update song_shorthand example --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index ea4384b0c..cb3b6c152 100755 --- a/neofetch +++ b/neofetch @@ -448,7 +448,7 @@ music_player="auto" # default: 'Song: Jet - Get Born - Sgt Major' song_format="%artist% - %album% - %title%" -# Print the Artist and Title on separate lines +# Print the Artist, Album and Title on separate lines # # Default: 'off' # Values: 'on', 'off' @@ -456,9 +456,10 @@ song_format="%artist% - %album% - %title%" # # Example: # on: 'Artist: The Fratellis' +# 'Album: Costello Music' # 'Song: Chelsea Dagger' # -# off: 'Song: The Fratellis - Chelsea Dagger' +# off: 'Song: The Fratellis - Costello Music - Chelsea Dagger' song_shorthand="off" From bd0e62d5f31ace5b91e7db11a53174d27a0129f3 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 12 May 2018 13:53:23 +0200 Subject: [PATCH 0336/1133] song: audacious: remove audtool, closes #986 --- neofetch | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/neofetch b/neofetch index cb3b6c152..4f508ef6e 100755 --- a/neofetch +++ b/neofetch @@ -2428,11 +2428,7 @@ get_song() { "tomahawk"*) get_song_dbus "tomahawk" ;; "elisa"*) get_song_dbus "elisa" ;; "sayonara"*) get_song_dbus "sayonara" ;; - - "audacious"*) - song="$(audtool current-song)" - [[ -z "$song" || "$song_shorthand" == "on" ]] && get_song_dbus "audacious" - ;; + "audacious"*) get_song_dbus "audacious" ;; "cmus"*) song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; From 33fbed0b1491e7b962a5f28025d253ad928d15a9 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 13 May 2018 11:06:22 +0200 Subject: [PATCH 0337/1133] general: update copyright year --- LICENSE.md | 2 +- neofetch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 851d9f6aa..835c1789d 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016-2017 Dylan Araps +Copyright (c) 2016-2018 Dylan Araps Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/neofetch b/neofetch index cb3b6c152..9983e3e36 100755 --- a/neofetch +++ b/neofetch @@ -6,7 +6,7 @@ # # The MIT License (MIT) # -# Copyright (c) 2016-2017 Dylan Araps +# Copyright (c) 2016-2018 Dylan Araps # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal From a62c3d20298d5fb30c660d34ce89fb6be4df9c80 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 13 May 2018 11:15:24 +0200 Subject: [PATCH 0338/1133] song: add support for vlc --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 84fef5989..f7e99fa35 100755 --- a/neofetch +++ b/neofetch @@ -436,6 +436,7 @@ disk_subtitle="mount" # xmms2d # yarock # sayonara +# vlc music_player="auto" # Format to display song information. @@ -2392,7 +2393,8 @@ get_song() { -e "tomahawk" \ -e "xmms2d" \ -e "yarock" \ - -e "sayonara")" + -e "sayonara" \ + -e "vlc")" [[ "$music_player" && "$music_player" != "auto" ]] && \ player="$music_player" @@ -2429,6 +2431,7 @@ get_song() { "elisa"*) get_song_dbus "elisa" ;; "sayonara"*) get_song_dbus "sayonara" ;; "audacious"*) get_song_dbus "audacious" ;; + "vlc"*) get_song_dbus "vlc" ;; "cmus"*) song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; From 57cd8e3cc5b5bf0edb6ba996d3b4db6c81529b4e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 17 May 2018 12:36:03 +1000 Subject: [PATCH 0339/1133] docs: update --- README.md | 21 ++++++++++----------- neofetch | 4 ++-- nflogo5.png | Bin 0 -> 11035 bytes nflogo7.png | Bin 0 -> 6739 bytes 4 files changed, 12 insertions(+), 13 deletions(-) create mode 100644 nflogo5.png create mode 100644 nflogo7.png diff --git a/README.md b/README.md index 4be61f4d3..4d1c0aed0 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,16 @@ -# Neofetch - - Packaging status + Packaging status -[![Discord](https://img.shields.io/discord/440354555197128704.svg)](https://discord.gg/BtnTPFF) -[![Build Status](https://travis-ci.org/dylanaraps/neofetch.svg?branch=master)](https://travis-ci.org/dylanaraps/neofetch) -[![MIT licensed](https://img.shields.io/badge/license-MIT-blue.svg)](./LICENSE.md) -[![Latest release](https://img.shields.io/github/release/dylanaraps/neofetch.svg)](https://github.com/dylanaraps/neofetch/releases) -[![Donate](https://img.shields.io/badge/donate-patreon-yellow.svg)](https://www.patreon.com/dyla) +

logo

+ +

+ + + + + +

Neofetch is a command-line system information tool written in `bash 3.2+`. Neofetch displays information about your operating system, software and hardware in an aesthetic and visually pleasing way. @@ -23,9 +25,6 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, ### For more information: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] -neofetch -neofetch - ## Articles - https://lamiradadelreplicante.com/2016/05/15/la-informacion-de-tu-sistema-en-la-terminal-con-neofetch/ diff --git a/neofetch b/neofetch index 3efa3f3bf..ce0428fed 100755 --- a/neofetch +++ b/neofetch @@ -8427,8 +8427,8 @@ ${c1} -1vvnvv. `~+++` ++|+++ EOF ;; - *"[Windows 10]"* | *"on Windows 10"* | "Windows 8"* |\ - "Windows 10"* | "windows10" | "windows8" ) + *"[Windows 10]"*|*"on Windows 10"*|"Windows 8"*|\ + "Windows 10"* |"windows10"|"windows8") set_colors 6 7 read -rd '' ascii_data <<'EOF' ${c1} .., diff --git a/nflogo5.png b/nflogo5.png new file mode 100644 index 0000000000000000000000000000000000000000..394cb7296a7bb7021e8f11ef9850567edad9fd18 GIT binary patch literal 11035 zcmeHMXHXPfy6z!|0SPJ@hbU2Uk{~&WBvDC%!Dkc{LZr$K@Y zNEQZ=C_ygnt-DqG<9@q)*R9&`yWgqmeyjR)b)WO}^FGgePDg5Ms*n)T5&-}}qNb{- z3jlc50DxUdfOUCgMeBSN04PvCdirjRfU70p*=?5=CY%3AtY=c=`5D3b##9z&QElO2GOyi@VOW_g3LzM@1yLWzVmdPrupFNz8d{mh2Cz7DG$uxUOjSiS!gfGpm6Z^%qI8y zYTJtkDIXp@GV%+*$GO#L_3~W<2637*sd@W*52uQj^w$2++a`naw3?l}E6qcOURBmK z$RnxqcoEW4e=s>%v%^KX%be8Gm>2u1TXp((T9?=q31q5Md|{mGWU#)=!}93(wnl{{ zN*UK97T5We0kt1S-cbR4=~d(BHw9OD+?`f_q}9$_IvgN5w8RXl3^n|219Uexr!BU+ z)God?oOU?OK-~+s#>^9oN9$6!|tn;HZ`>qdfMs-{ph#_C;y=0A20UxHa zyExZ>Q?<`RUx%$vd&5Iyn>{|#h;!a|6%89o3^lkKFMUwt#b~audQe^b!F}Ua(Oag< zQIok0%y*pb&;-2X-j1_q-KRnAU58u!(j0KQYa=!1w~O#cjKM1`OhNg+E|L_%6;vbN zrQmi=HilcBbklZD^XUs1PMLGz&z_z?_G&R_!h;aJ^CWFUKJ~Ll>#jx*a8B;oE1U{9 zI01ACb?5+F*lT7FUDb_PpCe7<{x-mw0n^56i4>Phrg}OLB93&DXC5v5<*BadjL=p6K zKln-uN-|bwn<%hZ)pIiH1#e)Ug^hS75Q6iriniVADd%CjD;GE;DR>2I!wzd!$S$X8 zO>^$v*!2=*vVqFPgrRLB2l;AmtzcTR!nu@4}j6kh>AY5Q6cS%Bh1DufN)4 zt-W(p$t2;)I!h(zYUuATk6a*Nb|Bx*Zce^00@}lQaLc+vIM9J*8I(YfOL3hj*{GP; zFN^nn`)Y?w;ep0RkB^~27pbtV=Z|uY6I$zK_t0(3$=toU`TDP(V(u+1Pv1mjhE4Wb zzzgFx^$GduYev*;NXJI)hOvbiz11l(wbYYM#jA;a21nbFA!At%Z)%HScAnsGd8_Yq z26QqMk);B2PYCe~L~U!7g&&|3Ag&P$ID@ zx;BCswtNf>8&ku&f!SjbB$ms#0g`5+B3lEZFPRZ@7Lo_=jKy5zDzxU%uNrY`sJC&@ zGurH+OJ`9=6GN~X^@Sz--4R3tH#t5EKLVsUHPP8My#vH`#5SX4`F;8Lk9%+w8Qj}u z)WV$1pWJcZ$r{48wW&;`pl1TJjrI{?pG%pGqy~xO)pI%v*3!!pDKZ~4< zM2S^z2|D1h6p+U2AZ0<`*s_+%JO-XVxWv)`T)|w}x-oZW zXg)W?v9^ADd#`0^$$}a48YY4p?ZO6*QwXD<4Cd1DOES{8pi*ZJ7pJA=lURHngO#l* z<_qqyXvWS{xv}PzjU~+P{U%UfZXkA`couHXQW1*554g(^|G|k>l+WG@{3b&d)!vSX zn^GPauzE73nE?kvm(Va%+3!pPystFO>Ej=�w=<-xS>AHWg_sVt$qVG3D-b$MxZ%ebV_XV{<0EqUZFyWjM!6_|$gboH0{C#17T5W9 zu1O1FGY^j)`sLbZrJnG))(CnR84SLnDoDWfqL{u9L4#>!8 z6!NW7x3!?y(@xIzph(tR*;%V=Po;ird^M`;F^G#Y=w<|Bgrp zgcaoz;EU*(+p`-{GhV|t7m(Ll)VgjcJO0qYdot<GQck`GzvbD(ynNHWS)W15(qN^gxBWNxW!SKfY4;FQnI zaL;UTmy)SOg4ZpF8NJ$g98G4p39bjZcGmNW=NEb6o1x>1 zsN_$R>5TZu&QwTXUprGdqW(6(VzaSyf`ES02hX99jCA9cmV*Mg|n_X@*$^Xm$_k_E+3n zbG_{;*rI{k_CsSOwGS29!A+eSdYaxP6xl+aTqft-qPVQ>o*?*w1r^Gr(^thiO`%YH zyBefarnNeWlHrV0@<@=dJ1Yv=p=$Li7~8QxJv{ zo^9|O%hP;y>fw}sipPBD!0F)iI8TfFT=7NyEqiU;Q8H+0TXj7?pLhfZ(s>l}Pz8L*eUNE-lG ziSNYf5_EhNb;%lde60Ue$m&M1h$1#^aBvgpx1;$WWZKSymyp4DXDvqkt5^#Y;6X0_ z0YiPRyDt*_-vc7?q&q9h6$K9n-)PGxT@g@6+E1v!%epb#Da#D z4>F97EW=(j^m1w!^T3#;-B2R7ebP+wzIra)L2HqgTuG>PsC#Mq?f3{2(qdM3Uc`bp z#Q_~+0=Nj>ZPiT|et>9V4VB)KxU2I~T@RXKC(VXr3OVU{Zf_Fmo2I!?rs=q4dV4?P z7U^&%U0>P5Sy#IjEw_F>eZ2~W&y2^5qT}i(GT$`%bSvN`SpF!0yF-BPHbSuA*C#0U{(FS`=rqi0NWa)cS5DNJ7}u$F&x2k?#u z6rRBlMBD{o4C^Ti+&QNLp7UGIU31GD_OO#`2-A9J9rYv6O$pzE)I;S%T@mbBf#Tdy z(*oiw13p-OLO;F5Fiq76q+^|#VkONdaCCC+?tAa{3Vd(Zi;Ql>JrK;?-irK{*YgzJrZSr^Kzid zZYc2A6jisyp*BzFj(N%Mu9dH2*G(LrwGl&~66yMzF%hkDJQDWl%T#;&t=zw%?~B3S z9A`~Y)7sE}3K}kJls-qYuSHllBb`N~|6@jO2u{$z$K>yL6fW0Nc#3SI9z18aIJoE= zEtf+aMB@n-gZVvX^w}Fa52+kjxO~RbR7D~JiD!%|_HzdgM(7X{Nm(svoah*I#%GVP z!3Mtw9Aa^4E)>^co`I22PEleZgWkluj8ne*DO;JZ{9hLZd{XZ|R#Hv8Zo7i+II74q zJr1WWsqj=TW>g@LqtEdKWXj!A?7Z6ga-}3`-j_7O9bP)<=wT_HLKwIJ>+2kR={GlK zTXovILY19h;8N-$(#?UAVi8Yad0e1GNy?(dL`dqTboKWyVpD9GNHYaxxx0ZEWM&Sc z-(wR*J~?S=l5WKs09>e9D_8%;)UG8)dLRAf10pJ$P&jaLDaL42FBEFm2Jth1_Trw&? z9#Jr7697=5)D-3Pyrwtj1T^UlsFihEbb2FEiyaA`3K4p0Dm)=?5)%kM#T2ONM^Pq- z6>r-vwdrC%*q7k8^}7;Xe_|DIf^+%YKii)O{Cg2-m84@2tgZe0ncA!t5w3E{YQVU@ zMdL3oZAs|=86m7fKLbH8_-Bw8#J)TS#{Dk4%mqLI)Xi0srInk;f*KUaz0~)MClz6a z^}gE&W`RR$3G))hY8*}R+E7&m}`WWt=3xvlflnC(b!u{%~l8IsbwO{|A4EidO(2{z0OM z95^<$0J8vmzmTcdDO+b?{?i`c)G#O~(Mv`K2K>R%{M+REW&Eso6^KGyN+*c)ys1iB z%7+vH&?R-hXMy~e)LmZ#0O;o~1<#k-0z7Z}83}vb3j@Jc{z;9!P6?GBTpb{2M1Qs9 z%UW_Xl*YeI_y*`7JK_J9qQ7Ace`T+4z(Nynt0(#Iy2ypV-bX_xr)a>p{EpV8$q!wo zd?V=5AKQd}1Hs?u`U|+PU1>q@JE%Vr{4Xdi%nN>*$QXJ}jvk(uEE?O8xKz;6#eb6J zf1IM~AJ&ZPlmMV2*2RD6-&DWQ&i)@F8Af>P>na?^vN^e0R!S}&w^}qn&~UJPnn8Z) zK-jMTC#CE##{$r6E9uJOaROmwHv$=ccoUrU{e5-$1D3CKj6+&8nlinY;I8ht|138h z>wkf(|CRsE{=cX){tqr-|6xD-4K@CauKyA01+gyb%RmRosA%e{a(M_tHcl zjJ%QRGx0xEfc#!0;^#X2&-S}TU`GoEh5Q^nq-WkIh@9(pJCQ#J{-26~7w7}KbztWZ S$InerKut+g@xA<$;Qs=8IC0ki literal 0 HcmV?d00001 diff --git a/nflogo7.png b/nflogo7.png new file mode 100644 index 0000000000000000000000000000000000000000..d742738b3a2984e0b498caa516d1b10eca8063df GIT binary patch literal 6739 zcmZvgWl$VEyZ3jI;_mKJoZ?O??oynh#l1L-dvRy+A~&wZix!tH?z-p}w_;u7<$gZA zXXc#eLw<8jGLvMIT$2A+O?3qb)+SaZIAb{TtisC0?xI{cB+D`Q^i|@AOTg)w%RJ#uh@Rn8(3hU|~06#v{4L zdGCi{DWM~uHNO`zcBw4u9tk8*L!#`YhyBz& z_ZN~K?o|E7rH;7WK!pchBD&T)tkZJJ?vb>B{7#k+TlK7gV!xzJg_#^4pRWVYCR;ro zTROEUvK_X&EAO!{^V}H@YxezWE_I*LV1EO|%&g)t1_kZZd)P}0-mQpNmgUQfjuq}I z$1yFQWP8H$NKU$~&derBk6!od;+9Sij`mO-91F%7)VKxEF*+nm98v9 zW3GuTmH+PP`MGhevouECvn7O+Zw+vVc2GV8KP~|cTt#}n za<{&+^f$tp=j-AnhaEyHL0Al&0J`)T1T}8N1_z@1k_G5=GQB{IA^}kvS4oCmZu4UE zrv!4N<|;cK-MPAfSX~0gGMh!`KkFFy%-vpC8~*23JcqP@poc%HtRUhOH99uAqRzJ> z#D5IE#vD|#YI}w!JDtXZ+iES=&Op9jD)ttJa;tNFXi)0%zZ|8^B~pt$#pBFxRy@ZT z{YC4LlIQH!>Wo={Nj}LYSS+~G&1MjEfI|)H&<1bl0Y%qC97a_FW_w&Vjkd8e?<$x& zpeLSqh(C|sPAJhV2h!g~wW#y3)WY+KXy;bIjwrKWUuk5)GUtOX|<-l z(Iowl!&Je2P9|Z8hvn7_s8CPEJA-uLiu&KWR3Wgftl)l@MNIO~uueRKMApnMxP0%(q!7iEq?28o^~JApQpp zXyjqQ)e}caJUnYF(Zb?Tb(f=t_|xi8YYNv_VdGZkHtf)g>$DBO3e&f+O~AoJM>q+e zUp!M4M>ql??2Hw8maJ}<{C(0C)~s$c_=wL_+ZuVPXUM(}(w1z=Swxpxa^_w9bW{Nh zY*?72GNyW0COW~(o*9}=~snpx=PQ` zsR~V_(8Ed7dBj~i4+O}Kb6J)RXnCuR*{R|&Z#?}A>>_Kd%DhNERq6A|3C+{mR{PSQ zttPzD0%=}7*^-@GBNyh)62bSXcTnFvk& z%!*plC#BXJGp_q`4gu+B{_t_^m%PU#mI_a^7wAv710yCFrWwyQ+qQlSAgH7`jgC{G ze1N9E1Lur?5A4vY6KmEKt>P7Wt`P-K6NR%&&YYFWwQ|rHMx;m zM_aH;{f8M_I9uU;DkrxPE!T*nT92iIzH1!1L0E&9H&5HNNxf<>G%z!xS#~)Z*-8mR z{cS$LTJEi`=WlfD9Qax9T#ediFBE8`TgHSOY~u zMGMqJytkg$d~|w$+?q#zaWqrLsY`7pRuq3bobR-3f6 z+X)j6Nl*Ws>|$<0A!p|2@qQcl=~EwHf)AQ#(d>C`u_-J&9KT4fG1Jc%Sd?WKxH{xg z&`2Y($JE6--nQ$x0~(U`MT||bT&`frmEuQW%oQs0F!RKzCH9_q^EV`zKya3r&drhh zW9=VOJ2+W#YRk_rIU%u(FnQZ7D~!*1o(k(WVrP7HT>}@zKFCe3Ct-H1L!~K}MBz^+ zoa5OcT(K?!HO6m^6huD8bnX^9^GW2$!DN3-);1ipF@3`k4TUbTRkBSLdv~fFdClQb zZ{%69ur}em3#nqDBV!qY0#qlQIo(1g5fIo1`TscK|F|x>JieuICLQ+6x7QB6!+I0F zE2->s?s!fs4cpE2w*A$LkkzQ$p)I&@*!b-xpvvXR61$FPLSmN6b7UKvTN;>FIv_qr zeOwglV%Bo0)bV0?xkWQz76^TzMD;xkvAV|z$p=fRmC8b23lKCnMMDn&fQ#YZ2K4<$ z%KNnw#ZyU54rK=!4?qq;;nDR40PuX3WZ!@ET|LbY4A5T)9ND5{WCY8~$RHu0lCq|> z3M;T%fBUGV$x^@gPFCOVcb@tTNt4TuBF^g5!N$7zMK)nW7B9j$qoQ_%Se)N%lA5xE zn25rxioVQ9Vd6Hyd1=hOdp=Wvqvv#Vg?Gm{p!a9puyv2Aj=O-#fx7^WH=5D7wc#y& zn%3dC&f(bO2y_v+__+TUG6?h$xc?Q3(ys&mLFw1T!}i1dk|@4!HNn5#GIHCl#vOZg zD$(d7{Ap!S=@|dTDiKu%@=wD~Z_bS$UMhzY@IQwo@gy?MX26bs`3rC_21ciBYjVG2+M4ft;P?Z^SU;9R61=YS}kVCu9nGs#!hjaJ;A@b#InPdMWu^CdWG!KG^0Oi znQFF-x_aWf*Og|OX!T8aqf!{S6GU1svNWzQ%VMRTB`!Sn*FATItm^!B6BcTWTIij# zTP%mryLn|$Q`CWD6B8xv?ZO8JbD4qa>gr97S65dbEoD$=l&2|UaAjgz=Me3yA-O_H z{r&w-N7>A(;BR3>GR;)LN-;x~4clnT#GBD6sA^#sxHs2S$LG6XZMJ~Rx-cgrp-hY? z`skrVFYNRF8Q99|4PrRTFr}E`gKCd;vRL`?uGc@djQbl zfZwbmq>I#n5ZcvNh;pJsf<5!Nfw#)9$L^ev(iaTu&LBDpMa9YF`sBZ;R*W$tBab-2 z^FdbzVfGytl{=c;CmsEEOI!C6jqBOp|){=~} za;(lRpt36qmp%$5l*^g_G@lBljyR&*Wsi$XC)@cA<01=K2S+l%`G~j?a$3vy1P?Ju z^3XsOs*Yizm5JGN6FDoYX6O?NWg2HgivcXwn`tO1Db4N#-)~3z?WHJKCZ4XguxtJp zPE5$hFzN{q`4EM9iM3XufJ0Oh(?28$dr{w^11g~=Ns4mQU79>0xBDxfG>V<8ZVYXh#EAET#Jo@JylW~d6sr&9-ib`X9{I+Ln`lII2xVmH2Hfkgg-bb7LtdW+ zuKNsSjBqabhwMaRcbyj%5irp_2|{3~6I3UDVcNl50by>D;vRh(=eJdFXLlb>$X)0i zPg%*=&$Mn|yM4HGg+QkswQYCeWZ&yXQD^QUu^uO?qcBJxq~)>lSDQ;KW!u^oxv}Z{ zQS_PcBV5?u2K%WtYsu*zvj@^SsI%ZN#}jxaM{H>QDm)9J<#v+>!8M8lzK5!qbhbgN zxhQp84N*JKtQYAJF%jKK1zWv3%=hZ5eHY8Rjsx=VO-*T;x3$J?f?|SB%RF0d(Ks|N z-cGZnN`!=j%`CtU?f_;~`!_Q?uFE#%t5R5m5Jp3dRseqx3NG zp_i51{2Z(`D@lHDY_1ye*9+@Hc-ZM)HLNH69TeW@JMx6H3YSEpRLc$VWalalm=4j? zjU(KHX-zY#MPuu-$VxBP8fRU>{NSf{)ko}XZ1XJk-$tL|0#F!|@uN2p&$!+&#)nPU z^xA1IRNp{4H?a#&xYi4;Oyn1_3m)9&1xFHEQjHn6 zAJ;&tDF3uVMxs#pAkSy5VGFZK-l;@$>wxn$OsGG*XUfvSYglL|0cInJE3{|Kt@P=5 zv(mHrAXdx7C|HRCw-AHW-0o;aNaM;!UVC)P0LS!YB3gTh+-tC;ckwe@QH42C&1RTg z6x!nC9(WhnHluIZ=1w|uDCi-y<|1y1ui?gL|Iazz)?H$2XCWSR)fG`nxz9&n@-{uJ zd6@+9>$2YWUgz#RwGR)TZ-N{_E}V1|w+MA=7ON9H1NoevG&4{h-`ocbUhpwQv5%ZG zZ{F?V0<(qP>GQ>W)E&tk932gt?NZPgD9JbjmZHt|OzXdx@R8pyA(cJIgL)ql9eZ#d z{SeMq2zCwcRN7$#_`jw?q*OFbs6x!lqgty{^Ul=!uK6)jTGKsvTrRnpFXf52&iXO) zqc*Puwh^upE(zXte&ev#2-*t78GP*ao3JSW35pP%RtVqNTfHY^N{e^Q`nOqoz#)-gL=^FU&^vp(@lj;NIIp>nRUAkX@_0m7y5` z`(Bj$FpX8IAJSSCA2*{QhChE-Md1v<>E3OrF2sV;h=MX8Vr%Hi77KE0{xSk zP8u}liYf^745)n~s9Y!nEWpl@z08vx`F&XJcg4Lt%FK%Y?f|$RSMCr(lz81iO><-2 z-u5Ms&}w^cM@;eqxkN7Ibv3Ci)D+dw7P-IW4YZ6feT=d2x^36A_ww!VUr1b|k}CWr z(PIHj$4|25_3<~AQ%CgnR>0&7&4pCr^*>tg-lzShTW)oxP)MRyb0oh#T`LcZkx#}7 zYegb$t#J8r;!wzwgwlS_Y`lFJ>%oQCRQ$M`5 zIYv6tv4!V^2V+|kjv3*}4faA)_fdc(Cy{XP^h&$ZTmU!YR6&udI?1**4Oj)fdkVi$ z@seq)`{iZ;Z9RXTZw)G{mtgei-+59zCNh8NdZQqOzaB+F84#x14d)n2^ z%+N`vfFm8^>|tLw2OV(FTG$*BhObG714OAalt!;tlh0d`WMde2zsnv)fMS^J;+igT z7a!V5$XqZ}ynBg*dKnMaqzkW05DxMS(VUYQQDX|>2}y{oE&nGvoQbV_^#O^$BqxHfhXfM8)-P#oj6@fp5p8E z2}$yd*;`l_Jx#E)S4Q5ZVYVo6g{;%OnUqwd^l;teWUKQ|!Pu!i;NeSbY(I#zqN2il zw$vbQ2pNM|)6{hH$Ta2&ekZhM_DR;|XZdb{g+EphflD^MZtxu5JdpsBlYb>WxE+%dj(uCf$ePY0EW00)o(7APGzB;H)*%uot-` z!Hu#8;m@Ag7U!;+N&?VgaA!om8txxkzi&YameR0TIbkre=<2{mcdP%rZClx#ZtiF| z8*0|`X8^3D@>(9L3koCcO^{YsZlHB-xf?$OP3}Hc;JPRL5qWu!e|^eOc)iqO30(OM z(lq@L@?Jk>E2K?e^@1O$y_vChd^HlXgdYmVbX6vd$0cHJ6xhiyvg?H=LVzI_oocKfPpQq#0I8G^gChr@;pcpiX|u07r9H7eTebv9@Zn+m*SOD_ zQ^7%p2Ta?@X!Z4^b8^U)WP}TboS2Sv4^>BMs!XYQdO#t;{q4}8rQIB+_U@r)++BwO zfo(~wJM4%F#h#QtzP|88<;N^N%y3kh&|g`Y@p0*yC$`#@(42p;fn+h4CtZVh&vEV1 z6jCl2+`Ul^GCa1Ec@aYb!OsEKzgK?h8Lyba+$9NinL(m9Q@GsztFbS`@o>Mm`aNx9j{prpiNm`y{l? z!tXxcG3h0n9OPi|NVba#7yPOwnZYpFv-3PbmP`*posskf@Wt=nNbIkoTmNv@4Yp(d z%B6=SZ{bbs)D==Scxxm-9e}-$X%mdS)Y_KD>p`hu*#)F&Av*DWq>`>16y{SE?BoR* zJcjS){A|THjlIk?v6pLP8Ag5(hHB(QbWraiKVU0#tvOMTlwjE4KT7d%J&P@i2mhE6 zFb**T5=iW@{ygz`CLG@0RR=jC*_5znwXExuj>wuI(94qF19p4XT+NPt@^691^HT8~=DBxU}?s`?ywMmn&VT8lh++ckhJ1^MrNDVs*>|4`ckI-GJR>Wo3I`9+Yp8;2tAlR>8E8JgFJ#xTt-jQtOpXz51B$LZPG zC+>1=vez3+T!lj*5Qy~USG@@(i0Qhk1xM2r{csb>ORdZCN(5Q#LnKie>qnptn#M=;4+Rw4#P@$NsO zZJU73hrt)vn5@({CkSW~rn`au8v#KFbZ|0I7a@o7^Sp2BP2P&A-vKA%L9=0-G(`ree}NT~-|$4lf$W zDC{guMK!h2>(w9Y3CB97z+RyIkmuDE%4>XMX&fT_yw>{My-f36yAXRldL_)el#1){ zL-@)Oukng=9|v|o{_jO0FYtD`92gDS*eYjcW4ufT-fqbU7v(Rsrap7*JQ17M#Hapr zyj{X*DzhTB+5XI%9O-Uj;0)qCN9bkxv6kTl79d+%-jb8nUu&04TuE^c|HUqK3-Gas zDz0<+cmT8DI8k5mu`BuYLW0)w`w|(_b5Lg*PZQ^yBtYGwM3UTTBSCU~*R8{y#7GPG zakUzYU6P4rC!0%3?b!y!)b})fU6Bg@XUO#?g+U>JWR*(fOQ|2QC0IUQSk6L|qrf-N&9o`iEo z>4qiTfX Date: Thu, 17 May 2018 12:36:19 +1000 Subject: [PATCH 0340/1133] docs: update --- nflogo5.png | Bin 11035 -> 0 bytes nflogo7.png | Bin 6739 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 nflogo5.png delete mode 100644 nflogo7.png diff --git a/nflogo5.png b/nflogo5.png deleted file mode 100644 index 394cb7296a7bb7021e8f11ef9850567edad9fd18..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11035 zcmeHMXHXPfy6z!|0SPJ@hbU2Uk{~&WBvDC%!Dkc{LZr$K@Y zNEQZ=C_ygnt-DqG<9@q)*R9&`yWgqmeyjR)b)WO}^FGgePDg5Ms*n)T5&-}}qNb{- z3jlc50DxUdfOUCgMeBSN04PvCdirjRfU70p*=?5=CY%3AtY=c=`5D3b##9z&QElO2GOyi@VOW_g3LzM@1yLWzVmdPrupFNz8d{mh2Cz7DG$uxUOjSiS!gfGpm6Z^%qI8y zYTJtkDIXp@GV%+*$GO#L_3~W<2637*sd@W*52uQj^w$2++a`naw3?l}E6qcOURBmK z$RnxqcoEW4e=s>%v%^KX%be8Gm>2u1TXp((T9?=q31q5Md|{mGWU#)=!}93(wnl{{ zN*UK97T5We0kt1S-cbR4=~d(BHw9OD+?`f_q}9$_IvgN5w8RXl3^n|219Uexr!BU+ z)God?oOU?OK-~+s#>^9oN9$6!|tn;HZ`>qdfMs-{ph#_C;y=0A20UxHa zyExZ>Q?<`RUx%$vd&5Iyn>{|#h;!a|6%89o3^lkKFMUwt#b~audQe^b!F}Ua(Oag< zQIok0%y*pb&;-2X-j1_q-KRnAU58u!(j0KQYa=!1w~O#cjKM1`OhNg+E|L_%6;vbN zrQmi=HilcBbklZD^XUs1PMLGz&z_z?_G&R_!h;aJ^CWFUKJ~Ll>#jx*a8B;oE1U{9 zI01ACb?5+F*lT7FUDb_PpCe7<{x-mw0n^56i4>Phrg}OLB93&DXC5v5<*BadjL=p6K zKln-uN-|bwn<%hZ)pIiH1#e)Ug^hS75Q6iriniVADd%CjD;GE;DR>2I!wzd!$S$X8 zO>^$v*!2=*vVqFPgrRLB2l;AmtzcTR!nu@4}j6kh>AY5Q6cS%Bh1DufN)4 zt-W(p$t2;)I!h(zYUuATk6a*Nb|Bx*Zce^00@}lQaLc+vIM9J*8I(YfOL3hj*{GP; zFN^nn`)Y?w;ep0RkB^~27pbtV=Z|uY6I$zK_t0(3$=toU`TDP(V(u+1Pv1mjhE4Wb zzzgFx^$GduYev*;NXJI)hOvbiz11l(wbYYM#jA;a21nbFA!At%Z)%HScAnsGd8_Yq z26QqMk);B2PYCe~L~U!7g&&|3Ag&P$ID@ zx;BCswtNf>8&ku&f!SjbB$ms#0g`5+B3lEZFPRZ@7Lo_=jKy5zDzxU%uNrY`sJC&@ zGurH+OJ`9=6GN~X^@Sz--4R3tH#t5EKLVsUHPP8My#vH`#5SX4`F;8Lk9%+w8Qj}u z)WV$1pWJcZ$r{48wW&;`pl1TJjrI{?pG%pGqy~xO)pI%v*3!!pDKZ~4< zM2S^z2|D1h6p+U2AZ0<`*s_+%JO-XVxWv)`T)|w}x-oZW zXg)W?v9^ADd#`0^$$}a48YY4p?ZO6*QwXD<4Cd1DOES{8pi*ZJ7pJA=lURHngO#l* z<_qqyXvWS{xv}PzjU~+P{U%UfZXkA`couHXQW1*554g(^|G|k>l+WG@{3b&d)!vSX zn^GPauzE73nE?kvm(Va%+3!pPystFO>Ej=�w=<-xS>AHWg_sVt$qVG3D-b$MxZ%ebV_XV{<0EqUZFyWjM!6_|$gboH0{C#17T5W9 zu1O1FGY^j)`sLbZrJnG))(CnR84SLnDoDWfqL{u9L4#>!8 z6!NW7x3!?y(@xIzph(tR*;%V=Po;ird^M`;F^G#Y=w<|Bgrp zgcaoz;EU*(+p`-{GhV|t7m(Ll)VgjcJO0qYdot<GQck`GzvbD(ynNHWS)W15(qN^gxBWNxW!SKfY4;FQnI zaL;UTmy)SOg4ZpF8NJ$g98G4p39bjZcGmNW=NEb6o1x>1 zsN_$R>5TZu&QwTXUprGdqW(6(VzaSyf`ES02hX99jCA9cmV*Mg|n_X@*$^Xm$_k_E+3n zbG_{;*rI{k_CsSOwGS29!A+eSdYaxP6xl+aTqft-qPVQ>o*?*w1r^Gr(^thiO`%YH zyBefarnNeWlHrV0@<@=dJ1Yv=p=$Li7~8QxJv{ zo^9|O%hP;y>fw}sipPBD!0F)iI8TfFT=7NyEqiU;Q8H+0TXj7?pLhfZ(s>l}Pz8L*eUNE-lG ziSNYf5_EhNb;%lde60Ue$m&M1h$1#^aBvgpx1;$WWZKSymyp4DXDvqkt5^#Y;6X0_ z0YiPRyDt*_-vc7?q&q9h6$K9n-)PGxT@g@6+E1v!%epb#Da#D z4>F97EW=(j^m1w!^T3#;-B2R7ebP+wzIra)L2HqgTuG>PsC#Mq?f3{2(qdM3Uc`bp z#Q_~+0=Nj>ZPiT|et>9V4VB)KxU2I~T@RXKC(VXr3OVU{Zf_Fmo2I!?rs=q4dV4?P z7U^&%U0>P5Sy#IjEw_F>eZ2~W&y2^5qT}i(GT$`%bSvN`SpF!0yF-BPHbSuA*C#0U{(FS`=rqi0NWa)cS5DNJ7}u$F&x2k?#u z6rRBlMBD{o4C^Ti+&QNLp7UGIU31GD_OO#`2-A9J9rYv6O$pzE)I;S%T@mbBf#Tdy z(*oiw13p-OLO;F5Fiq76q+^|#VkONdaCCC+?tAa{3Vd(Zi;Ql>JrK;?-irK{*YgzJrZSr^Kzid zZYc2A6jisyp*BzFj(N%Mu9dH2*G(LrwGl&~66yMzF%hkDJQDWl%T#;&t=zw%?~B3S z9A`~Y)7sE}3K}kJls-qYuSHllBb`N~|6@jO2u{$z$K>yL6fW0Nc#3SI9z18aIJoE= zEtf+aMB@n-gZVvX^w}Fa52+kjxO~RbR7D~JiD!%|_HzdgM(7X{Nm(svoah*I#%GVP z!3Mtw9Aa^4E)>^co`I22PEleZgWkluj8ne*DO;JZ{9hLZd{XZ|R#Hv8Zo7i+II74q zJr1WWsqj=TW>g@LqtEdKWXj!A?7Z6ga-}3`-j_7O9bP)<=wT_HLKwIJ>+2kR={GlK zTXovILY19h;8N-$(#?UAVi8Yad0e1GNy?(dL`dqTboKWyVpD9GNHYaxxx0ZEWM&Sc z-(wR*J~?S=l5WKs09>e9D_8%;)UG8)dLRAf10pJ$P&jaLDaL42FBEFm2Jth1_Trw&? z9#Jr7697=5)D-3Pyrwtj1T^UlsFihEbb2FEiyaA`3K4p0Dm)=?5)%kM#T2ONM^Pq- z6>r-vwdrC%*q7k8^}7;Xe_|DIf^+%YKii)O{Cg2-m84@2tgZe0ncA!t5w3E{YQVU@ zMdL3oZAs|=86m7fKLbH8_-Bw8#J)TS#{Dk4%mqLI)Xi0srInk;f*KUaz0~)MClz6a z^}gE&W`RR$3G))hY8*}R+E7&m}`WWt=3xvlflnC(b!u{%~l8IsbwO{|A4EidO(2{z0OM z95^<$0J8vmzmTcdDO+b?{?i`c)G#O~(Mv`K2K>R%{M+REW&Eso6^KGyN+*c)ys1iB z%7+vH&?R-hXMy~e)LmZ#0O;o~1<#k-0z7Z}83}vb3j@Jc{z;9!P6?GBTpb{2M1Qs9 z%UW_Xl*YeI_y*`7JK_J9qQ7Ace`T+4z(Nynt0(#Iy2ypV-bX_xr)a>p{EpV8$q!wo zd?V=5AKQd}1Hs?u`U|+PU1>q@JE%Vr{4Xdi%nN>*$QXJ}jvk(uEE?O8xKz;6#eb6J zf1IM~AJ&ZPlmMV2*2RD6-&DWQ&i)@F8Af>P>na?^vN^e0R!S}&w^}qn&~UJPnn8Z) zK-jMTC#CE##{$r6E9uJOaROmwHv$=ccoUrU{e5-$1D3CKj6+&8nlinY;I8ht|138h z>wkf(|CRsE{=cX){tqr-|6xD-4K@CauKyA01+gyb%RmRosA%e{a(M_tHcl zjJ%QRGx0xEfc#!0;^#X2&-S}TU`GoEh5Q^nq-WkIh@9(pJCQ#J{-26~7w7}KbztWZ S$InerKut+g@xA<$;Qs=8IC0ki diff --git a/nflogo7.png b/nflogo7.png deleted file mode 100644 index d742738b3a2984e0b498caa516d1b10eca8063df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6739 zcmZvgWl$VEyZ3jI;_mKJoZ?O??oynh#l1L-dvRy+A~&wZix!tH?z-p}w_;u7<$gZA zXXc#eLw<8jGLvMIT$2A+O?3qb)+SaZIAb{TtisC0?xI{cB+D`Q^i|@AOTg)w%RJ#uh@Rn8(3hU|~06#v{4L zdGCi{DWM~uHNO`zcBw4u9tk8*L!#`YhyBz& z_ZN~K?o|E7rH;7WK!pchBD&T)tkZJJ?vb>B{7#k+TlK7gV!xzJg_#^4pRWVYCR;ro zTROEUvK_X&EAO!{^V}H@YxezWE_I*LV1EO|%&g)t1_kZZd)P}0-mQpNmgUQfjuq}I z$1yFQWP8H$NKU$~&derBk6!od;+9Sij`mO-91F%7)VKxEF*+nm98v9 zW3GuTmH+PP`MGhevouECvn7O+Zw+vVc2GV8KP~|cTt#}n za<{&+^f$tp=j-AnhaEyHL0Al&0J`)T1T}8N1_z@1k_G5=GQB{IA^}kvS4oCmZu4UE zrv!4N<|;cK-MPAfSX~0gGMh!`KkFFy%-vpC8~*23JcqP@poc%HtRUhOH99uAqRzJ> z#D5IE#vD|#YI}w!JDtXZ+iES=&Op9jD)ttJa;tNFXi)0%zZ|8^B~pt$#pBFxRy@ZT z{YC4LlIQH!>Wo={Nj}LYSS+~G&1MjEfI|)H&<1bl0Y%qC97a_FW_w&Vjkd8e?<$x& zpeLSqh(C|sPAJhV2h!g~wW#y3)WY+KXy;bIjwrKWUuk5)GUtOX|<-l z(Iowl!&Je2P9|Z8hvn7_s8CPEJA-uLiu&KWR3Wgftl)l@MNIO~uueRKMApnMxP0%(q!7iEq?28o^~JApQpp zXyjqQ)e}caJUnYF(Zb?Tb(f=t_|xi8YYNv_VdGZkHtf)g>$DBO3e&f+O~AoJM>q+e zUp!M4M>ql??2Hw8maJ}<{C(0C)~s$c_=wL_+ZuVPXUM(}(w1z=Swxpxa^_w9bW{Nh zY*?72GNyW0COW~(o*9}=~snpx=PQ` zsR~V_(8Ed7dBj~i4+O}Kb6J)RXnCuR*{R|&Z#?}A>>_Kd%DhNERq6A|3C+{mR{PSQ zttPzD0%=}7*^-@GBNyh)62bSXcTnFvk& z%!*plC#BXJGp_q`4gu+B{_t_^m%PU#mI_a^7wAv710yCFrWwyQ+qQlSAgH7`jgC{G ze1N9E1Lur?5A4vY6KmEKt>P7Wt`P-K6NR%&&YYFWwQ|rHMx;m zM_aH;{f8M_I9uU;DkrxPE!T*nT92iIzH1!1L0E&9H&5HNNxf<>G%z!xS#~)Z*-8mR z{cS$LTJEi`=WlfD9Qax9T#ediFBE8`TgHSOY~u zMGMqJytkg$d~|w$+?q#zaWqrLsY`7pRuq3bobR-3f6 z+X)j6Nl*Ws>|$<0A!p|2@qQcl=~EwHf)AQ#(d>C`u_-J&9KT4fG1Jc%Sd?WKxH{xg z&`2Y($JE6--nQ$x0~(U`MT||bT&`frmEuQW%oQs0F!RKzCH9_q^EV`zKya3r&drhh zW9=VOJ2+W#YRk_rIU%u(FnQZ7D~!*1o(k(WVrP7HT>}@zKFCe3Ct-H1L!~K}MBz^+ zoa5OcT(K?!HO6m^6huD8bnX^9^GW2$!DN3-);1ipF@3`k4TUbTRkBSLdv~fFdClQb zZ{%69ur}em3#nqDBV!qY0#qlQIo(1g5fIo1`TscK|F|x>JieuICLQ+6x7QB6!+I0F zE2->s?s!fs4cpE2w*A$LkkzQ$p)I&@*!b-xpvvXR61$FPLSmN6b7UKvTN;>FIv_qr zeOwglV%Bo0)bV0?xkWQz76^TzMD;xkvAV|z$p=fRmC8b23lKCnMMDn&fQ#YZ2K4<$ z%KNnw#ZyU54rK=!4?qq;;nDR40PuX3WZ!@ET|LbY4A5T)9ND5{WCY8~$RHu0lCq|> z3M;T%fBUGV$x^@gPFCOVcb@tTNt4TuBF^g5!N$7zMK)nW7B9j$qoQ_%Se)N%lA5xE zn25rxioVQ9Vd6Hyd1=hOdp=Wvqvv#Vg?Gm{p!a9puyv2Aj=O-#fx7^WH=5D7wc#y& zn%3dC&f(bO2y_v+__+TUG6?h$xc?Q3(ys&mLFw1T!}i1dk|@4!HNn5#GIHCl#vOZg zD$(d7{Ap!S=@|dTDiKu%@=wD~Z_bS$UMhzY@IQwo@gy?MX26bs`3rC_21ciBYjVG2+M4ft;P?Z^SU;9R61=YS}kVCu9nGs#!hjaJ;A@b#InPdMWu^CdWG!KG^0Oi znQFF-x_aWf*Og|OX!T8aqf!{S6GU1svNWzQ%VMRTB`!Sn*FATItm^!B6BcTWTIij# zTP%mryLn|$Q`CWD6B8xv?ZO8JbD4qa>gr97S65dbEoD$=l&2|UaAjgz=Me3yA-O_H z{r&w-N7>A(;BR3>GR;)LN-;x~4clnT#GBD6sA^#sxHs2S$LG6XZMJ~Rx-cgrp-hY? z`skrVFYNRF8Q99|4PrRTFr}E`gKCd;vRL`?uGc@djQbl zfZwbmq>I#n5ZcvNh;pJsf<5!Nfw#)9$L^ev(iaTu&LBDpMa9YF`sBZ;R*W$tBab-2 z^FdbzVfGytl{=c;CmsEEOI!C6jqBOp|){=~} za;(lRpt36qmp%$5l*^g_G@lBljyR&*Wsi$XC)@cA<01=K2S+l%`G~j?a$3vy1P?Ju z^3XsOs*Yizm5JGN6FDoYX6O?NWg2HgivcXwn`tO1Db4N#-)~3z?WHJKCZ4XguxtJp zPE5$hFzN{q`4EM9iM3XufJ0Oh(?28$dr{w^11g~=Ns4mQU79>0xBDxfG>V<8ZVYXh#EAET#Jo@JylW~d6sr&9-ib`X9{I+Ln`lII2xVmH2Hfkgg-bb7LtdW+ zuKNsSjBqabhwMaRcbyj%5irp_2|{3~6I3UDVcNl50by>D;vRh(=eJdFXLlb>$X)0i zPg%*=&$Mn|yM4HGg+QkswQYCeWZ&yXQD^QUu^uO?qcBJxq~)>lSDQ;KW!u^oxv}Z{ zQS_PcBV5?u2K%WtYsu*zvj@^SsI%ZN#}jxaM{H>QDm)9J<#v+>!8M8lzK5!qbhbgN zxhQp84N*JKtQYAJF%jKK1zWv3%=hZ5eHY8Rjsx=VO-*T;x3$J?f?|SB%RF0d(Ks|N z-cGZnN`!=j%`CtU?f_;~`!_Q?uFE#%t5R5m5Jp3dRseqx3NG zp_i51{2Z(`D@lHDY_1ye*9+@Hc-ZM)HLNH69TeW@JMx6H3YSEpRLc$VWalalm=4j? zjU(KHX-zY#MPuu-$VxBP8fRU>{NSf{)ko}XZ1XJk-$tL|0#F!|@uN2p&$!+&#)nPU z^xA1IRNp{4H?a#&xYi4;Oyn1_3m)9&1xFHEQjHn6 zAJ;&tDF3uVMxs#pAkSy5VGFZK-l;@$>wxn$OsGG*XUfvSYglL|0cInJE3{|Kt@P=5 zv(mHrAXdx7C|HRCw-AHW-0o;aNaM;!UVC)P0LS!YB3gTh+-tC;ckwe@QH42C&1RTg z6x!nC9(WhnHluIZ=1w|uDCi-y<|1y1ui?gL|Iazz)?H$2XCWSR)fG`nxz9&n@-{uJ zd6@+9>$2YWUgz#RwGR)TZ-N{_E}V1|w+MA=7ON9H1NoevG&4{h-`ocbUhpwQv5%ZG zZ{F?V0<(qP>GQ>W)E&tk932gt?NZPgD9JbjmZHt|OzXdx@R8pyA(cJIgL)ql9eZ#d z{SeMq2zCwcRN7$#_`jw?q*OFbs6x!lqgty{^Ul=!uK6)jTGKsvTrRnpFXf52&iXO) zqc*Puwh^upE(zXte&ev#2-*t78GP*ao3JSW35pP%RtVqNTfHY^N{e^Q`nOqoz#)-gL=^FU&^vp(@lj;NIIp>nRUAkX@_0m7y5` z`(Bj$FpX8IAJSSCA2*{QhChE-Md1v<>E3OrF2sV;h=MX8Vr%Hi77KE0{xSk zP8u}liYf^745)n~s9Y!nEWpl@z08vx`F&XJcg4Lt%FK%Y?f|$RSMCr(lz81iO><-2 z-u5Ms&}w^cM@;eqxkN7Ibv3Ci)D+dw7P-IW4YZ6feT=d2x^36A_ww!VUr1b|k}CWr z(PIHj$4|25_3<~AQ%CgnR>0&7&4pCr^*>tg-lzShTW)oxP)MRyb0oh#T`LcZkx#}7 zYegb$t#J8r;!wzwgwlS_Y`lFJ>%oQCRQ$M`5 zIYv6tv4!V^2V+|kjv3*}4faA)_fdc(Cy{XP^h&$ZTmU!YR6&udI?1**4Oj)fdkVi$ z@seq)`{iZ;Z9RXTZw)G{mtgei-+59zCNh8NdZQqOzaB+F84#x14d)n2^ z%+N`vfFm8^>|tLw2OV(FTG$*BhObG714OAalt!;tlh0d`WMde2zsnv)fMS^J;+igT z7a!V5$XqZ}ynBg*dKnMaqzkW05DxMS(VUYQQDX|>2}y{oE&nGvoQbV_^#O^$BqxHfhXfM8)-P#oj6@fp5p8E z2}$yd*;`l_Jx#E)S4Q5ZVYVo6g{;%OnUqwd^l;teWUKQ|!Pu!i;NeSbY(I#zqN2il zw$vbQ2pNM|)6{hH$Ta2&ekZhM_DR;|XZdb{g+EphflD^MZtxu5JdpsBlYb>WxE+%dj(uCf$ePY0EW00)o(7APGzB;H)*%uot-` z!Hu#8;m@Ag7U!;+N&?VgaA!om8txxkzi&YameR0TIbkre=<2{mcdP%rZClx#ZtiF| z8*0|`X8^3D@>(9L3koCcO^{YsZlHB-xf?$OP3}Hc;JPRL5qWu!e|^eOc)iqO30(OM z(lq@L@?Jk>E2K?e^@1O$y_vChd^HlXgdYmVbX6vd$0cHJ6xhiyvg?H=LVzI_oocKfPpQq#0I8G^gChr@;pcpiX|u07r9H7eTebv9@Zn+m*SOD_ zQ^7%p2Ta?@X!Z4^b8^U)WP}TboS2Sv4^>BMs!XYQdO#t;{q4}8rQIB+_U@r)++BwO zfo(~wJM4%F#h#QtzP|88<;N^N%y3kh&|g`Y@p0*yC$`#@(42p;fn+h4CtZVh&vEV1 z6jCl2+`Ul^GCa1Ec@aYb!OsEKzgK?h8Lyba+$9NinL(m9Q@GsztFbS`@o>Mm`aNx9j{prpiNm`y{l? z!tXxcG3h0n9OPi|NVba#7yPOwnZYpFv-3PbmP`*posskf@Wt=nNbIkoTmNv@4Yp(d z%B6=SZ{bbs)D==Scxxm-9e}-$X%mdS)Y_KD>p`hu*#)F&Av*DWq>`>16y{SE?BoR* zJcjS){A|THjlIk?v6pLP8Ag5(hHB(QbWraiKVU0#tvOMTlwjE4KT7d%J&P@i2mhE6 zFb**T5=iW@{ygz`CLG@0RR=jC*_5znwXExuj>wuI(94qF19p4XT+NPt@^691^HT8~=DBxU}?s`?ywMmn&VT8lh++ckhJ1^MrNDVs*>|4`ckI-GJR>Wo3I`9+Yp8;2tAlR>8E8JgFJ#xTt-jQtOpXz51B$LZPG zC+>1=vez3+T!lj*5Qy~USG@@(i0Qhk1xM2r{csb>ORdZCN(5Q#LnKie>qnptn#M=;4+Rw4#P@$NsO zZJU73hrt)vn5@({CkSW~rn`au8v#KFbZ|0I7a@o7^Sp2BP2P&A-vKA%L9=0-G(`ree}NT~-|$4lf$W zDC{guMK!h2>(w9Y3CB97z+RyIkmuDE%4>XMX&fT_yw>{My-f36yAXRldL_)el#1){ zL-@)Oukng=9|v|o{_jO0FYtD`92gDS*eYjcW4ufT-fqbU7v(Rsrap7*JQ17M#Hapr zyj{X*DzhTB+5XI%9O-Uj;0)qCN9bkxv6kTl79d+%-jb8nUu&04TuE^c|HUqK3-Gas zDz0<+cmT8DI8k5mu`BuYLW0)w`w|(_b5Lg*PZQ^yBtYGwM3UTTBSCU~*R8{y#7GPG zakUzYU6P4rC!0%3?b!y!)b})fU6Bg@XUO#?g+U>JWR*(fOQ|2QC0IUQSk6L|qrf-N&9o`iEo z>4qiTfX Date: Thu, 17 May 2018 13:06:53 +1000 Subject: [PATCH 0341/1133] docs: update --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4d1c0aed0..85444b84e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,3 @@ - - Packaging status - -

logo

@@ -12,6 +8,10 @@

+ + Packaging status + + Neofetch is a command-line system information tool written in `bash 3.2+`. Neofetch displays information about your operating system, software and hardware in an aesthetic and visually pleasing way. The overall purpose of Neofetch is to be used in screen-shots of your system. Neofetch shows the information other people want to see. There are other tools available for proper system statistic/diagnostics. @@ -22,6 +22,8 @@ You can further configure Neofetch to display exactly what you want it to. Throu Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added.
+neofetch +neofetch ### For more information: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] From 582fa2f50b3aa48f731ee76b47326f34ff15fa65 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 17 May 2018 13:39:24 +1000 Subject: [PATCH 0342/1133] version: bump --- neofetch | 4 ++-- neofetch.1 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 3f3e3fa0a..c9a76a585 100755 --- a/neofetch +++ b/neofetch @@ -27,7 +27,7 @@ # SOFTWARE. # Neofetch version. -version="4.0.0-git" +version="4.0.0" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" @@ -831,7 +831,7 @@ stdout="off" # # NOTE: Don't change this value, neofetch reads this to determine # how to handle backwards compatibility. -config_version="4.0.0-git" +config_version="4.0.0" EOF # DETECT INFORMATION diff --git a/neofetch.1 b/neofetch.1 index 44886a15d..159eebc52 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "May 2018" "Neofetch 4.0.0-git" "User Commands" +.TH NEOFETCH "1" "May 2018" "Neofetch 4.0.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From 7961c3869365e12ef90ba033c77f9d157aa578f3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 17 May 2018 13:45:03 +1000 Subject: [PATCH 0343/1133] docs: update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76cfa8529..054dac524 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,6 +65,8 @@ it. :+1: **Song** +- Added support for VLC. [**@mstraube**](https://github.com/mstraube) +- Added support for Sayonara. [**@mstraube**](https://github.com/mstraube) - Added album data to song output. [**@mstraube**](https://github.com/mstraube), [**@iandrewt**](https://github.com/iandrewt) - Added `song_format` to change the display format of the data. - Default: `%artist% - %album% - %title%`. From c5dbf34e76094062e097a1159998582f1548bfe0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 17 May 2018 13:47:50 +1000 Subject: [PATCH 0344/1133] docs: update --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 054dac524..c5ddf2dbc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,6 +22,13 @@ discussed proposed changes in the bug tracker and Discord. I appreciate it. :+1: +## Discord + +Neofetch now has a Discord server. Come and join the discussion! + + ## Contributors From e398f1ee087bb65273fe1b14624e563099d3b6dd Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 17 May 2018 13:57:45 +1000 Subject: [PATCH 0345/1133] docs: update --- CHANGELOG.md | 5 +++-- neofetch | 4 ++-- neofetch.1 | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c5ddf2dbc..e5217dd62 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,8 +24,9 @@ it. :+1: ## Discord -Neofetch now has a Discord server. Come and join the discussion! diff --git a/neofetch b/neofetch index c9a76a585..c30231b85 100755 --- a/neofetch +++ b/neofetch @@ -27,7 +27,7 @@ # SOFTWARE. # Neofetch version. -version="4.0.0" +version="4.0.1" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" @@ -831,7 +831,7 @@ stdout="off" # # NOTE: Don't change this value, neofetch reads this to determine # how to handle backwards compatibility. -config_version="4.0.0" +config_version="4.0.1" EOF # DETECT INFORMATION diff --git a/neofetch.1 b/neofetch.1 index 159eebc52..4c25cc434 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "May 2018" "Neofetch 4.0.0" "User Commands" +.TH NEOFETCH "1" "May 2018" "Neofetch 4.0.1" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From 0f7e7b6ee02d695a20b6f3fad026020883793cf2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 17 May 2018 14:02:05 +1000 Subject: [PATCH 0346/1133] docs: update --- CHANGELOG.md | 91 +++++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 43 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5217dd62..877b2bc03 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] + +## [4.0.0] - 2018-05-17 + This release bumps the version number up to `4.0.0` as it contains major changes to how Neofetch is packaged and installed. @@ -24,9 +27,10 @@ it. :+1: ## Discord -Neofetch now has a Discord server. Come and join the discussion! +Neofetch now has a Discord server. Come and join the discussion! - @@ -109,12 +113,12 @@ src="https://img.shields.io/discord/440354555197128704.svg"> - Added support for detecting `dwm`. - + ## [3.4.0] - 2018-04-05 This release adds support for a large number of Linux distros as well as support for the latest macOS and iOS devices. This release also contains a large number of bug fixes and some minor features. -I'm pretty sure that this release is the largest in terms of number of contributors. Thanks to everyone who contributed this release! +I'm pretty sure that this release is the largest in terms of number of contributors. Thanks to everyone who contributed this release! ## Contributors @@ -267,7 +271,7 @@ I'm pretty sure that this release is the largest in terms of number of contribut - Fixed Kitty `font_size` regex. [**@aidanharris**](https://github.com/aidanharris) - Added support for `XTerm.vt11.facename`. [**@aidanharris**](https://github.com/aidanharris) - + ## [3.3.0] - 2017-09-14 Thanks to everyone who contributed this release, I appreciate ya! @@ -395,13 +399,13 @@ Thanks to everyone who contributed this release, I appreciate ya! - Use `maim` over `scrot`. **[@ybden](https://github.com/ybden)** - Fixed `scrot_cmd` arguments not being used. **[@winneon](https://github.com/winneon)** - + ## [3.2.0] - 2017-06-21 -This release was long overdue and I apologise for the delay. I've been busy with study among other things. This update is smaller than usual but fixes some important bugs. +This release was long overdue and I apologise for the delay. I've been busy with study among other things. This update is smaller than usual but fixes some important bugs. -Thanks once again to everyone that contributed! +Thanks once again to everyone that contributed! ## Contributors @@ -481,7 +485,7 @@ Thanks once again to everyone that contributed! - [FreeBSD]: Fix inaccurate free memory calculation. - + ## [3.1.0] - 2017-04-25 Hi, It's been quite a while since the last release. I've been extremely busy with university and I finally found some time to flag a new release. (I've been meaning to do this for a few weeks now) @@ -594,7 +598,7 @@ The screenshot feature no longer requires any configuration before working. We n - [Linux] Hide duplicate GPU lines (Only display 1). - + ## [3.0.1] - 2017-01-30 This minor release fixes all of the bugs that were found in the 3.0 release. @@ -663,12 +667,12 @@ Thanks for all of the bug reports and contributions. :) ## Scrot - Added message to let users know that a screenshot was taken. - + ## [3.0] - 2017-01-23 -This is another large release containing over `550` commits from 7 contributors. Due to the size and large amount of changes made this release expect at least one minor release to fix any bugs that come up. +This is another large release containing over `550` commits from 7 contributors. Due to the size and large amount of changes made this release expect at least one minor release to fix any bugs that come up. -The version number has been bumped to `3.0` due to the large amount of breaking changes introduced this update. I've added backwards compatibility for all of the new changes but there may still be some breakage. I highly recommend starting with a new config to avoid any issues that may arise. +The version number has been bumped to `3.0` due to the large amount of breaking changes introduced this update. I've added backwards compatibility for all of the new changes but there may still be some breakage. I highly recommend starting with a new config to avoid any issues that may arise. Neofetch now supports displaying images using `catimg`, `libcaca` and `jp2a`. See this wiki page for screenshots. https://github.com/dylanaraps/neofetch/wiki/Image-Backends @@ -883,7 +887,7 @@ I have given collaborator access to both **[@konimex](https://github.com/konimex - Fixed bug where `neofetch --config` sourced the user config twice. - Cleaned up config arg handling. - + ## [2.0.2] - 2016-12-07 This minor release fixes some issues related to new features added in 2.0. These issues weren't picked up in the time between 2.0 and 2.1 and another minor release is needed due to the Packages issue being rather important. @@ -903,7 +907,7 @@ I also want to apologize to those packaging Neofetch for this unexpected release **Theme**
- [Cinnamon] Fixed incorrect information. - + ## [2.0.1] - 2016-12-06 This release of Neofetch fixes some important bugs that were found after 2.0 was release. This includes: Detection issues on CentOS and Linux Mint systems, Incorrect Memory usage on BSD, Linux GPU detection issues and more. @@ -987,7 +991,7 @@ The config option `scrot_cmd` and the commandline flag `--scrot_cmd` are still t - teknik doesn't compress images whereas imgur does. - You can change this back to imgur by using `--image_host imgur` or by editing your config file. - + ## [2.0] - 2016-12-02 This is the biggest release of Neofetch in a long time. 97 files were changed with 2700~ additions to 2900~ deletions. Although the changelog isn't as interesting this time majority of the script has been rewritten, restructered and cleaned up. Every function and variable name follows a proper naming scheme and a large number of bugs were fixed. @@ -1123,12 +1127,12 @@ Thanks to all of the contributors this time around, you guys are a big help and **Resolution**
- [MacOS] If refresh rate is empty don't append Hz. - + ## [1.9.1] - 2016-11-04 This is a small release which fixes various issues found in 1.9. -Note: Those packaging neofetch can ignore the new file: `config/travis` +Note: Those packaging neofetch can ignore the new file: `config/travis` ## Contributors - **[@konimex](https://github.com/konimex)** @@ -1178,7 +1182,7 @@ Note: Those packaging neofetch can ignore the new file: `config/travis` **Memory**
- [OpenBSD] Fixed used memory usage. **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** - + ## [1.9] - 2016-11-01 This change log won't cover everything that's changed. Have a look through the commit @@ -1211,7 +1215,7 @@ Thanks to everyone below who contributed, it's nice to see some new faces too. : - Added support for Android. - Dependencies: - Required: `bash` and `busybox` - - Note: I recommend installing `termux` from the Play Store or F-Droid. Termux provides you with a fully + - Note: I recommend installing `termux` from the Play Store or F-Droid. Termux provides you with a fully working Linux environment, doesn't require root acess and includes all dependencies. - Note2: Neofetch will be packaged in `termux` thanks to **[@konimex](https://github.com/konimex)** - PR [#351](https://github.com/termux/termux-packages/pull/531) @@ -1340,7 +1344,7 @@ Note: `\033[14t` is still supported, if images already work for you then you don - Added support for Audacious. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** - Rewrote song function, it's now much faster/cleaner. - + ## [1.8.1] - 2016-10-04 This release fixes various bugs found in 1.8. @@ -1385,7 +1389,7 @@ This release fixes various bugs found in 1.8. - Added logo mode which only displays the ascii art. - Adds two new identical flags `--logo` and `-L`. - + ## [1.8] - 2016-10-02 This version of neofetch is vastly different from the previous versions and this @@ -1548,7 +1552,7 @@ now have working image support. - Use a pure bash solution to getting ascii size. - Updated Solus ascii art to match new logo. **[@undrskr](https://github.com/undrskr)** - + ## [1.7] - 2016-05-14 Hello, sorry this release took so long. I've been extremely busy with uni and @@ -1715,7 +1719,7 @@ called `fg` which will set the color to your foreground color. [///// ] ``` - + ## [1.6] - 2016-04-01 # Neofetch 1.6 @@ -1862,7 +1866,7 @@ Thanks to the following people for contributing this release. ### Scrot - Fixed scrot function not using user defined options. - + ## [1.5] - 2016-03-17 # Neofetch 1.5 @@ -1956,7 +1960,7 @@ me finish up with this PR. ### Stdout Mode - Fixed issues with functions that use `prin`. - + ## [1.4] - 2016-03-09 Lots of bugs were fixed and a lot of code was cleaned up, this changelog just lists @@ -2028,14 +2032,14 @@ Example: neofetch --stdout memory battery disk --stdout_separator " | " ``` - + ## [1.3] - 2016-02-26 # Fetch 1.3 Hey guys, -This update brought some breaking changes, see this wiki page for what you'll +This update brought some breaking changes, see this wiki page for what you'll need to update in your config file. https://github.com/dylanaraps/fetch/wiki/Following-HEAD @@ -2106,7 +2110,7 @@ much faster and cleaner. - Removed `--stdout_subtitles` - Removed `--stdout_title` - + ## [1.2] - 2016-02-17 # Fetch 1.2 @@ -2121,7 +2125,7 @@ https://github.com/dylanaraps/fetch/wiki/Following-HEAD ### OS -We now support almost all the Linux distros Screenfetch supports excluding +We now support almost all the Linux distros Screenfetch supports excluding the distros that have been discontinued. Added support for these distros: @@ -2219,7 +2223,7 @@ info "Font" font - Fix missing ascii art when fetch is installed in /usr/local - Update Deepin's ascii art to their new logo - + ## [1.1] - 2016-02-06 # Fetch 1.1 changelog @@ -2272,7 +2276,7 @@ the first value of `ascii_colors`. If `ascii_colors` is left empty, color will b ### Config file - Fetch now has a config file that you can share with people and keep between - script versions! [1] + script versions! [1] - Added `--config` and `$config_file` to specify a custom config location. - Added `--config off`, `--config none` and `$config` to enable / disable config files at launch or in script. @@ -2389,7 +2393,7 @@ Battery: 10% - **NOTE:** This currently doesn't support BSD systems as we have no one to help us test - See **[Issue #46](https://github.com/dylanaraps/fetch/issues/46)** - + ## [1.0] - 2016-01-27 # Fetch 1.0 @@ -2549,7 +2553,7 @@ to set the program to use to take the screenshot. ## Wiki: -Added `Customizing Info` page which has info/examples about +Added `Customizing Info` page which has info/examples about the new printinfo function. https://github.com/dylanaraps/fetch/wiki/Customizing-Info @@ -2558,7 +2562,7 @@ Added `Customization` which lists all options and their values. https://github.com/dylanaraps/fetch/wiki/Customization - + ## [0.2.1] - 2016-01-04 Here's what's new: @@ -2570,19 +2574,19 @@ Here's what's new: - Fixed bug with multiple colons - Fixed underlines not being drawn the full width. - Functions now fallback to "Unknown" instead of printing nothing. -- `getos` now gets os type and `getdistro` gets the distro. +- `getos` now gets os type and `getdistro` gets the distro. - This makes it even easier to add other os types. Here's what I'm working on: -- Finishing OpenBSD support -- Cygwin support +- Finishing OpenBSD support +- Cygwin support Enjoy - + ## [0.2] - 2016-01-03 -I finished my rewrite! +I finished my rewrite! ## Here's what's new: - The script is now way faster. @@ -2637,8 +2641,8 @@ Changelog: - The script now aligns the cursor to the bottom of the terminal instead of using a hardcoded amount of newlines - Image size and padding is now dynamic, the only difference on the user - side is that instead of setting a long line of spaces as - padding, you set your font width. This means that you set the + side is that instead of setting a long line of spaces as + padding, you set your font width. This means that you set the var once and the script will just work at any window size. - You can disable dynamic images and go back to the old behaviour with by using the `--size` or the in config var. @@ -2654,7 +2658,8 @@ Changelog: Let me know if you're having issues. -[Unreleased]: https://github.com/dylanaraps/neofetch/compare/3.4.0...HEAD +[Unreleased]: https://github.com/dylanaraps/neofetch/compare/4.0.0...HEAD +[4.0.0]: https://github.com/dylanaraps/neofetch/compare/3.4.0...4.0.0 [3.4.0]: https://github.com/dylanaraps/neofetch/compare/3.3.0...3.4.0 [3.3.0]: https://github.com/dylanaraps/neofetch/compare/3.2.0...3.3.0 [3.2.0]: https://github.com/dylanaraps/neofetch/compare/3.1.0...3.2.0 From bad073d78a4599cfada48a04ab8fe433156996b5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 17 May 2018 20:30:46 +1000 Subject: [PATCH 0347/1133] term: Fix macOS issue --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c30231b85..2918aefe8 100755 --- a/neofetch +++ b/neofetch @@ -2789,7 +2789,8 @@ get_term() { case "${name// }" in "${SHELL/*\/}" | *"sh" | "tmux"* | "screen" | "su"*) ;; "login"* | *"Login"* | "init" | "(init)") term="$(tty)" ;; - "ruby" | "1" | "systemd" | "sshd"* | "python"* | "USER"*"PID"* | "kdeinit"*) + "ruby" | "1" | "systemd" | "sshd"* | "python"* | + "USER"*"PID"* | "kdeinit"* | "launchd"*) break ;; "gnome-terminal-") term="gnome-terminal" ;; From b16ff8bc4df77f3117bc4f8be7a2c10c405bac23 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 17 May 2018 20:43:22 +1000 Subject: [PATCH 0348/1133] term: Fix tmux issue. --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 2918aefe8..d0bc8a950 100755 --- a/neofetch +++ b/neofetch @@ -2787,15 +2787,16 @@ get_term() { [[ -z "$parent" ]] && break name="$(get_process_name "$parent")" case "${name// }" in - "${SHELL/*\/}" | *"sh" | "tmux"* | "screen" | "su"*) ;; + "${SHELL/*\/}" | *"sh" | "screen" | "su"*) ;; "login"* | *"Login"* | "init" | "(init)") term="$(tty)" ;; - "ruby" | "1" | "systemd" | "sshd"* | "python"* | + "ruby" | "1" | "systemd" | "sshd"* | "python"* |\ "USER"*"PID"* | "kdeinit"* | "launchd"*) break ;; "gnome-terminal-") term="gnome-terminal" ;; *"nvim") term="Neovim Terminal" ;; *"NeoVimServer"*) term="VimR Terminal" ;; + *"tmux"*) term="tmux" ;; *) term="${name##*/}" ;; esac fi From 6e41d5e0a9a1347ddd31aa71256916ff22b0c01e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 18 May 2018 15:49:14 +1000 Subject: [PATCH 0349/1133] packages: cleanup --- neofetch | 64 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/neofetch b/neofetch index d0bc8a950..86788ffd5 100755 --- a/neofetch +++ b/neofetch @@ -1303,83 +1303,83 @@ get_packages() { packages="$(pacman -Qq --color never | wc -l)" type -p dpkg >/dev/null && \ - packages="$((packages+=$(dpkg --get-selections | grep -cv deinstall$)))" + ((packages+=$(dpkg --get-selections | grep -cv deinstall$))) type -p pkgtool >/dev/null && \ - packages="$((packages+=$(ls -1 /var/log/packages | wc -l)))" + ((packages+=$(ls -1 /var/log/packages | wc -l))) type -p rpm >/dev/null && \ - packages="$((packages+=$(rpm -qa | wc -l)))" + ((packages+=$(rpm -qa | wc -l))) type -p xbps-query >/dev/null && \ - packages="$((packages+=$(xbps-query -l | wc -l)))" + ((packages+=$(xbps-query -l | wc -l))) type -p pkginfo >/dev/null && \ - packages="$((packages+=$(pkginfo -i | wc -l)))" + ((packages+=$(pkginfo -i | wc -l))) type -p emerge >/dev/null && \ - packages="$((packages+=$(ls -d /var/db/pkg/*/* | wc -l)))" + ((packages+=$(ls -d /var/db/pkg/*/* | wc -l))) type -p nix-env >/dev/null && \ - packages="$((packages+=$(ls -d -1 /nix/store/*/ | wc -l)))" + ((packages+=$(ls -d -1 /nix/store/*/ | wc -l))) type -p guix >/dev/null && \ - packages="$((packages+=$(ls -d -1 /gnu/store/*/ | wc -l)))" + ((packages+=$(ls -d -1 /gnu/store/*/ | wc -l))) type -p apk >/dev/null && \ - packages="$((packages+=$(apk info | wc -l)))" + ((packages+=$(apk info | wc -l))) type -p opkg >/dev/null && \ - packages="$((packages+=$(opkg list-installed | wc -l)))" + ((packages+=$(opkg list-installed | wc -l))) type -p pacman-g2 >/dev/null && \ - packages="$((packages+=$(pacman-g2 -Q | wc -l)))" + ((packages+=$(pacman-g2 -Q | wc -l))) type -p lvu >/dev/null && \ - packages="$((packages+=$(lvu installed | wc -l)))" + ((packages+=$(lvu installed | wc -l))) type -p tce-status >/dev/null && \ - packages="$((packages+=$(tce-status -i | wc -l)))" + ((packages+=$(tce-status -i | wc -l))) type -p Compile >/dev/null && \ - packages="$((packages+=$(ls -d -1 /Programs/*/ | wc -l)))" + ((packages+=$(ls -d -1 /Programs/*/ | wc -l))) type -p eopkg >/dev/null && \ - packages="$((packages+=$(ls -1 /var/lib/eopkg/package | wc -l)))" + ((packages+=$(ls -1 /var/lib/eopkg/package | wc -l))) type -p pkg_info >/dev/null && \ - packages="$((packages+=$(pkg_info | wc -l)))" + ((packages+=$(pkg_info | wc -l))) type -p crew >/dev/null && \ - packages="$((packages+=$(ls -l /usr/local/etc/crew/meta/*.filelist | wc -l)))" + ((packages+=$(ls -l /usr/local/etc/crew/meta/*.filelist | wc -l))) type -p tazpkg >/dev/null && \ - packages="$((packages+=$(tazpkg list | wc -l) - 6))" + ((packages+=$(tazpkg list | wc -l) - 6)) type -p sorcery >/dev/null && \ - packages="$((packages+=$(gaze installed | wc -l)))" + ((packages+=$(gaze installed | wc -l))) type -p alps >/dev/null && \ - packages="$((packages+=$(alps showinstalled | wc -l)))" + ((packages+=$(alps showinstalled | wc -l))) type -p kpt >/dev/null && \ type -p kpm >/dev/null && \ - packages="$((packages+=$(kpm --get-selections | grep -cv deinstall$)))" + ((packages+=$(kpm --get-selections | grep -cv deinstall$))) if type -p cave >/dev/null; then package_dir=(/var/db/paludis/repositories/{cross-installed/*,installed}/data/*) - packages="$((packages+=$(ls -d -1 "${package_dir[@]}" | wc -l)))" + ((packages+=$(ls -d -1 "${package_dir[@]}" | wc -l))) fi type -p butch >/dev/null && \ - packages="$((packages+=$(butch list | wc -l)))" + ((packages+=$(butch list | wc -l))) if type -p pkg >/dev/null; then case "$kernel_name" in - "FreeBSD") packages="$((packages+=$(pkg info | wc -l)))" ;; + "FreeBSD") ((packages+=$(pkg info | wc -l))) ;; *) - packages="$((packages+=$(ls -1 /var/db/pkg | wc -l)))" - ((packages == 0)) && packages="$((packages+=$(pkg list | wc -l)))" + ((packages+=$(ls -1 /var/db/pkg | wc -l))) + ((packages == 0)) && ((packages+=$(pkg list | wc -l))) esac fi ;; @@ -1389,13 +1389,13 @@ get_packages() { packages="$(($(ls -l /usr/local/bin/ | grep -cv "\(../Cellar/\|brew\)") - 1))" type -p port >/dev/null && \ - packages="$((packages + $(port installed | wc -l) - 1))" + ((packages+=$(port installed | wc -l) - 1)) type -p brew >/dev/null && \ - packages="$((packages + $(find /usr/local/Cellar -maxdepth 1 | wc -l) - 1))" + ((packages+=$(find /usr/local/Cellar -maxdepth 1 | wc -l) - 1)) type -p pkgin >/dev/null && \ - packages="$((packages + $(pkgin list | wc -l)))" + ((packages+=$(pkgin list | wc -l))) ;; "Windows") @@ -1406,7 +1406,7 @@ get_packages() { # Count chocolatey packages. [[ -d "/cygdrive/c/ProgramData/chocolatey/lib" ]] && \ - packages="$((packages+=$(ls -1 /cygdrive/c/ProgramData/chocolatey/lib | wc -l)))" + ((packages+=$(ls -1 /cygdrive/c/ProgramData/chocolatey/lib | wc -l))) ;; "Haiku") @@ -1415,7 +1415,7 @@ get_packages() { "AIX") packages="$(lslpp -J -l -q | grep -cv '^#')" - packages="$((packages+=$(rpm -qa | wc -l)))" + ((packages+=$(rpm -qa | wc -l))) ;; "IRIX") @@ -1424,7 +1424,7 @@ get_packages() { "FreeMiNT") type -p rpm >/dev/null && \ - packages="$((packages+=$(rpm -qa | wc -l)))" + packages="$(rpm -qa | wc -l)" ;; esac From 98252472cee3a8a0eaa0bbc627f1cdd0dc6f4421 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 18 May 2018 16:11:00 +1000 Subject: [PATCH 0350/1133] general: Fix default config in bash3. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d0bc8a950..1eb8f4fe1 100755 --- a/neofetch +++ b/neofetch @@ -8679,7 +8679,7 @@ main() { get_os # Load default config. - source /dev/stdin < <(printf "%s\n" "$config") + source /dev/stdin <<< "$config" get_args "$@" [[ "$verbose" != "on" ]] && exec 2>/dev/null From 0e43d765fac00546d88cae8eb593f009f7f6b2c0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 18 May 2018 16:14:04 +1000 Subject: [PATCH 0351/1133] docs: update --- CHANGELOG.md | 88 +++++++++++++++++++++++++++------------------------- 1 file changed, 46 insertions(+), 42 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 877b2bc03..f7d3d0a6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] - +- [config] Fixed issue with default config in bash3. +- [packages] Simplified code. +- [term] Fixed macOS issue. +- [term] Fixed `tmux` issue. + ## [4.0.0] - 2018-05-17 This release bumps the version number up to `4.0.0` as it contains major @@ -27,7 +31,7 @@ it. :+1: ## Discord -Neofetch now has a Discord server. Come and join the discussion! +Neofetch now has a Discord server. Come and join the discussion! - Added support for detecting `dwm`. - + ## [3.4.0] - 2018-04-05 This release adds support for a large number of Linux distros as well as support for the latest macOS and iOS devices. This release also contains a large number of bug fixes and some minor features. -I'm pretty sure that this release is the largest in terms of number of contributors. Thanks to everyone who contributed this release! +I'm pretty sure that this release is the largest in terms of number of contributors. Thanks to everyone who contributed this release! ## Contributors @@ -271,7 +275,7 @@ I'm pretty sure that this release is the largest in terms of number of contribut - Fixed Kitty `font_size` regex. [**@aidanharris**](https://github.com/aidanharris) - Added support for `XTerm.vt11.facename`. [**@aidanharris**](https://github.com/aidanharris) - + ## [3.3.0] - 2017-09-14 Thanks to everyone who contributed this release, I appreciate ya! @@ -399,13 +403,13 @@ Thanks to everyone who contributed this release, I appreciate ya! - Use `maim` over `scrot`. **[@ybden](https://github.com/ybden)** - Fixed `scrot_cmd` arguments not being used. **[@winneon](https://github.com/winneon)** - + ## [3.2.0] - 2017-06-21 -This release was long overdue and I apologise for the delay. I've been busy with study among other things. This update is smaller than usual but fixes some important bugs. +This release was long overdue and I apologise for the delay. I've been busy with study among other things. This update is smaller than usual but fixes some important bugs. -Thanks once again to everyone that contributed! +Thanks once again to everyone that contributed! ## Contributors @@ -485,7 +489,7 @@ Thanks once again to everyone that contributed! - [FreeBSD]: Fix inaccurate free memory calculation. - + ## [3.1.0] - 2017-04-25 Hi, It's been quite a while since the last release. I've been extremely busy with university and I finally found some time to flag a new release. (I've been meaning to do this for a few weeks now) @@ -598,7 +602,7 @@ The screenshot feature no longer requires any configuration before working. We n - [Linux] Hide duplicate GPU lines (Only display 1). - + ## [3.0.1] - 2017-01-30 This minor release fixes all of the bugs that were found in the 3.0 release. @@ -667,12 +671,12 @@ Thanks for all of the bug reports and contributions. :) ## Scrot - Added message to let users know that a screenshot was taken. - + ## [3.0] - 2017-01-23 -This is another large release containing over `550` commits from 7 contributors. Due to the size and large amount of changes made this release expect at least one minor release to fix any bugs that come up. +This is another large release containing over `550` commits from 7 contributors. Due to the size and large amount of changes made this release expect at least one minor release to fix any bugs that come up. -The version number has been bumped to `3.0` due to the large amount of breaking changes introduced this update. I've added backwards compatibility for all of the new changes but there may still be some breakage. I highly recommend starting with a new config to avoid any issues that may arise. +The version number has been bumped to `3.0` due to the large amount of breaking changes introduced this update. I've added backwards compatibility for all of the new changes but there may still be some breakage. I highly recommend starting with a new config to avoid any issues that may arise. Neofetch now supports displaying images using `catimg`, `libcaca` and `jp2a`. See this wiki page for screenshots. https://github.com/dylanaraps/neofetch/wiki/Image-Backends @@ -887,7 +891,7 @@ I have given collaborator access to both **[@konimex](https://github.com/konimex - Fixed bug where `neofetch --config` sourced the user config twice. - Cleaned up config arg handling. - + ## [2.0.2] - 2016-12-07 This minor release fixes some issues related to new features added in 2.0. These issues weren't picked up in the time between 2.0 and 2.1 and another minor release is needed due to the Packages issue being rather important. @@ -907,7 +911,7 @@ I also want to apologize to those packaging Neofetch for this unexpected release **Theme**
- [Cinnamon] Fixed incorrect information. - + ## [2.0.1] - 2016-12-06 This release of Neofetch fixes some important bugs that were found after 2.0 was release. This includes: Detection issues on CentOS and Linux Mint systems, Incorrect Memory usage on BSD, Linux GPU detection issues and more. @@ -991,7 +995,7 @@ The config option `scrot_cmd` and the commandline flag `--scrot_cmd` are still t - teknik doesn't compress images whereas imgur does. - You can change this back to imgur by using `--image_host imgur` or by editing your config file. - + ## [2.0] - 2016-12-02 This is the biggest release of Neofetch in a long time. 97 files were changed with 2700~ additions to 2900~ deletions. Although the changelog isn't as interesting this time majority of the script has been rewritten, restructered and cleaned up. Every function and variable name follows a proper naming scheme and a large number of bugs were fixed. @@ -1127,12 +1131,12 @@ Thanks to all of the contributors this time around, you guys are a big help and **Resolution**
- [MacOS] If refresh rate is empty don't append Hz. - + ## [1.9.1] - 2016-11-04 This is a small release which fixes various issues found in 1.9. -Note: Those packaging neofetch can ignore the new file: `config/travis` +Note: Those packaging neofetch can ignore the new file: `config/travis` ## Contributors - **[@konimex](https://github.com/konimex)** @@ -1182,7 +1186,7 @@ Note: Those packaging neofetch can ignore the new file: `config/travis` **Memory**
- [OpenBSD] Fixed used memory usage. **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** - + ## [1.9] - 2016-11-01 This change log won't cover everything that's changed. Have a look through the commit @@ -1215,7 +1219,7 @@ Thanks to everyone below who contributed, it's nice to see some new faces too. : - Added support for Android. - Dependencies: - Required: `bash` and `busybox` - - Note: I recommend installing `termux` from the Play Store or F-Droid. Termux provides you with a fully + - Note: I recommend installing `termux` from the Play Store or F-Droid. Termux provides you with a fully working Linux environment, doesn't require root acess and includes all dependencies. - Note2: Neofetch will be packaged in `termux` thanks to **[@konimex](https://github.com/konimex)** - PR [#351](https://github.com/termux/termux-packages/pull/531) @@ -1344,7 +1348,7 @@ Note: `\033[14t` is still supported, if images already work for you then you don - Added support for Audacious. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** - Rewrote song function, it's now much faster/cleaner. - + ## [1.8.1] - 2016-10-04 This release fixes various bugs found in 1.8. @@ -1389,7 +1393,7 @@ This release fixes various bugs found in 1.8. - Added logo mode which only displays the ascii art. - Adds two new identical flags `--logo` and `-L`. - + ## [1.8] - 2016-10-02 This version of neofetch is vastly different from the previous versions and this @@ -1552,7 +1556,7 @@ now have working image support. - Use a pure bash solution to getting ascii size. - Updated Solus ascii art to match new logo. **[@undrskr](https://github.com/undrskr)** - + ## [1.7] - 2016-05-14 Hello, sorry this release took so long. I've been extremely busy with uni and @@ -1719,7 +1723,7 @@ called `fg` which will set the color to your foreground color. [///// ] ``` - + ## [1.6] - 2016-04-01 # Neofetch 1.6 @@ -1866,7 +1870,7 @@ Thanks to the following people for contributing this release. ### Scrot - Fixed scrot function not using user defined options. - + ## [1.5] - 2016-03-17 # Neofetch 1.5 @@ -1960,7 +1964,7 @@ me finish up with this PR. ### Stdout Mode - Fixed issues with functions that use `prin`. - + ## [1.4] - 2016-03-09 Lots of bugs were fixed and a lot of code was cleaned up, this changelog just lists @@ -2032,14 +2036,14 @@ Example: neofetch --stdout memory battery disk --stdout_separator " | " ``` - + ## [1.3] - 2016-02-26 # Fetch 1.3 Hey guys, -This update brought some breaking changes, see this wiki page for what you'll +This update brought some breaking changes, see this wiki page for what you'll need to update in your config file. https://github.com/dylanaraps/fetch/wiki/Following-HEAD @@ -2110,7 +2114,7 @@ much faster and cleaner. - Removed `--stdout_subtitles` - Removed `--stdout_title` - + ## [1.2] - 2016-02-17 # Fetch 1.2 @@ -2125,7 +2129,7 @@ https://github.com/dylanaraps/fetch/wiki/Following-HEAD ### OS -We now support almost all the Linux distros Screenfetch supports excluding +We now support almost all the Linux distros Screenfetch supports excluding the distros that have been discontinued. Added support for these distros: @@ -2223,7 +2227,7 @@ info "Font" font - Fix missing ascii art when fetch is installed in /usr/local - Update Deepin's ascii art to their new logo - + ## [1.1] - 2016-02-06 # Fetch 1.1 changelog @@ -2276,7 +2280,7 @@ the first value of `ascii_colors`. If `ascii_colors` is left empty, color will b ### Config file - Fetch now has a config file that you can share with people and keep between - script versions! [1] + script versions! [1] - Added `--config` and `$config_file` to specify a custom config location. - Added `--config off`, `--config none` and `$config` to enable / disable config files at launch or in script. @@ -2393,7 +2397,7 @@ Battery: 10% - **NOTE:** This currently doesn't support BSD systems as we have no one to help us test - See **[Issue #46](https://github.com/dylanaraps/fetch/issues/46)** - + ## [1.0] - 2016-01-27 # Fetch 1.0 @@ -2553,7 +2557,7 @@ to set the program to use to take the screenshot. ## Wiki: -Added `Customizing Info` page which has info/examples about +Added `Customizing Info` page which has info/examples about the new printinfo function. https://github.com/dylanaraps/fetch/wiki/Customizing-Info @@ -2562,7 +2566,7 @@ Added `Customization` which lists all options and their values. https://github.com/dylanaraps/fetch/wiki/Customization - + ## [0.2.1] - 2016-01-04 Here's what's new: @@ -2574,19 +2578,19 @@ Here's what's new: - Fixed bug with multiple colons - Fixed underlines not being drawn the full width. - Functions now fallback to "Unknown" instead of printing nothing. -- `getos` now gets os type and `getdistro` gets the distro. +- `getos` now gets os type and `getdistro` gets the distro. - This makes it even easier to add other os types. Here's what I'm working on: -- Finishing OpenBSD support -- Cygwin support +- Finishing OpenBSD support +- Cygwin support Enjoy - + ## [0.2] - 2016-01-03 -I finished my rewrite! +I finished my rewrite! ## Here's what's new: - The script is now way faster. @@ -2641,8 +2645,8 @@ Changelog: - The script now aligns the cursor to the bottom of the terminal instead of using a hardcoded amount of newlines - Image size and padding is now dynamic, the only difference on the user - side is that instead of setting a long line of spaces as - padding, you set your font width. This means that you set the + side is that instead of setting a long line of spaces as + padding, you set your font width. This means that you set the var once and the script will just work at any window size. - You can disable dynamic images and go back to the old behaviour with by using the `--size` or the in config var. From 19d35b995d8412a1495ef3143dc406325f7adee1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 18 May 2018 16:25:46 +1000 Subject: [PATCH 0352/1133] docs: update --- CHANGELOG.md | 11 ++++++++++- neofetch | 9 +-------- neofetch.1 | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7d3d0a6c..1147a7618 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,13 +7,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] + +## [4.0.1] - 2018-05-18 + +### Note: This release is only required for those running `bash <3.3`. + - [config] Fixed issue with default config in bash3. - [packages] Simplified code. - [term] Fixed macOS issue. - [term] Fixed `tmux` issue. + ## [4.0.0] - 2018-05-17 +

logo

+ This release bumps the version number up to `4.0.0` as it contains major changes to how Neofetch is packaged and installed. @@ -2662,7 +2670,8 @@ Changelog: Let me know if you're having issues. -[Unreleased]: https://github.com/dylanaraps/neofetch/compare/4.0.0...HEAD +[Unreleased]: https://github.com/dylanaraps/neofetch/compare/4.0.1...HEAD +[4.0.1]: https://github.com/dylanaraps/neofetch/compare/4.0.0...4.0.1 [4.0.0]: https://github.com/dylanaraps/neofetch/compare/3.4.0...4.0.0 [3.4.0]: https://github.com/dylanaraps/neofetch/compare/3.3.0...3.4.0 [3.3.0]: https://github.com/dylanaraps/neofetch/compare/3.2.0...3.3.0 diff --git a/neofetch b/neofetch index 4870d0590..185d031b6 100755 --- a/neofetch +++ b/neofetch @@ -27,7 +27,7 @@ # SOFTWARE. # Neofetch version. -version="4.0.1" +version="4.0.2" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" @@ -826,12 +826,6 @@ image_host="teknik" # Default: 'off' # Values: 'on', 'off' stdout="off" - -# Config version. -# -# NOTE: Don't change this value, neofetch reads this to determine -# how to handle backwards compatibility. -config_version="4.0.1" EOF # DETECT INFORMATION @@ -8713,7 +8707,6 @@ main() { # Add neofetch info to verbose output. err "Neofetch command: $0 $*" err "Neofetch version: $version" - err "Neofetch config: $config_version" # Show error messages. [[ "$verbose" == "on" ]] && printf "%b" "$err" >&2 diff --git a/neofetch.1 b/neofetch.1 index 4c25cc434..672506576 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "May 2018" "Neofetch 4.0.1" "User Commands" +.TH NEOFETCH "1" "May 2018" "Neofetch 4.0.2" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From c69e5ef041bfbd4882d371689c26a5e9604174fd Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 18 May 2018 16:26:22 +1000 Subject: [PATCH 0353/1133] docs: update --- CHANGELOG.md | 11 ++++++++++- neofetch | 9 +-------- neofetch.1 | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7d3d0a6c..1147a7618 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,13 +7,21 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] + +## [4.0.1] - 2018-05-18 + +### Note: This release is only required for those running `bash <3.3`. + - [config] Fixed issue with default config in bash3. - [packages] Simplified code. - [term] Fixed macOS issue. - [term] Fixed `tmux` issue. + ## [4.0.0] - 2018-05-17 +

logo

+ This release bumps the version number up to `4.0.0` as it contains major changes to how Neofetch is packaged and installed. @@ -2662,7 +2670,8 @@ Changelog: Let me know if you're having issues. -[Unreleased]: https://github.com/dylanaraps/neofetch/compare/4.0.0...HEAD +[Unreleased]: https://github.com/dylanaraps/neofetch/compare/4.0.1...HEAD +[4.0.1]: https://github.com/dylanaraps/neofetch/compare/4.0.0...4.0.1 [4.0.0]: https://github.com/dylanaraps/neofetch/compare/3.4.0...4.0.0 [3.4.0]: https://github.com/dylanaraps/neofetch/compare/3.3.0...3.4.0 [3.3.0]: https://github.com/dylanaraps/neofetch/compare/3.2.0...3.3.0 diff --git a/neofetch b/neofetch index 4870d0590..185d031b6 100755 --- a/neofetch +++ b/neofetch @@ -27,7 +27,7 @@ # SOFTWARE. # Neofetch version. -version="4.0.1" +version="4.0.2" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" @@ -826,12 +826,6 @@ image_host="teknik" # Default: 'off' # Values: 'on', 'off' stdout="off" - -# Config version. -# -# NOTE: Don't change this value, neofetch reads this to determine -# how to handle backwards compatibility. -config_version="4.0.1" EOF # DETECT INFORMATION @@ -8713,7 +8707,6 @@ main() { # Add neofetch info to verbose output. err "Neofetch command: $0 $*" err "Neofetch version: $version" - err "Neofetch config: $config_version" # Show error messages. [[ "$verbose" == "on" ]] && printf "%b" "$err" >&2 diff --git a/neofetch.1 b/neofetch.1 index 4c25cc434..672506576 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "May 2018" "Neofetch 4.0.1" "User Commands" +.TH NEOFETCH "1" "May 2018" "Neofetch 4.0.2" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From 80299bd064f9c2873305783cb538b1b14c6d0748 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 19 May 2018 08:06:05 +1000 Subject: [PATCH 0354/1133] macOS: Fix xquartz issue. --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index 185d031b6..ac80de385 100755 --- a/neofetch +++ b/neofetch @@ -3686,6 +3686,11 @@ get_term_size() { term_width="${term_size[2]/t*}" fi + # If the sequences above don't work and the user is on a macOS system + # or a system not running an X server, return early. + [[ -z "$DISPLAY" || "$os" == "Mac OS X" ]] && \ + { term_width=0; return; } + # 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 From 992d0b38ae7f70863f645ce78f801636e4a4940d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 19 May 2018 08:28:10 +1000 Subject: [PATCH 0355/1133] general: Added --print_config to display the default config file. --- neofetch | 2 ++ neofetch.1 | 3 +++ 2 files changed, 5 insertions(+) diff --git a/neofetch b/neofetch index ac80de385..cc409a9b2 100755 --- a/neofetch +++ b/neofetch @@ -4814,6 +4814,7 @@ SCREENSHOT: OTHER: --config /path/to/config Specify a path to a custom config file --config none Launch the script without a config file + --print_config Print the default config file to stdout. --stdout Turn off all colors and disables any ASCII/image backend. --help Print this text and exit --version Show neofetch version @@ -5006,6 +5007,7 @@ get_args() { ;; "--stdout") stdout="on" ;; "-v") verbose="on" ;; + "--print_config") printf "%s\\n" "$config"; exit ;; "-vv") set -x; verbose="on" ;; "--help") usage ;; "--version") diff --git a/neofetch.1 b/neofetch.1 index 672506576..8575a3ef4 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -326,6 +326,9 @@ Specify a path to a custom config file \fB\-\-config\fR none Launch the script without a config file .TP +\fB\-\-print_config\fR +Print the default config file to stdout. +.TP \fB\-\-stdout\fR Turn off all colors and disables any ASCII/image backend. .TP From c814f14726f42f3e7318af91ad3e0e4e899514cf Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 19 May 2018 20:38:45 +1000 Subject: [PATCH 0356/1133] general: Fix issues with default config. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index cc409a9b2..36abc6af5 100755 --- a/neofetch +++ b/neofetch @@ -8680,7 +8680,7 @@ main() { get_os # Load default config. - source /dev/stdin <<< "$config" + eval "$config" get_args "$@" [[ "$verbose" != "on" ]] && exec 2>/dev/null From c9bda1dd09c3b6a3d0c298abc0fe0a2f8fa01684 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 20 May 2018 07:56:46 +1000 Subject: [PATCH 0357/1133] docs: update --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1147a7618..25fc3b9c7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +- [config] Fixed `/dev/stdin` error. +- [config] Added `--print_config` to display the default config file. +- [macOS] Fixed xquartz issue. + ## [4.0.1] - 2018-05-18 From e4c1732c010b509fe3375e4f7bc5cb60f0413fbe Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 20 May 2018 07:59:01 +1000 Subject: [PATCH 0358/1133] docs: update --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 25fc3b9c7..ebdecfc8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] + +## [4.0.2] - 2018-05-19 + - [config] Fixed `/dev/stdin` error. - [config] Added `--print_config` to display the default config file. - [macOS] Fixed xquartz issue. @@ -2674,7 +2677,8 @@ Changelog: Let me know if you're having issues. -[Unreleased]: https://github.com/dylanaraps/neofetch/compare/4.0.1...HEAD +[Unreleased]: https://github.com/dylanaraps/neofetch/compare/4.0.2...HEAD +[4.0.2]: https://github.com/dylanaraps/neofetch/compare/4.0.1...4.0.2 [4.0.1]: https://github.com/dylanaraps/neofetch/compare/4.0.0...4.0.1 [4.0.0]: https://github.com/dylanaraps/neofetch/compare/3.4.0...4.0.0 [3.4.0]: https://github.com/dylanaraps/neofetch/compare/3.3.0...3.4.0 From 1f678f8020316063285f56f4b6e52d52eaec4490 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 20 May 2018 08:03:12 +1000 Subject: [PATCH 0359/1133] version: bump --- neofetch | 2 +- neofetch.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 36abc6af5..caade7580 100755 --- a/neofetch +++ b/neofetch @@ -27,7 +27,7 @@ # SOFTWARE. # Neofetch version. -version="4.0.2" +version="4.0.3" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" diff --git a/neofetch.1 b/neofetch.1 index 8575a3ef4..d9b4e2c7b 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "May 2018" "Neofetch 4.0.2" "User Commands" +.TH NEOFETCH "1" "May 2018" "Neofetch 4.0.3" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From 7a4492c6c309adf1ecd4d09504ade1770ff5849f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 20 May 2018 13:50:10 +1000 Subject: [PATCH 0360/1133] ascii: Fix ascii art on windows. --- neofetch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/neofetch b/neofetch index caade7580..a8f335e3c 100755 --- a/neofetch +++ b/neofetch @@ -8661,6 +8661,28 @@ oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ .omMMMMMMMM-`NMMMMMMMmo. `:hMMMMMM. NMMMMMh/` .odNm+ /dNms. +EOF + ;; + + "Windows"*) + set_colors 1 2 4 3 + read -rd '' ascii_data <<'EOF' +${c1} ,.=:!!t3Z3z., + :tt:::tt333EE3 +${c1} Et:::ztt33EEEL${c2} @Ee., .., +${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# +${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL +${c1} it::::tt333EEF${c2} @EEEEEEttttt33F +${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. +${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF +${c3} ;::::::::zt33)${c2} "4EEEtttji3P* +${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. +${c3} i::::::::zt33F${c4} AEEEtttt::::ztF +${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 +${c3} E::::::::zt33L${c4} @EEEtttt::::z3F +${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` +${c3} `${c4} :EEEEtttt::::z7 + "VEzjt:;;z>*` EOF ;; esac From cb68508be27c87075beca9cb93d148f72c75f9bf Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 20 May 2018 13:56:24 +1000 Subject: [PATCH 0361/1133] general: Fix issues with default config. --- neofetch | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/neofetch b/neofetch index a8f335e3c..1d8ebdc9e 100755 --- a/neofetch +++ b/neofetch @@ -8462,7 +8462,7 @@ llllllllllllll lllllllllllllllllll EOF ;; - "Windows"*) + "Windows"*|"Microsoft Windows"*) set_colors 1 2 4 3 read -rd '' ascii_data <<'EOF' ${c1} ,.=:!!t3Z3z., @@ -8661,28 +8661,6 @@ oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ .omMMMMMMMM-`NMMMMMMMmo. `:hMMMMMM. NMMMMMh/` .odNm+ /dNms. -EOF - ;; - - "Windows"*) - set_colors 1 2 4 3 - read -rd '' ascii_data <<'EOF' -${c1} ,.=:!!t3Z3z., - :tt:::tt333EE3 -${c1} Et:::ztt33EEEL${c2} @Ee., .., -${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# -${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL -${c1} it::::tt333EEF${c2} @EEEEEEttttt33F -${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. -${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF -${c3} ;::::::::zt33)${c2} "4EEEtttji3P* -${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. -${c3} i::::::::zt33F${c4} AEEEtttt::::ztF -${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 -${c3} E::::::::zt33L${c4} @EEEtttt::::z3F -${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` -${c3} `${c4} :EEEEtttt::::z7 - "VEzjt:;;z>*` EOF ;; esac From 7b1b3755a91b4988444b6e274c01483319a3a054 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 20 May 2018 13:59:14 +1000 Subject: [PATCH 0362/1133] general: Fix issues with default config. --- neofetch | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/neofetch b/neofetch index 1d8ebdc9e..95c1e9546 100755 --- a/neofetch +++ b/neofetch @@ -8462,28 +8462,6 @@ llllllllllllll lllllllllllllllllll EOF ;; - "Windows"*|"Microsoft Windows"*) - set_colors 1 2 4 3 - read -rd '' ascii_data <<'EOF' -${c1} ,.=:!!t3Z3z., - :tt:::tt333EE3 -${c1} Et:::ztt33EEEL${c2} @Ee., .., -${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# -${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL -${c1} it::::tt333EEF${c2} @EEEEEEttttt33F -${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. -${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF -${c3} ;::::::::zt33)${c2} "4EEEtttji3P* -${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. -${c3} i::::::::zt33F${c4} AEEEtttt::::ztF -${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 -${c3} E::::::::zt33L${c4} @EEEtttt::::z3F -${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` -${c3} `${c4} :EEEEtttt::::z7 - "VEzjt:;;z>*` -EOF - ;; - "Xubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' @@ -8533,6 +8511,28 @@ ssssssssssssso/-` `-/osssssssssssss EOF ;; + *"Windows"*) + set_colors 1 2 4 3 + read -rd '' ascii_data <<'EOF' +${c1} ,.=:!!t3Z3z., + :tt:::tt333EE3 +${c1} Et:::ztt33EEEL${c2} @Ee., .., +${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# +${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL +${c1} it::::tt333EEF${c2} @EEEEEEttttt33F +${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. +${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF +${c3} ;::::::::zt33)${c2} "4EEEtttji3P* +${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. +${c3} i::::::::zt33F${c4} AEEEtttt::::ztF +${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 +${c3} E::::::::zt33L${c4} @EEEtttt::::z3F +${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` +${c3} `${c4} :EEEEtttt::::z7 + "VEzjt:;;z>*` +EOF + ;; + *) case "$kernel_name" in *"BSD") From c4bf54db3dfebadbb83a8ad0c75756051656113a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 20 May 2018 14:22:26 +1000 Subject: [PATCH 0363/1133] ascii: Fix ascii art on windows. --- neofetch | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/neofetch b/neofetch index 95c1e9546..c6361da26 100755 --- a/neofetch +++ b/neofetch @@ -5084,7 +5084,7 @@ get_distro_ascii() { # This function gets the distro ascii art and colors. # # $ascii_distro is the same as $distro. - case "$ascii_distro" in + case "$( trim "$ascii_distro")" in "AIX"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' @@ -8462,6 +8462,28 @@ llllllllllllll lllllllllllllllllll EOF ;; + "Windows"*) + set_colors 1 2 4 3 + read -rd '' ascii_data <<'EOF' +${c1} ,.=:!!t3Z3z., + :tt:::tt333EE3 +${c1} Et:::ztt33EEEL${c2} @Ee., .., +${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# +${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL +${c1} it::::tt333EEF${c2} @EEEEEEttttt33F +${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. +${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF +${c3} ;::::::::zt33)${c2} "4EEEtttji3P* +${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. +${c3} i::::::::zt33F${c4} AEEEtttt::::ztF +${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 +${c3} E::::::::zt33L${c4} @EEEtttt::::z3F +${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` +${c3} `${c4} :EEEEtttt::::z7 + "VEzjt:;;z>*` +EOF + ;; + "Xubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' @@ -8511,28 +8533,6 @@ ssssssssssssso/-` `-/osssssssssssss EOF ;; - *"Windows"*) - set_colors 1 2 4 3 - read -rd '' ascii_data <<'EOF' -${c1} ,.=:!!t3Z3z., - :tt:::tt333EE3 -${c1} Et:::ztt33EEEL${c2} @Ee., .., -${c1} ;tt:::tt333EE7${c2} ;EEEEEEttttt33# -${c1} :Et:::zt333EEQ.${c2} $EEEEEttttt33QL -${c1} it::::tt333EEF${c2} @EEEEEEttttt33F -${c1} ;3=*^```"*4EEV${c2} :EEEEEEttttt33@. -${c3} ,.=::::!t=., ${c1}`${c2} @EEEEEEtttz33QF -${c3} ;::::::::zt33)${c2} "4EEEtttji3P* -${c3} :t::::::::tt33.${c4}:Z3z..${c2} ``${c4} ,..g. -${c3} i::::::::zt33F${c4} AEEEtttt::::ztF -${c3} ;:::::::::t33V${c4} ;EEEttttt::::t3 -${c3} E::::::::zt33L${c4} @EEEtttt::::z3F -${c3}{3=*^```"*4E3)${c4} ;EEEtttt:::::tZ` -${c3} `${c4} :EEEEtttt::::z7 - "VEzjt:;;z>*` -EOF - ;; - *) case "$kernel_name" in *"BSD") From fc229704c8ee03452f8f4e5cf30bccbe1e4bdd7d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 20 May 2018 15:36:54 +1000 Subject: [PATCH 0364/1133] general: term_size, macos fix. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c6361da26..15eed8aca 100755 --- a/neofetch +++ b/neofetch @@ -3688,7 +3688,7 @@ get_term_size() { # If the sequences above don't work and the user is on a macOS system # or a system not running an X server, return early. - [[ -z "$DISPLAY" || "$os" == "Mac OS X" ]] && \ + [[ -z "$DISPLAY" ]] && \ { term_width=0; return; } # Get terminal width/height if \e[14t is unsupported. From 0fe972073f533ac99e6d4fae7bda0acd1dfc4017 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 21 May 2018 08:24:32 +1000 Subject: [PATCH 0365/1133] image: Cleanup of get_term_size --- neofetch | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index 15eed8aca..5bd1203e2 100755 --- a/neofetch +++ b/neofetch @@ -3686,13 +3686,8 @@ get_term_size() { term_width="${term_size[2]/t*}" fi - # If the sequences above don't work and the user is on a macOS system - # or a system not running an X server, return early. - [[ -z "$DISPLAY" ]] && \ - { term_width=0; return; } - # Get terminal width/height if \e[14t is unsupported. - if [[ -z "$term_width" ]] || (( "$term_width" < 50 )); then + if (( "${term_width:-0}" < 50 )) && [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then if type -p xdotool >/dev/null 2>&1; then current_window="$(xdotool getactivewindow)" source <(xdotool getwindowgeometry --shell "$current_window") @@ -3715,13 +3710,11 @@ get_term_size() { awk -F ': ' '/Width|Height/ {printf $2 " "}')" term_width="${term_size/ *}" term_height="${term_size/${term_width}}" - else - term_width=0 fi - else - term_width=0 fi fi + + term_width="${term_width:-0}" } get_image_size() { From a27382d21dd503bacee605e0ccd8766e17e4c4ae Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 21 May 2018 08:29:50 +1000 Subject: [PATCH 0366/1133] image: Make the resolution of catimg configurable. --- neofetch | 12 +++++++++++- neofetch.1 | 3 +++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 5bd1203e2..30a98816c 100755 --- a/neofetch +++ b/neofetch @@ -747,6 +747,14 @@ crop_offset="center" # --size image_size="auto" +# Catimg block size. +# Control the resolution of catimg. +# +# Default: '2' +# Values: '1', '2' +# Flags: --catimg_size +catimg_size="2" + # Gap between image and text # # Default: '3' @@ -3842,7 +3850,7 @@ display_image() { ;; "catimg") - catimg -w "$((width * 2 / font_width))" "$image" ||\ + catimg -w "$((width * 2 / font_width))" -r "$catimg_size" "$image" ||\ to_off "Image: catimg failed to display the image." ;; @@ -4778,6 +4786,7 @@ IMAGE: in some terminals emulators when using image mode. --size 00px | --size 00% How to size the image. Possible values: auto, 00px, 00%, none + --catimg_size 1/2 Change the resolution of catimg. --crop_mode mode Which crop mode to use Takes the values: normal, fit, fill --crop_offset value Change the crop offset for normal mode. @@ -4940,6 +4949,7 @@ get_args() { # Image options "--loop") image_loop="on" ;; "--image_size" | "--size") image_size="$2" ;; + "--catimg_size") catimg_size="$2" ;; "--crop_mode") crop_mode="$2" ;; "--crop_offset") crop_offset="$2" ;; "--xoffset") xoffset="$2" ;; diff --git a/neofetch.1 b/neofetch.1 index d9b4e2c7b..e65e9fa2a 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -276,6 +276,9 @@ in some terminals emulators when using image mode. How to size the image. Possible values: auto, 00px, 00%, none .TP +\fB\-\-catimg_size\fR 1/2 +Change the resolution of catimg. +.TP \fB\-\-crop_mode\fR mode Which crop mode to use Takes the values: normal, fit, fill From aed206b5d773c40649e0601b0324ba802bb98ba5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 21 May 2018 08:32:28 +1000 Subject: [PATCH 0367/1133] docs: update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebdecfc8b..a630cf99c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +- [ascii] Fixed a bug causing Windows 7 ASCII art to not display. +- [image] Added new option to configure the resolution of `catimg`. ## [4.0.2] - 2018-05-19 From 8ad455a1ce06a7afb4a2e446c905fc7741fec4ed Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 21 May 2018 09:35:07 +1000 Subject: [PATCH 0368/1133] docs: update --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 85444b84e..a3eddda0a 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,7 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, - https://www.techrepublic.com/article/how-to-get-all-the-information-you-need-about-your-linux-machine-with-a-single-command/ - https://www.tecmint.com/neofetch-shows-linux-system-information-with-logo/ - https://www.youtube.com/watch?v=bgepGW858fc +- https://www.linuxuprising.com/2018/05/display-system-information-on-linux.html ## Thanks From 4895ed33b1c3b48ed5a86479a6bef7ea30d984df Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 21 May 2018 10:08:43 +1000 Subject: [PATCH 0369/1133] misc: cleanup --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 30a98816c..818f4b488 100755 --- a/neofetch +++ b/neofetch @@ -2252,8 +2252,8 @@ get_memory() { # Source: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716 while IFS=":" read -r a b; do case "$a" in - "MemTotal") mem_used="$((mem_used+=${b/kB}))"; mem_total="${b/kB}" ;; - "Shmem") mem_used="$((mem_used+=${b/kB}))" ;; + "MemTotal") ((mem_used+=${b/kB})); mem_total="${b/kB}" ;; + "Shmem") ((mem_used+=${b/kB})) ;; "MemFree" | "Buffers" | "Cached" | "SReclaimable") mem_used="$((mem_used-=${b/kB}))" ;; @@ -3408,7 +3408,7 @@ get_cols() { cols="${cols//nl/\\n\\e[${text_padding}C${zws}}" # Add block height to info height. - info_height="$((info_height+=block_height+2))" + ((info_height+=block_height+2)) printf "%b\n" "\e[${text_padding}C${zws}${cols}" fi From 6bf7f9452e52609fde1d8eff6be93e33a43de491 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 21 May 2018 10:14:35 +1000 Subject: [PATCH 0370/1133] misc: Remove all instances of export. They're pointless. --- neofetch | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 818f4b488..59f57b022 100755 --- a/neofetch +++ b/neofetch @@ -26,27 +26,21 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -# Neofetch version. version="4.0.3" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/.config}" +PATH="/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec:${PATH}" # Speed up script by not using unicode. -export LC_ALL=C -export LANG=C - -# Add more paths to $PATH. -export PATH="/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec:${PATH}" +LC_ALL=C +LANG=C # Fix issues with gsettings. -export GIO_EXTRA_MODULES="/usr/lib/x86_64-linux-gnu/gio/modules/" +GIO_EXTRA_MODULES="/usr/lib/x86_64-linux-gnu/gio/modules/" -# Set no case match. shopt -s nocasematch - -# Reset colors and bold. reset="\e[0m" # Neofetch default config. @@ -3495,7 +3489,7 @@ get_ascii() { fi # Set locale to get correct padding. - export LC_ALL="$sys_locale" + LC_ALL="$sys_locale" # Turn file into variable. while IFS=$'\n' read -r line; do @@ -3524,7 +3518,7 @@ get_ascii() { text_padding="$((ascii_length + gap))" printf "%b" "$print" - export LC_ALL=C + LC_ALL=C } get_image_source() { From c5188a891fa13b7167b4ddb0bbe0e9f0abec7006 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 21 May 2018 10:23:01 +1000 Subject: [PATCH 0371/1133] config: Remove support for deprecated options. --- neofetch | 84 -------------------------------------------------------- 1 file changed, 84 deletions(-) diff --git a/neofetch b/neofetch index 59f57b022..101b19922 100755 --- a/neofetch +++ b/neofetch @@ -4276,7 +4276,6 @@ get_user_config() { if [[ -f "$config_file" ]]; then source "$config_file" err "Config: Sourced user config. (${config_file})" - old_options return fi mkdir -p "${XDG_CONFIG_HOME}/neofetch/" @@ -4298,7 +4297,6 @@ get_user_config() { source "$config_file" err "Config: Sourced user config. (${config_file})" - old_options } bar() { @@ -4409,87 +4407,6 @@ dynamic_prompt() { fi } -old_functions() { - # Deprecated functions. - # Neofetch 2.0 changed the names of a few variables. - # This function adds backwards compatibility for the - # old variable names. - if type printinfo >/dev/null 2>&1; then - print_info() { printinfo ; } - get_wmtheme() { get_wm_theme; wmtheme="$wm_theme"; } - get_termfont() { get_term_font; termfont="$term_font"; } - get_localip() { get_local_ip; localip="$local_ip"; } - get_publicip() { get_public_ip; publicip="$public_ip"; } - get_linebreak() { get_line_break; linebreak="$line_break"; } - fi - - get_birthday() { get_install_date; birthday="$install_date"; } -} - -old_options() { - [[ -n "$osx_buildversion" ]] && \ - err "Config: \$osx_buildversion is deprecated, use \$distro_shorthand instead." - [[ -n "$osx_codename" ]] && \ - err "Config: \$osx_codename is deprecated, use \$distro_shorthand instead." - [[ "$cpu_cores" == "on" ]] && \ - err "Config: cpu_cores='on' is deprecated, use cpu_cores='logical|physical|off' instead." - [[ -n "$image" ]] && \ - { err "Config: \$image is deprecated, use \$image_source instead."; image_source="$image"; } - - # All progress_ variables were changed to bar_. - [[ -n "$progress_char" ]] && \ - err "Config: \$progress_char is deprecated, use \$bar_char_{elapsed,total} instead." - [[ -n "$progress_border" ]] && \ - { err "Config: \$progress_border is deprecated, use \$bar_border instead."; \ - bar_border="$progress_border"; } - [[ -n "$progress_length" ]] && \ - { err "Config: \$progress_length is deprecated, use \$bar_length instead."; \ - bar_length="$progress_length"; } - [[ -n "$progress_color_elapsed" ]] && \ - { err "Config: \$progress_color_elapsed is deprecated, use \$bar_color_elapsed instead."; \ - bar_color_elapsed="$progress_color_elapsed"; } - [[ -n "$progress_color_total" ]] && \ - { err "Config: \$progress_color_total is deprecated, use \$bar_color_total instead."; \ - bar_color_total="$progress_color_total"; } - - # All cpufreq values were changed in 3.0. - [[ "$speed_type" == "current" ]] && \ - err "Config: speed_type='current' is deprecated, use speed_type='scaling_cur_freq' instead." - [[ "$speed_type" == "min" ]] && \ - err "Config: speed_type='min' is deprecated, use speed_type='scaling_min_freq' instead." - [[ "$speed_type" == "max" ]] && \ - err "Config: speed_type='max' is deprecated, use speed_type='scaling_max_freq' instead." - [[ "$speed_type" == "bios" ]] && \ - err "Config: speed_type='bios' is deprecated, use speed_type='bios_limit' instead." - - # Ascii_logo_size was removed in 3.0. - [[ "$ascii_logo_size" ]] && \ - err "Config: ascii_logo_size is deprecated, use ascii_distro='{distro}_small' instead." - - # $start and $end were replaced with ${block_range[@]} in 3.0. - [[ "$start" && "$end" ]] && \ - { err "Config: \$start and \$end are deprecated, use block_range=(0 7) instead."; \ - block_range=("$start" "$end"); } - - # Fahrenheit support was added to CPU so the options were changed. - [[ "$cpu_temp" == "on" ]] && \ - { err "Config: cpu_temp='on' is deprecated, use cpu_temp='C' or 'F' instead."; - cpu_temp="C"; } - - # Birthday was renamed to Install Date in 3.0 - [[ -n "$birthday_time" ]] && \ - { err "Config: \$birthday_time is deprecated, use \3install_time instead."; \ - install_time="$birthday_time"; } - - # Scrot dir was removed in 3.1.0. - [[ -n "$scrot_dir" ]] && scrot_dir= - - # cpu_shorthand was deprecated in 3.3.0 - [[ -n "$cpu_shorthand" ]] && \ - { err "Config: \$cpu_shorthand is deprecated, use \$cpu_brand, \$cpu_cores, and - \$cpu_speed instead."; } -} - cache_uname() { # Cache the output of uname so we don't # have to spawn it multiple times. @@ -8696,7 +8613,6 @@ main() { fi image_backend - old_functions get_cache_dir print_info dynamic_prompt From 6aba54154c0f2a04c5408a54aeddfa7d446cc6b7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 21 May 2018 10:26:46 +1000 Subject: [PATCH 0372/1133] misc: Remove uppercase() --- neofetch | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/neofetch b/neofetch index 101b19922..fd9a916e3 100755 --- a/neofetch +++ b/neofetch @@ -1782,7 +1782,6 @@ get_wm_theme() { esac wm_theme="$(trim_quotes "$wm_theme")" - wm_theme="$(uppercase "$wm_theme")" } get_cpu() { @@ -2614,7 +2613,7 @@ get_style() { kde_font_size="${kde_font_size/,*}" kde_theme="${kde_theme/,*} ${kde_theme/*,} ${kde_font_size}" fi - kde_theme="$(uppercase "$kde_theme") [KDE], " + kde_theme="$kde_theme [KDE], " else err "Theme: KDE config files not found, skipping." fi @@ -2690,10 +2689,6 @@ get_style() { gtk2_theme="$(trim_quotes "$gtk2_theme")" gtk3_theme="$(trim_quotes "$gtk3_theme")" - # Uppercase the first letter of each GTK theme. - gtk2_theme="$(uppercase "$gtk2_theme")" - gtk3_theme="$(uppercase "$gtk3_theme")" - # Toggle visibility of GTK themes. [[ "$gtk2" == "off" ]] && unset gtk2_theme [[ "$gtk3" == "off" ]] && unset gtk3_theme @@ -4153,14 +4148,6 @@ strip_sequences() { printf "%s\n" "$strip" } -uppercase() { - if ((bash_version >= 4)); then - printf "%s" "${1^}" - else - printf "%s" "$1" - fi -} - # COLORS set_colors() { From 070651e4f4d943282fe8444eeec62109bda0af0b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 21 May 2018 12:46:05 +1000 Subject: [PATCH 0373/1133] general: Remove screenshot functionality. --- neofetch | 177 ----------------------------------------------------- neofetch.1 | 13 ---- 2 files changed, 190 deletions(-) diff --git a/neofetch b/neofetch index fd9a916e3..d441cd781 100755 --- a/neofetch +++ b/neofetch @@ -775,51 +775,6 @@ xoffset=0 background_color= -# Scrot Options - - -# Whether or not to always take a screenshot -# You can manually take a screenshot with "--scrot" or "-s" -# -# Default: 'off' -# Values: 'on', 'off' -# Flags: --scrot -# -s -scrot="off" - -# Screenshot Program -# Neofetch will automatically use whatever screenshot tool -# is installed on your system. -# -# If 'neofetch -v' says that it couldn't find a screenshot -# tool or you're using a custom tool then you can change -# the option below to a custom command. -# -# Default: 'auto' -# Values: 'auto' 'cmd -flags' -# Flag: --scrot_cmd -scrot_cmd="auto" - -# Screenshot Filename -# What to name the screenshots -# -# Default: 'neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png' -# Values: 'string' -# Flag: --scrot_name -scrot_name="neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png" - -# Image upload host -# Where to upload the image. -# -# Default: 'teknik' -# Values: 'imgur', 'teknik' -# Flag: --image_host -# -# NOTE: If you'd like another image host to be added to Neofetch. -# Open an issue on github. -image_host="teknik" - - # Misc Options # Stdout mode @@ -3919,116 +3874,6 @@ to_off() { text_padding= } -# SCREENSHOT - -take_scrot() { - scrot_program "${scrot_dir}${scrot_name}" - - err "Scrot: Saved screenshot as: ${scrot_dir}${scrot_name}" - - [[ "$scrot_upload" == "on" ]] && scrot_upload -} - -scrot_upload() { - if ! type -p curl >/dev/null 2>&1; then - printf "%s\n" "[!] Install curl to upload images" - return - fi - - image_file="${scrot_dir}${scrot_name}" - - # Print a message letting the user know we're uploading - # the screenshot. - printf "%s\r" "Uploading scrot" - sleep .2 - printf "%s\r" "Uploading scrot." - sleep .2 - printf "%s\r" "Uploading scrot.." - sleep .2 - printf "%s\r" "Uploading scrot..." - - case "$image_host" in - "teknik") - image_url="$(curl -sf -F file="@${image_file};type=image/png" \ - "https://api.teknik.io/v1/Upload")" - image_url="$(awk -F 'url:|,' '{printf $2}' <<< "${image_url//\"}")" - ;; - - "imgur") - image_url="$(curl -sH "Authorization: Client-ID 0e8b44d15e9fc95" \ - -F image="@${image_file}" "https://api.imgur.com/3/upload")" - image_url="$(awk -F 'id:|,' '{printf $2}' <<< "${image_url//\"}")" - [[ "$image_url" ]] && image_url="https://i.imgur.com/${image_url}.png" - ;; - esac - - printf "%s\n" "${image_url:-'[!] Image failed to upload'}" -} - -scrot_args() { - scrot="on" - - if [[ "$2" =~ \.(png|jpg|jpe|jpeg|gif)$ ]]; then - scrot_name="${2##*/}" - scrot_dir="${2/$scrot_name}" - - elif [[ -d "$2" ]]; then - scrot_dir="$2" - else - scrot_dir="${PWD:+${PWD}/}" - fi -} - -scrot_program() { - # Detect screenshot program. - # - # We first check to see if an X server is running before - # falling back to OS specific screenshot tools. - if [[ -n "$DISPLAY" ]]; then - if [[ "$scrot_cmd" != "auto" ]] && type -p "${scrot_cmd%% *}" >/dev/null; then - IFS=" " read -ra scrot_program <<< "$scrot_cmd" - - elif type -p maim >/dev/null; then - scrot_program=(maim) - - elif type -p scrot >/dev/null; then - scrot_program=(scrot) - - elif type -p import >/dev/null && [[ "$os" != "Mac OS X" ]]; then - scrot_program=(import -window root) - - elif type -p imlib2_grab >/dev/null; then - scrot_program=(imlib2_grab) - - elif type -p gnome-screenshot >/dev/null; then - scrot_program=(gnome-screenshot -f) - - else - err "Scrot: No screen capture tool found." - return - fi - else - case "$os" in - "Mac OS X") scrot_program=(screencapture -S) ;; - "Haiku") scrot_program=(screenshot -s) ;; - esac - fi - - # Print a message letting the user know we're taking - # a screenshot. - printf "%s\r" "Taking scrot" - sleep .2 - printf "%s\r" "Taking scrot." - sleep .2 - printf "%s\r" "Taking scrot.." - sleep .2 - printf "%s\r" "Taking scrot..." - - # Take the scrot. - "${scrot_program[@]}" "$1" - - err "Scrot: Screen captured using ${scrot_program[0]}" -} # TEXT FORMATTING @@ -4704,13 +4549,6 @@ IMAGE: --clean Delete cached files and thumbnails. -SCREENSHOT: - -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- - shot function will use \$scrot_dir and \$scrot_name. - -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. - --image_host imgur/teknik Website to upload scrots to. - --scrot_cmd cmd Screenshot program to launch - OTHER: --config /path/to/config Specify a path to a custom config file --config none Launch the script without a config file @@ -4884,18 +4722,6 @@ get_args() { print_info() { info line_break; } ;; - # Screenshot - "--scrot" | "-s") - scrot_args "$@" - ;; - "--upload" | "-su") - scrot_upload="on" - scrot_args "$@" - ;; - - "--image_host") image_host="$2" ;; - "--scrot_cmd") scrot_cmd="$2" ;; - # Other "--config") case "$2" in @@ -8608,9 +8434,6 @@ main() { # rendering issues in specific terminal emulators. [[ "$image_backend" == *w3m* ]] && display_image - # Take a screenshot. - [[ "$scrot" == "on" ]] && take_scrot - # Add neofetch info to verbose output. err "Neofetch command: $0 $*" err "Neofetch version: $version" diff --git a/neofetch.1 b/neofetch.1 index e65e9fa2a..7f52fbe3f 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -308,19 +308,6 @@ closer to the left side. .TP \fB\-\-clean\fR Delete cached files and thumbnails. -.SS "SCREENSHOT:" -.TP -\fB\-s\fR, \fB\-\-scrot\fR \fI\,/path/to/img\/\fP -Take a screenshot, if path is left empty the screenshot function will use $scrot_dir and $scrot_name. -.TP -\fB\-su\fR, \fB\-\-upload\fR \fI\,/path/to/img\/\fP -Same as \fB\-\-scrot\fR but uploads the scrot to a website. -.TP -\fB\-\-image_host\fR imgur/teknik -Website to upload scrots to. -.TP -\fB\-\-scrot_cmd\fR cmd -Screenshot program to launch .SS "OTHER:" .TP \fB\-\-config\fR \fI\,/path/to/config\/\fP From dc9334b7f138563b3bb52fd440d63b6fc1317a81 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 21 May 2018 11:03:36 +0200 Subject: [PATCH 0374/1133] OS: Add support for Redcore Linux --- neofetch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/neofetch b/neofetch index d441cd781..9a76eecce 100755 --- a/neofetch +++ b/neofetch @@ -7457,6 +7457,28 @@ ${c1} .. EOF ;; + "Redcore"*) + set_colors 1 + read -rd '' ascii_data <<'EOF' +${c1} RRRRRRRRR + RRRRRRRRRRRRR + RRRRRRRRRR RRRRR + RRRRRRRRRRRRRRRRRRRRRRRRRRR + RRRRRRR RRR RRR RRRRRRRR +RRRRR RR RRRRRRRRR +RRRR RR RRRRRRRR RR RRRRRR +RRRR R RRRRRRRRRRRRRR RR RRRRR +RRRR R RRRRRRRRRRRRRRRRRR R RRRRR +RRRR RRRRRRRRRRRRRRRRRRR R RRRR + RRR RRRRRRRRRRRRRRRRRRRR R RRRR + RRR RRRRRRRRRRRRRRRRRRRR RRRR + RR RRRRRRRRRRRRRRRRRRR RRR + RR RRRRRRRRRRRRRRRRR RRR + RR RRRRRRRRRRRRRR RR + R RRRR RR +EOF + ;; + "Redhat"* | "Red Hat"* | "rhel"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' From 3f021fbbb61c5ca5be06e2000fac6a3a471ce41a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 22 May 2018 14:14:17 +1000 Subject: [PATCH 0375/1133] misc: cleanup --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d441cd781..83ce65342 100755 --- a/neofetch +++ b/neofetch @@ -8442,7 +8442,7 @@ main() { [[ "$verbose" == "on" ]] && printf "%b" "$err" >&2 # If `--loop` was used, constantly redraw the image. - while [[ "$image_loop" == "on" && "$image_backend" == "w3m" ]]; do display_image; sleep 1s; done + while [[ "$image_loop" == "on" && "$image_backend" == "w3m" ]]; do display_image; sleep 1; done return 0 } From 38762182e8aa82078242cf6c3697849d11d95e28 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 22 May 2018 19:44:14 +1000 Subject: [PATCH 0376/1133] docs: update --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a3eddda0a..d479e3e40 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -

logo

+

logo

+

A command-line system information tool written in bash 3.2+

From dfc8b10ee427105df20cf2617b7889b51a53372f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 24 May 2018 08:07:37 +1000 Subject: [PATCH 0377/1133] general: Fix cursor location errors. --- neofetch | 53 ++++++++++++----------------------------------------- 1 file changed, 12 insertions(+), 41 deletions(-) diff --git a/neofetch b/neofetch index 284439a74..bd09a0b74 100755 --- a/neofetch +++ b/neofetch @@ -3352,9 +3352,9 @@ get_cols() { cols="${cols//nl/\\n\\e[${text_padding}C${zws}}" # Add block height to info height. - ((info_height+=block_height+2)) + ((info_height+=block_height-1)) - printf "%b\n" "\e[${text_padding}C${zws}${cols}" + printf "%b" "\e[${text_padding}C${zws}${cols}" fi unset -v blocks blocks2 cols @@ -3362,7 +3362,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" "\e[30;47m" # Tell info() that we printed manually. prin=1 @@ -3943,6 +3943,8 @@ get_underline() { "${underline// /$underline_char}${reset} " unset -v length fi + + ((++info_height)) prin=1 } @@ -3952,7 +3954,6 @@ get_line_break() { # Calculate info height. ((++info_height)) - line_breaks+="\n" # Tell info() that we printed manually. prin=1 @@ -4189,49 +4190,19 @@ kde_config_dir() { kde_config_dir="${kde_config_dir/$'/:'*}" } -get_term_padding() { - # Terminal info. - # - # Parse terminal config files to get - # info about padding. Due to how w3m-img - # works padding around the terminal throws - # off the cursor placement calculation in - # specific terminals. - # - # Note: This issue only seems to affect - # URxvt. - ((term_run != 1)) && get_term - - case "$term" in - "URxvt"*) - border="$(xrdb -query | awk -F ':' '/^(URxvt|\*).internalBorder/ {printf $2; exit}')" - ;; - esac -} - dynamic_prompt() { - case "$image_backend" in - "ascii") printf "\n" ;; - "off") return ;; - *) - get_term_padding - lines="$(((border + height + yoffset) / font_height))" - image_prompt="on" - ;; - esac + [[ "$image_backend" == "off" ]] && { printf "\n"; return; } + [[ "$image_backend" != "ascii" ]] && ((lines+=1000)) - # If the info is higher than the ascii/image place the prompt - # based on the info height instead of the ascii/image height. - if ((lines < info_height)); then - [[ "$image_prompt" ]] && printf "\n" - return - else - [[ "$image_prompt" ]] && printf "%b\n" "$line_breaks" + # If the ascii art is taller than the info. + if ((lines > info_height)); then lines="$((lines - info_height + 1))" + else + lines=1 fi # Set the prompt location. - if ((lines > 1)); then + if ((lines >= 1)); then case "$kernel_name" in "OpenBSD") tput cud "$lines" ;; *) printf "%b" "\e[${lines}B" ;; From 14981205c6b7cdc2b9b7001486175a6f761d7cb2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 24 May 2018 08:52:55 +1000 Subject: [PATCH 0378/1133] docs: update --- README.md | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index d479e3e40..c96d1d27a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -

logo

+

logo

A command-line system information tool written in bash 3.2+

@@ -9,9 +9,7 @@

- - Packaging status - +neofetch Neofetch is a command-line system information tool written in `bash 3.2+`. Neofetch displays information about your operating system, software and hardware in an aesthetic and visually pleasing way. @@ -19,14 +17,14 @@ The overall purpose of Neofetch is to be used in screen-shots of your system. Ne The information by default is displayed alongside your operating system's logo. You can further configure Neofetch to instead use an image, a custom ASCII file, your wallpaper or nothing at all. +neofetch + You can further configure Neofetch to display exactly what you want it to. Through the use of command-line flags and the configuration file you can change existing information outputs or add your own custom ones. -Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added.
+Neofetch supports almost 150 different operating systems. From Linux to Windows, all the way to more obscure operating systems like Minix, AIX and Haiku. If your favourite operating system is unsupported: Open up an issue and support will be added. -neofetch -neofetch -### For more information: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] +### More: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] ## Articles From 5756eb97f266a8442689fe1d0029746b59f672c0 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Thu, 24 May 2018 12:46:47 +1000 Subject: [PATCH 0379/1133] song: fix iTunes detection --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index bd09a0b74..68b9e6aa8 100755 --- a/neofetch +++ b/neofetch @@ -2328,7 +2328,7 @@ get_song() { -e "exaile" \ -e "gnome-music" \ -e "guayadeque" \ - -e "iTunes$" \ + -e "iTunes" \ -e "juk" \ -e "lollypop" \ -e "mocp" \ From 15c2939779aa1d4ba156a156300903336f004cea Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Thu, 24 May 2018 13:46:35 +1000 Subject: [PATCH 0380/1133] term_font: fix iTerm2 checking 2 more profiles than exists --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 68b9e6aa8..be423c665 100755 --- a/neofetch +++ b/neofetch @@ -2800,9 +2800,9 @@ END font_file="${HOME}/Library/Preferences/com.googlecode.iterm2.plist" # Count Guids in "New Bookmarks"; they should be unique - profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | grep -c "Guid")" + profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | grep -w -c "Guid")" - for ((i=0; i<=profiles_count; i++)); do + for ((i=0; i Date: Thu, 24 May 2018 13:50:05 +1000 Subject: [PATCH 0381/1133] docs: update [skip ci] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a630cf99c..b75694cfd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [ascii] Fixed a bug causing Windows 7 ASCII art to not display. - [image] Added new option to configure the resolution of `catimg`. +- [font] Fix iTerm2 checking for 2 extra profiles that don't exist. [**@iandrewt**](https://github.com/iandrewt") ## [4.0.2] - 2018-05-19 From 5143b20ce132ed26a3f4afd1d3dc36de8812e39e Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Thu, 24 May 2018 13:55:09 +1000 Subject: [PATCH 0382/1133] font: fix line length for iTerm2 profile count --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index be423c665..853e90afa 100755 --- a/neofetch +++ b/neofetch @@ -2800,7 +2800,8 @@ END font_file="${HOME}/Library/Preferences/com.googlecode.iterm2.plist" # Count Guids in "New Bookmarks"; they should be unique - profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | grep -w -c "Guid")" + profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | \ + grep -w -c "Guid")" for ((i=0; i Date: Thu, 24 May 2018 14:27:39 +1000 Subject: [PATCH 0383/1133] Revert "term_font: fix iTerm2 checking 2 more profiles than exists" This reverts commit 15c2939779aa1d4ba156a156300903336f004cea. --- neofetch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 853e90afa..68b9e6aa8 100755 --- a/neofetch +++ b/neofetch @@ -2800,10 +2800,9 @@ END font_file="${HOME}/Library/Preferences/com.googlecode.iterm2.plist" # Count Guids in "New Bookmarks"; they should be unique - profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | \ - grep -w -c "Guid")" + profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | grep -c "Guid")" - for ((i=0; i Date: Thu, 24 May 2018 15:33:13 +1000 Subject: [PATCH 0384/1133] song: Fix matching --- neofetch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index bd09a0b74..00df4b66f 100755 --- a/neofetch +++ b/neofetch @@ -2313,7 +2313,7 @@ get_memory() { } get_song() { - player="$(ps -e | grep -m 1 -o \ + player="$(ps -e | grep -m 1 \ -e "Google Play" \ -e "Spotify" \ -e "amarok" \ @@ -2345,6 +2345,8 @@ get_song() { -e "yarock" \ -e "sayonara" \ -e "vlc")" + player="${player/* }" + player="${player##*/}" [[ "$music_player" && "$music_player" != "auto" ]] && \ player="$music_player" From 33d6dd760f79c5ebfff06c42b0e0c88c1ec6c17f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 24 May 2018 15:36:04 +1000 Subject: [PATCH 0385/1133] song: Fix matching --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 00df4b66f..e71746e1d 100755 --- a/neofetch +++ b/neofetch @@ -2313,7 +2313,7 @@ get_memory() { } get_song() { - player="$(ps -e | grep -m 1 \ + player="$(ps -e | grep -m 1 -F \ -e "Google Play" \ -e "Spotify" \ -e "amarok" \ @@ -2328,7 +2328,7 @@ get_song() { -e "exaile" \ -e "gnome-music" \ -e "guayadeque" \ - -e "iTunes$" \ + -e "iTunes" \ -e "juk" \ -e "lollypop" \ -e "mocp" \ From de0d342852c587e88cd4a56d24df29b04409ff37 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Thu, 24 May 2018 15:46:38 +1000 Subject: [PATCH 0386/1133] Revert "Revert "term_font: fix iTerm2 checking 2 more profiles than exists"" This reverts commit f49919e95773878709e2e0c52453d4321a31c521. --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 68b9e6aa8..853e90afa 100755 --- a/neofetch +++ b/neofetch @@ -2800,9 +2800,10 @@ END font_file="${HOME}/Library/Preferences/com.googlecode.iterm2.plist" # Count Guids in "New Bookmarks"; they should be unique - profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | grep -c "Guid")" + profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | \ + grep -w -c "Guid")" - for ((i=0; i<=profiles_count; i++)); do + for ((i=0; i Date: Thu, 24 May 2018 16:51:23 +1000 Subject: [PATCH 0387/1133] general: Added json output option. --- neofetch | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/neofetch b/neofetch index bd09a0b74..0b3bf6500 100755 --- a/neofetch +++ b/neofetch @@ -3909,6 +3909,11 @@ info() { prin() { # If $2 doesn't exist we format $1 as info. if [[ "$(trim "$1")" && "$2" ]]; then + if [[ "$json" ]]; then + printf " %b\n" "\"${1}\": \"${2}\"," + return + fi + string="${1}${2:+: $2}" else string="${2:-$1}" @@ -4718,6 +4723,17 @@ get_args() { exit 1 ;; + "--json") + json="on" + unset -f get_title get_cols get_line_break get_underline + + printf "{\n" + print_info 2>/dev/null + printf " %s\n" "\"Version\": \"${version}\"" + printf "}\n" + exit + ;; + "--travis") print_info() { info title From c64b5c3d8c681064b4420f49ec16aadcd033937e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 24 May 2018 16:55:10 +1000 Subject: [PATCH 0388/1133] general: clean up --- neofetch | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 82b0b5c84..0785c0228 100755 --- a/neofetch +++ b/neofetch @@ -3910,10 +3910,7 @@ info() { prin() { # If $2 doesn't exist we format $1 as info. if [[ "$(trim "$1")" && "$2" ]]; then - if [[ "$json" ]]; then - printf " %b\n" "\"${1}\": \"${2}\"," - return - fi + [[ "$json" ]] && { printf " %s\n" "\"${1}\": \"${2}\","; return; } string="${1}${2:+: $2}" else From bff6cf3b1a629f752b60c29b10d6753a17880628 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 25 May 2018 06:05:31 +1000 Subject: [PATCH 0389/1133] general: Fix prompt issues 2 --- neofetch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index d55ed960e..393845fd0 100755 --- a/neofetch +++ b/neofetch @@ -4201,20 +4201,20 @@ kde_config_dir() { dynamic_prompt() { [[ "$image_backend" == "off" ]] && { printf "\n"; return; } - [[ "$image_backend" != "ascii" ]] && ((lines+=1000)) + [[ "$image_backend" != "ascii" ]] && { printf "%b" "\e[1000;0H"; return; } # If the ascii art is taller than the info. if ((lines > info_height)); then - lines="$((lines - info_height + 1))" + prompt="$((lines - info_height + 1))" else - lines=1 + prompt=1 fi # Set the prompt location. if ((lines >= 1)); then case "$kernel_name" in - "OpenBSD") tput cud "$lines" ;; - *) printf "%b" "\e[${lines}B" ;; + "OpenBSD") tput cud "$prompt" ;; + *) printf "\n\n%b" "\e[${prompt}D" ;; esac fi } From 77282c8fea326c79da742b5bbee95e2a32f3d076 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 25 May 2018 06:07:42 +1000 Subject: [PATCH 0390/1133] general: revert Fix prompt issue 2 --- neofetch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 393845fd0..d55ed960e 100755 --- a/neofetch +++ b/neofetch @@ -4201,20 +4201,20 @@ kde_config_dir() { dynamic_prompt() { [[ "$image_backend" == "off" ]] && { printf "\n"; return; } - [[ "$image_backend" != "ascii" ]] && { printf "%b" "\e[1000;0H"; return; } + [[ "$image_backend" != "ascii" ]] && ((lines+=1000)) # If the ascii art is taller than the info. if ((lines > info_height)); then - prompt="$((lines - info_height + 1))" + lines="$((lines - info_height + 1))" else - prompt=1 + lines=1 fi # Set the prompt location. if ((lines >= 1)); then case "$kernel_name" in - "OpenBSD") tput cud "$prompt" ;; - *) printf "\n\n%b" "\e[${prompt}D" ;; + "OpenBSD") tput cud "$lines" ;; + *) printf "%b" "\e[${lines}B" ;; esac fi } From 160276ff6dc8d18500329f2d1a42060aeb0cc823 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 25 May 2018 06:51:06 +1000 Subject: [PATCH 0391/1133] general: Fix prompt issues 3 --- neofetch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index d55ed960e..1b8e285eb 100755 --- a/neofetch +++ b/neofetch @@ -3801,12 +3801,14 @@ display_image() { ;; "catimg") - catimg -w "$((width * 2 / font_width))" -r "$catimg_size" "$image" ||\ + catimg -w "$((width*2 / font_width))" -r "$catimg_size" "$image" ||\ to_off "Image: catimg failed to display the image." ;; "jp2a") - jp2a --width="$((width / font_width))" --colors "$image" ||\ + jp2a --width="$((width / font_width))" \ + --height="$((height / font_height))" \ + --colors "$image" ||\ to_off "Image: jp2a failed to display the image." ;; @@ -3828,7 +3830,9 @@ display_image() { ;; "termpix") - termpix --width "$((width / font_width))" "$image" ||\ + termpix --width "$((width / font_width))" \ + --height "$((height / font_height))" \ + "$image" ||\ to_off "Image: termpix failed to display the image." ;; @@ -4201,7 +4205,8 @@ kde_config_dir() { dynamic_prompt() { [[ "$image_backend" == "off" ]] && { printf "\n"; return; } - [[ "$image_backend" != "ascii" ]] && ((lines+=1000)) + [[ "$image_backend" != "ascii" ]] && lines="$(((height + yoffset) / font_height))" + [[ "$image_backend" == "catimg" ]] && { printf "%b" "\e[1000B"; return; } # If the ascii art is taller than the info. if ((lines > info_height)); then @@ -4210,13 +4215,8 @@ dynamic_prompt() { lines=1 fi - # Set the prompt location. - if ((lines >= 1)); then - case "$kernel_name" in - "OpenBSD") tput cud "$lines" ;; - *) printf "%b" "\e[${lines}B" ;; - esac - fi + printf -v nlines "%${lines}s" + printf "%b" "${nlines// /\\n}" } cache_uname() { From 01ef60445eeeccb88416c236e0b383aac7fa90b9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 25 May 2018 15:13:10 +1000 Subject: [PATCH 0392/1133] song: Use regex for matching. --- neofetch | 70 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/neofetch b/neofetch index 1b8e285eb..adcac6ccc 100755 --- a/neofetch +++ b/neofetch @@ -2317,40 +2317,42 @@ get_memory() { } get_song() { - player="$(ps -e | grep -m 1 -F \ - -e "Google Play" \ - -e "Spotify" \ - -e "amarok" \ - -e "audacious" \ - -e "banshee" \ - -e "bluemindo" \ - -e "clementine" \ - -e "cmus" \ - -e "deadbeef" \ - -e "deepin-music" \ - -e "elisa" \ - -e "exaile" \ - -e "gnome-music" \ - -e "guayadeque" \ - -e "iTunes" \ - -e "juk" \ - -e "lollypop" \ - -e "mocp" \ - -e "mopidy" \ - -e "mpd" \ - -e "pogo" \ - -e "pragha" \ - -e "qmmp" \ - -e "quodlibet" \ - -e "rhythmbox" \ - -e "spotify" \ - -e "tomahawk" \ - -e "xmms2d" \ - -e "yarock" \ - -e "sayonara" \ - -e "vlc")" - player="${player/* }" - player="${player##*/}" + players=( + "amarok" + "audacious" + "banshee" + "bluemindo" + "clementine" + "cmus" + "deadbeef" + "deepin-music" + "elise" + "exaile" + "gnome-music" + "Google Play" + "guayadeque" + "iTunes" + "juk" + "lollypop" + "mocp" + "mopidy" + "mpd" + "pogo" + "pragha" + "qmmp" + "quodlibet" + "rhythmbox" + "sayonara" + "spotify" + "Spotify" + "tomahawk" + "vlc" + "xmms2d" + "yarock" + ) + + printf -v players "|%s" "${players[@]}" + player="$(ps -e | awk -v pattern="(${players:1})$" '$0 ~ pattern {print $NF; exit}')" [[ "$music_player" && "$music_player" != "auto" ]] && \ player="$music_player" From 3ad38d7c95f1a20fc8dad0858c55d895ee392c11 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 25 May 2018 16:08:41 +1000 Subject: [PATCH 0393/1133] docs: update --- neofetch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index adcac6ccc..5e645cf97 100755 --- a/neofetch +++ b/neofetch @@ -32,6 +32,8 @@ bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/.config}" PATH="/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec:${PATH}" +reset="\e[0m" +shopt -s nocasematch # Speed up script by not using unicode. LC_ALL=C @@ -40,9 +42,6 @@ LANG=C # Fix issues with gsettings. GIO_EXTRA_MODULES="/usr/lib/x86_64-linux-gnu/gio/modules/" -shopt -s nocasematch -reset="\e[0m" - # Neofetch default config. read -rd '' config <<'EOF' # See this wiki page for more info: From 2a13d62c0cadf395ea976ddb9465948aa12549fb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 26 May 2018 06:54:38 +1000 Subject: [PATCH 0394/1133] song: Use ascii characters to split fields. --- neofetch | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/neofetch b/neofetch index 5e645cf97..33b0d68fb 100755 --- a/neofetch +++ b/neofetch @@ -2364,18 +2364,18 @@ get_song() { org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' \ string:'Metadata' |\ awk -F '"' 'BEGIN {RS=" entry"}; /xesam:artist/ {a = $4} /xesam:album/ {b = $4} - /xesam:title/ {t = $4} END {print a " ‡ " b " ‡ " t}' + /xesam:title/ {t = $4} END {print a " -@- " b " -@- " t}' )" } case "${player/*\/}" in - "mpd"* | "mopidy"*) song="$(mpc -f '%artist% ‡ %album% ‡ %title%' current)" ;; - "mocp"*) song="$(mocp -Q "%artist ‡ %album ‡ %song")" ;; + "mpd"* | "mopidy"*) song="$(mpc -f '%artist% -@- %album% -@- %title%' current)" ;; + "mocp"*) song="$(mocp -Q "%artist -@- %album -@- %song")" ;; "google play"*) song="$(gpmdp-remote current)" ;; - "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta ‡ %at ‡ %tt')" ;; - "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% ‡ %album% ‡ %title%')" ;; - "xmms2d"*) song="$(xmms2 current -f '${artist} ‡ ${album} ‡ ${title}')" ;; - "qmmp"*) song="$(qmmp --nowplaying '%p ‡ %a ‡ %t')" ;; + "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta -@- %at -@- %tt')" ;; + "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% -@- %album% -@- %title%')" ;; + "xmms2d"*) song="$(xmms2 current -f '${artist} -@- ${album} -@- ${title}')" ;; + "qmmp"*) song="$(qmmp --nowplaying '%p -@- %a -@- %t')" ;; "gnome-music"*) get_song_dbus "GnomeMusic" ;; "lollypop"*) get_song_dbus "Lollypop" ;; "clementine"*) get_song_dbus "clementine" ;; @@ -2395,7 +2395,7 @@ get_song() { /tag artist/ {$1=$2=""; sub(" ", ""); a=$0}\ /tag album / {$1=$2=""; sub(" ", ""); b=$0}\ /tag title/ {$1=$2=""; sub(" ", ""); t=$0}\ - END { print a " ‡ " b " ‡ " t }')" + END { print a " -@- " b " -@- " t }')" ;; "spotify"*) @@ -2404,61 +2404,61 @@ get_song() { "Mac OS X") song="$(osascript -e 'tell application "Spotify" to artist of current track as¬ - string & " ‡ " & album of current track as¬ - string & " ‡ " & name of current track as string')" + string & " -@- " & album of current track as¬ + string & " -@- " & name of current track as string')" ;; esac ;; "itunes"*) song="$(osascript -e 'tell application "iTunes" to artist of current track as¬ - string & " ‡ " & album of current track as¬ - string & " ‡ " & name of current track as string')" + string & " -@- " & album of current track as¬ + string & " -@- " & name of current track as string')" ;; "banshee"*) song="$(banshee --query-artist --query-album --query-title |\ awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} - END{print a " ‡ " b " ‡ "t}')" + END{print a " -@- " b " -@- "t}')" ;; "amarok"*) song="$(qdbus org.kde.amarok /Player GetMetadata |\ awk -F':' '/^artist:/ {a=$2} /^album:/ {b=$2} /^title:/ {t=$2} - END{print a " ‡ " b " ‡ " t}')" + END{print a " -@- " b " -@- " t}')" ;; "pragha"*) song="$(pragha -c | awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} - END{print a " ‡ " b " ‡ " t}')" + END{print a " -@- " b " -@- " t}')" ;; "exaile"*) song="$(dbus-send --print-reply --dest=org.exaile.Exaile /org/exaile/Exaile \ org.exaile.Exaile.Query | - awk -F':|,' '{if ($6 && $8 && $4) printf $6 " ‡" $8 " ‡" $4}')" + awk -F':|,' '{if ($6 && $8 && $4) printf $6 " -@-" $8 " -@-" $4}')" ;; "quodlibet"*) song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \ /net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\ awk -F'"' '/artist/ {getline; a=$2} /album/ {getline; b=$2} - /title/ {getline; t=$2} END{print a " ‡ " b " ‡ " t}')" + /title/ {getline; t=$2} END{print a " -@- " b " -@- " t}')" ;; "pogo"*) song="$(dbus-send --print-reply --dest=org.mpris.pogo /Player \ org.freedesktop.MediaPlayer.GetMetadata | awk -F'"' '/string "artist"/ {getline; a=$2} /string "album"/ {getline; b=$2} \ - /string "title"/ {getline; t=$2} END{print a " ‡ " b " ‡ " t}')" + /string "title"/ {getline; t=$2} END{print a " -@- " b " -@- " t}')" ;; - *) mpc >/dev/null 2>&1 && song="$(mpc -f '%artist% ‡ %album% ‡ %title%' current)" ;; + *) mpc >/dev/null 2>&1 && song="$(mpc -f '%artist% -@- %album% -@- %title%' current)" ;; esac [[ "$song" != *[a-z]* ]] && { unset -v song; return; } - LC_ALL="$sys_locale" IFS="‡" read -r artist album title <<< "$song" + LC_ALL="$sys_locale" IFS=$'\n' read -d "" -r artist album title <<< "${song//-@-/$'\n'}" # Display Artist, Album and Title on separate lines. if [[ "$song_shorthand" == "on" ]]; then From 8554f423459fd7db81a6eaf76ea472eb821d933f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 26 May 2018 06:55:25 +1000 Subject: [PATCH 0395/1133] song: Remove locale override. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 33b0d68fb..f2b12f7c4 100755 --- a/neofetch +++ b/neofetch @@ -2458,7 +2458,7 @@ get_song() { [[ "$song" != *[a-z]* ]] && { unset -v song; return; } - LC_ALL="$sys_locale" IFS=$'\n' read -d "" -r artist album title <<< "${song//-@-/$'\n'}" + IFS=$'\n' read -d "" -r artist album title <<< "${song//-@-/$'\n'}" # Display Artist, Album and Title on separate lines. if [[ "$song_shorthand" == "on" ]]; then From e6b8f4f64f072956f082766e9ccbdb631d646593 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 26 May 2018 09:14:28 +1000 Subject: [PATCH 0396/1133] song: Use newlines as a separator directly. --- neofetch | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/neofetch b/neofetch index f2b12f7c4..567ab4fd3 100755 --- a/neofetch +++ b/neofetch @@ -2364,18 +2364,18 @@ get_song() { org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' \ string:'Metadata' |\ awk -F '"' 'BEGIN {RS=" entry"}; /xesam:artist/ {a = $4} /xesam:album/ {b = $4} - /xesam:title/ {t = $4} END {print a " -@- " b " -@- " t}' + /xesam:title/ {t = $4} END {print a " \n " b " \n " t}' )" } case "${player/*\/}" in - "mpd"* | "mopidy"*) song="$(mpc -f '%artist% -@- %album% -@- %title%' current)" ;; - "mocp"*) song="$(mocp -Q "%artist -@- %album -@- %song")" ;; + "mpd"* | "mopidy"*) song="$(mpc -f '%artist% \n %album% \n %title%' current)" ;; + "mocp"*) song="$(mocp -Q "%artist \n %album \n %song")" ;; "google play"*) song="$(gpmdp-remote current)" ;; - "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta -@- %at -@- %tt')" ;; - "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% -@- %album% -@- %title%')" ;; - "xmms2d"*) song="$(xmms2 current -f '${artist} -@- ${album} -@- ${title}')" ;; - "qmmp"*) song="$(qmmp --nowplaying '%p -@- %a -@- %t')" ;; + "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta \n %at \n %tt')" ;; + "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% \n %album% \n %title%')" ;; + "xmms2d"*) song="$(xmms2 current -f '${artist} \n ${album} \n ${title}')" ;; + "qmmp"*) song="$(qmmp --nowplaying '%p \n %a \n %t')" ;; "gnome-music"*) get_song_dbus "GnomeMusic" ;; "lollypop"*) get_song_dbus "Lollypop" ;; "clementine"*) get_song_dbus "clementine" ;; @@ -2395,7 +2395,7 @@ get_song() { /tag artist/ {$1=$2=""; sub(" ", ""); a=$0}\ /tag album / {$1=$2=""; sub(" ", ""); b=$0}\ /tag title/ {$1=$2=""; sub(" ", ""); t=$0}\ - END { print a " -@- " b " -@- " t }')" + END { print a " \n " b " \n " t }')" ;; "spotify"*) @@ -2404,61 +2404,61 @@ get_song() { "Mac OS X") song="$(osascript -e 'tell application "Spotify" to artist of current track as¬ - string & " -@- " & album of current track as¬ - string & " -@- " & name of current track as string')" + string & " \n " & album of current track as¬ + string & " \n " & name of current track as string')" ;; esac ;; "itunes"*) song="$(osascript -e 'tell application "iTunes" to artist of current track as¬ - string & " -@- " & album of current track as¬ - string & " -@- " & name of current track as string')" + string & " \n " & album of current track as¬ + string & " \n " & name of current track as string')" ;; "banshee"*) song="$(banshee --query-artist --query-album --query-title |\ awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} - END{print a " -@- " b " -@- "t}')" + END{print a " \n " b " \n "t}')" ;; "amarok"*) song="$(qdbus org.kde.amarok /Player GetMetadata |\ awk -F':' '/^artist:/ {a=$2} /^album:/ {b=$2} /^title:/ {t=$2} - END{print a " -@- " b " -@- " t}')" + END{print a " \n " b " \n " t}')" ;; "pragha"*) song="$(pragha -c | awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} - END{print a " -@- " b " -@- " t}')" + END{print a " \n " b " \n " t}')" ;; "exaile"*) song="$(dbus-send --print-reply --dest=org.exaile.Exaile /org/exaile/Exaile \ org.exaile.Exaile.Query | - awk -F':|,' '{if ($6 && $8 && $4) printf $6 " -@-" $8 " -@-" $4}')" + awk -F':|,' '{if ($6 && $8 && $4) printf $6 " \n" $8 " \n" $4}')" ;; "quodlibet"*) song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \ /net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\ awk -F'"' '/artist/ {getline; a=$2} /album/ {getline; b=$2} - /title/ {getline; t=$2} END{print a " -@- " b " -@- " t}')" + /title/ {getline; t=$2} END{print a " \n " b " \n " t}')" ;; "pogo"*) song="$(dbus-send --print-reply --dest=org.mpris.pogo /Player \ org.freedesktop.MediaPlayer.GetMetadata | awk -F'"' '/string "artist"/ {getline; a=$2} /string "album"/ {getline; b=$2} \ - /string "title"/ {getline; t=$2} END{print a " -@- " b " -@- " t}')" + /string "title"/ {getline; t=$2} END{print a " \n " b " \n " t}')" ;; - *) mpc >/dev/null 2>&1 && song="$(mpc -f '%artist% -@- %album% -@- %title%' current)" ;; + *) mpc >/dev/null 2>&1 && song="$(mpc -f '%artist% \n %album% \n %title%' current)" ;; esac [[ "$song" != *[a-z]* ]] && { unset -v song; return; } - IFS=$'\n' read -d "" -r artist album title <<< "${song//-@-/$'\n'}" + IFS=$'\n' read -d "" -r artist album title <<< "$song" # Display Artist, Album and Title on separate lines. if [[ "$song_shorthand" == "on" ]]; then From fca688dd12e76f440ea27a5d193cd1f6f8bf9544 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 26 May 2018 10:21:08 +0200 Subject: [PATCH 0397/1133] song: sort players in config --- neofetch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 567ab4fd3..ab494a583 100755 --- a/neofetch +++ b/neofetch @@ -399,8 +399,6 @@ disk_subtitle="mount" # # Available values for 'player-name': # -# Google Play -# Spotify # amarok # audacious # banshee @@ -412,8 +410,9 @@ disk_subtitle="mount" # elisa # exaile # gnome-music +# Google Play # guayadeque -# iTunes$ +# iTunes # juk # lollypop # mocp @@ -424,12 +423,13 @@ disk_subtitle="mount" # qmmp # quodlibet # rhythmbox +# sayonara # spotify +# Spotify # tomahawk +# vlc # xmms2d # yarock -# sayonara -# vlc music_player="auto" # Format to display song information. From ba9c7bba23ccd315a07b064427121dee9f69dc02 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 May 2018 08:42:35 +1000 Subject: [PATCH 0398/1133] docs: update --- neofetch | 2 -- 1 file changed, 2 deletions(-) diff --git a/neofetch b/neofetch index 567ab4fd3..17e725bf4 100755 --- a/neofetch +++ b/neofetch @@ -971,8 +971,6 @@ get_distro() { "Windows") distro="$(wmic os get Caption)" - - # Strip crap from the output of wmic. distro="${distro/Caption}" distro="${distro/Microsoft }" ;; From 92ecdf0012f79500b569202ac191a6b838bc8e1d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 May 2018 09:27:41 +1000 Subject: [PATCH 0399/1133] image: Removed catimg support. Fixed sixel size. --- neofetch | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/neofetch b/neofetch index 34068428b..2646910c8 100755 --- a/neofetch +++ b/neofetch @@ -638,7 +638,7 @@ disk_display="off" # Image backend. # # Default: 'ascii' -# Values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m' +# Values: 'ascii', 'caca', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m' # Flag: --backend image_backend="ascii" @@ -740,14 +740,6 @@ crop_offset="center" # --size image_size="auto" -# Catimg block size. -# Control the resolution of catimg. -# -# Default: '2' -# Values: '1', '2' -# Flags: --catimg_size -catimg_size="2" - # Gap between image and text # # Default: '3' @@ -3388,7 +3380,7 @@ image_backend() { "ascii") get_ascii ;; "off") image_backend="off" ;; - "caca" | "catimg" | "jp2a" | "iterm2" | "termpix" |\ + "caca" | "jp2a" | "iterm2" | "termpix" |\ "tycat" | "w3m" | "sixel" | "pixterm" | "kitty") get_image_source @@ -3417,7 +3409,7 @@ image_backend() { *) err "Image: Unknown image backend specified '$image_backend'." - err "Image: Valid backends are: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'kitty', + err "Image: Valid backends are: 'ascii', 'caca', 'jp2a', 'iterm2', 'kitty', 'off', 'sixel', 'pixterm', 'termpix', 'tycat', 'w3m')" err "Image: Falling back to ascii mode." get_ascii @@ -3799,11 +3791,6 @@ display_image() { to_off "Image: libcaca failed to display the image." ;; - "catimg") - catimg -w "$((width*2 / font_width))" -r "$catimg_size" "$image" ||\ - to_off "Image: catimg failed to display the image." - ;; - "jp2a") jp2a --width="$((width / font_width))" \ --height="$((height / font_height))" \ @@ -3824,7 +3811,9 @@ display_image() { ;; "sixel") - img2sixel -w "$width" "$image" ||\ + img2sixel -w "$width" \ + -h "$height" \ + "$image" ||\ to_off "Image: libsixel failed to display the image." ;; @@ -4205,7 +4194,6 @@ kde_config_dir() { dynamic_prompt() { [[ "$image_backend" == "off" ]] && { printf "\n"; return; } [[ "$image_backend" != "ascii" ]] && lines="$(((height + yoffset) / font_height))" - [[ "$image_backend" == "catimg" ]] && { printf "%b" "\e[1000B"; return; } # If the ascii art is taller than the info. if ((lines > info_height)); then @@ -4459,14 +4447,13 @@ BARS: IMAGE BACKEND: --backend backend Which image backend to use. - Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', + Possible values: 'ascii', 'caca', '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/' --ascii source Shortcut to use 'ascii' backend. --caca source Shortcut to use 'caca' backend. - --catimg source Shortcut to use 'catimg' backend. --iterm2 source Shortcut to use 'iterm2' backend. --jp2a source Shortcut to use 'jp2a' backend. --kitty source Shortcut to use 'kitty' backend. @@ -4508,7 +4495,6 @@ IMAGE: in some terminals emulators when using image mode. --size 00px | --size 00% How to size the image. Possible values: auto, 00px, 00%, none - --catimg_size 1/2 Change the resolution of catimg. --crop_mode mode Which crop mode to use Takes the values: normal, fit, fill --crop_offset value Change the crop offset for normal mode. @@ -4652,7 +4638,7 @@ get_args() { # Image backend "--backend") image_backend="$2" ;; "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--ascii" | "--caca" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") image_backend="${1/--}" case "$2" in @@ -4664,7 +4650,6 @@ get_args() { # Image options "--loop") image_loop="on" ;; "--image_size" | "--size") image_size="$2" ;; - "--catimg_size") catimg_size="$2" ;; "--crop_mode") crop_mode="$2" ;; "--crop_offset") crop_offset="$2" ;; "--xoffset") xoffset="$2" ;; From e04302ccecd49f7ae52115cccf65352ffa0d200d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 May 2018 09:27:55 +1000 Subject: [PATCH 0400/1133] docs: update --- neofetch.1 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 7f52fbe3f..d7356cf8d 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -191,7 +191,7 @@ Possible values: bar, infobar, barinfo, off .TP \fB\-\-backend\fR backend Which image backend to use. -Possible values: 'ascii', 'caca', 'catimg', 'jp2a', 'iterm2', 'off', +Possible values: 'ascii', 'caca', 'jp2a', 'iterm2', 'off', \&'sixel', 'tycat', 'w3m' .TP \fB\-\-source\fR source @@ -205,9 +205,6 @@ Shortcut to use 'ascii' backend. \fB\-\-caca\fR source Shortcut to use 'caca' backend. .TP -\fB\-\-catimg\fR source -Shortcut to use 'catimg' backend. -.TP \fB\-\-iterm2\fR source Shortcut to use 'iterm2' backend. .TP @@ -276,9 +273,6 @@ in some terminals emulators when using image mode. How to size the image. Possible values: auto, 00px, 00%, none .TP -\fB\-\-catimg_size\fR 1/2 -Change the resolution of catimg. -.TP \fB\-\-crop_mode\fR mode Which crop mode to use Takes the values: normal, fit, fill From b981fb50fa6ec48022ad060415c3850e6d0c4493 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 May 2018 09:33:47 +1000 Subject: [PATCH 0401/1133] image: Fixed tycat size. --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 2646910c8..38791f7d2 100755 --- a/neofetch +++ b/neofetch @@ -3835,7 +3835,7 @@ display_image() { ;; "tycat") - tycat "$image" ||\ + tycat -g "${width}x${height}" "$image" ||\ to_off "Image: tycat failed to display the image." ;; @@ -4193,7 +4193,7 @@ kde_config_dir() { dynamic_prompt() { [[ "$image_backend" == "off" ]] && { printf "\n"; return; } - [[ "$image_backend" != "ascii" ]] && lines="$(((height + yoffset) / font_height))" + [[ "$image_backend" != "ascii" ]] && lines="$(((height + yoffset) / font_height + 1))" # If the ascii art is taller than the info. if ((lines > info_height)); then From 8707a49f04d476f48949d49d49d44c333bbc5438 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 May 2018 09:46:08 +1000 Subject: [PATCH 0402/1133] docs: update --- neofetch | 4 +++- neofetch.1 | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 38791f7d2..38fcc73da 100755 --- a/neofetch +++ b/neofetch @@ -4342,7 +4342,9 @@ Options: INFO: --disable infoname Allows you to disable an info line from appearing - in the output. + in the output. 'infoname' is the function name from the + 'print_info()' function inside the config file. + For example: 'info \"Memory\" memory' would be '--disable memory' NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' diff --git a/neofetch.1 b/neofetch.1 index d7356cf8d..9a87abe65 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -16,7 +16,9 @@ NOTE: Every launch flag has a config option. .TP \fB\-\-disable\fR infoname Allows you to disable an info line from appearing -in the output. +in the output. 'infoname' is the function name from the +\&'print_info()' function inside the config file. +For example: 'info "Memory" memory' would be '\-\-disable memory' .IP NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu' .TP From 29aabc97fa60aa0f9fda7e9808d9853b143742f5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 May 2018 09:47:17 +1000 Subject: [PATCH 0403/1133] docs: update --- neofetch | 2 +- neofetch.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 38fcc73da..60a47afef 100755 --- a/neofetch +++ b/neofetch @@ -4464,7 +4464,7 @@ IMAGE BACKEND: --termpix source Shortcut to use 'termpix' backend. --tycat source Shortcut to use 'tycat' backend. --w3m source Shortcut to use 'w3m' backend. - --off Shortcut to use 'off' backend. + --off Shortcut to use 'off' backend (Disable ascii art). NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/' diff --git a/neofetch.1 b/neofetch.1 index 9a87abe65..4bfa57aba 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -232,7 +232,7 @@ Shortcut to use 'tycat' backend. Shortcut to use 'w3m' backend. .TP \fB\-\-off\fR -Shortcut to use 'off' backend. +Shortcut to use 'off' backend (Disable ascii art). .IP NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', \&'/path/to/ascii', '/path/to/dir/' From b02ed9fff27fa534329f0a7bb70f64e26f881e2f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 May 2018 10:28:14 +1000 Subject: [PATCH 0404/1133] image: Fixed kitty image size. --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 60a47afef..3e76fa3e4 100755 --- a/neofetch +++ b/neofetch @@ -3799,7 +3799,11 @@ display_image() { ;; "kitty") - kitty icat --align left --place "${width}x${height}@${xoffset}x${yoffset}" "$image" ||\ + kitty icat \ + --align left \ + --place "$((width / font_width))x$((height / font_height))\ + @${xoffset}x${yoffset}" \ + "$image" ||\ to_off "Image: kitty failed to display the image." ;; From 8e3be5204dc3e2b1a02abb199bb9b010dde7bf7d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 May 2018 11:08:06 +1000 Subject: [PATCH 0405/1133] docs: update --- CHANGELOG.md | 39 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 37 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b75694cfd..bf1f16f85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,44 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] -- [ascii] Fixed a bug causing Windows 7 ASCII art to not display. -- [image] Added new option to configure the resolution of `catimg`. +**Contributors** + +- [**@mstraube**](https://github.com/mstraube) +- [**@iandrewt**](https://github.com/iandrewt") + +**Operating System** + +- Added support for RedCore Linux. [**@mstraube**](https://github.com/mstraube) + +**General** + +- [output] Added `--json` to output the info in `json`. +- [cursor] Fixed prompt location issues after Neofetch is run. +- [macOS] Fixed neofetch launching XQuartz. +- [misc] Removed `uppercase()`. +- [misc] Removed all instances of `export`. + +**Ascii** + +- Fixed a bug causing Windows 7 ASCII art to not display. + +**Image** + +- Removed `catimg` support (*It didn’t allow us to specify height so we + couldn’t accurately place the cursor*). +- Fixed `tycat`, `sixel` and `kitty icat` image sizes. + +**Screenshot** + +- Removed screenshot functionality. +- Removed screenshot upload functionality. + +**Info** + - [font] Fix iTerm2 checking for 2 extra profiles that don't exist. [**@iandrewt**](https://github.com/iandrewt") +- [gpu] Fixed ATI/AMD branding issue. +- [song] Fixed song detection on macOS. +- [song] Fixed song output on systems using `C` locale. ## [4.0.2] - 2018-05-19 From a2769a93ed598d53dd7d719c4fcff0925e753423 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 May 2018 18:51:33 +1000 Subject: [PATCH 0406/1133] image: Fixed images in kitty on macOS. Closes #994 --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 3e76fa3e4..05faa904a 100755 --- a/neofetch +++ b/neofetch @@ -3636,6 +3636,9 @@ get_term_size() { term_width="${term_size[2]/t*}" fi + [[ "$image_backend" == "kitty" ]] && \ + IFS=x read -r term_width term_height < <(kitty icat --print-window-size) + # Get terminal width/height if \e[14t is unsupported. if (( "${term_width:-0}" < 50 )) && [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then if type -p xdotool >/dev/null 2>&1; then From ec29e744066f7278973240837246620f9be70186 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 29 May 2018 08:48:03 +1000 Subject: [PATCH 0407/1133] cpu: Simplify cpu_cores --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 05faa904a..24d991358 100755 --- a/neofetch +++ b/neofetch @@ -1002,9 +1002,9 @@ get_distro() { *) machine_arch="$(uname -m)" ;; esac - if [[ "$os_arch" == "on" ]]; then + + [[ "$os_arch" == "on" ]] && \ distro+=" ${machine_arch}" - fi [[ "${ascii_distro:-auto}" == "auto" ]] && \ ascii_distro="$(trim "$distro")" @@ -1793,7 +1793,7 @@ get_cpu() { # Get CPU cores. case "$cpu_cores" in "logical" | "on") cores="$(grep -c "^processor" "$cpu_file")" ;; - "physical") cores="$(grep "^core id" "$cpu_file" | sort -u | wc -l)" ;; + "physical") cores="$(awk '/^core id/&&!a[$0]++{++i}END{print i}' "$cpu_file")" ;; esac ;; From 15cd3b3e079b4d3d97d5fead74a4dbb1d6ca829d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 29 May 2018 09:08:32 +1000 Subject: [PATCH 0408/1133] gpu: Remove glxinfo usage. Too slow. --- neofetch | 3 --- 1 file changed, 3 deletions(-) diff --git a/neofetch b/neofetch index 24d991358..1558ed53e 100755 --- a/neofetch +++ b/neofetch @@ -2078,9 +2078,6 @@ get_gpu() { ;; *"intel"*) - type -p glxinfo >/dev/null && \ - gpu="$(glxinfo | grep "Device:.*Intel")" - gpu="${gpu/*Intel/Intel}" gpu="${gpu/'(R)'}" gpu="${gpu/'Corporation'}" From 9175a47a3cd1b7cc2514a47a1db6511700e4bcfe Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 29 May 2018 09:16:45 +1000 Subject: [PATCH 0409/1133] packages: Fix issues with pacman 5.1. Remove needless call to pkginfo on Linux. --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 1558ed53e..ce368edba 100755 --- a/neofetch +++ b/neofetch @@ -1239,7 +1239,7 @@ get_uptime() { get_packages() { case "$os" in "Linux" | "BSD" | "iPhone OS" | "Solaris") - type -p paclog-pkglist >/dev/null && \ + type -p pacman-key >/dev/null && \ packages="$(pacman -Qq --color never | wc -l)" type -p dpkg >/dev/null && \ @@ -1254,7 +1254,7 @@ get_packages() { type -p xbps-query >/dev/null && \ ((packages+=$(xbps-query -l | wc -l))) - type -p pkginfo >/dev/null && \ + [[ "$os" != "Linux" ]] && type -p pkginfo >/dev/null && \ ((packages+=$(pkginfo -i | wc -l))) type -p emerge >/dev/null && \ @@ -3888,7 +3888,7 @@ info() { unset -v prin # Call the function. - "get_${2:-$1}" + get_${2:-$1}" # If the get_func function called 'prin' directly, stop here. [[ "$prin" ]] && return From 3889bf8dd4228c8a2e4d111c783f10483be087f7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 29 May 2018 09:26:59 +1000 Subject: [PATCH 0410/1133] misc: Fix missing quote. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index ce368edba..5325d01c3 100755 --- a/neofetch +++ b/neofetch @@ -3888,7 +3888,7 @@ info() { unset -v prin # Call the function. - get_${2:-$1}" + "get_${2:-$1}" # If the get_func function called 'prin' directly, stop here. [[ "$prin" ]] && return From b93eb5ad30bce0531f399a103dcbad810211373f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 31 May 2018 07:33:20 +1000 Subject: [PATCH 0411/1133] w3m: Simplify path find. --- neofetch | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/neofetch b/neofetch index 5325d01c3..d421bf401 100755 --- a/neofetch +++ b/neofetch @@ -3571,27 +3571,17 @@ END get_w3m_img_path() { # Find w3m-img path. - if [[ -x "/usr/lib/w3m/w3mimgdisplay" ]]; then - w3m_img_path="/usr/lib/w3m/w3mimgdisplay" - - elif [[ -x "/usr/libexec/w3m/w3mimgdisplay" ]]; then - w3m_img_path="/usr/libexec/w3m/w3mimgdisplay" - - elif [[ -x "/usr/lib64/w3m/w3mimgdisplay" ]]; then - w3m_img_path="/usr/lib64/w3m/w3mimgdisplay" - - elif [[ -x "/usr/libexec64/w3m/w3mimgdisplay" ]]; then - w3m_img_path="/usr/libexec64/w3m/w3mimgdisplay" - - elif [[ -x "/usr/local/libexec/w3m/w3mimgdisplay" ]]; then - w3m_img_path="/usr/local/libexec/w3m/w3mimgdisplay" + shopt -s nullglob + w3m_paths=( + /usr/{local/,}{lib,libexec,lib64,libexec64}/w3m/w3mi* + ~/.nix-profile/libexec/w3m/w3mi* + ) + shopt -u nullglob - elif [[ -x "$HOME/.nix-profile/libexec/w3m/w3mimgdisplay" ]]; then - w3m_img_path="$HOME/.nix-profile/libexec/w3m/w3mimgdisplay" + [[ -x "${w3m_paths[0]}" ]] && \ + { w3m_img_path="${w3m_paths[0]}"; return; } - else - err "Image: w3m-img wasn't found on your system" - fi + err "Image: w3m-img wasn't found on your system" } get_term_size() { From c6fde1ff9afcd41a9a2289677f1312a1fbc5b56a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 31 May 2018 08:04:01 +1000 Subject: [PATCH 0412/1133] ascii: Simplify function. --- neofetch | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/neofetch b/neofetch index d421bf401..f9c439478 100755 --- a/neofetch +++ b/neofetch @@ -3418,17 +3418,8 @@ image_backend() { } get_ascii() { - if [[ ! -f "$image_source" || - "$image_source" =~ ^(auto|ascii)$ || - "$image_source" =~ \.(png|jpg|jpe|jpeg|gif)$ ]]; then - - # Fallback to distro ascii mode if custom ascii isn't found. - [[ ! "$image_source" =~ ^(auto|ascii)$ ]] && \ - err "Ascii: Ascii file not found, using distro ascii." - - # Fallback to distro ascii mode if source is an image. - [[ "$image_source" =~ \.(png|jpg|jpe|jpeg|gif)$ ]] && \ - err "Image: Source is image file but ascii backend was selected. Using distro ascii." + if [[ ! -f "$image_source" ]]; then + err "Ascii: Ascii file not found, using distro ascii." else ascii_data="$(< "$image_source")" fi @@ -3458,10 +3449,7 @@ get_ascii() { print="${print//'${c5}'/$c5}" print="${print//'${c6}'/$c6}" - # Overwrite padding if ascii_length_force is set. - [[ "$ascii_length_force" ]] && ascii_length="$ascii_length_force" - - text_padding="$((ascii_length + gap))" + ((text_padding=ascii_length+gap)) printf "%b" "$print" LC_ALL=C } From 077e5fadb7b04c9b5dcacb67c92f55b04a4c73b3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 31 May 2018 08:10:43 +1000 Subject: [PATCH 0413/1133] w3m: Simplify function further. --- neofetch | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/neofetch b/neofetch index f9c439478..5bffeb3ce 100755 --- a/neofetch +++ b/neofetch @@ -3560,10 +3560,7 @@ END get_w3m_img_path() { # Find w3m-img path. shopt -s nullglob - w3m_paths=( - /usr/{local/,}{lib,libexec,lib64,libexec64}/w3m/w3mi* - ~/.nix-profile/libexec/w3m/w3mi* - ) + w3m_paths=({/usr/{local/,},~/.nix-profile/}{lib,libexec,lib64,libexec64}/w3m/w3mi*) shopt -u nullglob [[ -x "${w3m_paths[0]}" ]] && \ From f41607c36c01efee201e1019f12de730a3f70afc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 31 May 2018 14:30:48 +1000 Subject: [PATCH 0414/1133] cpu: Use HOSTTYPE --- neofetch | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/neofetch b/neofetch index 5bffeb3ce..04fe81920 100755 --- a/neofetch +++ b/neofetch @@ -996,15 +996,8 @@ get_distro() { [[ -z "$distro" ]] && distro="$os (Unknown)" - # Get OS architecture. - case "$os" in - "Solaris" | "AIX" | "Haiku" | "IRIX" | "FreeMiNT") machine_arch="$(uname -p)" ;; - *) machine_arch="$(uname -m)" ;; - - esac - [[ "$os_arch" == "on" ]] && \ - distro+=" ${machine_arch}" + distro+=" $HOSTTYPE" [[ "${ascii_distro:-auto}" == "auto" ]] && \ ascii_distro="$(trim "$distro")" @@ -1038,7 +1031,7 @@ get_model() { ;; "iPhone OS") - case "$machine_arch" in + case "$kernel_machine" in "iPad1,1") model="iPad" ;; "iPad2,"[1-4]) model="iPad 2" ;; "iPad3,"[1-3]) model="iPad 3" ;; @@ -1739,7 +1732,7 @@ get_cpu() { # Get CPU name. cpu_file="/proc/cpuinfo" - case "$machine_arch" in + case "$kernel_machine" in "frv" | "hppa" | "m68k" | "openrisc" | "or"* | "powerpc" | "ppc"* | "sparc"*) cpu="$(awk -F':' '/^cpu\t|^CPU/ {printf $2; exit}' "$cpu_file")" ;; @@ -1808,7 +1801,7 @@ get_cpu() { ;; "iPhone OS") - case "$machine_arch" in + case "$kernel_machine" in "iPhone1,"[1-2] | "iPod1,1") cpu="Samsung S5L8900 (1) @ 412MHz" ;; "iPhone2,1") cpu="Samsung S5PC100 (1) @ 600MHz" ;; "iPhone3,"[1-3] | "iPod4,1") cpu="Apple A4 (1) @ 800MHz" ;; @@ -2119,7 +2112,7 @@ get_gpu() { ;; "iPhone OS") - case "$machine_arch" in + case "$kernel_machine" in "iPhone1,"[1-2]) gpu="PowerVR MBX Lite 3D" ;; "iPhone5,"[1-4]) gpu="PowerVR SGX543MP3" ;; "iPhone8,"[1-4]) gpu="PowerVR GT7600" ;; @@ -4188,10 +4181,11 @@ dynamic_prompt() { cache_uname() { # Cache the output of uname so we don't # have to spawn it multiple times. - IFS=" " read -ra uname <<< "$(uname -sr)" + IFS=" " read -ra uname <<< "$(uname -srm)" kernel_name="${uname[0]}" kernel_version="${uname[1]}" + kernel_machine="${uname[2]}" } convert_time() { From 2bb28bb67b08b2f3f8fee2a0f2087b26770ca7fa Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 31 May 2018 15:01:20 +1000 Subject: [PATCH 0415/1133] cpu: Use uname -m for portability --- neofetch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 04fe81920..a14120b36 100755 --- a/neofetch +++ b/neofetch @@ -996,8 +996,14 @@ get_distro() { [[ -z "$distro" ]] && distro="$os (Unknown)" + # Get OS architecture. + case "$os" in + "Solaris" | "AIX" | "Haiku" | "IRIX" | "FreeMiNT") machine_arch="$(uname -p)" ;; + *) machine_arch="$kernel_machine" ;; + esac + [[ "$os_arch" == "on" ]] && \ - distro+=" $HOSTTYPE" + distro+=" $machine_arch" [[ "${ascii_distro:-auto}" == "auto" ]] && \ ascii_distro="$(trim "$distro")" From 6244bbb1da67fc11128be6366435459381612edb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 31 May 2018 15:05:22 +1000 Subject: [PATCH 0416/1133] os: cleanup --- neofetch | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index a14120b36..f93c90098 100755 --- a/neofetch +++ b/neofetch @@ -782,16 +782,26 @@ get_os() { # $kernel_name is set in a function called cache_uname and is # just the output of "uname -s". case "$kernel_name" in - "Linux" | "GNU"*) os="Linux" ;; - "Darwin") os="$(sw_vers -productName)" ;; - *"BSD" | "DragonFly" | "Bitrig") os="BSD" ;; - "CYGWIN"* | "MSYS"* | "MINGW"*) os="Windows" ;; - "SunOS") os="Solaris" ;; - "Haiku") os="Haiku" ;; - "MINIX") os="MINIX" ;; - "AIX") os="AIX" ;; - "IRIX"*) os="IRIX" ;; + "Darwin") os="$(sw_vers -productName)" ;; + "SunOS") os="Solaris" ;; + "Haiku") os="Haiku" ;; + "MINIX") os="MINIX" ;; + "AIX") os="AIX" ;; + "IRIX"*) os="IRIX" ;; "FreeMiNT") os="FreeMiNT" ;; + + "Linux" | "GNU"*) + os="Linux" + ;; + + *"BSD" | "DragonFly" | "Bitrig") + os="BSD" + ;; + + "CYGWIN"* | "MSYS"* | "MINGW"*) + os="Windows" + ;; + *) printf "%s\n" "Unknown OS detected: '$kernel_name', aborting..." >&2 printf "%s\n" "Open an issue on GitHub to add support for your OS." >&2 From ea7512da2f11cdf6da40d607593f0b30d0c62e48 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 31 May 2018 15:09:48 +1000 Subject: [PATCH 0417/1133] misc: cleanup --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index f93c90098..ce1743d3b 100755 --- a/neofetch +++ b/neofetch @@ -867,7 +867,7 @@ get_distro() { # Chrome OS doesn't conform to the /etc/*-release standard. # While the file is a series of variables they can't be sourced # by the shell since the values aren't quoted. - elif [[ -f "/etc/lsb-release" && "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then + elif [[ "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then distro="$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release)" elif [[ -f "/etc/os-release" || \ @@ -882,9 +882,9 @@ get_distro() { # Format the distro name. case "$distro_shorthand" in - "on") distro="${NAME:-${DISTRIB_ID}} ${VERSION_ID:-${DISTRIB_RELEASE}}" ;; + "on") distro="${NAME:-${DISTRIB_ID}} ${VERSION_ID:-${DISTRIB_RELEASE}}" ;; "tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;; - "off") distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; + "off") distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; esac # Workarounds for distros that go against the os-release standard. @@ -1039,7 +1039,7 @@ get_model() { ;; "Mac OS X") - if [[ "$(kextstat | grep "FakeSMC")" != "" ]]; then + if [[ "$(kextstat | grep -F "FakeSMC")" != "" ]]; then model="Hackintosh (SMBIOS: $(sysctl -n hw.model))" else model="$(sysctl -n hw.model)" From 4b684c0eb644eea3489e329bcfcd543bd0f72da4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 31 May 2018 19:28:46 +1000 Subject: [PATCH 0418/1133] term_font: cleanup konsole --- neofetch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index ce1743d3b..9d9d31c69 100755 --- a/neofetch +++ b/neofetch @@ -2874,13 +2874,14 @@ END # Get Process ID of current konsole window / tab child="$(get_ppid "$$")" - konsole_instances=($(qdbus | grep 'org.kde.konsole')) + IFS=$'\n' read -d "" -ra konsole_instances < <(qdbus | grep -F 'org.kde.konsole') for i in "${konsole_instances[@]}"; do - konsole_sessions=($(qdbus "${i}" | grep '/Sessions/')) + IFS=$'\n' read -d "" -ra konsole_sessions < <(qdbus "$i" | grep -F '/Sessions/') + for session in "${konsole_sessions[@]}"; do - if ((child == "$(qdbus "${i}" "${session}" processId)")); then - profile="$(qdbus "${i}" "${session}" environment |\ + if ((child == "$(qdbus "$i" "$session" processId)")); then + profile="$(qdbus "$i" "$session" environment |\ awk -F '=' '/KONSOLE_PROFILE_NAME/ {print $2}')" break fi @@ -2889,8 +2890,9 @@ END done # We could have two profile files for the same profile name, take first match - profile_filename="$(grep -l "Name=${profile}" "${HOME}"/.local/share/konsole/*.profile)" + profile_filename="$(grep -l "Name=${profile}" "$HOME"/.local/share/konsole/*.profile)" profile_filename="${profile_filename/$'\n'*}" + [[ "$profile_filename" ]] && \ term_font="$(awk -F '=|,' '/Font=/ {print $2 " " $3}' "$profile_filename")" ;; From da97fc8a6493f552cceefd72cb4cedf71fa60334 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 31 May 2018 19:35:29 +1000 Subject: [PATCH 0419/1133] term_font: cleanup xfce4-terminal --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 9d9d31c69..7110fb6ff 100755 --- a/neofetch +++ b/neofetch @@ -3034,13 +3034,13 @@ END ;; "xfce4-terminal") - term_font="$(awk -F '=' '/^FontName/ {a=$2} /^FontUseSystem=TRUE/ {a=$0} END{print a}' \ + term_font="$(awk -F '=' '/^FontName/{a=$2}/^FontUseSystem=TRUE/{a=$0}END{print a}' \ "${XDG_CONFIG_HOME}/xfce4/terminal/terminalrc")" - if [[ "$term_font" == "FontUseSystem=TRUE" ]]; then + [[ "$term_font" == "FontUseSystem=TRUE" ]] && \ term_font="$(gsettings get org.gnome.desktop.interface monospace-font-name)" - term_font="$(trim_quotes "$term_font")" - fi + + term_font="$(trim_quotes "$term_font")" # Default fallback font hardcoded in terminal-preferences.c [[ -z "$term_font" ]] && term_font="Monospace 12" From 226f746c603c8096b17f48555a5637c458fe16e3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 31 May 2018 19:48:14 +1000 Subject: [PATCH 0420/1133] term_font: cleanup urxvt/xterm --- neofetch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 7110fb6ff..9e3680933 100755 --- a/neofetch +++ b/neofetch @@ -3010,16 +3010,15 @@ END term_font="${term_font/*"*.font:"}" term_font="$(trim "$term_font")" - if [[ -z "$term_font" && "$term" == "xterm" ]]; then + [[ -z "$term_font" && "$term" == "xterm" ]] && \ term_font="$(grep -E '^XTerm.vt100.faceName' <<< "$xrdb")" - term_font="${term_font/*"faceName:"}" - fi + + term_font="$(trim "${term_font/*"faceName:"}")" # xft: isn't required at the beginning so we prepend it if it's missing - if [[ "${term_font:0:1}" != "-" && \ - "${term_font:0:4}" != "xft:" ]]; then + [[ "${term_font:0:1}" != "-" && \ + "${term_font:0:4}" != "xft:" ]] && \ term_font="xft:$term_font" - fi # Xresources has two different font formats, this checks which # one is in use and formats it accordingly. @@ -3029,7 +3028,9 @@ END term_font="${term_font/:*}" ;; - "-"*) term_font="$(awk -F '\\-' '{printf $3}' <<< "$term_font")" ;; + "-"*) + IFS=- read -r _ _ term_font _ <<< "$term_font" + ;; esac ;; From f8779be33349cdedc5f931e9f5c4f6e98c75e833 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 1 Jun 2018 09:29:51 +1000 Subject: [PATCH 0421/1133] disk: cleanup --- neofetch | 29 ++++++++++++++++++++--------- 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 9e3680933..4fda7dbcb 100755 --- a/neofetch +++ b/neofetch @@ -3053,15 +3053,17 @@ get_disk() { type -p df >/dev/null 2>&1 ||\ { err "Disk requires 'df' to function. Install 'df' to get disk info."; return; } - # Get "df" version. df_version="$(df --version 2>&1)" + case "$df_version" in + *"IMitv"*) df_flags=(-P -g) ;; # AIX + *"befhikm"*) df_flags=(-P -k) ;; # IRIX + *"Tracker"*) # Haiku err "Your version of df cannot be used due to the non-standard flags" return ;; - *"IMitv"*) df_flags=(-P -g) ;; # AIX - *"befhikm"*) df_flags=(-P -k) ;; # IRIX + *) df_flags=(-P -h) ;; esac @@ -3071,10 +3073,10 @@ get_disk() { unset "disks[0]" # Stop here if 'df' fails to print disk info. - if [[ -z "${disks[*]}" ]]; then + [[ -z "${disks[*]}" ]] && { err "Disk: df failed to print the disks, make sure the disk_show array is set properly." return - fi + } for disk in "${disks[@]}"; do # Create a second array and make each element split at whitespace this time. @@ -3085,17 +3087,26 @@ get_disk() { *"befhikm"*) disk="$((disk_info[2]/1024/1024))G / $((disk_info[1]/1024/1024))G (${disk_perc}%)" ;; - *) disk="${disk_info[2]/i} / ${disk_info[1]/i} (${disk_perc}%)" ;; + + *) + disk="${disk_info[2]/i} / ${disk_info[1]/i} (${disk_perc}%)" + ;; esac # Subtitle. case "$disk_subtitle" in - "name") disk_sub="${disk_info[0]}" ;; + "name") + disk_sub="${disk_info[0]}" + ;; + "dir") disk_sub="${disk_info[5]/*\/}" - [[ -z "$disk_sub" ]] && disk_sub="${disk_info[5]}" + disk_sub="${disk_sub:-${disk_info[5]}}" + ;; + + *) + disk_sub="${disk_info[5]}" ;; - *) disk_sub="${disk_info[5]}" ;; esac # Bar. From f7001b142a9dbd1bd32425692f840a6b00534a20 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 1 Jun 2018 09:34:26 +1000 Subject: [PATCH 0422/1133] OS: Added support for PureOS --- neofetch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/neofetch b/neofetch index 4fda7dbcb..937aa1685 100755 --- a/neofetch +++ b/neofetch @@ -7357,6 +7357,24 @@ ${c1} `-/osyyyysosyhhhhhyys+- EOF ;; + "PureOS"*) + set_colors 2 7 7 + read -rd '' ascii_data <<'EOF' +${c1}dmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmd +dNm//////////////////////////////////mNd +dNd dNd +dNd dNd +dNd dNd +dNd dNd +dNd dNd +dNd dNd +dNd dNd +dNd dNd +dNm//////////////////////////////////mNd +dmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmd +EOF + ;; + "Qubes"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' From f143ed5991b52206d404187a05a4f1f227e46221 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 1 Jun 2018 09:54:46 +1000 Subject: [PATCH 0423/1133] OS: Added support for Kibojoe Linux --- neofetch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/neofetch b/neofetch index 937aa1685..ae49d6c68 100755 --- a/neofetch +++ b/neofetch @@ -6279,6 +6279,25 @@ ${c1} `..---+/---..` EOF ;; + "Kibojoe"*) + set_colors 2 7 4 + read -rd '' ascii_data <<'EOF' + ${c3} ./+oooooo+/. + -/+ooooo+/:.` + ${c1}`${c3}yyyo${c2}+++/++${c3}osss${c1}. + ${c1}+NMN${c3}yssssssssssss${c1}. + ${c1}.dMMMMN${c3}sssssssssssy${c1}Ns` + +MMMMMMMm${c3}sssssssssssh${c1}MNo` + `hMMMMMNNNMd${c3}sssssssssssd${c1}MMN/ + .${c3}syyyssssssy${c1}NNmmmmd${c3}sssss${c1}hMMMMd: + -NMmh${c3}yssssssssyhhhhyssyh${c1}mMMMMMMMy` + -NMMMMMNN${c3}mdhyyyyyyyhdm${c1}NMMMMMMMMMMMN+ +`NMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMd. +ods+/:-----://+oyydmNMMMMMMMMMMMMMMMMMN- +` .-:+osyhhdmmNNNmdo +EOF + ;; + "Kogaion"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From d7e04822d3b7d0e31fa15365c85b01d798e2509f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 1 Jun 2018 10:04:04 +1000 Subject: [PATCH 0424/1133] OS: Added support for SharkLinux --- neofetch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/neofetch b/neofetch index ae49d6c68..1a35e80c0 100755 --- a/neofetch +++ b/neofetch @@ -7685,6 +7685,27 @@ M- ,=;;;#:, ,:#;;:=, ,@ EOF ;; + "SharkLinux"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} `:shd/ + `:yNMMMMs + `-smMMMMMMN. + .+dNMMMMMMMMs + .smNNMMMMMMMMm` + .sNNNNNNNMMMMMM/ + `omNNNNNNNMMMMMMm + /dNNNNNNNNMMMMMMM+ + .yNNNNNNNNNMMMMMMMN` + +mNNNNNNNNNMMMMMMMMh + .hNNNNNNNNNNMMMMMMMMMs + +mMNNNNNNNNMMMMMMMMMMMs + .hNMMNNNNMMMMMMMMMMMMMMMd + .oNNNNNNNNNNMMMMMMMMMMMMMMMo + `:+syyssoo++++ooooossssssssssso: +EOF + ;; + "Siduction"*) set_colors 4 4 read -rd '' ascii_data <<'EOF' From 5cac0a8dc196058ca90a56f4ddd9ff8cd456152c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 1 Jun 2018 10:16:35 +1000 Subject: [PATCH 0425/1133] OS: Added support for Linux Lite --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 1a35e80c0..8e5c99b27 100755 --- a/neofetch +++ b/neofetch @@ -6422,6 +6422,32 @@ ${c3} #####${c2}#######${c3}##### EOF ;; + "Linux Lite"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} ,xXc + .l0MMMMMO + .kNMMMMMWMMMN, + KMMMMMMKMMMMMMo + 'MMMMMMNKMMMMMM: + kMMMMMMOMMMMMMO + .MMMMMMX0MMMMMW. + oMMMMMMxWMMMMM: + WMMMMMNkMMMMMO +:MMMMMMOXMMMMW +.0MMMMMxMMMMM; +:;cKMMWxMMMMO +'MMWMMXOMMMMl + kMMMMKOMMMMMX: + .WMMMMKOWMMM0c + lMMMMMWO0MNd:' + oollXMKXoxl;. + ':. .: .' + .. + . +EOF + ;; + "LMDE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' From ffe94c26ee4b21f3439a2442d91cf699d285642c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 1 Jun 2018 10:53:28 +1000 Subject: [PATCH 0426/1133] misc: cleanup --- neofetch | 51 +++++++++++++++++++++------------------------------ 1 file changed, 21 insertions(+), 30 deletions(-) diff --git a/neofetch b/neofetch index 8e5c99b27..4fd07493d 100755 --- a/neofetch +++ b/neofetch @@ -3389,12 +3389,8 @@ get_cols() { # IMAGES image_backend() { - if [[ ! "$image_backend" =~ ^(off|ascii)$ ]]; then - if ! type -p convert >/dev/null 2>&1; then - image_backend="ascii" - err "Image: Imagemagick not found, falling back to ascii mode." - fi - fi + [[ "$image_backend" != "off" ]] && ! type -p convert >/dev/null 2>&1 && \ + { image_backend="ascii"; err "Image: Imagemagick not found, falling back to ascii mode."; } case "${image_backend:-off}" in "ascii") get_ascii ;; @@ -3404,26 +3400,22 @@ image_backend() { "tycat" | "w3m" | "sixel" | "pixterm" | "kitty") get_image_source - if [[ ! -f "$image" ]]; then + [[ ! -f "$image" ]] && { to_ascii "Image: '$image_source' doesn't exist, falling back to ascii mode." return - fi + } get_term_size - if [[ "$term_width" ]] && ((term_width >= 1)); then - printf "\e[2J\e[H" - else + ((term_width < 1)) && { to_ascii "Image: Failed to find terminal window size." err "Image: Check the 'Images in the terminal' wiki page for more info," return - fi + } + printf '\e[2J\e[H' get_image_size make_thumbnail - - [[ "$image_backend" == *"w3m"* ]] && zws="\xE2\x80\x8B\x20" - display_image ;; @@ -3514,17 +3506,14 @@ END "Windows") case "$distro" in "Windows XP") - case "$kernel_name" in - "CYGWIN"*) image="/cygdrive/c/Documents and Settings/${USER}" ;; - "MSYS2"* | "MINGW*") image="/c/Documents and Settings/${USER}" ;; - esac - image+="/Local Settings/Application Data/Microsoft" - image+="/Wallpaper1.bmp" + image="/c/Documents and Settings/${USER}" + image+="/Local Settings/Application Data/Microsoft/Wallpaper1.bmp" + + [[ "$kernel_name" == *CYGWIN* ]] && image="/cygdrive${image}" ;; "Windows"*) - image="$APPDATA/Microsoft/Windows/Themes" - image+="/TranscodedWallpaper.jpg" + image="${APPDATA}/Microsoft/Windows/Themes/TranscodedWallpaper.jpg" ;; esac ;; @@ -3533,13 +3522,14 @@ END # Get DE if user has disabled the function. ((de_run != 1)) && get_de - if type -p wal >/dev/null && [[ -f "${HOME}/.cache/wal/wal" ]]; then - image="$(< "${HOME}/.cache/wal/wal")" - return - fi + type -p wal >/dev/null && [[ -f "${HOME}/.cache/wal/wal" ]] && \ + { image="$(< "${HOME}/.cache/wal/wal")"; return; } case "$de" in - "MATE"*) image="$(gsettings get org.mate.background picture-filename)" ;; + "MATE"*) + image="$(gsettings get org.mate.background picture-filename)" + ;; + "Xfce"*) image="$(xfconf-query -c xfce4-desktop -p \ "/backdrop/screen0/monitor0/workspace0/last-image")" @@ -3843,6 +3833,7 @@ display_image() { "w3m") get_w3m_img_path + zws='\xE2\x80\x8B\x20' # Add a tiny delay to fix issues with images not # appearing in specific terminal emulators. @@ -3964,12 +3955,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 } From ae7271578afacd7964ff7b610dccd75c5190d68a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 1 Jun 2018 12:34:28 +1000 Subject: [PATCH 0427/1133] image: Performance improvements --- neofetch | 88 ++++++++++++++++++++++++++++++-------------------------- 1 file changed, 48 insertions(+), 40 deletions(-) diff --git a/neofetch b/neofetch index 4fd07493d..5a1da023e 100755 --- a/neofetch +++ b/neofetch @@ -3594,22 +3594,20 @@ get_term_size() { # Tmux has a special way of reading escape sequences # 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\\" - read_flags=(-d c) - - elif [[ "$image_backend" == "tycat" ]]; then - printf "%b" "\e}qs\000" + if [[ "$image_backend" == "tycat" ]]; then + printf '%b' '\e}qs\000' else - printf "%b" "\e[14t\e[c" - read_flags=(-d c) + case "${TMUX:-null}" in + "null") printf '%b' '\e[14t' ;; + *) printf '%b' '\ePtmux;\e\e[14t\e\\ ' ;; + esac fi # The escape codes above print the desired output as # user input so we have to use read to store the out # -put as a variable. - IFS=";" read -s -t 1 "${read_flags[@]}" -r -a term_size + IFS=';t' read -d t -t 0.05 -sra term_size # Split the string into height/width. if [[ "$image_backend" == "tycat" ]]; then @@ -3618,7 +3616,7 @@ get_term_size() { else term_height="${term_size[1]}" - term_width="${term_size[2]/t*}" + term_width="${term_size[2]}" fi [[ "$image_backend" == "kitty" ]] && \ @@ -3627,16 +3625,20 @@ get_term_size() { # Get terminal width/height if \e[14t is unsupported. if (( "${term_width:-0}" < 50 )) && [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then if type -p xdotool >/dev/null 2>&1; then - current_window="$(xdotool getactivewindow)" - source <(xdotool getwindowgeometry --shell "$current_window") - term_height="$HEIGHT" - term_width="$WIDTH" + IFS=$'\n' read -d "" -ra win < <(xdotool getactivewindow getwindowgeometry --shell %1) + term_width="${win[3]/WIDTH=}" + term_height="${win[4]/HEIGHT=}" elif type -p xwininfo >/dev/null 2>&1; then # Get the focused window's ID. - if type -p xdpyinfo >/dev/null 2>&1; then - current_window="$(xdpyinfo | grep -E -o "focus:.*0x[0-9a-f]+")" + if type -p xdo >/dev/null 2>&1; then + current_window="$(xdo id)" + + elif type -p xdpyinfo >/dev/null 2>&1; then + current_window="$(xdpyinfo | grep -F "focus:")" current_window="${current_window/*window }" + current_window="${current_window/,*}" + elif type -p xprop >/dev/null 2>&1; then current_window="$(xprop -root _NET_ACTIVE_WINDOW)" current_window="${current_window##* }" @@ -3644,10 +3646,11 @@ get_term_size() { # If the ID was found get the window size. if [[ "$current_window" ]]; then - term_size="$(xwininfo -id "$current_window" |\ - awk -F ': ' '/Width|Height/ {printf $2 " "}')" - term_width="${term_size/ *}" - term_height="${term_size/${term_width}}" + term_size="$(xwininfo -id "$current_window")" + term_width="${term_size#*Width: }" + term_width="${term_width/$'\n'*}" + term_height="${term_size/*Height: }" + term_height="${term_height/$'\n'*}" fi fi fi @@ -3693,19 +3696,20 @@ get_image_size() { done ;; - *) image_size="${image_size/px}" ;; + *) + image_size="${image_size/px}" + ;; esac width="${width:-$image_size}" height="${height:-$image_size}" - text_padding="$((width / font_width + gap + xoffset/font_width))" } make_thumbnail() { # Name the thumbnail using variables so we can # use it later. - image_name="$crop_mode-$crop_offset-$width-$height-${image##*/}" + image_name="${crop_mode}-${crop_offset}-${width}-${height}-${image##*/}" # Handle file extensions. case "${image##*.}" in @@ -3717,13 +3721,12 @@ make_thumbnail() { # Create the thumbnail dir if it doesn't exist. mkdir -p "$thumbnail_dir" - # Check to see if the thumbnail exists before we do any cropping. - if [[ ! -f "$thumbnail_dir/$image_name" ]]; then + if [[ ! -f "${thumbnail_dir}/${image_name}" ]]; then # Get image size so that we can do a better crop. - if [[ -z "$size" ]]; then + [[ -z "$size" ]] && { read -r og_width og_height <<< "$(identify -format "%w %h" "$image")" ((og_height > og_width)) && size="$og_width" || size="$og_height" - fi + } case "$crop_mode" in "fit") @@ -3737,9 +3740,9 @@ make_thumbnail() { -trim +repage \ -gravity south \ -background "$c" \ - -extent "$size"x"$size" \ - -scale "$width"x"$height" \ - "$thumbnail_dir/$image_name" + -extent "${size}x${size}" \ + -scale "${width}x${height}" \ + "${thumbnail_dir}/${image_name}" ;; "fill") @@ -3747,27 +3750,32 @@ make_thumbnail() { -background none \ "$image" \ -trim +repage \ - -scale "$width"x"$height"^ \ - -extent "$width"x"$height" \ - "$thumbnail_dir/$image_name" + -scale "${width}x${height}^" \ + -extent "${width}x${height}" \ + "${thumbnail_dir}/${image_name}" + ;; + + "none") + cp "$image" "${thumbnail_dir}/${image_name}" ;; - "none") cp "$image" "$thumbnail_dir/$image_name" ;; *) - convert \ + time convert \ -background none \ "$image" \ + -strip \ + -define "jpeg:size=100x100" \ -gravity "$crop_offset" \ - -crop "$size"x"$size"+0+0 \ - -quality 95 \ - -scale "$width"x"$height" \ - "$thumbnail_dir/$image_name" + -crop "${size}x${size}+0+0" \ + -quality 40 \ + -sample "${width}x${height}" \ + "${thumbnail_dir}/${image_name}" ;; esac fi # The final image. - image="$thumbnail_dir/$image_name" + image="${thumbnail_dir}/${image_name}" } display_image() { From 5e78bcb7befb8e9567958b3cec7553e367c788d4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 1 Jun 2018 12:47:18 +1000 Subject: [PATCH 0428/1133] misc: Shorter syntax for no output --- neofetch | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 5a1da023e..bb43c6909 100755 --- a/neofetch +++ b/neofetch @@ -2449,7 +2449,7 @@ get_song() { /string "title"/ {getline; t=$2} END{print a " \n " b " \n " t}')" ;; - *) mpc >/dev/null 2>&1 && song="$(mpc -f '%artist% \n %album% \n %title%' current)" ;; + *) mpc &>/dev/null && song="$(mpc -f '%artist% \n %album% \n %title%' current)" ;; esac [[ "$song" != *[a-z]* ]] && { unset -v song; return; } @@ -3050,7 +3050,7 @@ END } get_disk() { - type -p df >/dev/null 2>&1 ||\ + type -p df &>/dev/null ||\ { err "Disk requires 'df' to function. Install 'df' to get disk info."; return; } df_version="$(df --version 2>&1)" @@ -3389,7 +3389,7 @@ get_cols() { # IMAGES image_backend() { - [[ "$image_backend" != "off" ]] && ! type -p convert >/dev/null 2>&1 && \ + [[ "$image_backend" != "off" ]] && ! type -p convert &>/dev/null && \ { image_backend="ascii"; err "Image: Imagemagick not found, falling back to ascii mode."; } case "${image_backend:-off}" in @@ -3624,22 +3624,22 @@ get_term_size() { # Get terminal width/height if \e[14t is unsupported. if (( "${term_width:-0}" < 50 )) && [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then - if type -p xdotool >/dev/null 2>&1; then + if type -p xdotool &>/dev/null; then IFS=$'\n' read -d "" -ra win < <(xdotool getactivewindow getwindowgeometry --shell %1) term_width="${win[3]/WIDTH=}" term_height="${win[4]/HEIGHT=}" - elif type -p xwininfo >/dev/null 2>&1; then + elif type -p xwininfo &>/dev/null; then # Get the focused window's ID. - if type -p xdo >/dev/null 2>&1; then + if type -p xdo &>/dev/null; then current_window="$(xdo id)" - elif type -p xdpyinfo >/dev/null 2>&1; then + elif type -p xdpyinfo &>/dev/null; then current_window="$(xdpyinfo | grep -F "focus:")" current_window="${current_window/*window }" current_window="${current_window/,*}" - elif type -p xprop >/dev/null 2>&1; then + elif type -p xprop &>/dev/null; then current_window="$(xprop -root _NET_ACTIVE_WINDOW)" current_window="${current_window##* }" fi @@ -3847,7 +3847,7 @@ display_image() { # appearing in specific terminal emulators. sleep 0.05 printf "%b\n" "0;1;$xoffset;$yoffset;$width;$height;;;;;$image\n4;\n3;" |\ - "${w3m_img_path:-false}" -bg "$background_color" >/dev/null 2>&1 ||\ + "${w3m_img_path:-false}" -bg "$background_color" &>/dev/null ||\ to_off "Image: w3m-img failed to display the image." ;; esac @@ -4173,13 +4173,13 @@ kde_config_dir() { if [[ "$kde_config_dir" ]]; then return - elif type -p kf5-config >/dev/null 2>&1; then + elif type -p kf5-config &>/dev/null; then kde_config_dir="$(kf5-config --path config)" - elif type -p kde4-config >/dev/null 2>&1; then + elif type -p kde4-config &>/dev/null; then kde_config_dir="$(kde4-config --path config)" - elif type -p kde-config >/dev/null 2>&1; then + elif type -p kde-config &>/dev/null; then kde_config_dir="$(kde-config --path config)" elif [[ -d "${HOME}/.kde4" ]]; then From 1f7aa76c48ea74c134bf0f0d67381570de35c913 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 1 Jun 2018 12:54:31 +1000 Subject: [PATCH 0429/1133] misc: cleanup --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index bb43c6909..cf9e80cf5 100755 --- a/neofetch +++ b/neofetch @@ -4085,11 +4085,11 @@ get_full_path() { # If the file exists in the current directory, stop here. [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } - if ! cd "${1%/*}"; then + ! cd "${1%/*}" && { err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" err " Check that the directory exists or try another directory." exit 1 - fi + } local full_dir="${1##*/}" @@ -4108,11 +4108,11 @@ get_full_path() { get_user_config() { # Check $config_file. - if [[ -f "$config_file" ]]; then + [[ -f "$config_file" ]] && { source "$config_file" err "Config: Sourced user config. (${config_file})" return - fi + } mkdir -p "${XDG_CONFIG_HOME}/neofetch/" # Check ${XDG_CONFIG_HOME}/neofetch and create the From c1f0fc969991fede65dbad1cd498555c7f31099f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 1 Jun 2018 12:58:23 +1000 Subject: [PATCH 0430/1133] misc: fix some lint errors --- neofetch | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/neofetch b/neofetch index cf9e80cf5..16ef1a8bf 100755 --- a/neofetch +++ b/neofetch @@ -803,8 +803,8 @@ get_os() { ;; *) - printf "%s\n" "Unknown OS detected: '$kernel_name', aborting..." >&2 - printf "%s\n" "Open an issue on GitHub to add support for your OS." >&2 + printf '%s\n' "Unknown OS detected: '$kernel_name', aborting..." >&2 + printf '%s\n' "Open an issue on GitHub to add support for your OS." >&2 exit 1 ;; esac @@ -2366,7 +2366,7 @@ get_song() { case "${player/*\/}" in "mpd"* | "mopidy"*) song="$(mpc -f '%artist% \n %album% \n %title%' current)" ;; - "mocp"*) song="$(mocp -Q "%artist \n %album \n %song")" ;; + "mocp"*) song="$(mocp -Q '%artist \n %album \n %song')" ;; "google play"*) song="$(gpmdp-remote current)" ;; "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta \n %at \n %tt')" ;; "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% \n %album% \n %title%')" ;; @@ -3909,7 +3909,7 @@ info() { prin() { # If $2 doesn't exist we format $1 as info. if [[ "$(trim "$1")" && "$2" ]]; then - [[ "$json" ]] && { printf " %s\n" "\"${1}\": \"${2}\","; return; } + [[ "$json" ]] && { printf ' %s\n' "\"${1}\": \"${2}\","; return; } string="${1}${2:+: $2}" else @@ -3977,7 +3977,7 @@ trim() { set -f # shellcheck disable=2048,2086 set -- $* - printf "%s\\n" "${*//[[:space:]]/ }" + printf '%s\n' "${*//[[:space:]]/ }" set +f } @@ -3993,7 +3993,7 @@ strip_sequences() { 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" + printf '%s\n' "$strip" } # COLORS @@ -4083,7 +4083,7 @@ get_full_path() { # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" # If the file exists in the current directory, stop here. - [[ -f "${PWD}/${1/*\/}" ]] && { printf "%s\n" "${PWD}/${1/*\/}"; return; } + [[ -f "${PWD}/${1/*\/}" ]] && { printf '%s\n' "${PWD}/${1/*\/}"; return; } ! cd "${1%/*}" && { err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" @@ -4103,7 +4103,7 @@ get_full_path() { # Final directory. full_dir="$(pwd -P)/${1/*\/}" - [[ -e "$full_dir" ]] && printf "%s\n" "$full_dir" + [[ -e "$full_dir" ]] && printf '%s\n' "$full_dir" } get_user_config() { @@ -4127,7 +4127,7 @@ get_user_config() { config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" # The config file doesn't exist, create it. - printf "%s\n" "$config" > "$config_file" + printf '%s\n' "$config" > "$config_file" fi source "$config_file" @@ -4702,11 +4702,11 @@ get_args() { ;; "--stdout") stdout="on" ;; "-v") verbose="on" ;; - "--print_config") printf "%s\\n" "$config"; exit ;; + "--print_config") printf '%s\n' "$config"; exit ;; "-vv") set -x; verbose="on" ;; "--help") usage ;; "--version") - printf "%s\\n" "Neofetch $version" + printf '%s\n' "Neofetch $version" exit 1 ;; "--gen-man") @@ -4719,10 +4719,10 @@ get_args() { json="on" unset -f get_title get_cols get_line_break get_underline - printf "{\n" + printf '{\n' print_info 2>/dev/null - printf " %s\n" "\"Version\": \"${version}\"" - printf "}\n" + printf ' %s\n' "\"Version\": \"${version}\"" + printf '}\n' exit ;; From bd5706ca0e574e7cd92c2367b9ff96a3c2c9237e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 1 Jun 2018 13:03:53 +1000 Subject: [PATCH 0431/1133] misc: remove unused var --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 16ef1a8bf..f9b0cd85f 100755 --- a/neofetch +++ b/neofetch @@ -32,7 +32,7 @@ bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/.config}" PATH="/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec:${PATH}" -reset="\e[0m" +reset='\e[0m' shopt -s nocasematch # Speed up script by not using unicode. @@ -1727,7 +1727,7 @@ get_wm_theme() { path="$(wmic process get ExecutablePath | grep -F "blackbox")" path="${path//\\/\/}" - wm_theme="$(grep "^session\.styleFile:" "${path/\.exe/.rc}")" + wm_theme="$(grep '^session\.styleFile:' "${path/\.exe/.rc}")" wm_theme="${wm_theme/'session.styleFile: '}" wm_theme="${wm_theme##*\\}" wm_theme="${wm_theme%.*}" @@ -2790,7 +2790,7 @@ END # dow" though, but that does not match to a guid in the plist. # So, be warned, collisions may occur! # See: https://groups.google.com/forum/#!topic/iterm2-discuss/0tO3xZ4Zlwg - local current_profile_name profiles_count profile_name diff_font none_ascii + local current_profile_name profiles_count profile_name diff_font current_profile_name="$(osascript < Date: Fri, 1 Jun 2018 13:22:31 +1000 Subject: [PATCH 0432/1133] misc: cleanup --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index f9b0cd85f..ae8fd6de7 100755 --- a/neofetch +++ b/neofetch @@ -3004,14 +3004,14 @@ END "urxvt" | "urxvtd" | "rxvt-unicode" | "xterm") xrdb="$(xrdb -query)" - term_font="$(grep -i "${term/d}\**\.*font" <<< "$xrdb")" + term_font="$(grep -i "${term/d}"'\**\.*font' <<< "$xrdb")" term_font="${term_font/*"*font:"}" term_font="${term_font/*".font:"}" term_font="${term_font/*"*.font:"}" term_font="$(trim "$term_font")" [[ -z "$term_font" && "$term" == "xterm" ]] && \ - term_font="$(grep -E '^XTerm.vt100.faceName' <<< "$xrdb")" + term_font="$(grep '^XTerm.vt100.faceName' <<< "$xrdb")" term_font="$(trim "${term_font/*"faceName:"}")" From aab70da27c097389c6df92a99525100b27655877 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 1 Jun 2018 14:02:12 +0200 Subject: [PATCH 0433/1133] song: add gmusicbrowser --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index ae8fd6de7..5b51aeef1 100755 --- a/neofetch +++ b/neofetch @@ -410,6 +410,7 @@ disk_subtitle="mount" # elisa # exaile # gnome-music +# gmusicbrowser # Google Play # guayadeque # iTunes @@ -2324,6 +2325,7 @@ get_song() { "elise" "exaile" "gnome-music" + "gmusicbrowser" "Google Play" "guayadeque" "iTunes" @@ -2385,6 +2387,7 @@ get_song() { "sayonara"*) get_song_dbus "sayonara" ;; "audacious"*) get_song_dbus "audacious" ;; "vlc"*) get_song_dbus "vlc" ;; + "gmusicbrowser"*) get_song_dbus "gmusicbrowser" ;; "cmus"*) song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; From 840d4afbb1dc35f5dcda8395b8bcdec504c39cee Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 1 Jun 2018 14:10:11 +0200 Subject: [PATCH 0434/1133] misc: align some lines --- neofetch | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/neofetch b/neofetch index 5b51aeef1..53cb4c08e 100755 --- a/neofetch +++ b/neofetch @@ -2368,25 +2368,25 @@ get_song() { case "${player/*\/}" in "mpd"* | "mopidy"*) song="$(mpc -f '%artist% \n %album% \n %title%' current)" ;; - "mocp"*) song="$(mocp -Q '%artist \n %album \n %song')" ;; - "google play"*) song="$(gpmdp-remote current)" ;; - "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta \n %at \n %tt')" ;; - "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% \n %album% \n %title%')" ;; - "xmms2d"*) song="$(xmms2 current -f '${artist} \n ${album} \n ${title}')" ;; - "qmmp"*) song="$(qmmp --nowplaying '%p \n %a \n %t')" ;; - "gnome-music"*) get_song_dbus "GnomeMusic" ;; - "lollypop"*) get_song_dbus "Lollypop" ;; - "clementine"*) get_song_dbus "clementine" ;; - "juk"*) get_song_dbus "juk" ;; - "bluemindo"*) get_song_dbus "Bluemindo" ;; - "guayadeque"*) get_song_dbus "guayadeque" ;; - "yarock"*) get_song_dbus "yarock" ;; - "deepin-music"*) get_song_dbus "DeepinMusic" ;; - "tomahawk"*) get_song_dbus "tomahawk" ;; - "elisa"*) get_song_dbus "elisa" ;; - "sayonara"*) get_song_dbus "sayonara" ;; - "audacious"*) get_song_dbus "audacious" ;; - "vlc"*) get_song_dbus "vlc" ;; + "mocp"*) song="$(mocp -Q '%artist \n %album \n %song')" ;; + "google play"*) song="$(gpmdp-remote current)" ;; + "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta \n %at \n %tt')" ;; + "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% \n %album% \n %title%')" ;; + "xmms2d"*) song="$(xmms2 current -f '${artist} \n ${album} \n ${title}')" ;; + "qmmp"*) song="$(qmmp --nowplaying '%p \n %a \n %t')" ;; + "gnome-music"*) get_song_dbus "GnomeMusic" ;; + "lollypop"*) get_song_dbus "Lollypop" ;; + "clementine"*) get_song_dbus "clementine" ;; + "juk"*) get_song_dbus "juk" ;; + "bluemindo"*) get_song_dbus "Bluemindo" ;; + "guayadeque"*) get_song_dbus "guayadeque" ;; + "yarock"*) get_song_dbus "yarock" ;; + "deepin-music"*) get_song_dbus "DeepinMusic" ;; + "tomahawk"*) get_song_dbus "tomahawk" ;; + "elisa"*) get_song_dbus "elisa" ;; + "sayonara"*) get_song_dbus "sayonara" ;; + "audacious"*) get_song_dbus "audacious" ;; + "vlc"*) get_song_dbus "vlc" ;; "gmusicbrowser"*) get_song_dbus "gmusicbrowser" ;; "cmus"*) From 96386dc90ecc1e00305269bffd49b2fd65cb581d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 09:52:49 +1000 Subject: [PATCH 0435/1133] cols: Fix lint errors. --- neofetch | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index ae8fd6de7..da1cf02a2 100755 --- a/neofetch +++ b/neofetch @@ -3345,16 +3345,18 @@ get_cols() { # Convert the width to space chars. printf -v block_width "%${block_width}s" - # Set variables. - start="${block_range[0]}" - end="${block_range[1]}" - # 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}" ;; + for ((block_range[0]; block_range[0]<=block_range[1]; block_range[0]++)); do + case "${block_range[0]}" in + [0-7]) + printf -v blocks '%b\e[3%bm\e[4%bm%b' \ + "$blocks" "${block_range[0]}" "${block_range[0]}" "$block_width" + ;; + + *) + printf -v blocks2 '%b\e[38;5;%bm\e[48;5;%bm%b' \ + "$blocks2" "${block_range[0]}" "${block_range[0]}" "$block_width" + ;; esac done @@ -3372,7 +3374,7 @@ get_cols() { # Add block height to info height. ((info_height+=block_height-1)) - printf "%b" "\e[${text_padding}C${zws}${cols}" + printf '\e[%bC%b' "$text_padding" "${zws}${cols}" fi unset -v blocks blocks2 cols From c1cde629c44c7c1876a069d9e8f51d20ceb86e9a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 10:07:04 +1000 Subject: [PATCH 0436/1133] resolution: Fix lint error. --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 98565843e..bcc4db882 100755 --- a/neofetch +++ b/neofetch @@ -2529,8 +2529,8 @@ get_resolution() { case "$refresh_rate" in "on") resolution="$(xrandr --nograb --current |\ - awk 'match($0,/[0-9]*\.[0-9]*\*/) {printf $1 " @ "\ - substr($0,RSTART,RLENGTH) "Hz, "}')" + awk 'match($0,/[0-9]*\.[0-9]*\*/) { + printf $1 " @ " substr($0,RSTART,RLENGTH) "Hz, "}')" ;; "off") From 6ea186d9878c3a0c9e8f23370ee8ddc052f7c9ca Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 12:08:08 +1000 Subject: [PATCH 0437/1133] misc: Fix lint errors. --- neofetch | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/neofetch b/neofetch index bcc4db882..b53246f9d 100755 --- a/neofetch +++ b/neofetch @@ -3384,8 +3384,7 @@ get_cols() { # TosWin2 on FreeMiNT is terrible at this, # so we'll reset colors arbitrarily. - [[ "$term" == "TosWin2" ]] && \ - printf "%b" "\e[30;47m" + [[ "$term" == "TosWin2" ]] && printf '\e[30;47m' # Tell info() that we printed manually. prin=1 @@ -3434,7 +3433,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 '\e[%sA\e[9999999D' "${lines:-0}" } get_ascii() { @@ -3449,8 +3448,8 @@ get_ascii() { # Turn file into variable. while IFS=$'\n' read -r line; do - print+="$line \n" - + print+="$line +" # Calculate size of ascii file in line length / line count. line="${line//[??;?;??m}" line="${line//[??;?;???m}" @@ -3831,12 +3830,14 @@ display_image() { "iterm2") image="$(base64 < "$image")" - iterm_cmd="\e]1337;File=width=${width}px;height=${height}px;inline=1:${image}" + + printf -v iterm_cmd '\e]1337;File=width=%spx;height=%spx;inline=1:%s' \ + "$width" "$height" "$image" # Tmux requires an additional escape sequence for this to work. - [[ -n "$TMUX" ]] && iterm_cmd="\ePtmux;\e${iterm_cmd}\e\\" + [[ -n "$TMUX" ]] && printf -v iterm_cmd '\ePtmux;\e%b\e'\\ "$iterm_cmd" - printf "%b\a\n" "$iterm_cmd" + printf '%b\a\n' "$iterm_cmd" ;; "tycat") @@ -3851,7 +3852,7 @@ display_image() { # Add a tiny delay to fix issues with images not # appearing in specific terminal emulators. sleep 0.05 - printf "%b\n" "0;1;$xoffset;$yoffset;$width;$height;;;;;$image\n4;\n3;" |\ + printf '%b\n%s;\n%s\n' "0;1;$xoffset;$yoffset;$width;$height;;;;;$image" 3 4 |\ "${w3m_img_path:-false}" -bg "$background_color" &>/dev/null ||\ to_off "Image: w3m-img failed to display the image." ;; @@ -3869,7 +3870,7 @@ to_ascii() { get_ascii # Set cursor position next image/ascii. - printf "%b" "\e[${lines:-0}A\e[9999999D" + printf '\e[%sA\e[9999999D' "${lines:-0}" } to_off() { @@ -3934,7 +3935,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)) @@ -3946,7 +3947,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 @@ -3957,7 +3958,7 @@ get_underline() { get_line_break() { # Print it directly. - printf "%b\n" "${zws}" + printf '%b\n' "$zws" # Calculate info height. ((++info_height)) @@ -3968,12 +3969,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 } @@ -4055,9 +4056,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\e[3%sm' "$reset" "$1" ;; + 7 | "fg") printf '\e[37m%b' "$reset" ;; + *) printf '\e[38;5;%bm' "$1" ;; esac } @@ -4080,7 +4081,8 @@ stdout() { } err() { - err+="$(color 1)[!]\e[0m $1\n" + err+="$(color 1)[!]${reset} $1 +" } get_full_path() { @@ -4198,7 +4200,7 @@ kde_config_dir() { } dynamic_prompt() { - [[ "$image_backend" == "off" ]] && { printf "\n"; return; } + [[ "$image_backend" == "off" ]] && { printf '\n'; return; } [[ "$image_backend" != "ascii" ]] && lines="$(((height + yoffset) / font_height + 1))" # If the ascii art is taller than the info. @@ -8512,7 +8514,7 @@ main() { 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 37bb79460239367e14cecf01f65b76e9ab917c89 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 12:28:10 +1000 Subject: [PATCH 0438/1133] misc: fix awk lint errors --- neofetch | 90 +++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 66 insertions(+), 24 deletions(-) diff --git a/neofetch b/neofetch index b53246f9d..ba130d9f6 100755 --- a/neofetch +++ b/neofetch @@ -1682,15 +1682,25 @@ get_wm_theme() { kdebugrc="${kde_config_dir}/kdebugrc" if [[ -f "$kwinrc" ]]; then - wm_theme="$(awk '/theme=/{gsub(/theme=.*qml_|theme=.*svg__/,"",$0);\ - print $0; exit}' "$kwinrc")" + wm_theme="$(awk '/theme=/ { + gsub(/theme=.*qml_|theme=.*svg__/,"",$0); + print $0; + exit + }' "$kwinrc")" [[ -z "$wm_theme" ]] && \ - wm_theme="$(awk '/library=org.kde/{gsub(/library=org.kde./,"",$0);\ - print $0; exit}' "$kwinrc")" + wm_theme="$(awk '/library=org.kde/ { + gsub(/library=org.kde./,"",$0); + print $0; + exit + }' "$kwinrc")" + [[ -z "$wm_theme" ]] && \ - wm_theme="$(awk '/PluginLib=kwin3_/{gsub(/PluginLib=kwin3_/,"",$0);\ - print $0; exit}' "$kwinrc")" + wm_theme="$(awk '/PluginLib=kwin3_/ { + gsub(/PluginLib=kwin3_/,"",$0); + print $0; + exit + }' "$kwinrc")" elif [[ -f "$kdebugrc" ]]; then wm_theme="$(awk '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$kdebugrc")" @@ -1764,8 +1774,10 @@ get_cpu() { ;; *) - cpu="$(awk -F ': | @' '/model name|Processor|^cpu model|chip type|^cpu type/\ - {printf $2; exit}' "$cpu_file")" + cpu="$(awk -F ': | @' '/model name|Processor|^cpu model|chip type|^cpu type/ { + printf $2; + exit + }' "$cpu_file")" [[ "$cpu" == *"processor rev"* ]] && \ cpu="$(awk -F':' '/Hardware/ {print $2; exit}' "$cpu_file")" @@ -2391,9 +2403,15 @@ get_song() { "cmus"*) song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; - /tag artist/ {$1=$2=""; sub(" ", ""); a=$0}\ - /tag album / {$1=$2=""; sub(" ", ""); b=$0}\ - /tag title/ {$1=$2=""; sub(" ", ""); t=$0}\ + /tag artist/ { + $1=$2=""; sub(" ", ""); a=$0 + } + /tag album / { + $1=$2=""; sub(" ", ""); b=$0 + } + /tag title/ { + $1=$2=""; sub(" ", ""); t=$0 + } END { print a " \n " b " \n " t }')" ;; @@ -2448,8 +2466,19 @@ get_song() { "pogo"*) song="$(dbus-send --print-reply --dest=org.mpris.pogo /Player \ org.freedesktop.MediaPlayer.GetMetadata | - awk -F'"' '/string "artist"/ {getline; a=$2} /string "album"/ {getline; b=$2} \ - /string "title"/ {getline; t=$2} END{print a " \n " b " \n " t}')" + awk -F'"' '/string "artist"/ { + getline; + a=$2 + } + /string "album"/ { + getline; + b=$2 + } + /string "title"/ { + getline; + t=$2 + } + END{print a " \n " b " \n " t}')" ;; *) mpc &>/dev/null && song="$(mpc -f '%artist% \n %album% \n %title%' current)" ;; @@ -2865,12 +2894,15 @@ END fi - term_font="$(awk '/^([[:space:]]*|[^#_])font_family[[:space:]]+/ \ - { $1 = ""; gsub(/^[[:space:]]/, ""); font = $0 } \ - /^([[:space:]]*|[^#_])font_size[[:space:]]+/ \ - { size = $2 } \ - END { print font " " size}' \ - "${kitty_file}")" + term_font="$(awk '/^([[:space:]]*|[^#_])font_family[[:space:]]+/ { + $1 = ""; + gsub(/^[[:space:]]/, ""); + font = $0 + } + /^([[:space:]]*|[^#_])font_size[[:space:]]+/ { + size = $2 + } + END { print font " " size}' "${kitty_file}")" ;; "konsole"*) @@ -2919,9 +2951,13 @@ END role="${role//\"}" profile="$(awk -F '=' -v r="$role" \ - '$0~r {getline; if(/Maximized/) getline; \ - if(/Fullscreen/) getline; id=$2"]"} \ - $0~id {if(id) {getline; print $2; exit}}' "$mateterm_config")" + '$0~r { + getline; + if(/Maximized/) getline; + if(/Fullscreen/) getline; + id=$2"]" + } $0~id {if(id) {getline; print $2; exit}}' \ + "$mateterm_config")" rm -f "$mateterm_config" @@ -3001,8 +3037,14 @@ END [[ -f "${XDG_CONFIG_HOME}/termite/config" ]] && \ termite_config="${XDG_CONFIG_HOME}/termite/config" - term_font="$(awk -F '= ' '/\[options\]/ {opt=1} /^\s*font/ {if(opt==1) a=$2; opt=0} \ - END{print a}' "/etc/xdg/termite/config" "$termite_config")" + term_font="$(awk -F '= ' '/\[options\]/ { + opt=1 + } + /^\s*font/ { + if(opt==1) a=$2; + opt=0 + } END{print a}' "/etc/xdg/termite/config" \ + "$termite_config")" ;; "urxvt" | "urxvtd" | "rxvt-unicode" | "xterm") From eba08e3efc29db47eb0a5ccd32f5f290a31d618b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 12:40:09 +1000 Subject: [PATCH 0439/1133] misc: fix more lint errors --- neofetch | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index ba130d9f6..71f89f261 100755 --- a/neofetch +++ b/neofetch @@ -1,5 +1,6 @@ #!/usr/bin/env bash # vim: noai:ts=4:sw=4:expandtab +# shellcheck source=/dev/null # # Neofetch: A command-line system information tool written in bash 3.2+. # https://github.com/dylanaraps/neofetch @@ -40,7 +41,7 @@ LC_ALL=C LANG=C # Fix issues with gsettings. -GIO_EXTRA_MODULES="/usr/lib/x86_64-linux-gnu/gio/modules/" +export GIO_EXTRA_MODULES="/usr/lib/x86_64-linux-gnu/gio/modules/" # Neofetch default config. read -rd '' config <<'EOF' @@ -3230,7 +3231,7 @@ get_battery() { "Windows") battery="$(wmic Path Win32_Battery get EstimatedChargeRemaining)" battery="${battery/EstimatedChargeRemaining}" - batttery="$(trim "$battery")%" + battery="$(trim "$battery")%" ;; "Haiku") @@ -3765,7 +3766,7 @@ make_thumbnail() { esac # Create the thumbnail dir if it doesn't exist. - mkdir -p "$thumbnail_dir" + mkdir -p "${thumbnail_dir:=${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch}" if [[ ! -f "${thumbnail_dir}/${image_name}" ]]; then # Get image size so that we can do a better crop. @@ -4828,6 +4829,9 @@ get_args() { memory_display="infobar" disk_display="infobar" cpu_temp="C" + + # Known implicit unused variables. + printf '%s\n' "$kernel $icons $font $battery $locale" ;; esac From 55c128211ca70495e7886526769706bc5c477d7f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 12:43:48 +1000 Subject: [PATCH 0440/1133] misc: Fix more lint errors. --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 71f89f261..69a1fa5da 100755 --- a/neofetch +++ b/neofetch @@ -1,6 +1,7 @@ #!/usr/bin/env bash # vim: noai:ts=4:sw=4:expandtab # shellcheck source=/dev/null +# shellcheck disable=2016,2009 # # Neofetch: A command-line system information tool written in bash 3.2+. # https://github.com/dylanaraps/neofetch From 8d0205a56a72ab6cdfd9274df9bd3b1db3236052 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 12:58:53 +1000 Subject: [PATCH 0441/1133] misc: Fix misc style error. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 69a1fa5da..c5141917c 100755 --- a/neofetch +++ b/neofetch @@ -2958,7 +2958,7 @@ END if(/Maximized/) getline; if(/Fullscreen/) getline; id=$2"]" - } $0~id {if(id) {getline; print $2; exit}}' \ + } $0~id {if(id) {getline; print $2; exit}}' \ "$mateterm_config")" rm -f "$mateterm_config" From d02c590ff7ce1a9e15c178d243603cda6138e5d6 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sat, 2 Jun 2018 13:09:02 +1000 Subject: [PATCH 0442/1133] misc: fix most SC1117 errors from PlistBuddy --- neofetch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index c5141917c..f3b401c04 100755 --- a/neofetch +++ b/neofetch @@ -2837,25 +2837,25 @@ END font_file="${HOME}/Library/Preferences/com.googlecode.iterm2.plist" # Count Guids in "New Bookmarks"; they should be unique - profiles_count="$(PlistBuddy -c "Print :New\ Bookmarks:" "$font_file" | \ + profiles_count="$(PlistBuddy -c "Print ':New Bookmarks:'" "$font_file" | \ grep -w -c "Guid")" for ((i=0; i Date: Sat, 2 Jun 2018 13:54:17 +1000 Subject: [PATCH 0443/1133] packages: cleanup --- neofetch | 3 --- 1 file changed, 3 deletions(-) diff --git a/neofetch b/neofetch index f3b401c04..86960457a 100755 --- a/neofetch +++ b/neofetch @@ -1337,9 +1337,6 @@ get_packages() { ;; "Mac OS X" | "MINIX") - [[ -d "/usr/local/bin" ]] && \ - packages="$(($(ls -l /usr/local/bin/ | grep -cv "\(../Cellar/\|brew\)") - 1))" - type -p port >/dev/null && \ ((packages+=$(port installed | wc -l) - 1)) From 4bc2a23a463745172419374c3142875d2f373445 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 14:44:52 +1000 Subject: [PATCH 0444/1133] packages: refactor --- neofetch | 170 ++++++++++++++++++++++------------------------------- neofetch.1 | 5 +- 2 files changed, 73 insertions(+), 102 deletions(-) diff --git a/neofetch b/neofetch index 86960457a..1f291e85a 100755 --- a/neofetch +++ b/neofetch @@ -144,6 +144,21 @@ os_arch="on" uptime_shorthand="on" +# Packages + + +# Show/Hide Package Manager names. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --package_manager +# +# Example: +# on: '900 (pacman, apt)' +# off: '900' +package_manager="on" + + # Shell @@ -1249,135 +1264,86 @@ get_uptime() { } get_packages() { + pkgs() { type -p "$1" >/dev/null && { ((packages+="$2")); managers+="$_, "; }; } + case "$os" in "Linux" | "BSD" | "iPhone OS" | "Solaris") - type -p pacman-key >/dev/null && \ - packages="$(pacman -Qq --color never | wc -l)" - - type -p dpkg >/dev/null && \ - ((packages+=$(dpkg --get-selections | grep -cv deinstall$))) - - type -p pkgtool >/dev/null && \ - ((packages+=$(ls -1 /var/log/packages | wc -l))) - - type -p rpm >/dev/null && \ - ((packages+=$(rpm -qa | wc -l))) - - type -p xbps-query >/dev/null && \ - ((packages+=$(xbps-query -l | wc -l))) - - [[ "$os" != "Linux" ]] && type -p pkginfo >/dev/null && \ - ((packages+=$(pkginfo -i | wc -l))) - - type -p emerge >/dev/null && \ - ((packages+=$(ls -d /var/db/pkg/*/* | wc -l))) - - type -p nix-env >/dev/null && \ - ((packages+=$(ls -d -1 /nix/store/*/ | wc -l))) - - type -p guix >/dev/null && \ - ((packages+=$(ls -d -1 /gnu/store/*/ | wc -l))) - - type -p apk >/dev/null && \ - ((packages+=$(apk info | wc -l))) - - type -p opkg >/dev/null && \ - ((packages+=$(opkg list-installed | wc -l))) - - type -p pacman-g2 >/dev/null && \ - ((packages+=$(pacman-g2 -Q | wc -l))) - - type -p lvu >/dev/null && \ - ((packages+=$(lvu installed | wc -l))) - - type -p tce-status >/dev/null && \ - ((packages+=$(tce-status -i | wc -l))) - - type -p Compile >/dev/null && \ - ((packages+=$(ls -d -1 /Programs/*/ | wc -l))) - - type -p eopkg >/dev/null && \ - ((packages+=$(ls -1 /var/lib/eopkg/package | wc -l))) + pkgs "pacman-key" "$(pacman -Qq --color never | wc -l)" + pkgs "dpkg" "$(dpkg --get-selections | grep -cv deinstall$)" + pkgs "rpm" "$(rpm -qa | wc -l)" + pkgs "xbps-query" "$(xbps-query -l | wc -l)" + pkgs "apk" "$(apk info | wc -l)" + pkgs "opkg" "$(opkg list-installed | wc -l)" + pkgs "pacman-g2" "$(pacman-g2 -Q | wc -l)" + pkgs "lvu" "$(lvu installed | wc -l)" + pkgs "tce-status" "$(tce-status -i | wc -l)" + pkgs "pkg_info" "$(pkg_info | wc -l)" + pkgs "tazpkg" "$(tazpkg list | wc -l) - 6" + pkgs "sorcery" "$(gaze installed | wc -l)" + pkgs "alps" "$(alps showinstalled | wc -l)" + pkgs "butch" "$(butch list | wc -l)" + pkgs "kpm-pkg" "$(kpm --get-selections | grep -cv deinstall$)" + pkgs "emerge" "$(ls -d /var/db/pkg/*/* | wc -l)" + pkgs "nix-env" "$(ls -d -1 /nix/store/*/ | wc -l)" + pkgs "guix" "$(ls -d -1 /gnu/store/*/ | wc -l)" + pkgs "Compile" "$(ls -d -1 /Programs/*/ | wc -l)" + pkgs "eopkg" "$(ls -1 /var/lib/eopkg/package | wc -l)" + pkgs "crew" "$(ls -l /usr/local/etc/crew/meta/*.filelist | wc -l)" + pkgs "pkgtool" "$(ls -1 /var/log/packages | wc -l)" + pkgs "cave" "$(ls -d -1 /var/db/paludis/repositories/cross-installed/*/data/* \ + /var/db/paludis/repositories/installed/data/* | wc -l)" - type -p pkg_info >/dev/null && \ - ((packages+=$(pkg_info | wc -l))) - - type -p crew >/dev/null && \ - ((packages+=$(ls -l /usr/local/etc/crew/meta/*.filelist | wc -l))) - - type -p tazpkg >/dev/null && \ - ((packages+=$(tazpkg list | wc -l) - 6)) - - type -p sorcery >/dev/null && \ - ((packages+=$(gaze installed | wc -l))) - - type -p alps >/dev/null && \ - ((packages+=$(alps showinstalled | wc -l))) - - type -p kpt >/dev/null && \ - type -p kpm >/dev/null && \ - ((packages+=$(kpm --get-selections | grep -cv deinstall$))) - - if type -p cave >/dev/null; then - package_dir=(/var/db/paludis/repositories/{cross-installed/*,installed}/data/*) - ((packages+=$(ls -d -1 "${package_dir[@]}" | wc -l))) - fi + case "$kernel_name" in + "FreeBSD") pkgs "pkg" "$(pkg info | wc -l)" ;; + "Solaris") pkgs "pkginfo" "$(pkginfo -i | wc -l)" ;; - type -p butch >/dev/null && \ - ((packages+=$(butch list | wc -l))) + *) + pkgs "pkg" "$(ls -1 /var/db/pkg | wc -l)" - if type -p pkg >/dev/null; then - case "$kernel_name" in - "FreeBSD") ((packages+=$(pkg info | wc -l))) ;; - *) - ((packages+=$(ls -1 /var/db/pkg | wc -l))) - ((packages == 0)) && ((packages+=$(pkg list | wc -l))) - esac - fi + ((packages == 0)) && \ + pkgs "pkg" "$(pkg list | wc -l)" + ;; + esac ;; "Mac OS X" | "MINIX") - type -p port >/dev/null && \ - ((packages+=$(port installed | wc -l) - 1)) - - type -p brew >/dev/null && \ - ((packages+=$(find /usr/local/Cellar -maxdepth 1 | wc -l) - 1)) + pkgs "port" "$(port installed | wc -l) - 1)" + pkgs "brew" "$(find /usr/local/Cellar -maxdepth 1 | wc -l) - 1)" + pkgs "pkgin" "$(pkgin list | wc -l)" + ;; - type -p pkgin >/dev/null && \ - ((packages+=$(pkgin list | wc -l))) + "AIX"| "FreeMiNT") + pkgs "lslpp" "$(lslpp -J -l -q | grep -cv '^#')" + pkgs "rpm" "$(rpm -qa | wc -l)" ;; "Windows") case "$kernel_name" in - "CYGWIN"*) packages="$(cygcheck -cd | wc -l)" ;; - "MSYS"*) packages="$(pacman -Qq --color never | wc -l)" + "CYGWIN"*) pkgs "cygcheck" "$(cygcheck -cd | wc -l)" ;; + "MSYS"*) pkgs "pacman" "$(pacman -Qq --color never | wc -l)" ;; esac # Count chocolatey packages. [[ -d "/cygdrive/c/ProgramData/chocolatey/lib" ]] && \ - ((packages+=$(ls -1 /cygdrive/c/ProgramData/chocolatey/lib | wc -l))) + pkgs ":" "$(ls -1 /cygdrive/c/ProgramData/chocolatey/lib | wc -l)" ;; "Haiku") packages="$(ls -1 /boot/system/package-links | wc -l)" ;; - "AIX") - packages="$(lslpp -J -l -q | grep -cv '^#')" - ((packages+=$(rpm -qa | wc -l))) - ;; - "IRIX") packages="$(($(versions -b | wc -l)-3))" ;; - - "FreeMiNT") - type -p rpm >/dev/null && \ - packages="$(rpm -qa | wc -l)" - ;; esac - ((packages == 0)) && unset packages + if ((packages == 0)); then + unset packages + + elif [[ "$package_manager" == "on" ]]; then + managers="${managers/pacman-key/pacman}" + packages+=" (${managers::-2})" + fi } get_shell() { @@ -4398,6 +4364,7 @@ INFO: NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' + --package_manager on/off Hide/Show Package Manager names. --os_arch on/off Hide/Show OS architecture. --speed_type type Change the type of cpu speed to display. Possible values: current, min, max, bios, @@ -4593,6 +4560,7 @@ get_args() { while [[ "$1" ]]; do case "$1" in # Info + "--package_manager") package_manager="$2" ;; "--os_arch") os_arch="$2" ;; "--cpu_cores") cpu_cores="$2" ;; "--cpu_speed") cpu_speed="$2" ;; diff --git a/neofetch.1 b/neofetch.1 index 4bfa57aba..6359a76af 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "May 2018" "Neofetch 4.0.3" "User Commands" +.TH NEOFETCH "1" "June 2018" "Neofetch 4.0.3" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -22,6 +22,9 @@ For example: 'info "Memory" memory' would be '\-\-disable memory' .IP NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu' .TP +\fB\-\-package_manager\fR on/off +Hide/Show Package Manager names. +.TP \fB\-\-os_arch\fR on/off Hide/Show OS architecture. .TP From 75f845c7afec5019396a719dc7ff8be61fd136e3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 14:52:08 +1000 Subject: [PATCH 0445/1133] packages: refactor --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 1f291e85a..95f7f220a 100755 --- a/neofetch +++ b/neofetch @@ -1307,8 +1307,8 @@ get_packages() { ;; "Mac OS X" | "MINIX") - pkgs "port" "$(port installed | wc -l) - 1)" - pkgs "brew" "$(find /usr/local/Cellar -maxdepth 1 | wc -l) - 1)" + pkgs "port" "$(port installed | wc -l) - 1" + pkgs "brew" "$(find /usr/local/Cellar -maxdepth 1 | wc -l) - 1" pkgs "pkgin" "$(pkgin list | wc -l)" ;; From dc9b5519fdbd5217c4f068ca3c6cf348cb07f0b5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 14:54:11 +1000 Subject: [PATCH 0446/1133] packages: refactor --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 95f7f220a..dc799d086 100755 --- a/neofetch +++ b/neofetch @@ -1342,6 +1342,7 @@ get_packages() { elif [[ "$package_manager" == "on" ]]; then managers="${managers/pacman-key/pacman}" + managers="${managers/kpt-pkg/kpt}" packages+=" (${managers::-2})" fi } From c03c9e12480ea18117d239625eea0faf9f10e6b0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 15:02:34 +1000 Subject: [PATCH 0447/1133] packages: refactor --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index dc799d086..9df45df90 100755 --- a/neofetch +++ b/neofetch @@ -1343,7 +1343,7 @@ get_packages() { elif [[ "$package_manager" == "on" ]]; then managers="${managers/pacman-key/pacman}" managers="${managers/kpt-pkg/kpt}" - packages+=" (${managers::-2})" + packages+=" (${managers%,*})" fi } From 9bf46946b6a11be5805b8996560a4ec247621dce Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 15:04:27 +1000 Subject: [PATCH 0448/1133] packages: Remove find usage from brew --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9df45df90..25c4a0108 100755 --- a/neofetch +++ b/neofetch @@ -1308,7 +1308,7 @@ get_packages() { "Mac OS X" | "MINIX") pkgs "port" "$(port installed | wc -l) - 1" - pkgs "brew" "$(find /usr/local/Cellar -maxdepth 1 | wc -l) - 1" + pkgs "brew" "$(files=(/usr/local/Cellar/*) && ((packages+=${#files[@]}))) - 1" pkgs "pkgin" "$(pkgin list | wc -l)" ;; From 3051bbc424a44ffb90597ac4516fe1b49afde6fb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 15:43:53 +1000 Subject: [PATCH 0449/1133] packages: Remove ls usage --- neofetch | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 25c4a0108..195c25dcd 100755 --- a/neofetch +++ b/neofetch @@ -1283,22 +1283,23 @@ get_packages() { pkgs "alps" "$(alps showinstalled | wc -l)" pkgs "butch" "$(butch list | wc -l)" pkgs "kpm-pkg" "$(kpm --get-selections | grep -cv deinstall$)" - pkgs "emerge" "$(ls -d /var/db/pkg/*/* | wc -l)" - pkgs "nix-env" "$(ls -d -1 /nix/store/*/ | wc -l)" - pkgs "guix" "$(ls -d -1 /gnu/store/*/ | wc -l)" - pkgs "Compile" "$(ls -d -1 /Programs/*/ | wc -l)" - pkgs "eopkg" "$(ls -1 /var/lib/eopkg/package | wc -l)" - pkgs "crew" "$(ls -l /usr/local/etc/crew/meta/*.filelist | wc -l)" - pkgs "pkgtool" "$(ls -1 /var/log/packages | wc -l)" - pkgs "cave" "$(ls -d -1 /var/db/paludis/repositories/cross-installed/*/data/* \ - /var/db/paludis/repositories/installed/data/* | wc -l)" + pkgs "emerge" "$(files=(/var/db/pkg/*/*/) && echo ${#files[@]})" + pkgs "nix-env" "$(files=(/nix/store/*/) && echo ${#files[@]})" + pkgs "guix" "$(files=(/gnu/store/*/) && echo ${#files[@]})" + pkgs "Compile" "$(files=(/Programs/*/) && echo ${#files[@]})" + pkgs "eopkg" "$(files=(/var/lib/eopkg/package/*) && echo ${#files[@]})" + pkgs "crew" "$(files=(/usr/local/etc/crew/meta/*.filelist) && echo ${#files[@]})" + pkgs "pkgtool" "$(files=(/var/log/packages/*) && echo ${#files[@]})" + pkgs "cave" "$(files=(/var/db/paludis/repositories/cross-installed/*/data/*/ + /var/db/paludis/repositories/installed/data/*/) && \ + echo ${#files[@]})" case "$kernel_name" in "FreeBSD") pkgs "pkg" "$(pkg info | wc -l)" ;; "Solaris") pkgs "pkginfo" "$(pkginfo -i | wc -l)" ;; *) - pkgs "pkg" "$(ls -1 /var/db/pkg | wc -l)" + pkgs "pkg" "$(files=(/var/db/pkg/*) && echo ${#files[@]})" ((packages == 0)) && \ pkgs "pkg" "$(pkg list | wc -l)" @@ -1325,11 +1326,12 @@ get_packages() { # Count chocolatey packages. [[ -d "/cygdrive/c/ProgramData/chocolatey/lib" ]] && \ - pkgs ":" "$(ls -1 /cygdrive/c/ProgramData/chocolatey/lib | wc -l)" + pkgs ":" "$(files=(/cygdrive/c/ProgramData/chocolatey/lib/*) && echo ${#files[@]})" ;; "Haiku") - packages="$(ls -1 /boot/system/package-links | wc -l)" + files=(/boot/system/package-links/*) + packages="${#files[@]}" ;; "IRIX") From 094fca97bf0bb279448b54416ef36112d6233785 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 16:19:29 +1000 Subject: [PATCH 0450/1133] packages: Remove wc usage --- neofetch | 75 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/neofetch b/neofetch index 195c25dcd..7267ec65a 100755 --- a/neofetch +++ b/neofetch @@ -1265,68 +1265,69 @@ get_uptime() { get_packages() { pkgs() { type -p "$1" >/dev/null && { ((packages+="$2")); managers+="$_, "; }; } + tots() { IFS=$'\n' read -d "" -ra files < <($1); echo "${#files[@]}"; } + dirc() { echo $#; } case "$os" in "Linux" | "BSD" | "iPhone OS" | "Solaris") - pkgs "pacman-key" "$(pacman -Qq --color never | wc -l)" + pkgs "pacman-key" "$(tots "pacman -Qq --color never")" + pkgs "rpm" "$(tots "rpm -qa")" + pkgs "xbps-query" "$(tots "xbps-query -l")" + pkgs "apk" "$(tots "apk info")" + pkgs "opkg" "$(tots "opkg list-installed")" + pkgs "pacman-g2" "$(tots "pacman-g2 -Q")" + pkgs "lvu" "$(tots "lvu installed")" + pkgs "tce-status" "$(tots "tce-status -i")" + pkgs "pkg_info" "$(tots "pkg_info")" + pkgs "tazpkg" "$(tots "tazpkg list") - 6" + pkgs "sorcery" "$(tots "gaze installed")" + pkgs "alps" "$(tots "alps showinstalled")" + pkgs "butch" "$(tots "butch list")" + pkgs "emerge" "$(dirc /var/db/pkg/*/*/)" + pkgs "nix-env" "$(dirc /nix/store/*/)" + pkgs "guix" "$(dirc /gnu/store/*/)" + pkgs "Compile" "$(dirc /Programs/*/)" + pkgs "eopkg" "$(dirc /var/lib/eopkg/package/*)" + pkgs "crew" "$(dirc /usr/local/etc/crew/meta/*.filelist)" + pkgs "pkgtool" "$(dirc /var/log/packages/*)" + pkgs "cave" "$(dirc /var/db/paludis/repositories/cross-installed/*/data/*/ \ + /var/db/paludis/repositories/installed/data/*/)" + pkgs "kpm-pkg" "$(kpm --get-selections | grep -cv deinstall$)" pkgs "dpkg" "$(dpkg --get-selections | grep -cv deinstall$)" - pkgs "rpm" "$(rpm -qa | wc -l)" - pkgs "xbps-query" "$(xbps-query -l | wc -l)" - pkgs "apk" "$(apk info | wc -l)" - pkgs "opkg" "$(opkg list-installed | wc -l)" - pkgs "pacman-g2" "$(pacman-g2 -Q | wc -l)" - pkgs "lvu" "$(lvu installed | wc -l)" - pkgs "tce-status" "$(tce-status -i | wc -l)" - pkgs "pkg_info" "$(pkg_info | wc -l)" - pkgs "tazpkg" "$(tazpkg list | wc -l) - 6" - pkgs "sorcery" "$(gaze installed | wc -l)" - pkgs "alps" "$(alps showinstalled | wc -l)" - pkgs "butch" "$(butch list | wc -l)" - pkgs "kpm-pkg" "$(kpm --get-selections | grep -cv deinstall$)" - pkgs "emerge" "$(files=(/var/db/pkg/*/*/) && echo ${#files[@]})" - pkgs "nix-env" "$(files=(/nix/store/*/) && echo ${#files[@]})" - pkgs "guix" "$(files=(/gnu/store/*/) && echo ${#files[@]})" - pkgs "Compile" "$(files=(/Programs/*/) && echo ${#files[@]})" - pkgs "eopkg" "$(files=(/var/lib/eopkg/package/*) && echo ${#files[@]})" - pkgs "crew" "$(files=(/usr/local/etc/crew/meta/*.filelist) && echo ${#files[@]})" - pkgs "pkgtool" "$(files=(/var/log/packages/*) && echo ${#files[@]})" - pkgs "cave" "$(files=(/var/db/paludis/repositories/cross-installed/*/data/*/ - /var/db/paludis/repositories/installed/data/*/) && \ - echo ${#files[@]})" case "$kernel_name" in - "FreeBSD") pkgs "pkg" "$(pkg info | wc -l)" ;; - "Solaris") pkgs "pkginfo" "$(pkginfo -i | wc -l)" ;; + "FreeBSD") pkgs "pkg" "$(tots "pkg info")" ;; + "SunOS") pkgs "pkginfo" "$(tots "pkginfo -i")" ;; *) - pkgs "pkg" "$(files=(/var/db/pkg/*) && echo ${#files[@]})" + pkgs "pkg" "$(dirc /var/db/pkg/*)" ((packages == 0)) && \ - pkgs "pkg" "$(pkg list | wc -l)" + pkgs "pkg" "$(tots "pkg list")" ;; esac ;; "Mac OS X" | "MINIX") - pkgs "port" "$(port installed | wc -l) - 1" - pkgs "brew" "$(files=(/usr/local/Cellar/*) && ((packages+=${#files[@]}))) - 1" - pkgs "pkgin" "$(pkgin list | wc -l)" + pkgs "port" "$(tots "port installed") - 1" + pkgs "brew" "$(dirc /usr/local/Cellar/*) - 1" + pkgs "pkgin" "$(tots "pkgin list")" ;; "AIX"| "FreeMiNT") pkgs "lslpp" "$(lslpp -J -l -q | grep -cv '^#')" - pkgs "rpm" "$(rpm -qa | wc -l)" + pkgs "rpm" "$(tots "rpm -qa")" ;; "Windows") case "$kernel_name" in - "CYGWIN"*) pkgs "cygcheck" "$(cygcheck -cd | wc -l)" ;; - "MSYS"*) pkgs "pacman" "$(pacman -Qq --color never | wc -l)" ;; + "CYGWIN"*) pkgs "cygcheck" "$(tots "cygcheck -cd")" ;; + "MSYS"*) pkgs "pacman" "$(tots "pacman -Qq --color never")" ;; esac # Count chocolatey packages. [[ -d "/cygdrive/c/ProgramData/chocolatey/lib" ]] && \ - pkgs ":" "$(files=(/cygdrive/c/ProgramData/chocolatey/lib/*) && echo ${#files[@]})" + pkgs ":" "$(dirc /cygdrive/c/ProgramData/chocolatey/lib/*)" ;; "Haiku") @@ -1335,14 +1336,14 @@ get_packages() { ;; "IRIX") - packages="$(($(versions -b | wc -l)-3))" + packages="$(($(tots "versions -b")-3))" ;; esac if ((packages == 0)); then unset packages - elif [[ "$package_manager" == "on" ]]; then + elif [[ "$package_manager" == "on" && "${managers//,}" ]]; then managers="${managers/pacman-key/pacman}" managers="${managers/kpt-pkg/kpt}" packages+=" (${managers%,*})" From e3afa265f97e10161ff379890b6f7f482978791e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 16:31:21 +1000 Subject: [PATCH 0451/1133] packages: only show manager when packages > 0 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 7267ec65a..12e35f18b 100755 --- a/neofetch +++ b/neofetch @@ -1264,7 +1264,7 @@ get_uptime() { } get_packages() { - pkgs() { type -p "$1" >/dev/null && { ((packages+="$2")); managers+="$_, "; }; } + pkgs() { type -p "$1" >/dev/null && { ((packages+="$2"));(("$2">0))&&managers+="$_, "; }; } tots() { IFS=$'\n' read -d "" -ra files < <($1); echo "${#files[@]}"; } dirc() { echo $#; } From 89d4126ec11f08a113eabda526f0fa2437e1f8e7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 2 Jun 2018 19:18:22 +1000 Subject: [PATCH 0452/1133] misc: Fix more lint errors. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 86960457a..24de8853d 100755 --- a/neofetch +++ b/neofetch @@ -1,7 +1,7 @@ #!/usr/bin/env bash # vim: noai:ts=4:sw=4:expandtab # shellcheck source=/dev/null -# shellcheck disable=2016,2009 +# shellcheck disable=2009,2012,2016 # # Neofetch: A command-line system information tool written in bash 3.2+. # https://github.com/dylanaraps/neofetch From 1c015aea18bd84bad37330235021839502ec9ca2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 06:59:24 +1000 Subject: [PATCH 0453/1133] travis: Remove lint exceptions. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index aac1b2fc5..78b7d7571 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ script: - time ./neofetch --travis -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,SC1091,SC1117; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch; 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 aedfa1e92d18c23ccd315ad69543c24eba428ec2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 07:01:20 +1000 Subject: [PATCH 0454/1133] docs: update --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c96d1d27a..e829aa1ce 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,7 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, - https://www.tecmint.com/neofetch-shows-linux-system-information-with-logo/ - https://www.youtube.com/watch?v=bgepGW858fc - https://www.linuxuprising.com/2018/05/display-system-information-on-linux.html +- https://esgeeks.com/neofetch-informacion-sistema-linux/ ## Thanks From 4698dbd06e965004f0923bfe82fc2804b6b6093f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 07:07:52 +1000 Subject: [PATCH 0455/1133] misc: Surpress last lint errors as they are intended behavior --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 12e35f18b..a98b72a9f 100755 --- a/neofetch +++ b/neofetch @@ -1,7 +1,7 @@ #!/usr/bin/env bash # vim: noai:ts=4:sw=4:expandtab # shellcheck source=/dev/null -# shellcheck disable=2016,2009 +# shellcheck disable=2009,2012,2016 # # Neofetch: A command-line system information tool written in bash 3.2+. # https://github.com/dylanaraps/neofetch From 175fce87b5aeb310bfa07957d074b238e12f7e81 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 07:31:24 +1000 Subject: [PATCH 0456/1133] info: Remove get_install_date --- neofetch | 158 ----------------------------------------------------- neofetch.1 | 8 +-- 2 files changed, 1 insertion(+), 165 deletions(-) diff --git a/neofetch b/neofetch index 24de8853d..c05c237c8 100755 --- a/neofetch +++ b/neofetch @@ -79,7 +79,6 @@ print_info() { # info "Local IP" local_ip # info "Public IP" public_ip # info "Users" users - # info "Install Date" install_date # info "Locale" locale # This only works on glibc systems. info line_break @@ -460,32 +459,6 @@ song_format="%artist% - %album% - %title%" song_shorthand="off" -# Install Date - - -# Whether to show the time in the output -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --install_time -# -# Example: -# on: 'Thu 14 Apr 2016 11:50 PM' -# off: 'Thu 14 Apr 2016' -install_time="on" - -# Set time format in the output -# -# Default: '24h' -# Values: '12h', '24h' -# Flag: --install_time_format -# -# Example: -# 12h: 'Thu 14 Apr 2016 11:50 PM' -# 24h: 'Thu 14 Apr 2016 23:50' -install_time_format="12h" - - # Text Colors @@ -3297,66 +3270,6 @@ get_users() { users="${users%\,*}" } -get_install_date() { - case "$os" in - "Linux" | "iPhone OS") install_file="/lost+found" ;; - "Mac OS X") install_file="/var/log/install.log" ;; - "Solaris") install_file="/var/sadm/system/logs/install_log" ;; - "Windows") - case "$kernel_name" in - "CYGWIN"*) install_file="/cygdrive/c/Windows/explorer.exe" ;; - "MSYS"* | "MINGW"*) install_file="/c/Windows/explorer.exe" ;; - esac - ;; - "Haiku") install_file="/boot" ;; - "BSD" | "MINIX" | "IRIX") - case "$kernel_name" in - "FreeBSD") install_file="/etc/hostid" ;; - "NetBSD" | "DragonFly"*) install_file="/etc/defaults/rc.conf" ;; - *) install_file="/" ;; - esac - ;; - "AIX") install_file="/var/adm/ras/bosinstlog" ;; - esac - - ls_prog="$(ls --version 2>&1)" - case "$ls_prog" in - *"BusyBox"*) - install_date="$(ls -tdce "$install_file" | awk '{printf $10 " " $7 " " $8 " " $9}')" - ;; - - *"crtime"*) # xpg4 (Solaris) - install_date="$(ls -tdcE "$install_file" | awk '{printf $6 " " $7}')" - ;; - - *"ACFHLRSZ"*) # Toybox - install_date="$(ls -dl "$install_file" | awk '{printf $6 " " $7}')" - ;; - - *"GNU coreutils"*) - install_date="$(ls -tcd --full-time "$install_file" | awk '{printf $6 " " $7}')" - ;; - - *"ACFHLNRS"* | *"RadC1xmnlog"*) # AIX ls / IRIX ls - err "Install Date doesn't work because your 'ls' doesn't support full date/time." - return - ;; - - *"HLOPRSTUWabc"*) # macOS ls - install_date="$(ls -dlctUT "$install_file" | awk '{printf $9 " " $6 " "$7 " " $8}')" - ;; - - *) - install_date="$(ls -dlctT "$install_file" | awk '{printf $9 " " $6 " " $7 " " $8}')" - ;; - esac - - install_date="${install_date//-/ }" - install_date="${install_date%:*}" - IFS=" " read -ra install_date <<< "$install_date" - install_date="$(convert_time "${install_date[@]}")" -} - get_locale() { locale="$sys_locale" } @@ -4265,71 +4178,6 @@ cache_uname() { kernel_machine="${uname[2]}" } -convert_time() { - # Convert ls timestamp to 'Tue 06 Dec 2016 4:58 PM' format. - year="$1" - day="${3#0}" - - # Split time into hours/minutes. - hour="${4/:*}" - min="${4/${hour}}" - - # Get month. (Month code is used for day of week) - # Due to different versions of 'ls', the month can be 1, 01 or Jan. - case "$2" in - 1 | 01 | "Jan") month="Jan"; month_code=0 ;; - 2 | 02 | "Feb") month="Feb"; month_code=3 ;; - 3 | 03 | "Mar") month="Mar"; month_code=3 ;; - 4 | 04 | "Apr") month="Apr"; month_code=6 ;; - 5 | 05 | "May") month="May"; month_code=1 ;; - 6 | 06 | "Jun") month="Jun"; month_code=4 ;; - 7 | 07 | "Jul") month="Jul"; month_code=6 ;; - 8 | 08 | "Aug") month="Aug"; month_code=2 ;; - 9 | 09 | "Sep") month="Sep"; month_code=5 ;; - 10 | "Oct") month="Oct"; month_code=0 ;; - 11 | "Nov") month="Nov"; month_code=3 ;; - 12 | "Dec") month="Dec"; month_code=5 ;; - esac - - # Get leap year. - # Source: http://stackoverflow.com/questions/725098/leap-year-calculation - [[ "$((year % 4))" == 0 && "$((year % 100))" != 0 || "$((year % 400))" == 0 ]] && \ - [[ "$month" =~ (Jan|Feb) ]] && \ - leap_code=1 - - # Calculate day of week. - # Source: http://blog.artofmemory.com/how-to-calculate-the-day-of-the-week-4203.html - year_code="$((${year/??} + (${year/??} / 4) % 7))" - week_day="$(((year_code + month_code + 6 + day - leap_code) % 7))" - - case "$week_day" in - 0) week_day="Sun" ;; - 1) week_day="Mon" ;; - 2) week_day="Tue" ;; - 3) week_day="Wed" ;; - 4) week_day="Thu" ;; - 5) week_day="Fri" ;; - 6) week_day="Sat" ;; - esac - - # Convert 24 hour time to 12 hour time + AM/PM. - case "$install_time_format" in - "12h") - case "$hour" in - [0-9] | 0[0-9] | 1[0-1]) time="${hour/00/12}${min} AM" ;; - *) time="$((hour - 12))${min} PM" ;; - esac - ;; - *) time="$4" ;; - esac - - # Toggle showing the time. - [[ "$install_time" == "off" ]] && unset time - - # Print the install date. - printf "%s" "$week_day $day $month $year $time" -} - get_ppid() { # Get parent process ID of PID. case "$os" in @@ -4464,9 +4312,6 @@ INFO: --song_shorthand on/off Print the Artist/Album/Title on separate lines. --music_player player-name Manually specify a player to use. Available values are listed in the config file - --install_time on/off Enable/Disable showing the time in Install Date output. - --install_time_format 12h/24h - Set time format in Install Date to be 12 hour or 24 hour. TEXT FORMATTING: --colors x x x x x x Changes the text colors in this order: @@ -4614,8 +4459,6 @@ get_args() { "--song_format") song_format="$2" ;; "--song_shorthand") song_shorthand="$2" ;; "--music_player") music_player="$2" ;; - "--install_time") install_time="$2" ;; - "--install_time_format") install_time_format="$2" ;; "--cpu_temp") cpu_temp="$2" [[ "$cpu_temp" == "on" ]] && cpu_temp="C" @@ -4806,7 +4649,6 @@ get_args() { info "Local IP" local_ip info "Public IP" public_ip info "Users" users - info "Install Date" install_date info line_break info cols diff --git a/neofetch.1 b/neofetch.1 index 4bfa57aba..9b6fe6c0c 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "May 2018" "Neofetch 4.0.3" "User Commands" +.TH NEOFETCH "1" "June 2018" "Neofetch 4.0.3" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -126,12 +126,6 @@ Print the Artist/Album/Title on separate lines. \fB\-\-music_player\fR player\-name Manually specify a player to use. Available values are listed in the config file -.TP -\fB\-\-install_time\fR on/off -Enable/Disable showing the time in Install Date output. -.TP -\fB\-\-install_time_format\fR 12h/24h -Set time format in Install Date to be 12 hour or 24 hour. .SS "TEXT FORMATTING:" .TP \fB\-\-colors\fR x x x x x x From 14005cac4a7cded6e8cb67fd6214e82cea5668d3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 08:15:12 +1000 Subject: [PATCH 0457/1133] misc: Get rid of SC2012/2016 --- neofetch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index 16caf6da4..00bdcf043 100755 --- a/neofetch +++ b/neofetch @@ -1,7 +1,7 @@ #!/usr/bin/env bash # vim: noai:ts=4:sw=4:expandtab # shellcheck source=/dev/null -# shellcheck disable=2009,2012,2016 +# shellcheck disable=2009 # # Neofetch: A command-line system information tool written in bash 3.2+. # https://github.com/dylanaraps/neofetch @@ -1335,13 +1335,13 @@ get_shell() { "sh" | "ash" | "dash") ;; "mksh" | "ksh") - shell+="$("$SHELL" -c 'printf "%s" "$KSH_VERSION"')" + shell+="$("$SHELL" -c "printf %s \$KSH_VERSION")" shell="${shell/ * KSH}" shell="${shell/version}" ;; "tcsh") - shell+="$("$SHELL" -c 'printf "%s" "$tcsh"')" + shell+="$("$SHELL" -c "printf %s \$tcsh")" ;; *) @@ -2326,7 +2326,7 @@ get_song() { "google play"*) song="$(gpmdp-remote current)" ;; "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta \n %at \n %tt')" ;; "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% \n %album% \n %title%')" ;; - "xmms2d"*) song="$(xmms2 current -f '${artist} \n ${album} \n ${title}')" ;; + "xmms2d"*) song="$(xmms2 current -f "\${artist}"$'\n'"\${album}"$'\n'"\${title}")" ;; "qmmp"*) song="$(qmmp --nowplaying '%p \n %a \n %t')" ;; "gnome-music"*) get_song_dbus "GnomeMusic" ;; "lollypop"*) get_song_dbus "Lollypop" ;; @@ -3385,12 +3385,12 @@ get_ascii() { done <<< "$ascii_data" # Colors. - print="${print//'${c1}'/$c1}" - print="${print//'${c2}'/$c2}" - print="${print//'${c3}'/$c3}" - print="${print//'${c4}'/$c4}" - print="${print//'${c5}'/$c5}" - print="${print//'${c6}'/$c6}" + print="${print//\$\{c1\}/$c1}" + print="${print//\$\{c2\}/$c2}" + print="${print//\$\{c3\}/$c3}" + print="${print//\$\{c4\}/$c4}" + print="${print//\$\{c5\}/$c5}" + print="${print//\$\{c6\}/$c6}" ((text_padding=ascii_length+gap)) printf "%b" "$print" From bee887a3e0be5b4fa6ee3173f307eb9cd5633074 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 08:25:30 +1000 Subject: [PATCH 0458/1133] misc: docs --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 00bdcf043..63f1be8df 100755 --- a/neofetch +++ b/neofetch @@ -1237,6 +1237,9 @@ get_uptime() { } get_packages() { + # pkgs: Run package manager if it exists. + # tots: Count lines in command output. + # dirc: Count files or dirs in a glob. pkgs() { type -p "$1" >/dev/null && { ((packages+="$2"));(("$2">0))&&managers+="$_, "; }; } tots() { IFS=$'\n' read -d "" -ra files < <($1); echo "${#files[@]}"; } dirc() { echo $#; } From d69fd6d839f218f193f2d3b1208907857647621b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 10:14:53 +1000 Subject: [PATCH 0459/1133] ascii: simplify handling. --- neofetch | 36 ++++++++++++++---------------------- 1 file changed, 14 insertions(+), 22 deletions(-) diff --git a/neofetch b/neofetch index 63f1be8df..5356df199 100755 --- a/neofetch +++ b/neofetch @@ -3364,39 +3364,31 @@ image_backend() { } get_ascii() { - if [[ ! -f "$image_source" ]]; then - err "Ascii: Ascii file not found, using distro ascii." - else + if [[ -f "$image_source" ]]; then ascii_data="$(< "$image_source")" + else + err "Ascii: Ascii file not found, using distro ascii." fi # Set locale to get correct padding. LC_ALL="$sys_locale" - # Turn file into variable. + # Calculate size of ascii file in line length / line count. while IFS=$'\n' read -r line; do - print+="$line -" - # Calculate size of ascii file in line length / line count. - line="${line//[??;?;??m}" - line="${line//[??;?;???m}" - line="${line//}" - line="${line//\$\{??\}}" - line="${line//\\\\/\\}" ((${#line} > ascii_length)) && ascii_length="${#line}" ((++lines)) - done <<< "$ascii_data" + done <<< "${ascii_data//\$\{??\}}" # Colors. - print="${print//\$\{c1\}/$c1}" - print="${print//\$\{c2\}/$c2}" - print="${print//\$\{c3\}/$c3}" - print="${print//\$\{c4\}/$c4}" - print="${print//\$\{c5\}/$c5}" - print="${print//\$\{c6\}/$c6}" + ascii_data="${ascii_data//\$\{c1\}/$c1}" + ascii_data="${ascii_data//\$\{c2\}/$c2}" + ascii_data="${ascii_data//\$\{c3\}/$c3}" + ascii_data="${ascii_data//\$\{c4\}/$c4}" + ascii_data="${ascii_data//\$\{c5\}/$c5}" + ascii_data="${ascii_data//\$\{c6\}/$c6}" ((text_padding=ascii_length+gap)) - printf "%b" "$print" + printf '%b\n' "$ascii_data" LC_ALL=C } @@ -6694,7 +6686,7 @@ EOF "nixos_small") set_colors 4 6 read -rd '' ascii_data <<'EOF' - ${c1}\\\\ \\\\ // + ${c1} \\\\ \\\\ // ==\\\\__\\\\/ // // \\\\// ==// //== @@ -6823,7 +6815,7 @@ EOF "OpenBSD"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' - ${c3} _ +${c3} _ (_) ${c1} | . ${c1} . |L /| . ${c3} _ From a46d2dec073d7467110c4c3ef62e3c485d532064 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 10:20:18 +1000 Subject: [PATCH 0460/1133] ascii: Update funtoo logo --- neofetch | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index 5356df199..db565f230 100755 --- a/neofetch +++ b/neofetch @@ -5849,17 +5849,16 @@ EOF "Funtoo"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' -${c2} _______ ____ - /MMMMMMM/ /MMMM| _____ _____ - __/M${c1}.MMM.${c2}M/_____________|M${c1}.M${c2}MM|/MMMMM\/MMMMM\\ -|MMMM${c1}MM'${c2}MMMMMMMMMMMMMMMMMMM${c1}MM${c2}MMMM${c1}.MMMM..MMMM.${c2}MM\\ -|MM${c1}MMMMMMM${c2}/m${c1}MMMMMMMMMMMMMMMMMMMMMM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| -|MMMM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MMMMM${c1}\MMM${c2}MMM${c1}MM${c2}MMMM${c1}MM${c2}MMMM${c1}MM${c2}MM| - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMMM${c1}'MMMM''MMMM'${c2}MM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMM${c2}MMM\MMMMM/\MMMMM/ - |MM${c1}MM${c2}MMM${c1}MM${c2}MMMMMM${c1}MM${c2}MM${c1}MM${c2}MM${c1}MMMMM'${c2}M| - |MM${c1}MM${c2}MMM${c1}MMMMMMMMMMMMMMMMM MM'${c2}M/ - |MMMMMMMMMMMMMMMMMMMMMMMMMMMM/ +${c1} .dKXXd . + :XXl;:. .OXo +.'OXO'' .''''''''''''''''''''':XNd..'oco.lco, +xXXXXXX, cXXXNNNXXXXNNXXXXXXXXNNNNKOOK; d0O .k + kXX xXo KNNN0 KNN. 'xXNo :c; 'cc. + kXX xNo KNNN0 KNN. :xxxx. 'NNo + kXX xNo loooc KNN. oNNNN. 'NNo + kXX xN0:. KNN' oNNNX' ,XNk + kXX xNNXNNNNNNNNXNNNNNNNNXNNOxXNX0Xl + ... ......................... .;cc;. EOF ;; From 27b2feb21610125290a21b161feb31493123018f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 10:22:01 +1000 Subject: [PATCH 0461/1133] travis: Update --- .travis.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 78b7d7571..2e21c079c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,12 +11,6 @@ before_install: script: - time ./neofetch --travis -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; 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. # Check for lines longer than 100 chars. - # There are 3 lines that must be longer than 100 chars. - - if (("$(grep '.\{101\}' neofetch | wc -l)" > 3)); then (exit 1); else (exit 0); fi + - if grep '.\{101\}' neofetch; then (exit 1); else (exit 0); fi From ee9939a1dd9c8d8c9debae1c4da6986f3d5dd7bb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 10:26:20 +1000 Subject: [PATCH 0462/1133] args: Rename package_manager --- neofetch | 10 +++++----- neofetch.1 | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index db565f230..212af18e6 100755 --- a/neofetch +++ b/neofetch @@ -150,12 +150,12 @@ uptime_shorthand="on" # # Default: 'on' # Values: 'on', 'off' -# Flag: --package_manager +# Flag: --package_managers # # Example: # on: '900 (pacman, apt)' # off: '900' -package_manager="on" +package_managers="on" # Shell @@ -1319,7 +1319,7 @@ get_packages() { if ((packages == 0)); then unset packages - elif [[ "$package_manager" == "on" && "${managers//,}" ]]; then + elif [[ "$package_managers" == "on" && "${managers//,}" ]]; then managers="${managers/pacman-key/pacman}" managers="${managers/kpt-pkg/kpt}" packages+=" (${managers%,*})" @@ -4211,7 +4211,7 @@ INFO: NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - --package_manager on/off Hide/Show Package Manager names. + --package_managers on/off Hide/Show Package Manager names. --os_arch on/off Hide/Show OS architecture. --speed_type type Change the type of cpu speed to display. Possible values: current, min, max, bios, @@ -4404,7 +4404,7 @@ get_args() { while [[ "$1" ]]; do case "$1" in # Info - "--package_manager") package_manager="$2" ;; + "--package_managers") package_managers="$2" ;; "--os_arch") os_arch="$2" ;; "--cpu_cores") cpu_cores="$2" ;; "--cpu_speed") cpu_speed="$2" ;; diff --git a/neofetch.1 b/neofetch.1 index c13e41403..7b83df3e3 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -22,7 +22,7 @@ For example: 'info "Memory" memory' would be '\-\-disable memory' .IP NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu' .TP -\fB\-\-package_manager\fR on/off +\fB\-\-package_managers\fR on/off Hide/Show Package Manager names. .TP \fB\-\-os_arch\fR on/off From f7f47799ea93a0fcb24e2b2cd6f12bd7099b4b67 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 11:11:26 +1000 Subject: [PATCH 0463/1133] travis: Use latest shellcheck --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index 2e21c079c..31e8b4477 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,14 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi +install: + # Install a custom version of shellcheck instead of Travis CI's default + - scversion="latest" # or "v0.4.7", or "latest" + - wget "https://storage.googleapis.com/shellcheck/shellcheck-${scversion}.linux.x86_64.tar.xz" + - tar --xz -xvf "shellcheck-${scversion}.linux.x86_64.tar.xz" + - shellcheck() { "shellcheck-${scversion}/shellcheck" "$@"; } + - shellcheck --version + script: - time ./neofetch --travis -v - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch; fi From f2e2cb94e905f6c164cdc4d3a9dc53e1ea4e8cf9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 11:15:13 +1000 Subject: [PATCH 0464/1133] travis: Use latest shellcheck --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 31e8b4477..1cc335900 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_install: install: # Install a custom version of shellcheck instead of Travis CI's default - - scversion="latest" # or "v0.4.7", or "latest" + - scversion="0.5.0" # or "v0.4.7", or "latest" - wget "https://storage.googleapis.com/shellcheck/shellcheck-${scversion}.linux.x86_64.tar.xz" - tar --xz -xvf "shellcheck-${scversion}.linux.x86_64.tar.xz" - shellcheck() { "shellcheck-${scversion}/shellcheck" "$@"; } From 041c021c976f479aacbbe6304b91487b4006205f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 11:16:18 +1000 Subject: [PATCH 0465/1133] travis: Use latest shellcheck --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1cc335900..98ce03081 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,6 @@ install: - wget "https://storage.googleapis.com/shellcheck/shellcheck-${scversion}.linux.x86_64.tar.xz" - tar --xz -xvf "shellcheck-${scversion}.linux.x86_64.tar.xz" - shellcheck() { "shellcheck-${scversion}/shellcheck" "$@"; } - - shellcheck --version script: - time ./neofetch --travis -v From f51de7f1396b67aaa14a18fea58890bbd1f7b9d8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 11:19:11 +1000 Subject: [PATCH 0466/1133] travis: Use latest shellcheck --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 98ce03081..afc2571b6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ before_install: install: # Install a custom version of shellcheck instead of Travis CI's default - - scversion="0.5.0" # or "v0.4.7", or "latest" + - scversion="latest" # or "v0.4.7", or "latest" - wget "https://storage.googleapis.com/shellcheck/shellcheck-${scversion}.linux.x86_64.tar.xz" - tar --xz -xvf "shellcheck-${scversion}.linux.x86_64.tar.xz" - shellcheck() { "shellcheck-${scversion}/shellcheck" "$@"; } From 320ad76b21628dbbbb19fbec56fa3242d232a192 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 12:19:03 +1000 Subject: [PATCH 0467/1133] docs: update --- CONTRIBUTING.md | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5d3aaf56c..f9c0191e7 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,20 +23,15 @@ and variable names. - Keep lines below `100` characters long. - Use `[[ ]]` for tests. -- Double Quote **EVERYTHING**. -- Don’t use single quotes, except for special cases. +- Quote **EVERYTHING**. ### ShellCheck For your contribution to be accepted, your changes need to pass ShellCheck. -Run ShellCheck with the following command: - ```sh -# Why do we exclude numerous tests? -# See: https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions -shellcheck neofetch -e SC1090,SC2009,SC2012,SC2016,SC2034,SC2128,SC2153,SC2154,SC2178,SC2010,SC1004,SC1091,SC1117 +shellcheck neofetch ``` **Note**: If you have trouble installing ShellCheck. You can open a pull @@ -58,6 +53,8 @@ request on the repo and our Travis.ci hook will run ShellCheck for you. - Use `bash`'s built-in syntax (`file="$(< /path/to/file.txt)")`). - Don’t use `grep "pattern" | awk '{ printf }'`. - Use `awk '/pattern/ { printf }'` +- Don’t use `wc`. + - Use `${#var}` or `${#arr[@]}`. ### If Statements From e12927aa17a983d20fcb1756cc1ab3a94afdf184 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 12:58:44 +1000 Subject: [PATCH 0468/1133] distro: [haiku] Use read instead of awk --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 212af18e6..6fb0d16fc 100755 --- a/neofetch +++ b/neofetch @@ -977,7 +977,8 @@ get_distro() { ;; "Haiku") - distro="$(uname -sv | awk '{print $1 " " $2}')" + read -r name version _ < <(uname -sv) + distro="$name $version" ;; "AIX") From 7696f58ea4b3892cf264a6b89df1a44c4cafe738 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 13:14:17 +1000 Subject: [PATCH 0469/1133] uptime: Remove subshells --- neofetch | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 6fb0d16fc..0e9e01635 100755 --- a/neofetch +++ b/neofetch @@ -1197,18 +1197,15 @@ get_uptime() { hours="$((seconds / 60 / 60 % 24)) hours" mins="$((seconds / 60 % 60)) minutes" - # Format the days, hours and minutes. - strip_date() { - case "$1" in - "0 "*) unset "${1/* }" ;; - "1 "*) printf "%s" "${1/s}" ;; - *) printf "%s" "$1" ;; - esac - } - - days="$(strip_date "$days")" - hours="$(strip_date "$hours")" - mins="$(strip_date "$mins")" + # Remove plural if < 2. + ((${days/ *} == 1)) && days="${days/s}" + ((${hours/ *} == 1)) && hours="${hours/s}" + ((${mins/ *} == 1)) && mins="${mins/s}" + + # Hide empty fields. + ((${days/ *} == 0)) && unset days + ((${hours/ *} == 0)) && unset hours + ((${mins/ *} == 0)) && unset mins uptime="${days:+$days, }${hours:+$hours, }${mins}" uptime="${uptime%', '}" From e3723d277c2535124052c508a2dec0acd15331da Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 14:52:22 +1000 Subject: [PATCH 0470/1133] packages: Fix performance bug --- neofetch | 100 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 47 deletions(-) diff --git a/neofetch b/neofetch index 0e9e01635..01e356f7d 100755 --- a/neofetch +++ b/neofetch @@ -1235,82 +1235,88 @@ get_uptime() { } get_packages() { - # pkgs: Run package manager if it exists. - # tots: Count lines in command output. - # dirc: Count files or dirs in a glob. - pkgs() { type -p "$1" >/dev/null && { ((packages+="$2"));(("$2">0))&&managers+="$_, "; }; } - tots() { IFS=$'\n' read -d "" -ra files < <($1); echo "${#files[@]}"; } - dirc() { echo $#; } + # has: Check if package manager installed. + # dir: Count files or dirs in a glob. + # pac: If packages > 0, log package manager name. + # tot: Count lines in command output. + has() { type -p "$1" >/dev/null && manager="$_"; } + dir() { ((packages+=$#)); pac "$#"; } + pac() { (($1 > 0)) && managers+="${manager}, "; } + tot() { IFS=$'\n' read -d "" -ra pkgs < <("$@");((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; } case "$os" in "Linux" | "BSD" | "iPhone OS" | "Solaris") - pkgs "pacman-key" "$(tots "pacman -Qq --color never")" - pkgs "rpm" "$(tots "rpm -qa")" - pkgs "xbps-query" "$(tots "xbps-query -l")" - pkgs "apk" "$(tots "apk info")" - pkgs "opkg" "$(tots "opkg list-installed")" - pkgs "pacman-g2" "$(tots "pacman-g2 -Q")" - pkgs "lvu" "$(tots "lvu installed")" - pkgs "tce-status" "$(tots "tce-status -i")" - pkgs "pkg_info" "$(tots "pkg_info")" - pkgs "tazpkg" "$(tots "tazpkg list") - 6" - pkgs "sorcery" "$(tots "gaze installed")" - pkgs "alps" "$(tots "alps showinstalled")" - pkgs "butch" "$(tots "butch list")" - pkgs "emerge" "$(dirc /var/db/pkg/*/*/)" - pkgs "nix-env" "$(dirc /nix/store/*/)" - pkgs "guix" "$(dirc /gnu/store/*/)" - pkgs "Compile" "$(dirc /Programs/*/)" - pkgs "eopkg" "$(dirc /var/lib/eopkg/package/*)" - pkgs "crew" "$(dirc /usr/local/etc/crew/meta/*.filelist)" - pkgs "pkgtool" "$(dirc /var/log/packages/*)" - pkgs "cave" "$(dirc /var/db/paludis/repositories/cross-installed/*/data/*/ \ - /var/db/paludis/repositories/installed/data/*/)" - pkgs "kpm-pkg" "$(kpm --get-selections | grep -cv deinstall$)" - pkgs "dpkg" "$(dpkg --get-selections | grep -cv deinstall$)" + # Package Manager Programs. + has "pacman-key" && tot pacman -Qq --color never + has "dpkg" && tot dpkg-query -f '\n' -W + has "rpm" && tot rpm -qa + has "xbps-query" && tot xbps-query -l + has "apk" && tot apk info + has "opkg" && tot opkg list-installed + has "pacman-g2" && tot pacman-g2 -Q + has "lvu" && tot lvu installed + has "tce-status" && tot tce-status -i + has "pkg_info" && tot pkg_info + has "tazpkg" && tot tazpkg list && ((packages-=6)) + has "sorcery" && tot gaze installed + has "alps" && tot alps showinstalled + has "butch" && tot butch list + + # Counting files/dirs. + has "emerge" && dir /var/db/pkg/*/*/ + has "nix-env" && dir /nix/store/*/ + has "guix" && dir /gnu/store/*/ + has "Compile" && dir /Programs/*/ + has "eopkg" && dir /var/lib/eopkg/package/* + has "crew" && dir /usr/local/etc/crew/meta/*.filelist + has "pkgtool" && dir /var/log/packages/* + has "cave" && dir /var/db/paludis/repositories/cross-installed/*/data/*/ \ + /var/db/paludis/repositories/installed/data/*/ + + # Other (Needs complex command) + has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) case "$kernel_name" in - "FreeBSD") pkgs "pkg" "$(tots "pkg info")" ;; - "SunOS") pkgs "pkginfo" "$(tots "pkginfo -i")" ;; - + "FreeBSD") has "pkg" && tot pkg info ;; + "SunOS") has "pkginfo" && tot pkginfo -i ;; *) - pkgs "pkg" "$(dirc /var/db/pkg/*)" + has "pkg" && dir /var/db/pkg/* ((packages == 0)) && \ - pkgs "pkg" "$(tots "pkg list")" + has "pkg" && tot pkg list ;; esac ;; "Mac OS X" | "MINIX") - pkgs "port" "$(tots "port installed") - 1" - pkgs "brew" "$(dirc /usr/local/Cellar/*) - 1" - pkgs "pkgin" "$(tots "pkgin list")" + has "port" && tot port installed && ((packages-=1)) + has "brew" && dir /usr/local/Cellar/* + has "pkgin" && tot pkgin list ;; "AIX"| "FreeMiNT") - pkgs "lslpp" "$(lslpp -J -l -q | grep -cv '^#')" - pkgs "rpm" "$(tots "rpm -qa")" + has "lslpp" && ((packages+="$(lslpp -J -l -q | grep -cv '^#')")) + has "rpm" && tot rpm -qa ;; "Windows") case "$kernel_name" in - "CYGWIN"*) pkgs "cygcheck" "$(tots "cygcheck -cd")" ;; - "MSYS"*) pkgs "pacman" "$(tots "pacman -Qq --color never")" ;; + "CYGWIN"*) has "cygcheck" && tot cygcheck -cd ;; + "MSYS"*) has "pacman" && tot pacman -Qq --color never ;; esac # Count chocolatey packages. [[ -d "/cygdrive/c/ProgramData/chocolatey/lib" ]] && \ - pkgs ":" "$(dirc /cygdrive/c/ProgramData/chocolatey/lib/*)" + dir /cygdrive/c/ProgramData/chocolatey/lib/* ;; "Haiku") - files=(/boot/system/package-links/*) - packages="${#files[@]}" + dir /boot/system/package-links/* ;; "IRIX") - packages="$(($(tots "versions -b")-3))" + tot versions -b + ((packages-=3)) ;; esac @@ -1319,7 +1325,7 @@ get_packages() { elif [[ "$package_managers" == "on" && "${managers//,}" ]]; then managers="${managers/pacman-key/pacman}" - managers="${managers/kpt-pkg/kpt}" + managers="${managers/nix-env/nix}" packages+=" (${managers%,*})" fi } From 21103d9ada918047b250caf3a7f40c0754f45c03 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 16:02:16 +1000 Subject: [PATCH 0471/1133] resolution: Added xwininfo support. --- neofetch | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 01e356f7d..8058e89a1 100755 --- a/neofetch +++ b/neofetch @@ -2520,6 +2520,11 @@ get_resolution() { esac resolution="${resolution//\*}" + elif type -p xwininfo >/dev/null; then + read -r w h \ + < <(xwininfo -root | awk -F':' '/Width|Height/ {printf $2}') + resolution="${w}x${h}" + elif type -p xdpyinfo >/dev/null; then resolution="$(xdpyinfo | awk '/dimensions:/ {printf $2}')" fi @@ -3687,7 +3692,7 @@ make_thumbnail() { ;; *) - time convert \ + convert \ -background none \ "$image" \ -strip \ From ab01e65fadb5ba3053ba09ee505f5b0b8a903958 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 16:11:37 +1000 Subject: [PATCH 0472/1133] misc: cleanup --- neofetch | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/neofetch b/neofetch index 8058e89a1..6da397904 100755 --- a/neofetch +++ b/neofetch @@ -1379,18 +1379,15 @@ get_de() { ;; "FreeMiNT") - get_wm - - for files in /proc/*; do - case "$files" in - *thing*) de="Thing" ;; - *jinnee*) de="Jinnee" ;; - *tera*) de="Teradesk" ;; - *neod*) de="NeoDesk" ;; - *zdesk*) de="zDesk" ;; - *mdesk*) de="mDesk" ;; - esac - done + freemint_wm=(/proc/*) + case "${freemint_wm[*]}" in + *thing*) de="Thing" ;; + *jinnee*) de="Jinnee" ;; + *tera*) de="Teradesk" ;; + *neod*) de="NeoDesk" ;; + *zdesk*) de="zDesk" ;; + *mdesk*) de="mDesk" ;; + esac ;; *) @@ -1663,15 +1660,13 @@ get_wm_theme() { wm_theme="$(PlistBuddy -c "Print AppleInterfaceStyle" "$global_preferences")" wm_theme_color="$(PlistBuddy -c "Print AppleAquaColorVariant" "$global_preferences")" - [[ -z "$wm_theme" ]] && wm_theme="Light" + [[ -z "$wm_theme" ]] && \ + wm_theme="Light" - if [[ -z "$wm_theme_color" ]] || ((wm_theme_color == 1)); then + [[ -z "$wm_theme_color" ]] || ((wm_theme_color == 1)) && \ wm_theme_color="Blue" - else - wm_theme_color="Graphite" - fi - wm_theme="$wm_theme_color ($wm_theme)" + wm_theme="${wm_theme_color:-Graphite} ($wm_theme)" ;; *"Explorer") From 96bd33c2a01cf90b98bf58d0e9bce0f7b55756c5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 16:40:06 +1000 Subject: [PATCH 0473/1133] misc: cleanup --- neofetch | 114 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 58 insertions(+), 56 deletions(-) diff --git a/neofetch b/neofetch index 6da397904..a9032b3cf 100755 --- a/neofetch +++ b/neofetch @@ -2698,38 +2698,42 @@ get_term() { # Workaround for macOS systems that # don't support the block below. case "$TERM_PROGRAM" in - "iTerm.app") term="iTerm2" ;; + "iTerm.app") term="iTerm2" ;; "Terminal.app") term="Apple Terminal" ;; - "Hyper") term="HyperTerm" ;; - *) term="${TERM_PROGRAM/\.app}" ;; + "Hyper") term="HyperTerm" ;; + *) term="${TERM_PROGRAM/\.app}" ;; esac # Most likely TosWin2 on FreeMiNT - quick check [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && \ term="TosWin2" + [[ "$SSH_CONNECTION" ]] && \ + term="$SSH_TTY" + # Check $PPID for terminal emulator. while [[ -z "$term" ]]; do - if [[ "$SSH_CONNECTION" ]]; then - term="$SSH_TTY"; break - else - parent="$(get_ppid "$parent")" - [[ -z "$parent" ]] && break - name="$(get_process_name "$parent")" - case "${name// }" in - "${SHELL/*\/}" | *"sh" | "screen" | "su"*) ;; - "login"* | *"Login"* | "init" | "(init)") term="$(tty)" ;; - "ruby" | "1" | "systemd" | "sshd"* | "python"* |\ - "USER"*"PID"* | "kdeinit"* | "launchd"*) - break - ;; - "gnome-terminal-") term="gnome-terminal" ;; - *"nvim") term="Neovim Terminal" ;; - *"NeoVimServer"*) term="VimR Terminal" ;; - *"tmux"*) term="tmux" ;; - *) term="${name##*/}" ;; - esac - fi + parent="$(get_ppid "$parent")" + [[ -z "$parent" ]] && break + name="$(get_process_name "$parent")" + + case "${name// }" in + "${SHELL/*\/}"|*"sh"|"screen"|"su"*) ;; + + "login"*|*"Login"*|"init"|"(init)") + term="$(tty)" + ;; + + "ruby"|"1"|"systemd"|"sshd"*|"python"*|"USER"*"PID"*|"kdeinit"*|"launchd"*) + break + ;; + + "gnome-terminal-") term="gnome-terminal" ;; + *"nvim") term="Neovim Terminal" ;; + *"NeoVimServer"*) term="VimR Terminal" ;; + *"tmux"*) term="tmux" ;; + *) term="${name##*/}" ;; + esac done # Log that the function was run. @@ -3351,7 +3355,7 @@ image_backend() { printf '\e[2J\e[H' get_image_size make_thumbnail - display_image + display_image || to_off "Image: $image_backend failed to display the image." ;; *) @@ -3708,54 +3712,52 @@ make_thumbnail() { display_image() { case "$image_backend" in "caca") - img2txt -W "$((width / font_width)))" \ - -H "$((height / font_height))" \ - --gamma=0.6 "$image" ||\ - to_off "Image: libcaca failed to display the image." + img2txt \ + -W "$((width / font_width)))" \ + -H "$((height / font_height))" \ + --gamma=0.6 \ + "$image" ;; "jp2a") - jp2a --width="$((width / font_width))" \ - --height="$((height / font_height))" \ - --colors "$image" ||\ - to_off "Image: jp2a failed to display the image." + jp2a \ + --width="$((width / font_width))" \ + --height="$((height / font_height))" \ + --colors \ + "$image" ;; "kitty") kitty icat \ - --align left \ - --place "$((width / font_width))x$((height / font_height))\ - @${xoffset}x${yoffset}" \ - "$image" ||\ - to_off "Image: kitty failed to display the image." + --align left \ + --place "$((width/font_width))x$((height/font_height))@${xoffset}x${yoffset}" \ + "$image" ;; "pixterm") - pixterm -tc "$((width / font_width))" \ - -tr "$((height / font_height))" \ - "$image" ||\ - to_off "Image: pixterm failed to display the image." + pixterm \ + -tc "$((width / font_width))" \ + -tr "$((height / font_height))" \ + "$image" ;; "sixel") - img2sixel -w "$width" \ - -h "$height" \ - "$image" ||\ - to_off "Image: libsixel failed to display the image." + img2sixel \ + -w "$width" \ + -h "$height" \ + "$image" ;; "termpix") - termpix --width "$((width / font_width))" \ - --height "$((height / font_height))" \ - "$image" ||\ - to_off "Image: termpix failed to display the image." + termpix \ + --width "$((width / font_width))" \ + --height "$((height / font_height))" \ + "$image" ;; "iterm2") - image="$(base64 < "$image")" - printf -v iterm_cmd '\e]1337;File=width=%spx;height=%spx;inline=1:%s' \ - "$width" "$height" "$image" + "$width" "$height" "$(base64 < "$image")" # Tmux requires an additional escape sequence for this to work. [[ -n "$TMUX" ]] && printf -v iterm_cmd '\ePtmux;\e%b\e'\\ "$iterm_cmd" @@ -3764,8 +3766,9 @@ display_image() { ;; "tycat") - tycat -g "${width}x${height}" "$image" ||\ - to_off "Image: tycat failed to display the image." + tycat \ + -g "${width}x${height}" \ + "$image" ;; "w3m") @@ -3776,8 +3779,7 @@ display_image() { # appearing in specific terminal emulators. sleep 0.05 printf '%b\n%s;\n%s\n' "0;1;$xoffset;$yoffset;$width;$height;;;;;$image" 3 4 |\ - "${w3m_img_path:-false}" -bg "$background_color" &>/dev/null ||\ - to_off "Image: w3m-img failed to display the image." + "${w3m_img_path:-false}" -bg "$background_color" &>/dev/null ;; esac } From 55b3925a29ddb7a00450c293f7b9db3365ab2491 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 Jun 2018 17:07:04 +1000 Subject: [PATCH 0474/1133] misc: cleanup --- neofetch | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/neofetch b/neofetch index a9032b3cf..531536537 100755 --- a/neofetch +++ b/neofetch @@ -946,9 +946,9 @@ get_distro() { "on") distro="${distro/ ${osx_build}}" ;; "tiny") case "$osx_version" in - "10."[4-7]*) distro="${distro/${codename}/Mac OS X}" ;; + "10."[4-7]*) distro="${distro/${codename}/Mac OS X}" ;; "10."[8-9]* | "10.1"[0-1]*) distro="${distro/${codename}/OS X}" ;; - "10.1"[2-3]*) distro="${distro/${codename}/macOS}" ;; + "10.1"[2-3]*) distro="${distro/${codename}/macOS}" ;; esac distro="${distro/ ${osx_build}}" ;; @@ -1146,7 +1146,7 @@ get_kernel() { if [[ "$os" =~ (BSD|MINIX) && "$distro" == *"$kernel_name"* ]]; then case "$distro_shorthand" in "on" | "tiny") kernel="$kernel_version" ;; - *) unset kernel ;; + *) unset kernel ;; esac fi } @@ -1415,7 +1415,7 @@ get_de() { # the desktop variables are sometimes also set to the # window manager name. This checks to see if WM == DE # and dicards the DE value. - [[ "$wm" && "$de" =~ ^$wm$ ]] && { unset -v de; return; } + [[ "$de" == "$wm" ]] && { unset -v de; return; } ;; esac @@ -3302,7 +3302,7 @@ get_cols() { printf -v block_spaces "%${block_height}s" # Convert the spaces into rows of blocks. - [[ "$blocks" ]] && cols+="${block_spaces// /${blocks}${reset}nl}" + [[ "$blocks" ]] && cols+="${block_spaces// /${blocks}${reset}nl}" [[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}${reset}nl}" # Add newlines to the string. @@ -3620,10 +3620,9 @@ get_image_size() { read -r width height <<< "$(identify -format "%w %h" "$image")" crop_mode="none" - while (( "$width" >= ("$term_width" / 2) || - "$height" >= "$term_height" )); do - width="$((width / 2))" - height="$((height / 2))" + while ((width >= (term_width / 2) || height >= term_height)); do + ((width=width/2)) + ((height=height/2)) done ;; @@ -3785,13 +3784,8 @@ display_image() { } to_ascii() { - # Log the error. err "$1" - - # This function makes neofetch fallback to ascii mode. image_backend="ascii" - - # Print the ascii art. get_ascii # Set cursor position next image/ascii. @@ -3799,7 +3793,6 @@ to_ascii() { } to_off() { - # This function makes neofetch fallback to off mode. err "$1" image_backend="off" text_padding= From 58e7bf039f864c3e461623edce02060115769443 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 3 Jun 2018 10:23:38 +0200 Subject: [PATCH 0475/1133] OS: Add support for Regata OS. --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 531536537..186d4f20d 100755 --- a/neofetch +++ b/neofetch @@ -7425,6 +7425,32 @@ ${c2} A EOF ;; + "Regata"*) + set_colors 7 1 4 5 3 2 + read -rd '' ascii_data <<'EOF' +${c1} ddhso+++++osydd + dho/.`hh${c2}.:/+/:.${c1}hhh`:+yd + do-hhhhhh${c2}/sssssss+`${c1}hhhhh./yd + h/`hhhhhhh${c2}-sssssssss:${c1}hhhhhhhh-yd + do`hhhhhhhhh${c2}`ossssssso.${c1}hhhhhhhhhh/d + d/hhhhhhhhhhhh${c2}`/ossso/.${c1}hhhhhhhhhhhh.h + /hhhhhhhhhhhh${c3}`-/osyso/-`${c1}hhhhhhhhhhhh.h +shh${c4}-/ooo+-${c1}hhh${c3}:syyso+osyys/`${c1}hhh${c5}`+oo`${c1}hhh/ +h${c4}`ohhhhhhho`${c3}+yyo.${c1}hhhhh${c3}.+yyo`${c5}.sssssss.${c1}h`h +s${c4}:hhhhhhhhho${c3}yys`${c1}hhhhhhh${c3}.oyy/${c5}ossssssso-${c1}hs +s${c4}.yhhhhhhhy/${c3}yys`${c1}hhhhhhh${c3}.oyy/${c5}ossssssso-${c1}hs +hh${c4}./syyys+.${c1} ${c3}+yy+.${c1}hhhhh${c3}.+yyo`${c5}.ossssso/${c1}h`h +shhh${c4}``.`${c1}hhh${c3}`/syyso++oyys/`${c1}hhh${c5}`+++-`${c1}hh:h +d/hhhhhhhhhhhh${c3}`-/osyso+-`${c1}hhhhhhhhhhhh.h + d/hhhhhhhhhhhh${c6}`/ossso/.${c1}hhhhhhhhhhhh.h + do`hhhhhhhhh${c6}`ossssssso.${c1}hhhhhhhhhh:h + h/`hhhhhhh${c6}-sssssssss:${c1}hhhhhhhh-yd + h+.hhhhhh${c6}+sssssss+${c1}hhhhhh`/yd + dho:.hhh${c6}.:+++/.${c1}hhh`-+yd + ddhso+++++osyhd +EOF + ;; + "Rosa"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From 4637e007429b1c8a597b7a045af6351c7d338ed9 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 3 Jun 2018 20:44:00 +0700 Subject: [PATCH 0476/1133] Packages: Add support for Flatpak --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 186d4f20d..c3224b6ba 100755 --- a/neofetch +++ b/neofetch @@ -1261,6 +1261,7 @@ get_packages() { has "sorcery" && tot gaze installed has "alps" && tot alps showinstalled has "butch" && tot butch list + has "flatpak" && tot flatpak list # Counting files/dirs. has "emerge" && dir /var/db/pkg/*/*/ From 2cc5516b42989583514e2f4e70d90f375318eb82 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 3 Jun 2018 20:44:57 +0700 Subject: [PATCH 0477/1133] Packages: Add support for Snap --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index c3224b6ba..6fbded7d8 100755 --- a/neofetch +++ b/neofetch @@ -1262,6 +1262,7 @@ get_packages() { has "alps" && tot alps showinstalled has "butch" && tot butch list has "flatpak" && tot flatpak list + has "snap" && tot snap list && ((packages-=1)) # Counting files/dirs. has "emerge" && dir /var/db/pkg/*/*/ From 5fc7dc61cea5c25ecbcc5dd532b8bd0bff23da26 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 3 Jun 2018 18:19:09 +0200 Subject: [PATCH 0478/1133] OS: Add support for Condres OS. --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index 186d4f20d..8cbc746ce 100755 --- a/neofetch +++ b/neofetch @@ -5421,6 +5421,29 @@ oNMMMMMMMMMMMNs` `sy` `oNMMMMMMMMMMMNo EOF ;; + "Condres"*) + set_colors 2 3 6 + read -rd '' ascii_data <<'EOF' +${c1}syyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy+${c3}.+. +${c1}`oyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy+${c3}:++. +${c2}/o${c1}+oyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy/${c3}oo++. +${c2}/y+${c1}syyyyyyyyyyyyyyyyyyyyyyyyyyyyy${c3}+ooo++. +${c2}/hy+${c1}oyyyhhhhhhhhhhhhhhyyyyyyyyy${c3}+oo+++++. +${c2}/hhh+${c1}shhhhhdddddhhhhhhhyyyyyyy${c3}+oo++++++. +${c2}/hhdd+${c1}oddddddddddddhhhhhyyyys${c3}+oo+++++++. +${c2}/hhddd+${c1}odmmmdddddddhhhhyyyy${c3}+ooo++++++++. +${c2}/hhdddmo${c1}odmmmdddddhhhhhyyy${c3}+oooo++++++++. +${c2}/hdddmmms${c1}/dmdddddhhhhyyys${c3}+oooo+++++++++. +${c2}/hddddmmmy${c1}/hdddhhhhyyyyo${c3}+oooo++++++++++: +${c2}/hhdddmmmmy${c1}:yhhhhyyyyy+${c3}+oooo+++++++++++: +${c2}/hhddddddddy${c1}-syyyyyys+${c3}ooooo++++++++++++: +${c2}/hhhddddddddy${c1}-+yyyy+${c3}/ooooo+++++++++++++: +${c2}/hhhhhdddddhhy${c1}./yo:${c3}+oooooo+++++++++++++/ +${c2}/hhhhhhhhhhhhhy${c1}:-.${c3}+sooooo+++++++++++///: +${c2}:sssssssssssso++${c1}${c3}`:/:--------.```````` +EOF + ;; + "Container Linux by CoreOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From c461704b361ef28221010e630a4bcd753cc154fb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Jun 2018 06:41:39 +1000 Subject: [PATCH 0479/1133] packages: Run flatpak/snap after regular package managers --- neofetch | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 03b5adb97..e9fb3c819 100755 --- a/neofetch +++ b/neofetch @@ -1261,8 +1261,6 @@ get_packages() { has "sorcery" && tot gaze installed has "alps" && tot alps showinstalled has "butch" && tot butch list - has "flatpak" && tot flatpak list - has "snap" && tot snap list && ((packages-=1)) # Counting files/dirs. has "emerge" && dir /var/db/pkg/*/*/ @@ -1288,6 +1286,10 @@ get_packages() { has "pkg" && tot pkg list ;; esac + + # List these last as they accompany regular package managers. + has "flatpak" && tot flatpak list + has "snap" && tot snap list && ((packages-=1)) ;; "Mac OS X" | "MINIX") From 23d02ae90ecfc3bbb461ffc4fc79ef4969a9fe07 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Jun 2018 06:51:30 +1000 Subject: [PATCH 0480/1133] misc: cleanup --- neofetch | 64 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/neofetch b/neofetch index e9fb3c819..15f24278a 100755 --- a/neofetch +++ b/neofetch @@ -971,7 +971,7 @@ get_distro() { "Solaris") case "$distro_shorthand" in "on" | "tiny") distro="$(awk 'NR==1{print $1 " " $3;}' /etc/release)" ;; - *) distro="$(awk 'NR==1{print $1 " " $2 " " $3;}' /etc/release)" ;; + *) distro="$(awk 'NR==1{print $1 " " $2 " " $3;}' /etc/release)" ;; esac distro="${distro/\(*}" ;; @@ -1430,11 +1430,15 @@ get_de() { # Format strings. case "$de" in "KDE_SESSION_VERSION"*) de="KDE${de/* = }" ;; - *"MUFFIN"* | "Cinnamon") de="$(cinnamon --version)"; de="${de:-Cinnamon}" ;; *"xfce4"*) de="Xfce4" ;; *"xfce5"*) de="Xfce5" ;; *"xfce"*) de="Xfce" ;; *"mate"*) de="MATE" ;; + + *"MUFFIN"* | "Cinnamon") + de="$(cinnamon --version)"; de="${de:-Cinnamon}" + ;; + *"GNOME"*) de="$(gnome-shell --version)" de="${de/Shell }" @@ -1503,11 +1507,11 @@ get_wm() { ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm')" case "$ps_line" in - *"chunkwm"*) wm="chunkwm" ;; - *"kwm"*) wm="Kwm" ;; - *"Amethyst"*) wm="Amethyst" ;; + *"chunkwm"*) wm="chunkwm" ;; + *"kwm"*) wm="Kwm" ;; + *"Amethyst"*) wm="Amethyst" ;; *"Spectacle"*) wm="Spectacle" ;; - *) wm="Quartz Compositor" ;; + *) wm="Quartz Compositor" ;; esac ;; @@ -1524,15 +1528,14 @@ get_wm() { ;; "FreeMiNT") - wm="Atari AES" - for files in /proc/*; do - case "$files" in - *xaaes*) wm="XaAES" ;; - *myaes*) wm="MyAES" ;; - *naes*) wm="N.AES" ;; - geneva) wm="Geneva" ;; - esac - done + freemint_wm=(/proc/*) + case "${freemint_wm[*]}" in + *xaaes*) wm="XaAES" ;; + *myaes*) wm="MyAES" ;; + *naes*) wm="N.AES" ;; + geneva) wm="Geneva" ;; + *) wm="Atari AES" ;; + esac ;; esac fi @@ -1773,7 +1776,7 @@ get_cpu() { # Get CPU cores. case "$cpu_cores" in "logical" | "on") cores="$(sysctl -n hw.logicalcpu_max)" ;; - "physical") cores="$(sysctl -n hw.physicalcpu_max)" ;; + "physical") cores="$(sysctl -n hw.physicalcpu_max)" ;; esac ;; @@ -1876,7 +1879,9 @@ get_cpu() { cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" ;; - "physical") cores="$(lparstat -i | awk -F':' '/Active Physical CPUs/ {printf $2}')" + "physical") + cores="$(lparstat -i | awk -F':' '/Active Physical CPUs/ {printf $2}')" + ;; esac ;; @@ -1934,7 +1939,7 @@ get_cpu() { [[ "$cpu_cores" != "off" && "$cores" ]] && \ case "$os" in "Mac OS X") cpu="${cpu/@/(${cores}) @}" ;; - *) cpu="$cpu ($cores)" ;; + *) cpu="$cpu ($cores)" ;; esac # Add CPU speed to the output. @@ -1974,14 +1979,17 @@ get_cpu_usage() { if [[ "$cpu_cores" != "logical" ]]; then case "$os" in "Linux" | "MINIX") cores="$(grep -c "^processor" /proc/cpuinfo)" ;; - "Mac OS X") cores="$(sysctl -n hw.logicalcpu_max)" ;; - "BSD") cores="$(sysctl -n hw.ncpu)" ;; - "Solaris") cores="$(kstat -m cpu_info | grep -c -F "chip_id")" ;; - "Haiku") cores="$(sysinfo -cpu | grep -c -F 'CPU #')" ;; - "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; - "AIX") cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" ;; - "IRIX") cores="$(sysconf NPROC_ONLN)" ;; - "FreeMiNT") cores="$(sysctl -n hw.ncpu)" + "Mac OS X") cores="$(sysctl -n hw.logicalcpu_max)" ;; + "BSD") cores="$(sysctl -n hw.ncpu)" ;; + "Solaris") cores="$(kstat -m cpu_info | grep -c -F "chip_id")" ;; + "Haiku") cores="$(sysinfo -cpu | grep -c -F 'CPU #')" ;; + "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; + "IRIX") cores="$(sysconf NPROC_ONLN)" ;; + "FreeMiNT") cores="$(sysctl -n hw.ncpu)" ;; + + "AIX") + cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" + ;; esac fi @@ -1992,10 +2000,10 @@ get_cpu_usage() { # Print the bar. case "$cpu_display" in - "bar") cpu_usage="$(bar "$cpu_usage" 100)" ;; + "bar") cpu_usage="$(bar "$cpu_usage" 100)" ;; "infobar") cpu_usage="${cpu_usage}% $(bar "$cpu_usage" 100)" ;; "barinfo") cpu_usage="$(bar "$cpu_usage" 100)${info_color} ${cpu_usage}%" ;; - *) cpu_usage="${cpu_usage}%" ;; + *) cpu_usage="${cpu_usage}%" ;; esac } From 05b0d1055b3f2572ec3ddcb03f4250c59ad5d583 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Jun 2018 07:36:56 +1000 Subject: [PATCH 0481/1133] misc: cleanup --- neofetch | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/neofetch b/neofetch index 15f24278a..231821031 100755 --- a/neofetch +++ b/neofetch @@ -773,24 +773,24 @@ get_os() { # $kernel_name is set in a function called cache_uname and is # just the output of "uname -s". case "$kernel_name" in - "Darwin") os="$(sw_vers -productName)" ;; - "SunOS") os="Solaris" ;; - "Haiku") os="Haiku" ;; - "MINIX") os="MINIX" ;; - "AIX") os="AIX" ;; - "IRIX"*) os="IRIX" ;; - "FreeMiNT") os="FreeMiNT" ;; + "Darwin") : "$(sw_vers -productName)" ;; + "SunOS") : "Solaris" ;; + "Haiku") : "Haiku" ;; + "MINIX") : "MINIX" ;; + "AIX") : "AIX" ;; + "IRIX"*) : "IRIX" ;; + "FreeMiNT") : "FreeMiNT" ;; "Linux" | "GNU"*) - os="Linux" + : "Linux" ;; *"BSD" | "DragonFly" | "Bitrig") - os="BSD" + : "BSD" ;; "CYGWIN"* | "MSYS"* | "MINGW"*) - os="Windows" + : "Windows" ;; *) @@ -799,6 +799,7 @@ get_os() { exit 1 ;; esac + os="$_" } get_distro() { @@ -1000,8 +1001,9 @@ get_distro() { # Get OS architecture. case "$os" in - "Solaris" | "AIX" | "Haiku" | "IRIX" | "FreeMiNT") machine_arch="$(uname -p)" ;; - *) machine_arch="$kernel_machine" ;; + "Solaris" | "AIX" | "Haiku" | "IRIX" | "FreeMiNT") + machine_arch="$(uname -p)" ;; + *) machine_arch="$kernel_machine" ;; esac [[ "$os_arch" == "on" ]] && \ @@ -1288,8 +1290,8 @@ get_packages() { esac # List these last as they accompany regular package managers. - has "flatpak" && tot flatpak list - has "snap" && tot snap list && ((packages-=1)) + has "flatpak" && tot flatpak list + has "snap" && tot snap list && ((packages-=1)) ;; "Mac OS X" | "MINIX") @@ -1319,8 +1321,7 @@ get_packages() { ;; "IRIX") - tot versions -b - ((packages-=3)) + tot versions -b && ((packages-=3)) ;; esac @@ -3980,15 +3981,15 @@ set_text_colors() { case "$bar_color_total $1" in "distro "[736]) bar_color_total="$(color "$1")" ;; "distro "[0-9]) bar_color_total="$(color "$2")" ;; - *) bar_color_total="$(color "$bar_color_total")" ;; + *) bar_color_total="$(color "$bar_color_total")" ;; esac } color() { case "$1" in - [0-6]) printf '%b\e[3%sm' "$reset" "$1" ;; - 7 | "fg") printf '\e[37m%b' "$reset" ;; - *) printf '\e[38;5;%bm' "$1" ;; + [0-6]) printf '%b\e[3%sm' "$reset" "$1" ;; + 7 | "fg") printf '\e[37m%b' "$reset" ;; + *) printf '\e[38;5;%bm' "$1" ;; esac } @@ -4100,7 +4101,7 @@ cache() { get_cache_dir() { case "$os" in "Mac OS X") cache_dir="/Library/Caches" ;; - *) cache_dir="/tmp" ;; + *) cache_dir="/tmp" ;; esac } From b119a154b08b246426363f9be555917fb4a41063 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Jun 2018 08:33:24 +1000 Subject: [PATCH 0482/1133] term_font: cleanup --- neofetch | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) diff --git a/neofetch b/neofetch index 231821031..9d436cdec 100755 --- a/neofetch +++ b/neofetch @@ -2758,18 +2758,13 @@ get_term_font() { case "$term" in "alacritty"*) - if [[ -f "${XDG_CONFIG_HOME}/alacritty.yml" ]]; then - alacritty_file="${XDG_CONFIG_HOME}/alacritty.yml" + shopt -s nullglob + confs=({$XDG_CONFIG_HOME,$HOME}/{alacritty,}/{.,}alacritty.ym?) + shopt -u nullglob - elif [[ -f "${XDG_CONFIG_HOME}/alacritty/alacritty.yml" ]]; then - alacritty_file="${XDG_CONFIG_HOME}/alacritty/alacritty.yml" + [[ -f "${confs[0]}" ]] || return - elif [[ -f "${HOME}/.alacritty.yml" ]]; then - alacritty_file="${HOME}/.alacritty.yml" - fi - - term_font="$(awk -F ':|#' '/normal:/ {getline; print}' \ - "$alacritty_file")" + term_font="$(awk -F ':|#' '/normal:/ {getline; print}' "${confs[0]}")" term_font="${term_font/*family:}" term_font="${term_font/$'\n'*}" term_font="${term_font/\#*}" @@ -2846,19 +2841,11 @@ END ;; "kitty"*) - if [[ -f "${KITTY_CONFIG_DIRECTORY}/kitty/kitty.conf" ]]; then - kitty_file="${KITTY_CONFIG_DIRECTORY}/kitty/kitty.conf" - - elif [[ -f "${XDG_CONFIG_HOME}/kitty/kitty.conf" ]]; then - kitty_file="${XDG_CONFIG_HOME}/kitty/kitty.conf" + shopt -s nullglob + confs=({$KITTY_CONFIG_DIRECTORY,$XDG_CONFIG_HOME,~/Library/Preferences}/kitty/kitty.con?) + shopt -u nullglob - elif [[ -f "${HOME}/.config/kitty/kitty.conf" ]]; then - kitty_file="${HOME}/.config/kitty/kitty.conf" - - elif [[ -f "${HOME}/Library/Preferences/kitty/kitty.conf" ]]; then - kitty_file="${HOME}/Library/Preferences/kitty/kitty.conf" - - fi + [[ -f "${confs[0]}" ]] || return term_font="$(awk '/^([[:space:]]*|[^#_])font_family[[:space:]]+/ { $1 = ""; @@ -2868,7 +2855,7 @@ END /^([[:space:]]*|[^#_])font_size[[:space:]]+/ { size = $2 } - END { print font " " size}' "${kitty_file}")" + END { print font " " size}' "${confs[0]}")" ;; "konsole"*) From b3235cfff427784f51ea4c8e15e0a30bbfc2355e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Jun 2018 08:41:23 +1000 Subject: [PATCH 0483/1133] docs: update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index afc2571b6..8e69d6b63 100644 --- a/.travis.yml +++ b/.travis.yml @@ -20,4 +20,4 @@ script: - time ./neofetch --travis -v - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch; fi # Check for lines longer than 100 chars. - - if grep '.\{101\}' neofetch; then (exit 1); else (exit 0); fi + - if grep '.\{102\}' neofetch; then (exit 1); else (exit 0); fi From 9b09ed65fa887a50bad0f57cee20deee11d0e36c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Jun 2018 08:45:21 +1000 Subject: [PATCH 0484/1133] misc: cleanup --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 9d436cdec..a4b94cd36 100755 --- a/neofetch +++ b/neofetch @@ -2435,7 +2435,7 @@ get_song() { getline; t=$2 } - END{print a " \n " b " \n " t}')" + END {print a " \n " b " \n " t}')" ;; *) mpc &>/dev/null && song="$(mpc -f '%artist% \n %album% \n %title%' current)" ;; @@ -2996,7 +2996,7 @@ END /^\s*font/ { if(opt==1) a=$2; opt=0 - } END{print a}' "/etc/xdg/termite/config" \ + } END {print a}' "/etc/xdg/termite/config" \ "$termite_config")" ;; From 02c7c90496df5fb4cfca7ee115eb7aca89250ac5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Jun 2018 08:56:32 +1000 Subject: [PATCH 0485/1133] misc: cleanup --- neofetch | 157 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 82 insertions(+), 75 deletions(-) diff --git a/neofetch b/neofetch index a4b94cd36..fac82d4b5 100755 --- a/neofetch +++ b/neofetch @@ -1042,48 +1042,53 @@ get_model() { "iPhone OS") case "$kernel_machine" in - "iPad1,1") model="iPad" ;; - "iPad2,"[1-4]) model="iPad 2" ;; - "iPad3,"[1-3]) model="iPad 3" ;; - "iPad3,"[4-6]) model="iPad 4" ;; - "iPad6,11" | "iPad 6,12") model="iPad 5" ;; - "iPad4,"[1-3]) model="iPad Air" ;; - "iPad5,"[3-4]) model="iPad Air 2" ;; - "iPad6,"[7-8]) model="iPad Pro (12.9 Inch)" ;; - "iPad6,"[3-4]) model="iPad Pro (9.7 Inch)" ;; - "iPad7,"[1-2]) model="iPad Pro 2 (12.9 Inch)" ;; - "iPad7,"[3-4]) model="iPad Pro (10.5 Inch)" ;; - "iPad2,"[5-7]) model="iPad mini" ;; - "iPad4,"[4-6]) model="iPad mini 2" ;; - "iPad4,"[7-9]) model="iPad mini 3" ;; - "iPad5,"[1-2]) model="iPad mini 4" ;; - - "iPhone1,1") model="iPhone" ;; - "iPhone1,2") model="iPhone 3G" ;; - "iPhone2,1") model="iPhone 3GS" ;; - "iPhone3,"[1-3]) model="iPhone 4" ;; - "iPhone4,1") model="iPhone 4S" ;; - "iPhone5,"[1-2]) model="iPhone 5" ;; - "iPhone5,"[3-4]) model="iPhone 5c" ;; - "iPhone6,"[1-2]) model="iPhone 5s" ;; - "iPhone7,2") model="iPhone 6" ;; - "iPhone7,1") model="iPhone 6 Plus" ;; - "iPhone8,1") model="iPhone 6s" ;; - "iPhone8,2") model="iPhone 6s Plus" ;; - "iPhone8,4") model="iPhone SE" ;; - "iPhone9,1" | "iPhone9,3") model="iPhone 7" ;; - "iPhone9,2" | "iPhone9,4") model="iPhone 7 Plus" ;; - "iPhone10,1" | "iPhone10,4") model="iPhone 8" ;; - "iPhone10,2" | "iPhone10,5") model="iPhone 8 Plus" ;; - "iPhone10,3" | "iPhone10,6") model="iPhone X" ;; - - "iPod1,1") model="iPod touch" ;; - "ipod2,1") model="iPod touch 2G" ;; - "ipod3,1") model="iPod touch 3G" ;; - "ipod4,1") model="iPod touch 4G" ;; - "ipod5,1") model="iPod touch 5G" ;; - "ipod7,1") model="iPod touch 6G" ;; + "iPad1,1"): "iPad" ;; + "iPad2,"[1-4]): "iPad 2" ;; + "iPad3,"[1-3]): "iPad 3" ;; + "iPad3,"[4-6]): "iPad 4" ;; + "iPad4,"[1-3]): "iPad Air" ;; + "iPad5,"[3-4]): "iPad Air 2" ;; + "iPad6,"[7-8]): "iPad Pro (12.9 Inch)" ;; + "iPad6,"[3-4]): "iPad Pro (9.7 Inch)" ;; + "iPad7,"[1-2]): "iPad Pro 2 (12.9 Inch)" ;; + "iPad7,"[3-4]): "iPad Pro (10.5 Inch)" ;; + "iPad2,"[5-7]): "iPad mini" ;; + "iPad4,"[4-6]): "iPad mini 2" ;; + "iPad4,"[7-9]): "iPad mini 3" ;; + "iPad5,"[1-2]): "iPad mini 4" ;; + + "iPad6,11" | "iPad 6,12") + : "iPad 5" + ;; + + "iPhone1,1"): "iPhone" ;; + "iPhone1,2"): "iPhone 3G" ;; + "iPhone2,1"): "iPhone 3GS" ;; + "iPhone3,"[1-3]): "iPhone 4" ;; + "iPhone4,1"): "iPhone 4S" ;; + "iPhone5,"[1-2]): "iPhone 5" ;; + "iPhone5,"[3-4]): "iPhone 5c" ;; + "iPhone6,"[1-2]): "iPhone 5s" ;; + "iPhone7,2"): "iPhone 6" ;; + "iPhone7,1"): "iPhone 6 Plus" ;; + "iPhone8,1"): "iPhone 6s" ;; + "iPhone8,2"): "iPhone 6s Plus" ;; + "iPhone8,4"): "iPhone SE" ;; + + "iPhone9,1" | "iPhone9,3"): "iPhone 7" ;; + "iPhone9,2" | "iPhone9,4"): "iPhone 7 Plus" ;; + "iPhone10,1" | "iPhone10,4"): "iPhone 8" ;; + "iPhone10,2" | "iPhone10,5"): "iPhone 8 Plus" ;; + "iPhone10,3" | "iPhone10,6"): "iPhone X" ;; + + "iPod1,1"): "iPod touch" ;; + "ipod2,1"): "iPod touch 2G" ;; + "ipod3,1"): "iPod touch 3G" ;; + "ipod4,1"): "iPod touch 4G" ;; + "ipod5,1"): "iPod touch 5G" ;; + "ipod7,1"): "iPod touch 6G" ;; esac + model="$_" ;; "BSD" | "MINIX") @@ -1783,29 +1788,30 @@ get_cpu() { "iPhone OS") case "$kernel_machine" in - "iPhone1,"[1-2] | "iPod1,1") cpu="Samsung S5L8900 (1) @ 412MHz" ;; - "iPhone2,1") cpu="Samsung S5PC100 (1) @ 600MHz" ;; - "iPhone3,"[1-3] | "iPod4,1") cpu="Apple A4 (1) @ 800MHz" ;; - "iPhone4,1" | "iPod5,1") cpu="Apple A5 (2) @ 800MHz" ;; - "iPhone5,"[1-4]) cpu="Apple A6 (2) @ 1.3GHz" ;; - "iPhone6,"[1-2]) cpu="Apple A7 (2) @ 1.3GHz" ;; - "iPhone7,"[1-2]) cpu="Apple A8 (2) @ 1.4GHz" ;; - "iPhone8,"[1-4]) cpu="Apple A9 (2) @ 1.85GHz" ;; - "iPhone9,"[1-4]) cpu="Apple A10 Fusion (4) @ 2.34GHz" ;; - "iPod2,1") cpu="Samsung S5L8720 (1) @ 533MHz" ;; - "iPod3,1") cpu="Samsung S5L8922 (1) @ 600MHz" ;; - "iPod7,1") cpu="Apple A8 (2) @ 1.1GHz" ;; - "iPad1,1") cpu="Apple A4 (1) @ 1GHz" ;; - "iPad2,"[1-7]) cpu="Apple A5 (2) @ 1GHz" ;; - "iPad3,"[1-3]) cpu="Apple A5X (2) @ 1GHz" ;; - "iPad3,"[4-6]) cpu="Apple A6X (2) @ 1.4GHz" ;; - "iPad4,"[1-3]) cpu="Apple A7 (2) @ 1.4GHz" ;; - "iPad4,"[4-9]) cpu="Apple A7 (2) @ 1.4GHz" ;; - "iPad5,"[1-2]) cpu="Apple A8 (2) @ 1.5GHz" ;; - "iPad5,"[3-4]) cpu="Apple A8X (3) @ 1.5GHz" ;; - "iPad6,"[3-4]) cpu="Apple A9X (2) @ 2.16GHz" ;; - "iPad6,"[7-8]) cpu="Apple A9X (2) @ 2.26GHz" ;; + "iPhone1,"[1-2] | "iPod1,1"): "Samsung S5L8900 (1) @ 412MHz" ;; + "iPhone2,1"): "Samsung S5PC100 (1) @ 600MHz" ;; + "iPhone3,"[1-3] | "iPod4,1"): "Apple A4 (1) @ 800MHz" ;; + "iPhone4,1" | "iPod5,1"): "Apple A5 (2) @ 800MHz" ;; + "iPhone5,"[1-4]): "Apple A6 (2) @ 1.3GHz" ;; + "iPhone6,"[1-2]): "Apple A7 (2) @ 1.3GHz" ;; + "iPhone7,"[1-2]): "Apple A8 (2) @ 1.4GHz" ;; + "iPhone8,"[1-4]): "Apple A9 (2) @ 1.85GHz" ;; + "iPhone9,"[1-4]): "Apple A10 Fusion (4) @ 2.34GHz" ;; + "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; + "iPod3,1"): "Samsung S5L8922 (1) @ 600MHz" ;; + "iPod7,1"): "Apple A8 (2) @ 1.1GHz" ;; + "iPad1,1"): "Apple A4 (1) @ 1GHz" ;; + "iPad2,"[1-7]): "Apple A5 (2) @ 1GHz" ;; + "iPad3,"[1-3]): "Apple A5X (2) @ 1GHz" ;; + "iPad3,"[4-6]): "Apple A6X (2) @ 1.4GHz" ;; + "iPad4,"[1-3]): "Apple A7 (2) @ 1.4GHz" ;; + "iPad4,"[4-9]): "Apple A7 (2) @ 1.4GHz" ;; + "iPad5,"[1-2]): "Apple A8 (2) @ 1.5GHz" ;; + "iPad5,"[3-4]): "Apple A8X (3) @ 1.5GHz" ;; + "iPad6,"[3-4]): "Apple A9X (2) @ 2.16GHz" ;; + "iPad6,"[7-8]): "Apple A9X (2) @ 2.26GHz" ;; esac + cpu="$_" ;; "BSD") @@ -2099,34 +2105,35 @@ get_gpu() { "iPhone OS") case "$kernel_machine" in - "iPhone1,"[1-2]) gpu="PowerVR MBX Lite 3D" ;; - "iPhone5,"[1-4]) gpu="PowerVR SGX543MP3" ;; - "iPhone8,"[1-4]) gpu="PowerVR GT7600" ;; - "iPad3,"[1-3]) gpu="PowerVR SGX534MP4" ;; - "iPad3,"[4-6]) gpu="PowerVR SGX554MP4" ;; - "iPad5,"[3-4]) gpu="PowerVR GXA6850" ;; - "iPad6,"[3-8]) gpu="PowerVR 7XT" ;; + "iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;; + "iPhone5,"[1-4]): "PowerVR SGX543MP3" ;; + "iPhone8,"[1-4]): "PowerVR GT7600" ;; + "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; + "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; + "iPad5,"[3-4]): "PowerVR GXA6850" ;; + "iPad6,"[3-8]): "PowerVR 7XT" ;; "iPhone2,1" | "iPhone3,"[1-3] | "iPod3,1" | "iPod4,1" | "iPad1,1") - gpu="PowerVR SGX535" + : "PowerVR SGX535" ;; "iPhone4,1" | "iPad2,"[1-7] | "iPod5,1") - gpu="PowerVR SGX543MP2" + : "PowerVR SGX543MP2" ;; "iPhone6,"[1-2] | "iPad4,"[1-9]) - gpu="PowerVR G6430" + : "PowerVR G6430" ;; "iPhone7,"[1-2] | "iPod7,1" | "iPad5,"[1-2]) - gpu="PowerVR GX6450" + : "PowerVR GX6450" ;; "iPod1,1" | "iPod2,1") - gpu="PowerVR MBX Lite" + : "PowerVR MBX Lite" ;; esac + gpu="$_" ;; "Windows") From c652bfb97b60e6f181758978e2ba2cf7457fa851 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Jun 2018 09:58:27 +1000 Subject: [PATCH 0486/1133] config: Cleanup and fix bugs --- neofetch | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index fac82d4b5..2d258637c 100755 --- a/neofetch +++ b/neofetch @@ -4015,7 +4015,7 @@ get_full_path() { # For example "Pictures/Wallpapers" --> "/home/dylan/Pictures/Wallpapers" # If the file exists in the current directory, stop here. - [[ -f "${PWD}/${1/*\/}" ]] && { printf '%s\n' "${PWD}/${1/*\/}"; return; } + [[ -f "${PWD}/${1}" ]] && { printf '%s\n' "${PWD}/${1}"; return; } ! cd "${1%/*}" && { err "Error: Directory '${1%/*}' doesn't exist or is inaccessible" @@ -4039,21 +4039,21 @@ get_full_path() { } get_user_config() { - # Check $config_file. - [[ -f "$config_file" ]] && { + mkdir -p "${XDG_CONFIG_HOME}/neofetch/" + + shopt -s nullglob + files=("$XDG_CONFIG_HOME"/neofetch/confi*) + shopt -u nullglob + + # --config /path/to/config.conf + if [[ -f "$config_file" ]]; then source "$config_file" err "Config: Sourced user config. (${config_file})" return - } - mkdir -p "${XDG_CONFIG_HOME}/neofetch/" - # Check ${XDG_CONFIG_HOME}/neofetch and create the - # dir/files if they don't exist. - if [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config" - - elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then - config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" + elif [[ -f "${files[0]}" ]]; then + source "${files[0]}" + err "Config: Sourced user config. (${config_file})" else config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" @@ -4061,9 +4061,6 @@ get_user_config() { # The config file doesn't exist, create it. printf '%s\n' "$config" > "$config_file" fi - - source "$config_file" - err "Config: Sourced user config. (${config_file})" } bar() { @@ -4656,7 +4653,7 @@ get_distro_ascii() { # This function gets the distro ascii art and colors. # # $ascii_distro is the same as $distro. - case "$( trim "$ascii_distro")" in + case "$(trim "$ascii_distro")" in "AIX"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' From da5f443bec88435163605ae000284138bf59ceb5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Jun 2018 10:16:28 +1000 Subject: [PATCH 0487/1133] docs: update --- CHANGELOG.md | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bf1f16f85..9a201ebff 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,14 +7,23 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +logo + **Contributors** - [**@mstraube**](https://github.com/mstraube) -- [**@iandrewt**](https://github.com/iandrewt") +- [**@iandrewt**](https://github.com/iandrewt) +- [@konimex](https://github.com/konimex) **Operating System** +- Added support for Condres OS. [**@mstraube**](https://github.com/mstraube) - Added support for RedCore Linux. [**@mstraube**](https://github.com/mstraube) +- Added support for Regata OS. [**@mstraube**](https://github.com/mstraube) +- Added support for PureOS. +- Added support for Kibojoe Linux. +- Added support for SharkLinux. +- Added support for Linux Lite. **General** @@ -23,28 +32,51 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [macOS] Fixed neofetch launching XQuartz. - [misc] Removed `uppercase()`. - [misc] Removed all instances of `export`. +- [misc] Removed all deprecated options and functions. +- [info] Removed `get_install_date()`. **Ascii** - Fixed a bug causing Windows 7 ASCII art to not display. +- Simplified ASCII art handling. +- Updated Funtoo ASCII art. **Image** +- Improved performance of image handling. - Removed `catimg` support (*It didn’t allow us to specify height so we couldn’t accurately place the cursor*). - Fixed `tycat`, `sixel` and `kitty icat` image sizes. +- Simplified `w3m-img` code. **Screenshot** +See: https://github.com/dylanaraps/neofetch/issues/1001 + - Removed screenshot functionality. - Removed screenshot upload functionality. **Info** +- [cpu] Remove extra call to `uname`. +- [cpu] Simplify core calculation. +- [disk] Clean up. - [font] Fix iTerm2 checking for 2 extra profiles that don't exist. [**@iandrewt**](https://github.com/iandrewt") - [gpu] Fixed ATI/AMD branding issue. +- [gpu] Removed `glxinfo` usage (*too slow*). +- [packages] Added support for `flatpak`. +- [packages] Added support for `snap`. +- [packages] Added used package managers to output (`Packages: 900 + (pacman, snap)`). +- [packages] Fixed issues with `pacman` 5.1. +- [packages] Removed `find` usage. +- [packages] Removed `ls` usage. +- [packages] Removed `wc -l` usage. +- [song] Added support for `gmusicbrowser`. - [song] Fixed song detection on macOS. - [song] Fixed song output on systems using `C` locale. +- [term_font] Clean up of config file handling. +- [resolution] Added support for `xwininfo`. ## [4.0.2] - 2018-05-19 From 131719a5ffd964a2cbb9bb11cd4c3500394b8cc1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Jun 2018 10:16:49 +1000 Subject: [PATCH 0488/1133] docs: update --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a201ebff..b35432132 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [**@mstraube**](https://github.com/mstraube) - [**@iandrewt**](https://github.com/iandrewt) -- [@konimex](https://github.com/konimex) +- [**@konimex**](https://github.com/konimex) **Operating System** From 264fc4d02808222b34e8ecbb35f41eff3c44b34c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Jun 2018 10:17:30 +1000 Subject: [PATCH 0489/1133] docs: update --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b35432132..a3c1f5261 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -64,15 +64,15 @@ See: https://github.com/dylanaraps/neofetch/issues/1001 - [font] Fix iTerm2 checking for 2 extra profiles that don't exist. [**@iandrewt**](https://github.com/iandrewt") - [gpu] Fixed ATI/AMD branding issue. - [gpu] Removed `glxinfo` usage (*too slow*). -- [packages] Added support for `flatpak`. -- [packages] Added support for `snap`. +- [packages] Added support for `flatpak`. [**@konimex**](https://github.com/konimex) +- [packages] Added support for `snap`. [**@konimex**](https://github.com/konimex) - [packages] Added used package managers to output (`Packages: 900 (pacman, snap)`). - [packages] Fixed issues with `pacman` 5.1. - [packages] Removed `find` usage. - [packages] Removed `ls` usage. - [packages] Removed `wc -l` usage. -- [song] Added support for `gmusicbrowser`. +- [song] Added support for `gmusicbrowser`. [**@mstraube**](https://github.com/mstraube) - [song] Fixed song detection on macOS. - [song] Fixed song output on systems using `C` locale. - [term_font] Clean up of config file handling. From cc0d232b4862fc8ba2d18d8a430321564dc1eaf7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Jun 2018 10:21:15 +1000 Subject: [PATCH 0490/1133] docs: update --- CHANGELOG.md | 54 ++++++++++++++++++++++++++++------------------------ 1 file changed, 29 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a3c1f5261..6e60d1a3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -27,13 +27,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. **General** -- [output] Added `--json` to output the info in `json`. -- [cursor] Fixed prompt location issues after Neofetch is run. -- [macOS] Fixed neofetch launching XQuartz. -- [misc] Removed `uppercase()`. -- [misc] Removed all instances of `export`. -- [misc] Removed all deprecated options and functions. -- [info] Removed `get_install_date()`. +- **output**: Added `--json` to output the info in `json`. +- **cursor**: Fixed prompt location issues after Neofetch is run. +- **macOS**: Fixed neofetch launching XQuartz. +- **misc**: Removed `uppercase()`. +- **misc**: Removed all instances of `export`. +- **misc**: Removed all deprecated options and functions. +- **info**: Removed `get_install_date()`. **Ascii** @@ -58,25 +58,29 @@ See: https://github.com/dylanaraps/neofetch/issues/1001 **Info** -- [cpu] Remove extra call to `uname`. -- [cpu] Simplify core calculation. -- [disk] Clean up. -- [font] Fix iTerm2 checking for 2 extra profiles that don't exist. [**@iandrewt**](https://github.com/iandrewt") -- [gpu] Fixed ATI/AMD branding issue. -- [gpu] Removed `glxinfo` usage (*too slow*). -- [packages] Added support for `flatpak`. [**@konimex**](https://github.com/konimex) -- [packages] Added support for `snap`. [**@konimex**](https://github.com/konimex) -- [packages] Added used package managers to output (`Packages: 900 +- **cpu**: Remove extra call to `uname`. +- **cpu**: Simplify core calculation. +- **disk**: Clean up. +- **font**: Fix iTerm2 checking for 2 extra profiles that don't exist. + [**@iandrewt**](https://github.com/iandrewt") +- **gpu**: Fixed ATI/AMD branding issue. +- **gpu**: Removed `glxinfo` usage (*too slow*). +- **packages**: Added support for `flatpak`. + [**@konimex**](https://github.com/konimex) +- **packages**: Added support for `snap`. + [**@konimex**](https://github.com/konimex) +- **packages**: Added used package managers to output (`Packages: 900 (pacman, snap)`). -- [packages] Fixed issues with `pacman` 5.1. -- [packages] Removed `find` usage. -- [packages] Removed `ls` usage. -- [packages] Removed `wc -l` usage. -- [song] Added support for `gmusicbrowser`. [**@mstraube**](https://github.com/mstraube) -- [song] Fixed song detection on macOS. -- [song] Fixed song output on systems using `C` locale. -- [term_font] Clean up of config file handling. -- [resolution] Added support for `xwininfo`. +- **packages**: Fixed issues with `pacman` 5.1. +- **packages**: Removed `find` usage. +- **packages**: Removed `ls` usage. +- **packages**: Removed `wc -l` usage. +- **song**: Added support for `gmusicbrowser`. + [**@mstraube**](https://github.com/mstraube) +- **song**: Fixed song detection on macOS. +- **song**: Fixed song output on systems using `C` locale. +- **term\_font**: Clean up of config file handling. +- **resolution**: Added support for `xwininfo`. ## [4.0.2] - 2018-05-19 From d6505023a9ae0f4b48acc4858d26b020778de29e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Jun 2018 10:46:47 +1000 Subject: [PATCH 0491/1133] cursor: simplify statement --- neofetch | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 2d258637c..28c944e72 100755 --- a/neofetch +++ b/neofetch @@ -4122,15 +4122,11 @@ kde_config_dir() { } dynamic_prompt() { - [[ "$image_backend" == "off" ]] && { printf '\n'; return; } + [[ "$image_backend" == "off" ]] && { printf '\n'; return; } [[ "$image_backend" != "ascii" ]] && lines="$(((height + yoffset) / font_height + 1))" # If the ascii art is taller than the info. - if ((lines > info_height)); then - lines="$((lines - info_height + 1))" - else - lines=1 - fi + ((lines=lines>info_height?lines-info_height+1:1)) printf -v nlines "%${lines}s" printf "%b" "${nlines// /\\n}" From 81beb26972c5b6ec410a359c1f902e8d42f58fd5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Jun 2018 14:40:18 +1000 Subject: [PATCH 0492/1133] packages: Added option to display package counts individually. --- neofetch | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index 28c944e72..6e4cd890c 100755 --- a/neofetch +++ b/neofetch @@ -148,14 +148,15 @@ uptime_shorthand="on" # Show/Hide Package Manager names. # -# Default: 'on' -# Values: 'on', 'off' +# Default: 'tiny' +# Values: 'on', 'tiny' 'off' # Flag: --package_managers # # Example: -# on: '900 (pacman, apt)' -# off: '900' -package_managers="on" +# on: '998 (pacman), 8 (flatpak), 4 (snap)' +# tiny: '908 (pacman, flatpak, snap)' +# off: '908' +package_managers="tiny" # Shell @@ -1248,7 +1249,7 @@ get_packages() { # tot: Count lines in command output. has() { type -p "$1" >/dev/null && manager="$_"; } dir() { ((packages+=$#)); pac "$#"; } - pac() { (($1 > 0)) && managers+="${manager}, "; } + pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } tot() { IFS=$'\n' read -d "" -ra pkgs < <("$@");((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; } case "$os" in @@ -1333,11 +1334,16 @@ get_packages() { if ((packages == 0)); then unset packages - elif [[ "$package_managers" == "on" && "${managers//,}" ]]; then - managers="${managers/pacman-key/pacman}" - managers="${managers/nix-env/nix}" - packages+=" (${managers%,*})" + elif [[ "$package_managers" == "on" ]]; then + printf -v packages '%s, ' "${managers[@]}" + packages="${packages%,*}" + + elif [[ "$package_managers" == "tiny" ]]; then + packages+=" (${manager_string%,*})" fi + + packages="${packages/pacman-key/pacman}" + packages="${packages/nix-env/nix}" } get_shell() { @@ -4210,7 +4216,7 @@ INFO: NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - --package_managers on/off Hide/Show Package Manager names. + --package_managers on/off Hide/Show Package Manager names . (tiny, on, off) --os_arch on/off Hide/Show OS architecture. --speed_type type Change the type of cpu speed to display. Possible values: current, min, max, bios, From 62aca4615127743836640ec47f7fa3d61259dc99 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 5 Jun 2018 06:33:27 +1000 Subject: [PATCH 0493/1133] packages: Fix snap issue --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6e4cd890c..329724dea 100755 --- a/neofetch +++ b/neofetch @@ -1297,7 +1297,10 @@ get_packages() { # List these last as they accompany regular package managers. has "flatpak" && tot flatpak list - has "snap" && tot snap list && ((packages-=1)) + + # Snap hangs if the command is run without the daemon running. + # Only run snap if the daemon is also running. + has "snap" && ps -e | grep -Fm 1 "snapd" && tot snap list && ((packages-=1)) ;; "Mac OS X" | "MINIX") From 552523edbfd9c5d72554a98771ef3150c15e19f7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 5 Jun 2018 06:45:11 +1000 Subject: [PATCH 0494/1133] misc: cleanup --- neofetch | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 329724dea..fa9466ff6 100755 --- a/neofetch +++ b/neofetch @@ -2291,7 +2291,7 @@ get_memory() { # Bars. case "$memory_display" in - "bar") memory="$(bar "${mem_used}" "${mem_total}")" ;; + "bar") memory="$(bar "${mem_used}" "${mem_total}")" ;; "infobar") memory="${memory} $(bar "${mem_used}" "${mem_total}")" ;; "barinfo") memory="$(bar "${mem_used}" "${mem_total}")${info_color} ${memory}" ;; esac @@ -3125,10 +3125,10 @@ get_disk() { # Bar. case "$disk_display" in - "bar") disk="$(bar "$disk_perc" "100")" ;; + "bar") disk="$(bar "$disk_perc" "100")" ;; "infobar") disk+=" $(bar "$disk_perc" "100")" ;; "barinfo") disk="$(bar "$disk_perc" "100")${info_color} $disk" ;; - "perc") disk="${disk_perc}% $(bar "$disk_perc" "100")" ;; + "perc") disk="${disk_perc}% $(bar "$disk_perc" "100")" ;; esac # Append '(disk mount point)' to the subtitle. @@ -3153,7 +3153,7 @@ get_battery() { battery="${capacity}% [${status}]" case "$battery_display" in - "bar") battery="$(bar "$capacity" 100)" ;; + "bar") battery="$(bar "$capacity" 100)" ;; "infobar") battery+=" $(bar "$capacity" 100)" ;; "barinfo") battery="$(bar "$capacity" 100)${info_color} ${battery}" ;; esac @@ -3212,7 +3212,7 @@ get_battery() { [[ "$battery_state" ]] && battery+=" Charging" case "$battery_display" in - "bar") battery="$(bar "${battery/'%'*}" 100)" ;; + "bar") battery="$(bar "${battery/'%'*}" 100)" ;; "infobar") battery="${battery} $(bar "${battery/'%'*}" 100)" ;; "barinfo") battery="$(bar "${battery/'%'*}" 100)${info_color} ${battery}" ;; esac @@ -4359,8 +4359,6 @@ ASCII: --ascii_bold on/off Whether or not to bold the ascii logo. -L, --logo Hide the info text and only show the ascii logo. - Possible values: bar, infobar, barinfo, off - IMAGE: --loop Redraw the image constantly until Ctrl+C is used. This fixes issues in some terminals emulators when using image mode. From 108bb9cff94e01d19b939e7374d020fffb132eac Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Tue, 5 Jun 2018 07:40:29 +1000 Subject: [PATCH 0495/1133] os: add macOS codename for Mojave --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index fa9466ff6..9955d89a1 100755 --- a/neofetch +++ b/neofetch @@ -940,6 +940,7 @@ get_distro() { "10.11"*) codename="OS X El Capitan" ;; "10.12"*) codename="macOS Sierra" ;; "10.13"*) codename="macOS High Sierra" ;; + "10.14"*) codename="macOS Mojave" ;; *) codename="macOS" ;; esac distro="$codename $osx_version $osx_build" @@ -950,7 +951,7 @@ get_distro() { case "$osx_version" in "10."[4-7]*) distro="${distro/${codename}/Mac OS X}" ;; "10."[8-9]* | "10.1"[0-1]*) distro="${distro/${codename}/OS X}" ;; - "10.1"[2-3]*) distro="${distro/${codename}/macOS}" ;; + "10.1"[2-4]*) distro="${distro/${codename}/macOS}" ;; esac distro="${distro/ ${osx_build}}" ;; From edb960fecebed23e58f2b652de5fba9f69a079cb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 5 Jun 2018 07:42:54 +1000 Subject: [PATCH 0496/1133] docs: update --- README.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e829aa1ce..459b274ed 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,7 @@ +

neofetch @@ -55,6 +56,7 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, ## Donate -Donations will allow me to spend more time working on `neofetch`. +Donations allow me to spend more time working on `neofetch` and my other Open Source projects. If you like `neofetch` and want to give back in some way you can donate at the links below. + + -If you like `neofetch` and want to give back in some way you can donate here: **https://patreon.com/dyla** From 6e41a62193aeed75fac8980f88a82cf4d767bbc7 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Tue, 5 Jun 2018 07:42:58 +1000 Subject: [PATCH 0497/1133] docs: update [skip ci] --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e60d1a3b..7aa203808 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Added support for Kibojoe Linux. - Added support for SharkLinux. - Added support for Linux Lite. +- Added support for macOS 10.14 Mojave. [**@iandrewt**](https://github.com/iandrewt) **General** From f847b05e322d150fe13a09c96fecba41f144a0e4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 5 Jun 2018 11:50:55 +1000 Subject: [PATCH 0498/1133] image: Added method to get the terminal size using an escape sequence. --- neofetch | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 9955d89a1..fcddf346d 100755 --- a/neofetch +++ b/neofetch @@ -3361,7 +3361,7 @@ image_backend() { return } - get_term_size + get_window_size ((term_width < 1)) && { to_ascii "Image: Failed to find terminal window size." @@ -3530,11 +3530,11 @@ get_w3m_img_path() { err "Image: w3m-img wasn't found on your system" } -get_term_size() { +get_window_size() { # This functions gets the current window size in # pixels. # - # We first try to use the escape sequence "\044[14t" + # We first try to use the escape sequence "\033[14t" # to get the terminal window size in pixels. If this # fails we then fallback to using "xdotool" or other # programs. @@ -3606,14 +3606,27 @@ get_term_size() { term_width="${term_width:-0}" } -get_image_size() { - # This functions determines the size to make - # the thumbnail image. - read -r lines columns <<< "$(stty size)" + +get_term_size() { + # Get the terminal size in cells. + printf '%b' '\e[18t' + IFS=';t' read -d t -t 0.05 -sra term_cells + + lines="${term_cells[1]}" + columns="${term_cells[2]}" + + # Fallback to stty if above sequence isn't supported. + [[ -z "$lines" || -z "$columns" ]] && \ + read -r lines columns <<< "$(stty size)" # Calculate font size. font_width="$((term_width / columns))" font_height="$((term_height / lines))" +} + +get_image_size() { + # This functions determines the size to make the thumbnail image. + get_term_size case "$image_size" in "auto") From bc9fd232e4e7be29a78a52a662863de62d073acd Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 5 Jun 2018 12:19:18 +1000 Subject: [PATCH 0499/1133] distro: Fixed file error --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index fcddf346d..a7e761e89 100755 --- a/neofetch +++ b/neofetch @@ -860,7 +860,7 @@ get_distro() { # Chrome OS doesn't conform to the /etc/*-release standard. # While the file is a series of variables they can't be sourced # by the shell since the values aren't quoted. - elif [[ "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then + elif [[ -f /etc/lsb-release && "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then distro="$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release)" elif [[ -f "/etc/os-release" || \ From d8f7e8df54fb58fb3e05fa52156632fb6e8544c5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 5 Jun 2018 12:20:12 +1000 Subject: [PATCH 0500/1133] config: Fixed incorrect error message --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index a7e761e89..59d7218b9 100755 --- a/neofetch +++ b/neofetch @@ -4076,7 +4076,7 @@ get_user_config() { elif [[ -f "${files[0]}" ]]; then source "${files[0]}" - err "Config: Sourced user config. (${config_file})" + err "Config: Sourced user config. (${files[0]})" else config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" From e95776d40b9c0c5d6279232c74c906bbec82a2c5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 5 Jun 2018 13:12:29 +1000 Subject: [PATCH 0501/1133] misc: cleanup --- neofetch | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 59d7218b9..96cd9850d 100755 --- a/neofetch +++ b/neofetch @@ -774,13 +774,13 @@ get_os() { # $kernel_name is set in a function called cache_uname and is # just the output of "uname -s". case "$kernel_name" in - "Darwin") : "$(sw_vers -productName)" ;; - "SunOS") : "Solaris" ;; - "Haiku") : "Haiku" ;; - "MINIX") : "MINIX" ;; - "AIX") : "AIX" ;; - "IRIX"*) : "IRIX" ;; - "FreeMiNT") : "FreeMiNT" ;; + "Darwin"): "$(sw_vers -productName)" ;; + "SunOS"): "Solaris" ;; + "Haiku"): "Haiku" ;; + "MINIX"): "MINIX" ;; + "AIX"): "AIX" ;; + "IRIX"*): "IRIX" ;; + "FreeMiNT"): "FreeMiNT" ;; "Linux" | "GNU"*) : "Linux" @@ -1283,7 +1283,7 @@ get_packages() { /var/db/paludis/repositories/installed/data/*/ # Other (Needs complex command) - has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) + has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) case "$kernel_name" in "FreeBSD") has "pkg" && tot pkg info ;; @@ -1774,10 +1774,8 @@ get_cpu() { fi # Get CPU temp. - if [[ -f "$temp_dir" ]]; then - deg="$(< "$temp_dir")" - deg="$((deg * 100 / 10000))" - fi + [[ -f "$temp_dir" ]] && \ + deg="$(($(< "$temp_dir") * 100 / 10000))" # Get CPU cores. case "$cpu_cores" in From 428b73fc5acdcb579f11be28aa130fdbe87d46fa Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Tue, 5 Jun 2018 23:13:20 +1000 Subject: [PATCH 0502/1133] os: add cache_uname for Darwin (macOS/iOS) --- neofetch | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 96cd9850d..c9410da77 100755 --- a/neofetch +++ b/neofetch @@ -774,7 +774,7 @@ get_os() { # $kernel_name is set in a function called cache_uname and is # just the output of "uname -s". case "$kernel_name" in - "Darwin"): "$(sw_vers -productName)" ;; + "Darwin"): "$darwin_name" ;; "SunOS"): "Solaris" ;; "Haiku"): "Haiku" ;; "MINIX"): "MINIX" ;; @@ -926,9 +926,6 @@ get_distro() { ;; "Mac OS X") - osx_version="$(sw_vers -productVersion)" - osx_build="$(sw_vers -buildVersion)" - case "$osx_version" in "10.4"*) codename="Mac OS X Tiger" ;; "10.5"*) codename="Mac OS X Leopard" ;; @@ -959,7 +956,7 @@ get_distro() { ;; "iPhone OS") - distro="iOS $(sw_vers -productVersion)" + distro="iOS $osx_version" # "uname -m" doesn't print architecture on iOS so we force it off. os_arch="off" @@ -4161,6 +4158,14 @@ cache_uname() { kernel_name="${uname[0]}" kernel_version="${uname[1]}" kernel_machine="${uname[2]}" + + if [[ "$kernel_name" == "Darwin" ]]; then + IFS=$'\n' read -d "" -ra sw_vers < <(awk -F'<|>' '/string/ {print $3}' \ + "/System/Library/CoreServices/SystemVersion.plist") + darwin_name="${sw_vers[2]}" + osx_version="${sw_vers[3]}" + osx_build="${sw_vers[0]}" + fi } get_ppid() { From e7645597e1d72198a3dfca2df7ada100562384cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Birger=20J=2E=20Nord=C3=B8lum?= Date: Tue, 5 Jun 2018 19:33:20 +0200 Subject: [PATCH 0503/1133] awk: Space around END --- neofetch | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index c9410da77..781bedd6b 100755 --- a/neofetch +++ b/neofetch @@ -1777,7 +1777,7 @@ get_cpu() { # Get CPU cores. case "$cpu_cores" in "logical" | "on") cores="$(grep -c "^processor" "$cpu_file")" ;; - "physical") cores="$(awk '/^core id/&&!a[$0]++{++i}END{print i}' "$cpu_file")" ;; + "physical") cores="$(awk '/^core id/&&!a[$0]++{++i} END {print i}' "$cpu_file")" ;; esac ;; @@ -2024,7 +2024,7 @@ get_gpu() { "Linux") # Read GPUs into array. gpu_cmd="$(lspci -mm | awk -F '\\"|\\" \\"|\\(' \ - '/"Display|"3D|"VGA/ {a[$0] = $3 " " $4} END{for(i in a) + '/"Display|"3D|"VGA/ {a[$0] = $3 " " $4} END {for(i in a) {if(!seen[a[i]]++) print a[i]}}')" IFS=$'\n' read -d "" -ra gpus <<< "$gpu_cmd" @@ -2229,13 +2229,13 @@ get_memory() { ;; "OpenBSD"*) ;; - *) mem_free="$(($(vmstat | awk 'END{printf $5}') / 1024))" ;; + *) mem_free="$(($(vmstat | awk 'END {printf $5}') / 1024))" ;; esac # Mem used. case "$kernel_name" in "OpenBSD"*) - mem_used="$(vmstat | awk 'END{printf $3}')" + mem_used="$(vmstat | awk 'END {printf $3}')" mem_used="${mem_used/M}" ;; @@ -2405,18 +2405,18 @@ get_song() { "banshee"*) song="$(banshee --query-artist --query-album --query-title |\ awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} - END{print a " \n " b " \n "t}')" + END {print a " \n " b " \n "t}')" ;; "amarok"*) song="$(qdbus org.kde.amarok /Player GetMetadata |\ awk -F':' '/^artist:/ {a=$2} /^album:/ {b=$2} /^title:/ {t=$2} - END{print a " \n " b " \n " t}')" + END {print a " \n " b " \n " t}')" ;; "pragha"*) song="$(pragha -c | awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} - END{print a " \n " b " \n " t}')" + END {print a " \n " b " \n " t}')" ;; "exaile"*) @@ -2429,7 +2429,7 @@ get_song() { song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \ /net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\ awk -F'"' '/artist/ {getline; a=$2} /album/ {getline; b=$2} - /title/ {getline; t=$2} END{print a " \n " b " \n " t}')" + /title/ {getline; t=$2} END {print a " \n " b " \n " t}')" ;; "pogo"*) @@ -2837,13 +2837,13 @@ END ;; "deepin-terminal"*) - term_font="$(awk -F '=' '/font=/ {a=$2} /font_size/ {b=$2} END{print a " " b}' \ + term_font="$(awk -F '=' '/font=/ {a=$2} /font_size/ {b=$2} END {print a " " b}' \ "${XDG_CONFIG_HOME}/deepin/deepin-terminal/config.conf")" ;; "GNUstep_Terminal") term_font="$(awk -F '>|<' '/>TerminalFontTerminalFontSizeTerminalFontSize Date: Wed, 6 Jun 2018 18:02:07 +0200 Subject: [PATCH 0504/1133] misc: indent --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 781bedd6b..3d5c2cc30 100755 --- a/neofetch +++ b/neofetch @@ -1568,7 +1568,7 @@ get_wm_theme() { "Sawfish") wm_theme="$(awk -F '\\(quote|\\)' '/default-frame-style/ {print $(NF-4)}' \ - "${HOME}/.sawfish/custom")" + "${HOME}/.sawfish/custom")" ;; "Cinnamon" | "Muffin" | "Mutter (Muffin)") @@ -2405,13 +2405,13 @@ get_song() { "banshee"*) song="$(banshee --query-artist --query-album --query-title |\ awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} - END {print a " \n " b " \n "t}')" + END {print a " \n " b " \n "t}')" ;; "amarok"*) song="$(qdbus org.kde.amarok /Player GetMetadata |\ awk -F':' '/^artist:/ {a=$2} /^album:/ {b=$2} /^title:/ {t=$2} - END {print a " \n " b " \n " t}')" + END {print a " \n " b " \n " t}')" ;; "pragha"*) @@ -2922,7 +2922,7 @@ END if(/Fullscreen/) getline; id=$2"]" } $0~id {if(id) {getline; print $2; exit}}' \ - "$mateterm_config")" + "$mateterm_config")" rm -f "$mateterm_config" From 059239d2a7d90448fc99bb0079501bb9ea324b64 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 7 Jun 2018 13:47:13 +0200 Subject: [PATCH 0505/1133] song: use get_song_dbus for pragha --- neofetch | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 3d5c2cc30..a0059a6d6 100755 --- a/neofetch +++ b/neofetch @@ -2369,6 +2369,7 @@ get_song() { "audacious"*) get_song_dbus "audacious" ;; "vlc"*) get_song_dbus "vlc" ;; "gmusicbrowser"*) get_song_dbus "gmusicbrowser" ;; + "pragha"*) get_song_dbus "pragha" ;; "cmus"*) song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; @@ -2414,11 +2415,6 @@ get_song() { END {print a " \n " b " \n " t}')" ;; - "pragha"*) - song="$(pragha -c | awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} - END {print a " \n " b " \n " t}')" - ;; - "exaile"*) song="$(dbus-send --print-reply --dest=org.exaile.Exaile /org/exaile/Exaile \ org.exaile.Exaile.Query | From 26389a8423c865c97cd43d8499f340caf78c11a8 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 8 Jun 2018 13:56:45 +0200 Subject: [PATCH 0506/1133] song: use get_song_dbus for amarok --- neofetch | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/neofetch b/neofetch index a0059a6d6..559a7b33f 100755 --- a/neofetch +++ b/neofetch @@ -2370,6 +2370,7 @@ get_song() { "vlc"*) get_song_dbus "vlc" ;; "gmusicbrowser"*) get_song_dbus "gmusicbrowser" ;; "pragha"*) get_song_dbus "pragha" ;; + "amarok"*) get_song_dbus "amarok" ;; "cmus"*) song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; @@ -2409,12 +2410,6 @@ get_song() { END {print a " \n " b " \n "t}')" ;; - "amarok"*) - song="$(qdbus org.kde.amarok /Player GetMetadata |\ - awk -F':' '/^artist:/ {a=$2} /^album:/ {b=$2} /^title:/ {t=$2} - END {print a " \n " b " \n " t}')" - ;; - "exaile"*) song="$(dbus-send --print-reply --dest=org.exaile.Exaile /org/exaile/Exaile \ org.exaile.Exaile.Query | From abe6b82fc79a5a67f33f63e4741e7d2d90b10a86 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 8 Jun 2018 14:18:56 +0200 Subject: [PATCH 0507/1133] song: add comment for exaile --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 559a7b33f..942626063 100755 --- a/neofetch +++ b/neofetch @@ -2411,6 +2411,7 @@ get_song() { ;; "exaile"*) + # NOTE: Exaile >= 4.0.0 will support mpris2. song="$(dbus-send --print-reply --dest=org.exaile.Exaile /org/exaile/Exaile \ org.exaile.Exaile.Query | awk -F':|,' '{if ($6 && $8 && $4) printf $6 " \n" $8 " \n" $4}')" From 440e8ca7b1a460fe8c8d592c30f87a44738220ab Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 9 Jun 2018 17:22:51 +1000 Subject: [PATCH 0508/1133] packages: Fix bug with snapd. Closes #1026 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 96cd9850d..cd4f1d703 100755 --- a/neofetch +++ b/neofetch @@ -1301,7 +1301,7 @@ get_packages() { # Snap hangs if the command is run without the daemon running. # Only run snap if the daemon is also running. - has "snap" && ps -e | grep -Fm 1 "snapd" && tot snap list && ((packages-=1)) + has "snap" && ps -e | grep -qFm 1 "snapd" >/dev/null && tot snap list && ((packages-=1)) ;; "Mac OS X" | "MINIX") From 078cda7b48222751c8f19e72fec7e25b713375ca Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 9 Jun 2018 17:23:42 +1000 Subject: [PATCH 0509/1133] misc: cleanup --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index ae144db2b..58b330f24 100755 --- a/neofetch +++ b/neofetch @@ -3604,7 +3604,7 @@ get_term_size() { # Fallback to stty if above sequence isn't supported. [[ -z "$lines" || -z "$columns" ]] && \ - read -r lines columns <<< "$(stty size)" + read -r lines columns < <(stty size) # Calculate font size. font_width="$((term_width / columns))" From 40bf68af26d23d137454fd045e3e687a8a7720a2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 9 Jun 2018 17:40:09 +1000 Subject: [PATCH 0510/1133] packages: Fix dpkg bug. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 58b330f24..45ec4fb35 100755 --- a/neofetch +++ b/neofetch @@ -1254,7 +1254,7 @@ get_packages() { "Linux" | "BSD" | "iPhone OS" | "Solaris") # Package Manager Programs. has "pacman-key" && tot pacman -Qq --color never - has "dpkg" && tot dpkg-query -f '\n' -W + has "dpkg" && tot dpkg-query -f . -W has "rpm" && tot rpm -qa has "xbps-query" && tot xbps-query -l has "apk" && tot apk info From e7306982e9c4b245923c68267ee0f3efcd842b0d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 9 Jun 2018 17:48:49 +1000 Subject: [PATCH 0511/1133] packages: Fix bug with dpkg --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 45ec4fb35..ede143979 100755 --- a/neofetch +++ b/neofetch @@ -1254,7 +1254,7 @@ get_packages() { "Linux" | "BSD" | "iPhone OS" | "Solaris") # Package Manager Programs. has "pacman-key" && tot pacman -Qq --color never - has "dpkg" && tot dpkg-query -f . -W + has "dpkg" && tot dpkg-query -f '.\n' -W has "rpm" && tot rpm -qa has "xbps-query" && tot xbps-query -l has "apk" && tot apk info From 94ae0099be93c42d8e7b4489e12de58acf81296b Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 13 Jun 2018 17:58:41 +0200 Subject: [PATCH 0512/1133] song: Add Dragon Player --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index ede143979..391190b30 100755 --- a/neofetch +++ b/neofetch @@ -424,6 +424,7 @@ disk_subtitle="mount" # cmus # deadbeef # deepin-music +# dragon # elisa # exaile # gnome-music @@ -2303,6 +2304,7 @@ get_song() { "cmus" "deadbeef" "deepin-music" + "dragon" "elise" "exaile" "gnome-music" @@ -2371,6 +2373,7 @@ get_song() { "gmusicbrowser"*) get_song_dbus "gmusicbrowser" ;; "pragha"*) get_song_dbus "pragha" ;; "amarok"*) get_song_dbus "amarok" ;; + "dragon"*) get_song_dbus "dragonplayer" ;; "cmus"*) song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; From ea462a8ec15945005806eada0fd9acf51cf66015 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 13 Jun 2018 18:03:51 +0200 Subject: [PATCH 0513/1133] song: Add SMPlayer --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 391190b30..7ed28d386 100755 --- a/neofetch +++ b/neofetch @@ -443,6 +443,7 @@ disk_subtitle="mount" # quodlibet # rhythmbox # sayonara +# smplayer # spotify # Spotify # tomahawk @@ -2323,6 +2324,7 @@ get_song() { "quodlibet" "rhythmbox" "sayonara" + "smplayer" "spotify" "Spotify" "tomahawk" @@ -2374,6 +2376,7 @@ get_song() { "pragha"*) get_song_dbus "pragha" ;; "amarok"*) get_song_dbus "amarok" ;; "dragon"*) get_song_dbus "dragonplayer" ;; + "smplayer"*) get_song_dbus "smplayer" ;; "cmus"*) song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; From 1fc48be2f4d36ec780277931f30992db3521b7fc Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 14 Jun 2018 20:43:52 +0200 Subject: [PATCH 0514/1133] OS: Add support for ClearOS --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 7ed28d386..8d743ee41 100755 --- a/neofetch +++ b/neofetch @@ -5417,6 +5417,32 @@ ${c1} ..,:${c3}dOkxl:. EOF ;; + "ClearOS"*) + set_colors 2 + read -rd '' ascii_data <<'EOF' +${c1} `.--::::::--.` + .-:////////////////:-. + `-////////////////////////-` + -////////////////////////////- + `//////////////-..-//////////////` + ./////////////: ://///////////. + `//////:..-////: :////-..-//////` + ://////` -///:.``.:///-` ://///: +`///////:. -////////-` `:///////` +.//:--////:. -////-` `:////--://. +./: .////:. --` `:////- :/. +`//-` .////:. `:////- `-//` + :///-` .////:. `:////- `-///: + `/////-` -///: :///- `-/////` + `//////- `///: :///` .//////` + `:////: `///: :///` -////:` + .://: `///: :///` -//:. + .:: `///: :///` -:. + `///: :///` + `... ...` +EOF + ;; + "Clover"*) set_colors 2 6 read -rd '' ascii_data <<'EOF' From b3e6b7e818d91a9c4f436543b381d252131e876d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 19 Jun 2018 08:59:14 +1000 Subject: [PATCH 0515/1133] song: Added mpc_args to specify arguments for mpc. Closes #1033 --- neofetch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index ede143979..db9aeed8a 100755 --- a/neofetch +++ b/neofetch @@ -474,6 +474,12 @@ song_format="%artist% - %album% - %title%" # off: 'Song: The Fratellis - Costello Music - Chelsea Dagger' song_shorthand="off" +# 'mpc' arguments (specify a host, password etc). +# +# Default: '' +# Example: mpc_args=(-h HOST -P PASSWORD) +mpc_args=() + # Text Colors @@ -2348,7 +2354,7 @@ get_song() { } case "${player/*\/}" in - "mpd"* | "mopidy"*) song="$(mpc -f '%artist% \n %album% \n %title%' current)" ;; + "mpd"* | "mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;; "mocp"*) song="$(mocp -Q '%artist \n %album \n %song')" ;; "google play"*) song="$(gpmdp-remote current)" ;; "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta \n %at \n %tt')" ;; From 24f52593397a1d87c7cb3ebd7acda8aea650b7df Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 19 Jun 2018 09:04:10 +1000 Subject: [PATCH 0516/1133] fix tests --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 11381d74f..8fa15897f 100755 --- a/neofetch +++ b/neofetch @@ -4665,7 +4665,7 @@ get_args() { cpu_temp="C" # Known implicit unused variables. - printf '%s\n' "$kernel $icons $font $battery $locale" + printf '%s\n' "$kernel $icons $font $battery $locale ${mpc_args[@]}" ;; esac From afb6782a88c3dcf34b92dc45880e0f4dc4f15703 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 19 Jun 2018 09:08:02 +1000 Subject: [PATCH 0517/1133] fix tests --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 8fa15897f..055370128 100755 --- a/neofetch +++ b/neofetch @@ -2358,7 +2358,7 @@ get_song() { } case "${player/*\/}" in - "mpd"* | "mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;; + "mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]:?}")" ;; "mocp"*) song="$(mocp -Q '%artist \n %album \n %song')" ;; "google play"*) song="$(gpmdp-remote current)" ;; "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta \n %at \n %tt')" ;; @@ -4665,7 +4665,7 @@ get_args() { cpu_temp="C" # Known implicit unused variables. - printf '%s\n' "$kernel $icons $font $battery $locale ${mpc_args[@]}" + printf '%s\n' "$kernel $icons $font $battery $locale ${mpc_args[*]}" ;; esac From 2783446387dcc27e8a159d9cba00d40c955f214e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 19 Jun 2018 09:09:09 +1000 Subject: [PATCH 0518/1133] fix tests --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 055370128..bc09d54e1 100755 --- a/neofetch +++ b/neofetch @@ -2358,7 +2358,7 @@ get_song() { } case "${player/*\/}" in - "mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]:?}")" ;; + "mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;; "mocp"*) song="$(mocp -Q '%artist \n %album \n %song')" ;; "google play"*) song="$(gpmdp-remote current)" ;; "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta \n %at \n %tt')" ;; @@ -4665,6 +4665,7 @@ get_args() { cpu_temp="C" # Known implicit unused variables. + mpc_args=() printf '%s\n' "$kernel $icons $font $battery $locale ${mpc_args[*]}" ;; esac From 94362674f2332b7bc8550ed38ac9243e16b2c596 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 19 Jun 2018 09:21:48 +1000 Subject: [PATCH 0519/1133] image: Use stty instead of sequence first. --- CHANGELOG.md | 25 +++++++++++++------------ neofetch | 10 +--------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aa203808..bcbe16c12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,15 +11,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. **Contributors** -- [**@mstraube**](https://github.com/mstraube) +- [**@arisinfenix**](https://github.com/arisinfenix) - [**@iandrewt**](https://github.com/iandrewt) - [**@konimex**](https://github.com/konimex) **Operating System** -- Added support for Condres OS. [**@mstraube**](https://github.com/mstraube) -- Added support for RedCore Linux. [**@mstraube**](https://github.com/mstraube) -- Added support for Regata OS. [**@mstraube**](https://github.com/mstraube) +- Added support for Condres OS. [**@arisinfenix**](https://github.com/arisinfenix) +- Added support for RedCore Linux. [**@arisinfenix**](https://github.com/arisinfenix) +- Added support for Regata OS. [**@arisinfenix**](https://github.com/arisinfenix) +- Added support for ClearOS. [**@arisinfenix**](https://github.com/arisinfenix) - Added support for PureOS. - Added support for Kibojoe Linux. - Added support for SharkLinux. @@ -62,24 +63,24 @@ See: https://github.com/dylanaraps/neofetch/issues/1001 - **cpu**: Remove extra call to `uname`. - **cpu**: Simplify core calculation. - **disk**: Clean up. -- **font**: Fix iTerm2 checking for 2 extra profiles that don't exist. - [**@iandrewt**](https://github.com/iandrewt") +- **font**: Fix iTerm2 checking for 2 extra profiles that don't exist. [**@iandrewt**](https://github.com/iandrewt") - **gpu**: Fixed ATI/AMD branding issue. - **gpu**: Removed `glxinfo` usage (*too slow*). -- **packages**: Added support for `flatpak`. - [**@konimex**](https://github.com/konimex) -- **packages**: Added support for `snap`. - [**@konimex**](https://github.com/konimex) +- **packages**: Added support for `flatpak`. [**@konimex**](https://github.com/konimex) +- **packages**: Added support for `snap`. [**@konimex**](https://github.com/konimex) - **packages**: Added used package managers to output (`Packages: 900 (pacman, snap)`). - **packages**: Fixed issues with `pacman` 5.1. +- **packages**: Fixed issues with `dpkg`. - **packages**: Removed `find` usage. - **packages**: Removed `ls` usage. - **packages**: Removed `wc -l` usage. -- **song**: Added support for `gmusicbrowser`. - [**@mstraube**](https://github.com/mstraube) +- **song**: Added support for `gmusicbrowser`. [**@arisinfenix**](https://github.com/arisinfenix) +- **song**: Added support for `SMPlayer`. [**@arisinfenix**](https://github.com/arisinfenix) +- **song**: Added support for `Dragon Player`. [**@arisinfenix**](https://github.com/arisinfenix) - **song**: Fixed song detection on macOS. - **song**: Fixed song output on systems using `C` locale. +- **song**: Added `mpc_args` to send additional arguments to `mpc`. - **term\_font**: Clean up of config file handling. - **resolution**: Added support for `xwininfo`. diff --git a/neofetch b/neofetch index bc09d54e1..d33d6ea67 100755 --- a/neofetch +++ b/neofetch @@ -3608,15 +3608,7 @@ get_window_size() { get_term_size() { # Get the terminal size in cells. - printf '%b' '\e[18t' - IFS=';t' read -d t -t 0.05 -sra term_cells - - lines="${term_cells[1]}" - columns="${term_cells[2]}" - - # Fallback to stty if above sequence isn't supported. - [[ -z "$lines" || -z "$columns" ]] && \ - read -r lines columns < <(stty size) + read -r lines columns < <(stty size) # Calculate font size. font_width="$((term_width / columns))" From 01bd13a3b555f0e8b4eb201c1a68423a1bd7bcf7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 19 Jun 2018 09:37:10 +1000 Subject: [PATCH 0520/1133] song: Fix detection. --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d33d6ea67..8737d3fc1 100755 --- a/neofetch +++ b/neofetch @@ -2340,7 +2340,8 @@ get_song() { ) printf -v players "|%s" "${players[@]}" - player="$(ps -e | awk -v pattern="(${players:1})$" '$0 ~ pattern {print $NF; exit}')" + player="$(ps aux | awk -v pattern="(${players:1})" \ + '!/ awk / && match($0,pattern){print substr($0,RSTART,RLENGTH); exit}')" [[ "$music_player" && "$music_player" != "auto" ]] && \ player="$music_player" From d35574352fb39812c676aa5e54ef4530706d85fc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 19 Jun 2018 09:41:27 +1000 Subject: [PATCH 0521/1133] misc: cleanup --- neofetch | 4 ++-- neofetch.1 | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 8737d3fc1..6533c5779 100755 --- a/neofetch +++ b/neofetch @@ -28,7 +28,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -version="4.0.3" +version="5.0.0" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" @@ -156,7 +156,7 @@ uptime_shorthand="on" # on: '998 (pacman), 8 (flatpak), 4 (snap)' # tiny: '908 (pacman, flatpak, snap)' # off: '908' -package_managers="tiny" +package_managers="on" # Shell diff --git a/neofetch.1 b/neofetch.1 index 7b83df3e3..37776b724 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "June 2018" "Neofetch 4.0.3" "User Commands" +.TH NEOFETCH "1" "June 2018" "Neofetch 5.0.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -23,7 +23,7 @@ For example: 'info "Memory" memory' would be '\-\-disable memory' NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu' .TP \fB\-\-package_managers\fR on/off -Hide/Show Package Manager names. +Hide/Show Package Manager names . (tiny, on, off) .TP \fB\-\-os_arch\fR on/off Hide/Show OS architecture. @@ -260,8 +260,6 @@ Whether or not to bold the ascii logo. .TP \fB\-L\fR, \fB\-\-logo\fR Hide the info text and only show the ascii logo. -.IP -Possible values: bar, infobar, barinfo, off .SS "IMAGE:" .TP \fB\-\-loop\fR From 2bdb5f3b01ed0fd14f52f89b2e1491908a2be7ce Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 19 Jun 2018 09:42:08 +1000 Subject: [PATCH 0522/1133] docs: update --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bcbe16c12..94d953f7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [**@arisinfenix**](https://github.com/arisinfenix) - [**@iandrewt**](https://github.com/iandrewt) - [**@konimex**](https://github.com/konimex) +- [**@MindTooth**](https://github.com/MindTooth) **Operating System** From 8a2e9738149e287362472362f5b678c892498070 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 19 Jun 2018 09:46:53 +1000 Subject: [PATCH 0523/1133] misc: cleanup --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94d953f7e..85d7683eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. logo +A lot of the script has been rewritten and all lint errors have been resolved. There's probably a few bugs so the version number has been bumped to `5.0`. Thanks to everyone who contributed to this release. + **Contributors** - [**@arisinfenix**](https://github.com/arisinfenix) From bdd21fa8a74a244950c4682085546346816e0105 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 19 Jun 2018 09:52:20 +1000 Subject: [PATCH 0524/1133] misc: cleanup --- CHANGELOG.md | 11 ++++++++--- neofetch | 2 +- neofetch.1 | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85d7683eb..824424487 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] + +## [5.0.0] - 2018-06-18 + logo -A lot of the script has been rewritten and all lint errors have been resolved. There's probably a few bugs so the version number has been bumped to `5.0`. Thanks to everyone who contributed to this release. +A lot of the script has been rewritten and all lint errors have been resolved. There's probably a few bugs so the version number has been bumped to `5.0`. Expect a minor release in the coming days to fix any bugs that come up. Thanks to everyone who contributed to this release. **Contributors** @@ -89,11 +92,12 @@ See: https://github.com/dylanaraps/neofetch/issues/1001 ## [4.0.2] - 2018-05-19 +### This fixes default config issues on Android, AIX, HP-UX and possibly others. + - [config] Fixed `/dev/stdin` error. - [config] Added `--print_config` to display the default config file. - [macOS] Fixed xquartz issue. - ## [4.0.1] - 2018-05-18 ### Note: This release is only required for those running `bash <3.3`. @@ -2756,7 +2760,8 @@ Changelog: Let me know if you're having issues. -[Unreleased]: https://github.com/dylanaraps/neofetch/compare/4.0.2...HEAD +[Unreleased]: https://github.com/dylanaraps/neofetch/compare/5.0.0...HEAD +[5.0.0]: https://github.com/dylanaraps/neofetch/compare/4.0.2...5.0.0 [4.0.2]: https://github.com/dylanaraps/neofetch/compare/4.0.1...4.0.2 [4.0.1]: https://github.com/dylanaraps/neofetch/compare/4.0.0...4.0.1 [4.0.0]: https://github.com/dylanaraps/neofetch/compare/3.4.0...4.0.0 diff --git a/neofetch b/neofetch index 6533c5779..bb9dc920a 100755 --- a/neofetch +++ b/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.0" +version="5.0.1" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" diff --git a/neofetch.1 b/neofetch.1 index 37776b724..5107a1ac1 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "June 2018" "Neofetch 5.0.0" "User Commands" +.TH NEOFETCH "1" "June 2018" "Neofetch 5.0.1" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From af455b296768b3e90f0b859b72e29bfb778bc78d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 19 Jun 2018 14:20:44 +1000 Subject: [PATCH 0525/1133] misc: Check if xprop is installed --- neofetch | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index bb9dc920a..285adb6b7 100755 --- a/neofetch +++ b/neofetch @@ -1445,7 +1445,7 @@ get_de() { esac # Fallback to using xprop. - [[ "$DISPLAY" && -z "$de" ]] && \ + [[ "$DISPLAY" && -z "$de" ]] && type -p xprop &>/dev/null && \ de="$(xprop -root | awk '/KDE_SESSION_VERSION|^_MUFFIN|xfce4|xfce5/')" # Format strings. @@ -1503,12 +1503,14 @@ get_wm() { -e "weston")" elif [[ "$DISPLAY" && "$os" != "Mac OS X" && "$os" != "FreeMiNT" ]]; then - id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" - id="${id##* }" - wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)" - wm="${wm/*WM_NAME = }" - wm="${wm/\"}" - wm="${wm/\"*}" + if type -p xprop &>/dev/null; then + id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" + id="${id##* }" + wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)" + wm="${wm/*WM_NAME = }" + wm="${wm/\"}" + wm="${wm/\"*}" + fi # Window Maker does not set _NET_WM_NAME [[ "$wm" =~ "WINDOWMAKER" ]] && wm="wmaker" @@ -2754,14 +2756,13 @@ get_term() { term="$(tty)" ;; - "ruby"|"1"|"systemd"|"sshd"*|"python"*|"USER"*"PID"*|"kdeinit"*|"launchd"*) + "ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*|"USER"*"PID"*|"kdeinit"*|"launchd"*) break ;; "gnome-terminal-") term="gnome-terminal" ;; *"nvim") term="Neovim Terminal" ;; *"NeoVimServer"*) term="VimR Terminal" ;; - *"tmux"*) term="tmux" ;; *) term="${name##*/}" ;; esac done From cf07cb0c357abdef874c842f0fa49a7a119cd647 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 19 Jun 2018 15:46:51 +1000 Subject: [PATCH 0526/1133] term: Show URxvtd as URxvt --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 285adb6b7..7e5a7cc8a 100755 --- a/neofetch +++ b/neofetch @@ -2761,6 +2761,7 @@ get_term() { ;; "gnome-terminal-") term="gnome-terminal" ;; + "urxvtd") term="urxvt" ;; *"nvim") term="Neovim Terminal" ;; *"NeoVimServer"*) term="VimR Terminal" ;; *) term="${name##*/}" ;; From 97b4f04d3368c803b5a4c57196211c7c9af30ebe Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 19 Jun 2018 16:02:24 +1000 Subject: [PATCH 0527/1133] term: [urxvt/xterm] Show greedy fonts. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 7e5a7cc8a..f36f2005c 100755 --- a/neofetch +++ b/neofetch @@ -3021,7 +3021,7 @@ END "urxvt" | "urxvtd" | "rxvt-unicode" | "xterm") xrdb="$(xrdb -query)" - term_font="$(grep -i "${term/d}"'\**\.*font' <<< "$xrdb")" + term_font="$(grep -im 1 -e "^${term/d}"'\**\.*font' -e "^\\*font" <<< "$xrdb")" term_font="${term_font/*"*font:"}" term_font="${term_font/*".font:"}" term_font="${term_font/*"*.font:"}" From c152801a8a15c2907e0b8849cff696cb71c4b333 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 19 Jun 2018 16:13:09 +1000 Subject: [PATCH 0528/1133] misc: cleanup --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f36f2005c..f8562b118 100755 --- a/neofetch +++ b/neofetch @@ -3021,7 +3021,7 @@ END "urxvt" | "urxvtd" | "rxvt-unicode" | "xterm") xrdb="$(xrdb -query)" - term_font="$(grep -im 1 -e "^${term/d}"'\**\.*font' -e "^\\*font" <<< "$xrdb")" + term_font="$(grep -im 1 -e "^${term/d}"'\**\.*font' -e '^\*font' <<< "$xrdb")" term_font="${term_font/*"*font:"}" term_font="${term_font/*".font:"}" term_font="${term_font/*"*.font:"}" From a596b6467f59b525bb50ab2e5fbba99cb633db61 Mon Sep 17 00:00:00 2001 From: "tsumiki.neko" Date: Tue, 19 Jun 2018 22:17:53 +0300 Subject: [PATCH 0529/1133] add januslinux --- neofetch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/neofetch b/neofetch index f8562b118..d8132d78d 100755 --- a/neofetch +++ b/neofetch @@ -6135,6 +6135,24 @@ WW W EOF ;; + "januslinux"*) + set_colors 7 + read -rd '' ascii_data <<'EOF' +${c1} ________________ +|\ \ +| \ \ +| \ \ +| \ ______________\ +| | | +| | | +| | | + \ | januslinux | + \ | | + \ | | + \|______________| +EOF + ;; + "Kali"*) set_colors 4 8 read -rd '' ascii_data <<'EOF' From 31af4fe0031828c11928083816c8d547a9a2ef92 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 20 Jun 2018 10:31:55 +1000 Subject: [PATCH 0530/1133] misc: cleanup --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 459b274ed..e590fbc6b 100644 --- a/README.md +++ b/README.md @@ -58,5 +58,5 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, Donations allow me to spend more time working on `neofetch` and my other Open Source projects. If you like `neofetch` and want to give back in some way you can donate at the links below. - + From 50804a687718d3916e07ec59626ecb1c84d01419 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 20 Jun 2018 21:48:16 +1000 Subject: [PATCH 0531/1133] gpu: Change Xeon output to HD Graphics --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index d8132d78d..c45db9c3c 100755 --- a/neofetch +++ b/neofetch @@ -2083,6 +2083,7 @@ get_gpu() { gpu="${gpu/'Corporation'}" gpu="${gpu/ \(*}" gpu="${gpu/Integrated Graphics Controller}" + gpu="${gpu/*Xeon*/Intel HD Graphics}" [[ -z "$(trim "$gpu")" ]] && gpu="Intel Integrated Graphics" ;; From 61ee751147746379d2c645bafda95a85c5f70ec2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 21 Jun 2018 13:55:44 +1000 Subject: [PATCH 0532/1133] docs: update --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e590fbc6b..3e61cfe5f 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ - - +Packaging status +

neofetch From aae3271422a1f741f1b598fd1c620974c0b9f9b3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 21 Jun 2018 14:36:33 +1000 Subject: [PATCH 0533/1133] wallpaper: Fixed GNOME support. Closes #1037 --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index c45db9c3c..dea01847e 100755 --- a/neofetch +++ b/neofetch @@ -3491,6 +3491,11 @@ END image="$(decode_url "$image")" ;; + "GNOME"*) + image="$(gsettings get org.gnome.desktop.background picture-uri)" + image="$(decode_url "$image")" + ;; + *) if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then image="$(awk -F\' '/feh/ {printf $(NF-1)}' "${HOME}/.fehbg")" From 288036eb264554073adcda4e03658d1fe617ee23 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 21 Jun 2018 17:21:08 +1000 Subject: [PATCH 0534/1133] misc: cleanup --- neofetch | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index dea01847e..c204586e4 100755 --- a/neofetch +++ b/neofetch @@ -3403,8 +3403,7 @@ get_ascii() { # Calculate size of ascii file in line length / line count. while IFS=$'\n' read -r line; do - ((${#line} > ascii_length)) && ascii_length="${#line}" - ((++lines)) + ((++lines,${#line}>ascii_length)) && ascii_length="${#line}" done <<< "${ascii_data//\$\{??\}}" # Colors. @@ -3648,17 +3647,15 @@ get_image_size() { "none") # Get image size so that we can do a better crop. read -r width height <<< "$(identify -format "%w %h" "$image")" - crop_mode="none" while ((width >= (term_width / 2) || height >= term_height)); do - ((width=width/2)) - ((height=height/2)) + ((width=width/2,height=height/2)) done - ;; - *) - image_size="${image_size/px}" + crop_mode="none" ;; + + *) image_size="${image_size/px}" ;; esac width="${width:-$image_size}" From c651f5e0684d3764ca14dc4591fc4e8b13990210 Mon Sep 17 00:00:00 2001 From: Albert Date: Fri, 22 Jun 2018 00:55:39 +0200 Subject: [PATCH 0535/1133] Fix #1039 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c204586e4..d0a3da018 100755 --- a/neofetch +++ b/neofetch @@ -201,7 +201,7 @@ speed_type="bios_limit" # # Default: 'off' # Values: 'on', 'off'. -# Flag: --speed_shorthand. +# Flag: --speed_shorthand # NOTE: This flag is not supported in systems with CPU speed less than 1 GHz # # Example: From 911c70adc39745e68b68a826e0a71320e91de99c Mon Sep 17 00:00:00 2001 From: Erik Dubois Date: Sat, 23 Jun 2018 06:56:54 +0200 Subject: [PATCH 0536/1133] Update neofetch --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index d0a3da018..65ad54dab 100755 --- a/neofetch +++ b/neofetch @@ -445,7 +445,6 @@ disk_subtitle="mount" # sayonara # smplayer # spotify -# Spotify # tomahawk # vlc # xmms2d From c99fc64b67a837739242fb1f63e356f91a15e016 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 25 Jun 2018 07:49:12 +1000 Subject: [PATCH 0537/1133] misc: Fixed substitutions. --- neofetch | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/neofetch b/neofetch index c204586e4..bf1a2e37e 100755 --- a/neofetch +++ b/neofetch @@ -930,7 +930,7 @@ get_distro() { fi distro="$(trim_quotes "$distro")" - distro="${distro/'NAME='}" + distro="${distro/NAME=}" ;; "Mac OS X") @@ -1184,7 +1184,7 @@ get_uptime() { "Mac OS X" | "iPhone OS" | "BSD" | "FreeMiNT") boot="$(sysctl -n kern.boottime)" - boot="${boot/'{ sec = '}" + boot="${boot/\{ sec = }" boot="${boot/,*}" # Get current date in seconds. @@ -1419,7 +1419,7 @@ get_de() { ((wm_run != 1)) && get_wm if [[ "$XDG_CURRENT_DESKTOP" ]]; then - de="${XDG_CURRENT_DESKTOP/'X-'}" + de="${XDG_CURRENT_DESKTOP/X\-}" de="${de/Budgie:GNOME/Budgie}" de="${de/:Unity7:ubuntu}" @@ -1682,7 +1682,7 @@ get_wm_theme() { wm_theme="$(awk '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$kdebugrc")" fi - wm_theme="${wm_theme/'theme='}" + wm_theme="${wm_theme/theme=}" ;; "Quartz Compositor") @@ -1713,7 +1713,7 @@ get_wm_theme() { path="${path//\\/\/}" wm_theme="$(grep '^session\.styleFile:' "${path/\.exe/.rc}")" - wm_theme="${wm_theme/'session.styleFile: '}" + wm_theme="${wm_theme/session\.styleFile: }" wm_theme="${wm_theme##*\\}" wm_theme="${wm_theme%.*}" ;; @@ -2061,8 +2061,8 @@ get_gpu() { brand="${brand:-${gpu/*AMD*/AMD}}" brand="${brand:-${gpu/*ATI*/ATi}}" - gpu="${gpu/'[AMD/ATI]' }" - gpu="${gpu/'[AMD]' }" + gpu="${gpu/\[AMD\/ATI\] }" + gpu="${gpu/\[AMD\] }" gpu="${gpu/OEM }" gpu="${gpu/Advanced Micro Devices, Inc.}" gpu="${gpu/ \/ *}" @@ -2079,8 +2079,8 @@ get_gpu() { *"intel"*) gpu="${gpu/*Intel/Intel}" - gpu="${gpu/'(R)'}" - gpu="${gpu/'Corporation'}" + gpu="${gpu/\(R\)}" + gpu="${gpu/Corporation}" gpu="${gpu/ \(*}" gpu="${gpu/Integrated Graphics Controller}" gpu="${gpu/*Xeon*/Intel HD Graphics}" @@ -2112,7 +2112,7 @@ get_gpu() { else gpu="$(system_profiler SPDisplaysDataType |\ awk -F': ' '/^\ *Chipset Model:/ {printf $2 ", "}')" - gpu="${gpu//'/ $'}" + gpu="${gpu//\/ \$}" gpu="${gpu%,*}" cache "gpu" "$gpu" @@ -2172,7 +2172,7 @@ get_gpu() { *) gpu="$(glxinfo | grep -F 'OpenGL renderer string')" - gpu="${gpu/'OpenGL renderer string: '}" + gpu="${gpu/OpenGL renderer string: }" ;; esac ;; @@ -3099,7 +3099,7 @@ get_disk() { for disk in "${disks[@]}"; do # Create a second array and make each element split at whitespace this time. IFS=" " read -ra disk_info <<< "$disk" - disk_perc="${disk_info[4]/'%'}" + disk_perc="${disk_info[4]/\%}" case "$df_version" in *"befhikm"*) @@ -3216,9 +3216,9 @@ get_battery() { [[ "$battery_state" ]] && battery+=" Charging" case "$battery_display" in - "bar") battery="$(bar "${battery/'%'*}" 100)" ;; - "infobar") battery="${battery} $(bar "${battery/'%'*}" 100)" ;; - "barinfo") battery="$(bar "${battery/'%'*}" 100)${info_color} ${battery}" ;; + "bar") battery="$(bar "${battery/\%*}" 100)" ;; + "infobar") battery="${battery} $(bar "${battery/\%*}" 100)" ;; + "barinfo") battery="$(bar "${battery/\%*}" 100)${info_color} ${battery}" ;; esac } @@ -3246,7 +3246,7 @@ get_local_ip() { "Haiku") local_ip="$(ifconfig | awk -F ': ' '/Bcast/ {print $2}')" - local_ip="${local_ip/', Bcast'}" + local_ip="${local_ip/, Bcast}" ;; esac } @@ -3516,7 +3516,7 @@ END esac # Strip un-needed info from the path. - image="${image/'file://'}" + image="${image/file:\/\/}" image="$(trim_quotes "$image")" ;; esac @@ -4175,7 +4175,7 @@ get_ppid() { case "$os" in "Windows") ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" - ppid="${ppid/'PPID'}" + ppid="${ppid/PPID}" ;; "Linux") @@ -4196,7 +4196,7 @@ get_process_name() { case "$os" in "Windows") name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" - name="${name/'COMMAND'}" + name="${name/COMMAND}" name="${name/*\/}" ;; From 22df76c3b6d3d6a37724cc784c3015b84d053995 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 25 Jun 2018 09:04:48 +1000 Subject: [PATCH 0538/1133] cpu: Use sysctl on NetBSD. Closes #1041 --- neofetch | 5 ----- 1 file changed, 5 deletions(-) diff --git a/neofetch b/neofetch index ab4a22ab9..a781e224d 100755 --- a/neofetch +++ b/neofetch @@ -1722,11 +1722,6 @@ get_wm_theme() { } get_cpu() { - # NetBSD emulates the Linux /proc filesystem instead of using sysctl for hw - # information so we have to use this block below which temporarily sets the - # OS to "Linux" for the duration of this function. - [[ "$distro" == "NetBSD"* ]] && local os="Linux" - case "$os" in "Linux" | "MINIX" | "Windows") # Get CPU name. From 5037d312fde021dd95d67cf0875634dcf39ecc70 Mon Sep 17 00:00:00 2001 From: Tony Date: Sat, 30 Jun 2018 00:44:56 +0100 Subject: [PATCH 0539/1133] Fix cannot correctly get window size A bug caused by not correctly unset IFS to read array --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index a781e224d..1f4dd2890 100755 --- a/neofetch +++ b/neofetch @@ -3557,6 +3557,7 @@ get_window_size() { # user input so we have to use read to store the out # -put as a variable. IFS=';t' read -d t -t 0.05 -sra term_size + unset IFS # Split the string into height/width. if [[ "$image_backend" == "tycat" ]]; then From 679c7397247031a1d6cb8828dad5518d49d37d78 Mon Sep 17 00:00:00 2001 From: William Gathoye Date: Sat, 14 Jul 2018 15:32:34 +0200 Subject: [PATCH 0540/1133] Add Proxmox VE --- neofetch | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/neofetch b/neofetch index a781e224d..e9324cab2 100755 --- a/neofetch +++ b/neofetch @@ -826,6 +826,14 @@ get_distro() { "on" | "tiny") distro="Siduction" ;; *) distro="Siduction ($(lsb_release -sic))" esac + elif type -p pveversion >/dev/null; then + case "$distro_shorthand" in + "on" | "tiny") distro="Proxmox VE" ;; + *) + distro="$(pveversion)" + distro="${distro#pve-manager/}" + distro="Proxmox VE ${distro%/*}" + esac elif type -p lsb_release >/dev/null; then case "$distro_shorthand" in @@ -7323,6 +7331,32 @@ ${c1} ss EOF ;; + "Proxmox"*) + set_colors 7 202 + read -rd '' ascii_data <<'EOF' +${c1} .://:` `://:. + `hMMMMMMd/ /dMMMMMMh` + `sMMMMMMMd: :mMMMMMMMs` +${c2}`-/+oo+/:${c1}`.yMMMMMMMh- -hMMMMMMMy.`${c2}:/+oo+/-` +`:oooooooo/${c1}`-hMMMMMMMyyMMMMMMMh-`${c2}/oooooooo:` + `/oooooooo:${c1}`:mMMMMMMMMMMMMm:`${c2}:oooooooo/` + ./ooooooo+-${c1} +NMMMMMMMMN+ ${c2}-+ooooooo/. + .+ooooooo+-${c1}`oNMMMMNo`${c2}-+ooooooo+. + -+ooooooo/.${c1}`sMMs`${c2}./ooooooo+- + :oooooooo/${c1}`..`${c2}/oooooooo: + :oooooooo/`${c1}..${c2}`/oooooooo: + -+ooooooo/.`${c1}sMMs${c2}`./ooooooo+- + .+ooooooo+-`${c1}oNMMMMNo${c2}`-+ooooooo+. + ./ooooooo+-${c1} +NMMMMMMMMN+ ${c2}-+ooooooo/. + `/oooooooo:`${c1}:mMMMMMMMMMMMMm:${c2}`:oooooooo/` +`:oooooooo/`${c1}-hMMMMMMMyyMMMMMMMh-${c2}`/oooooooo:` +`-/+oo+/:`${c1}.yMMMMMMMh- -hMMMMMMMy.${c2}`:/+oo+/-` +${c1} `sMMMMMMMm: :dMMMMMMMs` + `hMMMMMMd/ /dMMMMMMh` + `://:` `://:` +EOF + ;; + "Puppy"* | "Quirky Werewolf"* | "Precise Puppy"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' From 1332874265a703ba4e44b8db7bfe95bbf0424a69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charl=C3=A8ne?= Date: Mon, 16 Jul 2018 22:58:47 +0200 Subject: [PATCH 0541/1133] battery/OpenBSD: improved charge%, adds status This commit adds support for hw.sensors.acpibat0.amphour[03] for battery charge statistics in addition to watthour[03]. It also adds charging status. --- neofetch | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index a781e224d..d8be94f51 100755 --- a/neofetch +++ b/neofetch @@ -3176,12 +3176,19 @@ get_battery() { ;; "OpenBSD"* | "Bitrig"*) - battery0full="$(sysctl -n hw.sensors.acpibat0.watthour0)" - battery0full="${battery0full/ Wh*}" + battery0full="$(sysctl -n hw.sensors.acpibat0.watthour0\ + hw.sensors.acpibat0.amphour0)" + battery0full="${battery0full%% *}" - battery0now="$(sysctl -n hw.sensors.acpibat0.watthour3)" - battery0now="${battery0now/ Wh*}" + battery0now="$(sysctl -n hw.sensors.acpibat0.watthour3\ + hw.sensors.acpibat0.amphour3)" + battery0now="${battery0now%% *}" + state="$(sysctl -n hw.sensors.acpibat0.raw0)" + state="${state##? (battery }" + state="${state%)*}" + + [[ "${state}" == "charging" ]] && battery_state="charging" [[ "$battery0full" ]] && \ battery="$((100 * ${battery0now/\.} / ${battery0full/\.}))%" ;; From f960594cd4b85e52ea72f80d517be3e026e23c09 Mon Sep 17 00:00:00 2001 From: Ain <41307858+nero@users.noreply.github.com> Date: Tue, 17 Jul 2018 11:37:23 +0000 Subject: [PATCH 0542/1133] Fix borked version display for mksh `"$SHELL" -c "printf %s \$KSH_VERSION"` as part of the shell version detection for ksh and mksh was expanding to `printf %s $KSH_VERSION` inside of shell. This resulted in `$KSH_VERSION` being substituted as multiple arguments to printf. While (afaik) unspecified, mksh, bash and zsh resort to repeating the format strings. This resulted in all spaces missing from `$shell`, which in turn caused the string cleanup to fail: `Shell: mksh @MIRBSDKSHR562017/08/29` Quoting `$KSH_VERSION` causes it to be given to printf as a single argument, which preserves its spaces. The output after this change looks like follows: `Shell: mksh R56 2017/08/29` --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d8be94f51..b33ca4050 100755 --- a/neofetch +++ b/neofetch @@ -1366,7 +1366,7 @@ get_shell() { "sh" | "ash" | "dash") ;; "mksh" | "ksh") - shell+="$("$SHELL" -c "printf %s \$KSH_VERSION")" + shell+="$("$SHELL" -c "printf %s \"\$KSH_VERSION\"")" shell="${shell/ * KSH}" shell="${shell/version}" ;; From 2afc5a27af2b6f3f0879803da21c500552d3023f Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Tue, 24 Jul 2018 12:26:18 +0700 Subject: [PATCH 0543/1133] GPU [AMD]: Remove an unnecessary pattern check --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index d8be94f51..3ae85ee05 100755 --- a/neofetch +++ b/neofetch @@ -2059,7 +2059,6 @@ get_gpu() { gpu="${gpu/\[AMD\] }" gpu="${gpu/OEM }" gpu="${gpu/Advanced Micro Devices, Inc.}" - gpu="${gpu/ \/ *}" gpu="${gpu/*\[}" gpu="${gpu/\]*}" gpu="$brand $gpu" From 2cc7b84189a8e49c75a032c0a62fc2b16c135de4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Thu, 26 Jul 2018 15:19:03 +0100 Subject: [PATCH 0544/1133] Add support for Nix packages on macOS --- neofetch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 3ae85ee05..ea0ba8b0c 100755 --- a/neofetch +++ b/neofetch @@ -1309,9 +1309,10 @@ get_packages() { ;; "Mac OS X" | "MINIX") - has "port" && tot port installed && ((packages-=1)) - has "brew" && dir /usr/local/Cellar/* - has "pkgin" && tot pkgin list + has "port" && tot port installed && ((packages-=1)) + has "brew" && dir /usr/local/Cellar/* + has "pkgin" && tot pkgin list + has "nix-env" && dir /nix/store/*/ ;; "AIX"| "FreeMiNT") From 78f355ba6d40bcd02e59626e43691bce85309844 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Fri, 27 Jul 2018 10:26:43 +0700 Subject: [PATCH 0545/1133] docs: changelog --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 824424487..0efc0f3cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +**Contributors** + +- [**@nero**](https://github.com/nero) +- [**@alyssais**](https://github.com/alyssais) + +**Info** + +- **Shell**: Fixed output for mksh +- **Packages** [macOS]: Added detection of Nix ## [5.0.0] - 2018-06-18 From 2fef4d98495cf00ff48327f91ac4ee52bdd19656 Mon Sep 17 00:00:00 2001 From: plgruener Date: Tue, 31 Jul 2018 17:59:56 +0200 Subject: [PATCH 0546/1133] add term-font support for yakuake --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 79a15c306..cf58bb295 100755 --- a/neofetch +++ b/neofetch @@ -2872,7 +2872,7 @@ END END { print font " " size}' "${confs[0]}")" ;; - "konsole"*) + "konsole" | "yakuake") # Get Process ID of current konsole window / tab child="$(get_ppid "$$")" From 43c439853ca5ca036b338a7b500cb7b3f61d2c96 Mon Sep 17 00:00:00 2001 From: xynxynxyn Date: Tue, 14 Aug 2018 03:48:53 +0200 Subject: [PATCH 0547/1133] make seperator changeable --- neofetch | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 79a15c306..32707f205 100755 --- a/neofetch +++ b/neofetch @@ -3876,8 +3876,18 @@ prin() { length="${#length}" fi + # Make sure $sep is unset + unset -v sep + + # Check if $seperator is set + if [[ $seperator ]]; then + sep=$seperator + else + sep=":" + fi + # Format the output. - string="${string/:/${reset}${colon_color}:${info_color}}" + string="${string/:/${reset}${colon_color}${sep}${info_color}}" string="${subtitle_color}${bold}${string}" # Print the info. @@ -4498,6 +4508,7 @@ get_args() { "--underline") underline_enabled="$2" ;; "--underline_char") underline_char="$2" ;; "--bold") bold="$2" ;; + "--seperator") seperator="$2" ;; # Color Blocks "--color_blocks") color_blocks="$2" ;; From 614fad0421a89cd0e9bcf0715590591edb3c8688 Mon Sep 17 00:00:00 2001 From: plgruener Date: Wed, 15 Aug 2018 17:29:54 +0200 Subject: [PATCH 0548/1133] add color-reset to ascii logo drawing --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 79a15c306..96f344045 100755 --- a/neofetch +++ b/neofetch @@ -3416,7 +3416,7 @@ get_ascii() { ascii_data="${ascii_data//\$\{c6\}/$c6}" ((text_padding=ascii_length+gap)) - printf '%b\n' "$ascii_data" + printf '%b\n' "$ascii_data${reset}" LC_ALL=C } From 5d33b8d99d4aea18e65035188fb2c4ed5361d86b Mon Sep 17 00:00:00 2001 From: plgruener Date: Wed, 15 Aug 2018 17:38:02 +0200 Subject: [PATCH 0549/1133] fix arch_small logo --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 79a15c306..6295e1991 100755 --- a/neofetch +++ b/neofetch @@ -4954,7 +4954,7 @@ ${c1} /\ /${c2} __ \ / ( ) \ / __| |__\\\ -/// \\\\\ +/// \\\\\\ EOF ;; From b8eb8fbaa77fa7f67f54d7d7c8d7c3fbc2a81c25 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Thu, 16 Aug 2018 13:24:20 +0700 Subject: [PATCH 0550/1133] docs: changelog --- CHANGELOG.md | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0efc0f3cc..8b2bb1bd5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,11 +11,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [**@nero**](https://github.com/nero) - [**@alyssais**](https://github.com/alyssais) +- [**@plgruener**](https://github.com/plgruener) **Info** -- **Shell**: Fixed output for mksh -- **Packages** [macOS]: Added detection of Nix +- **Shell**: Fixed output for mksh [**@nero**](https://github.com/nero) +- **Packages** [macOS]: Added detection of Nix [**@alyssais**](https://github.com/alyssais) +- **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener) + +**ASCII** + +- Fixed a bug where ASCII logo changes the terminal foreground color. [**@plgruener**](https://github.com/plgruener) ## [5.0.0] - 2018-06-18 From 8ee47102252882cfaea03993eea8c6aed022ec4e Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Thu, 16 Aug 2018 13:52:02 +0700 Subject: [PATCH 0551/1133] Packages: pkginfo is used by CRUX and JanusLinux --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 181e3e3cf..c15220a99 100755 --- a/neofetch +++ b/neofetch @@ -1274,6 +1274,7 @@ get_packages() { has "sorcery" && tot gaze installed has "alps" && tot alps showinstalled has "butch" && tot butch list + has "pkginfo" && tot pkginfo -i # Counting files/dirs. has "emerge" && dir /var/db/pkg/*/*/ @@ -1290,8 +1291,7 @@ get_packages() { has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) case "$kernel_name" in - "FreeBSD") has "pkg" && tot pkg info ;; - "SunOS") has "pkginfo" && tot pkginfo -i ;; + "FreeBSD") has "pkg" && tot pkg info ;; *) has "pkg" && dir /var/db/pkg/* From 17f2f5b2a6530ee95c1ca3b0c69f3b8994de81ab Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Thu, 16 Aug 2018 13:53:12 +0700 Subject: [PATCH 0552/1133] docs: changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8b2bb1bd5..11c3b2f40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - **Shell**: Fixed output for mksh [**@nero**](https://github.com/nero) - **Packages** [macOS]: Added detection of Nix [**@alyssais**](https://github.com/alyssais) +- **Packages**: Fixed packages from pkginfo (pkgutils) not appearing in CRUX/Janus Linux. - **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener) **ASCII** From 9b29d3f669ac9f96e8fe618989c2264e7e656ea7 Mon Sep 17 00:00:00 2001 From: xynxynxyn Date: Thu, 16 Aug 2018 10:04:24 +0200 Subject: [PATCH 0553/1133] replace if statement with parameter expansion --- neofetch | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 32707f205..3566e1aea 100755 --- a/neofetch +++ b/neofetch @@ -3876,18 +3876,8 @@ prin() { length="${#length}" fi - # Make sure $sep is unset - unset -v sep - - # Check if $seperator is set - if [[ $seperator ]]; then - sep=$seperator - else - sep=":" - fi - # Format the output. - string="${string/:/${reset}${colon_color}${sep}${info_color}}" + string="${string/:/${reset}${colon_color}${separator:=:}${info_color}}" string="${subtitle_color}${bold}${string}" # Print the info. @@ -4508,7 +4498,7 @@ get_args() { "--underline") underline_enabled="$2" ;; "--underline_char") underline_char="$2" ;; "--bold") bold="$2" ;; - "--seperator") seperator="$2" ;; + "--separator") separator="$2" ;; # Color Blocks "--color_blocks") color_blocks="$2" ;; From 754ffe2fae1128472a4330914353d4fc5b9e3e70 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Fri, 24 Aug 2018 11:07:36 +0700 Subject: [PATCH 0554/1133] get_ascii: Do not parse file if it's an image file --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c15220a99..1b5d97904 100755 --- a/neofetch +++ b/neofetch @@ -3393,7 +3393,7 @@ image_backend() { } get_ascii() { - if [[ -f "$image_source" ]]; then + if [[ -f "$image_source" && ! "$image_source" =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then ascii_data="$(< "$image_source")" else err "Ascii: Ascii file not found, using distro ascii." From b32f4e4d1ad87c5a5daf67d957fdac5a1fdf777e Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Fri, 24 Aug 2018 12:08:29 +0700 Subject: [PATCH 0555/1133] get_window_size: Set read timeout as 1 --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c2b5bc9b3..94c612aab 100755 --- a/neofetch +++ b/neofetch @@ -3563,7 +3563,8 @@ get_window_size() { # The escape codes above print the desired output as # user input so we have to use read to store the out # -put as a variable. - IFS=';t' read -d t -t 0.05 -sra term_size + # The 1 second timeout is required for older bash + IFS=';t' read -d t -t 1 -sra term_size unset IFS # Split the string into height/width. From 4d129b50c18213848ecd85f651429c63642b38da Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Fri, 24 Aug 2018 12:11:43 +0700 Subject: [PATCH 0556/1133] docs: changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11c3b2f40..41e58acfa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [**@nero**](https://github.com/nero) - [**@alyssais**](https://github.com/alyssais) - [**@plgruener**](https://github.com/plgruener) +- [**@StarryTony**](https://github.com/StarryTony) **Info** @@ -24,6 +25,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Fixed a bug where ASCII logo changes the terminal foreground color. [**@plgruener**](https://github.com/plgruener) +**Image** + +- **macOS**: Unset IFS to get window size. [**@StarryTony**](https://github.com/StarryTony) + ## [5.0.0] - 2018-06-18 logo From 3272dce4ed2100b7010734f6f897a796567f684b Mon Sep 17 00:00:00 2001 From: nikitenich Date: Sat, 25 Aug 2018 14:00:52 +0300 Subject: [PATCH 0557/1133] Improve Hackintosh detection There is a new SMC emulator https://github.com/acidanthera/VirtualSMC --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 94c612aab..7a73cefa2 100755 --- a/neofetch +++ b/neofetch @@ -1039,7 +1039,7 @@ get_model() { ;; "Mac OS X") - if [[ "$(kextstat | grep -F "FakeSMC")" != "" ]]; then + if [[ "$(kextstat | grep -E "FakeSMC|VirtualSMC")" != "" ]]; then model="Hackintosh (SMBIOS: $(sysctl -n hw.model))" else model="$(sysctl -n hw.model)" From e7a3f5cba29419ed2b678b5ab0e9824b8de80085 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sat, 25 Aug 2018 18:44:41 +0700 Subject: [PATCH 0558/1133] trim: Remove additional space during trimming I noticed this when I'm testing with -v enabled. Looks like the trim function replaces any spaces with a space. This fixes the problem where terminal program cannot be displayed because of an additional space in PPID variable. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 94c612aab..449c84a31 100755 --- a/neofetch +++ b/neofetch @@ -3931,7 +3931,7 @@ trim() { set -f # shellcheck disable=2048,2086 set -- $* - printf '%s\n' "${*//[[:space:]]/ }" + printf '%s\n' "${*//[[:space:]]/}" set +f } From 9ba1bbaafe3a9b3dcedb38a052f5f04cb3ad2f95 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Wed, 29 Aug 2018 10:58:57 +0700 Subject: [PATCH 0559/1133] Misc: Apply existing PATH first before applying fallback values. In case user has a custom-installed binary, prioritise it first before using system-supplied binaries. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 449c84a31..3ac67137d 100755 --- a/neofetch +++ b/neofetch @@ -33,7 +33,7 @@ version="5.0.1" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/.config}" -PATH="/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec:${PATH}" +PATH="${PATH}:/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec" reset='\e[0m' shopt -s nocasematch From e07f545c26a47151236af3a3bc73acae62d87922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charl=C3=A8ne?= Date: Tue, 17 Jul 2018 05:11:50 +0200 Subject: [PATCH 0560/1133] Multiple fixes, OpenBSD related - get_wm: Fixes non-EWMH WM detection on OpenBSD by introducing a ps_flags array the same way we do for disks. Tested successfully on Debian GNU/Linux (this change impacts all OSes). - get_wm: Adds fvwm support - get_model: Adds vmm(4) (OpenBSD's KVM counterpart) support - get_disk: On OpenBSD you can't use df against a /dev/... unless being root or in the 'operator' group. A separate disks array creation using awk has been introduced only for this OS. --- neofetch | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index d8be94f51..3fb1a78fe 100755 --- a/neofetch +++ b/neofetch @@ -1136,6 +1136,7 @@ get_model() { case "$model" in "Standard PC"*) model="KVM/QEMU (${model})" ;; + "OpenBSD"*) model="vmm (${model})" ;; esac } @@ -1473,8 +1474,13 @@ get_wm() { # If function was run, stop here. ((wm_run == 1)) && return + case "$uname" in + *"OpenBSD"*) ps_flags=(x -c) ;; + *) ps_flags=(-e) ;; + esac + if [[ "$WAYLAND_DISPLAY" ]]; then - wm="$(ps -e | grep -m 1 -o -F \ + wm="$(ps "${ps_flags[@]}" | grep -m 1 -o -F \ -e "arcan" \ -e "asc" \ -e "clayland" \ @@ -1513,11 +1519,11 @@ get_wm() { # Window Maker does not set _NET_WM_NAME [[ "$wm" =~ "WINDOWMAKER" ]] && wm="wmaker" - # Fallback for non-EWMH WMs. [[ -z "$wm" ]] && \ - wm="$(ps -e | grep -m 1 -o -F \ + wm="$(ps "${ps_flags[@]}" | grep -m 1 -o -F \ -e "catwm" \ + -e "fvwm" \ -e "dwm" \ -e "2bwm" \ -e "monsterwm" \ @@ -3081,9 +3087,20 @@ get_disk() { # Create an array called 'disks' where each element is a separate line from # df's output. We then unset the first element which removes the column titles. - IFS=$'\n' read -d "" -ra disks <<< "$(df "${df_flags[@]}" "${disk_show[@]:-/}")" - unset "disks[0]" - + if [[ "$uname" == "OpenBSD" ]]; then + # On OpenBSD you can't use df against a /dev/... unless being root or + # in the 'operator' group. Making a separate disks array creation. + df_flags=(-h) + # building an AWK regexp + disk_re="${disk_show[*]:-/}" + disk_re="${disk_re// /\|}" + disk_re="^(${disk_re//\//\\\/})\$" + IFS=$'\n' read -d "" -ra disks <<< "$(df "${df_flags[@]}" | \ + awk -v disk_re="$disk_re" '(NR > 1) && ($1 ~ disk_re || $6 ~ disk_re)')" + else + IFS=$'\n' read -d "" -ra disks <<< "$(df "${df_flags[@]}" "${disk_show[@]:-/}")" + unset "disks[0]" + fi # Stop here if 'df' fails to print disk info. [[ -z "${disks[*]}" ]] && { err "Disk: df failed to print the disks, make sure the disk_show array is set properly." From 0d50468d192a161b93e79beefc5e8c2ba68b25f3 Mon Sep 17 00:00:00 2001 From: Matt Mathis Date: Sat, 1 Sep 2018 22:11:00 -0400 Subject: [PATCH 0561/1133] Updated to fix new kitty bug prior to kitty fixes Kitty recently updated and broke just using "kitty icat " however, "kitty +kitten icat " still works as intended. This commit makes the neofetch script use +kitten. --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 3ac67137d..69d982a77 100755 --- a/neofetch +++ b/neofetch @@ -3578,7 +3578,7 @@ get_window_size() { fi [[ "$image_backend" == "kitty" ]] && \ - IFS=x read -r term_width term_height < <(kitty icat --print-window-size) + IFS=x read -r term_width term_height < <(kitty +kitten icat --print-window-size) # Get terminal width/height if \e[14t is unsupported. if (( "${term_width:-0}" < 50 )) && [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then @@ -3757,7 +3757,7 @@ display_image() { ;; "kitty") - kitty icat \ + kitty +kitten icat \ --align left \ --place "$((width/font_width))x$((height/font_height))@${xoffset}x${yoffset}" \ "$image" From 495a9fefbfc6200f532d017df99abe2c965783e1 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 2 Sep 2018 23:28:33 +0700 Subject: [PATCH 0562/1133] Disk [OpenBSD]: Detect df version through usual df check instead of making a special if uname check --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9a2fc733d..b71e80620 100755 --- a/neofetch +++ b/neofetch @@ -3076,6 +3076,7 @@ get_disk() { case "$df_version" in *"IMitv"*) df_flags=(-P -g) ;; # AIX *"befhikm"*) df_flags=(-P -k) ;; # IRIX + *"hiklnP"*) df_flags=(-h) ;; # OpenBSD *"Tracker"*) # Haiku err "Your version of df cannot be used due to the non-standard flags" @@ -3090,7 +3091,6 @@ get_disk() { if [[ "$uname" == "OpenBSD" ]]; then # On OpenBSD you can't use df against a /dev/... unless being root or # in the 'operator' group. Making a separate disks array creation. - df_flags=(-h) # building an AWK regexp disk_re="${disk_show[*]:-/}" disk_re="${disk_re// /\|}" From ff06200e51cd48c7f339dbb30fbd63ff1229a66a Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 2 Sep 2018 23:41:37 +0700 Subject: [PATCH 0563/1133] docs: changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 41e58acfa..6a51dfb7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [**@alyssais**](https://github.com/alyssais) - [**@plgruener**](https://github.com/plgruener) - [**@StarryTony**](https://github.com/StarryTony) +- [**@julianaito**](https://github.com/julianaito) +- [**@HolyStephano**](https://github.com/HolyStephano) **Info** @@ -20,6 +22,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - **Packages** [macOS]: Added detection of Nix [**@alyssais**](https://github.com/alyssais) - **Packages**: Fixed packages from pkginfo (pkgutils) not appearing in CRUX/Janus Linux. - **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener) +- **Model** [OpenBSD]: Added vmm (OpenBSD hypervisor) support [**@julianaito**](https://github.com/julianaito) +- **WM**: Added detection for FVWM. [**@julianaito**](https://github.com/julianaito) +- **WM** [OpenBSD]: Added a new `ps_flags` to correctly detect non-EWMH WMs. [**@julianaito**](https://github.com/julianaito) +- **Disk** [OpenBSD]: Added a separate disk array creation using `awk` since one cannot directly use `/dev/...` unless being root or in the `operator` group. [**@julianaito**](https://github.com/julianaito) **ASCII** @@ -28,6 +34,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. **Image** - **macOS**: Unset IFS to get window size. [**@StarryTony**](https://github.com/StarryTony) +- **Kitty**: Use `kitty +kitten icat` instead of the deprecated `kitty icat`. [**@HolyStephano**](https://github.com/HolyStephano) ## [5.0.0] - 2018-06-18 From 6f17a2e367402d7f9219939ce13d7d3874141ce7 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 2 Sep 2018 23:47:24 +0700 Subject: [PATCH 0564/1133] docs: changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a51dfb7b..e6d893185 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [**@StarryTony**](https://github.com/StarryTony) - [**@julianaito**](https://github.com/julianaito) - [**@HolyStephano**](https://github.com/HolyStephano) +- [**@nikitenich**](https://github.com/nikitenich) **Info** @@ -23,6 +24,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - **Packages**: Fixed packages from pkginfo (pkgutils) not appearing in CRUX/Janus Linux. - **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener) - **Model** [OpenBSD]: Added vmm (OpenBSD hypervisor) support [**@julianaito**](https://github.com/julianaito) +- **Model** [macOS]: Added VirtualSMC as a new FakeSMC alternative for Hackintosh. [**@nikitenich**](https://github.com/nikitenich) - **WM**: Added detection for FVWM. [**@julianaito**](https://github.com/julianaito) - **WM** [OpenBSD]: Added a new `ps_flags` to correctly detect non-EWMH WMs. [**@julianaito**](https://github.com/julianaito) - **Disk** [OpenBSD]: Added a separate disk array creation using `awk` since one cannot directly use `/dev/...` unless being root or in the `operator` group. [**@julianaito**](https://github.com/julianaito) From 21f7203533c970e0f13c31c3353d5b27713b072b Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Wed, 5 Sep 2018 18:31:06 +0700 Subject: [PATCH 0565/1133] docs: changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6d893185..834fac391 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. **ASCII** - Fixed a bug where ASCII logo changes the terminal foreground color. [**@plgruener**](https://github.com/plgruener) +- Do not parse file as ASCII if the source is an image file. **Image** From f5186ef32dfb72d0b49cde03eaabb3bb6f3b1f54 Mon Sep 17 00:00:00 2001 From: Snuggle Date: Thu, 13 Sep 2018 03:24:12 +0100 Subject: [PATCH 0566/1133] Update config comment with kitty backend. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 27a0be1d4..0c95fcc13 100755 --- a/neofetch +++ b/neofetch @@ -637,7 +637,7 @@ disk_display="off" # Image backend. # # Default: 'ascii' -# Values: 'ascii', 'caca', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m' +# Values: 'ascii', 'caca', 'jp2a', 'iterm2', 'off', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' # Flag: --backend image_backend="ascii" From 0800cf0dfd1e78b5dbdbf93222b87a3f0c697511 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 16 Sep 2018 18:12:32 +0200 Subject: [PATCH 0567/1133] OS: Add Namib GNU/Linux --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 27a0be1d4..e28786ad2 100755 --- a/neofetch +++ b/neofetch @@ -6722,6 +6722,32 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM EOF ;; + "Namib"*) + set_colors 1 + read -rd '' ascii_data <<'EOF' +${c1} .:+shysyhhhhysyhs+:. + -/yyys syyy/- + -shy yhs- + -yhs shy- + +hy yh+ + +ds sd+ +/ys so sy/ +sh smMMNdyo hs +yo ymMMMMNNMMNho oy +N ydMMMNNMMMMMMMMMmy N +N shmMMMMNNMMMMMMMMMMMMMNy N +yo ooshmNMMMNNNNMMMMMMMMMMMMMMMMMms oy +sd yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy ds +/ys sy/ + +ds sd+ + +hy yh+ + -yhs shy- + -shy yhs- + -/yyys syyy/- + .:+shysyhyhhysyhs+:. +EOF + ;; + "NetBSD"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' From 4e33cf2f61298ce5e962e63dabff0f7d721ff855 Mon Sep 17 00:00:00 2001 From: appadeia Date: Thu, 4 Oct 2018 23:25:04 -0400 Subject: [PATCH 0568/1133] Add support for puyo & spm --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 27a0be1d4..f46abb04b 100755 --- a/neofetch +++ b/neofetch @@ -1303,6 +1303,8 @@ get_packages() { # List these last as they accompany regular package managers. has "flatpak" && tot flatpak list + has "spm" && tot spm list -i + has "puyo" && dir ~/.puyo/installed # Snap hangs if the command is run without the daemon running. # Only run snap if the daemon is also running. From 1278844d87fc9d133258b9ba332fbed3a97c0279 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 17 Oct 2018 14:32:18 +1100 Subject: [PATCH 0569/1133] general: fixed config issue. Closes #1088 --- neofetch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 0c95fcc13..7e28c23cb 100755 --- a/neofetch +++ b/neofetch @@ -4081,19 +4081,19 @@ get_full_path() { get_user_config() { mkdir -p "${XDG_CONFIG_HOME}/neofetch/" - shopt -s nullglob - files=("$XDG_CONFIG_HOME"/neofetch/confi*) - shopt -u nullglob - # --config /path/to/config.conf if [[ -f "$config_file" ]]; then source "$config_file" err "Config: Sourced user config. (${config_file})" return - elif [[ -f "${files[0]}" ]]; then - source "${files[0]}" - err "Config: Sourced user config. (${files[0]})" + elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config.conf" ]]; then + source "${XDG_CONFIG_HOME}/neofetch/config.conf" + err "Config: Sourced user config. (${XDG_CONFIG_HOME}/neofetch/config.conf)" + + elif [[ -f "${XDG_CONFIG_HOME}/neofetch/config" ]]; then + source "${XDG_CONFIG_HOME}/neofetch/config" + err "Config: Sourced user config. (${XDG_CONFIG_HOME}/neofetch/config)" else config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" From 6bb5a78f921c0159df4fa82b1868842ceb7b3a1a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 17 Oct 2018 14:51:14 +1100 Subject: [PATCH 0570/1133] general: revert change. --- neofetch | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index 7e28c23cb..b0adb7af3 100755 --- a/neofetch +++ b/neofetch @@ -1136,7 +1136,7 @@ get_model() { case "$model" in "Standard PC"*) model="KVM/QEMU (${model})" ;; - "OpenBSD"*) model="vmm (${model})" ;; + "OpenBSD"*) model="vmm ($model)" ;; esac } @@ -1476,8 +1476,8 @@ get_wm() { ((wm_run == 1)) && return case "$uname" in - *"OpenBSD"*) ps_flags=(x -c) ;; - *) ps_flags=(-e) ;; + *"OpenBSD"*) ps_flags=(x -c) ;; + *) ps_flags=(-e) ;; esac if [[ "$WAYLAND_DISPLAY" ]]; then @@ -3088,19 +3088,9 @@ get_disk() { # Create an array called 'disks' where each element is a separate line from # df's output. We then unset the first element which removes the column titles. - if [[ "$uname" == "OpenBSD" ]]; then - # On OpenBSD you can't use df against a /dev/... unless being root or - # in the 'operator' group. Making a separate disks array creation. - # building an AWK regexp - disk_re="${disk_show[*]:-/}" - disk_re="${disk_re// /\|}" - disk_re="^(${disk_re//\//\\\/})\$" - IFS=$'\n' read -d "" -ra disks <<< "$(df "${df_flags[@]}" | \ - awk -v disk_re="$disk_re" '(NR > 1) && ($1 ~ disk_re || $6 ~ disk_re)')" - else - IFS=$'\n' read -d "" -ra disks <<< "$(df "${df_flags[@]}" "${disk_show[@]:-/}")" - unset "disks[0]" - fi + IFS=$'\n' read -d "" -ra disks <<< "$(df "${df_flags[@]}" "${disk_show[@]:-/}")" + unset "disks[0]" + # Stop here if 'df' fails to print disk info. [[ -z "${disks[*]}" ]] && { err "Disk: df failed to print the disks, make sure the disk_show array is set properly." From caea0f059c36dbdbf118b04ad7adb461750408ae Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 17 Oct 2018 14:53:54 +1100 Subject: [PATCH 0571/1133] general: Faster grep --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index bd55790b4..833e8cf0b 100755 --- a/neofetch +++ b/neofetch @@ -1039,7 +1039,7 @@ get_model() { ;; "Mac OS X") - if [[ "$(kextstat | grep -E "FakeSMC|VirtualSMC")" != "" ]]; then + if [[ "$(kextstat | grep -F -e "FakeSMC" -e "VirtualSMC")" != "" ]]; then model="Hackintosh (SMBIOS: $(sysctl -n hw.model))" else model="$(sysctl -n hw.model)" From afc29ac448ba3425d8a452794d3731c0f9fb2066 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 17 Oct 2018 14:57:40 +1100 Subject: [PATCH 0572/1133] general: Faster read on newer bash --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 833e8cf0b..df3213620 100755 --- a/neofetch +++ b/neofetch @@ -3573,7 +3573,10 @@ get_window_size() { # user input so we have to use read to store the out # -put as a variable. # The 1 second timeout is required for older bash - IFS=';t' read -d t -t 1 -sra term_size + case "${BASH_VERSINFO[0]}" in + 4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;; + *) IFS=';t' read -d t -t 1 -sra term_size ;; + esac unset IFS # Split the string into height/width. From 95a8ecfa71afc3d6109b3ee11fe342a5cd6c95d1 Mon Sep 17 00:00:00 2001 From: xynxynxyn Date: Thu, 18 Oct 2018 14:28:33 +0200 Subject: [PATCH 0573/1133] add documentation --- neofetch | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/neofetch b/neofetch index 3566e1aea..5a84d660d 100755 --- a/neofetch +++ b/neofetch @@ -482,6 +482,22 @@ song_shorthand="off" mpc_args=() +# Separator + + +# Modify separator +# +# Default: ':' +# Flag: --separator +# +# Replace the default separator with the specified string. +# +# Example: +# separator="->": 'Shell-> bash' +# separator=" =": `WM = dwm` +separator=":" + + # Text Colors @@ -4307,6 +4323,8 @@ INFO: --music_player player-name Manually specify a player to use. Available values are listed in the config file + --separator string Changes the default ':' separator to the specified string. + TEXT FORMATTING: --colors x x x x x x Changes the text colors in this order: title, @, underline, subtitle, colon, info From fc12e550521d6b0a8fbfb1c7c930566119b5b4d9 Mon Sep 17 00:00:00 2001 From: xynxynxyn Date: Thu, 18 Oct 2018 17:04:53 +0200 Subject: [PATCH 0574/1133] use correct apostrophe --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 5a84d660d..598949c8a 100755 --- a/neofetch +++ b/neofetch @@ -494,7 +494,7 @@ mpc_args=() # # Example: # separator="->": 'Shell-> bash' -# separator=" =": `WM = dwm` +# separator=" =": 'WM = dwm' separator=":" From fb23cc69d68f3243b3b4b76644be748f924a5e23 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 19 Oct 2018 08:08:03 +1100 Subject: [PATCH 0575/1133] docs: update --- neofetch | 31 +++++++++++++------------------ neofetch.1 | 7 +++++-- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/neofetch b/neofetch index 5e16cfa22..400db8ffc 100755 --- a/neofetch +++ b/neofetch @@ -482,22 +482,6 @@ song_shorthand="off" mpc_args=() -# Separator - - -# Modify separator -# -# Default: ':' -# Flag: --separator -# -# Replace the default separator with the specified string. -# -# Example: -# separator="->": 'Shell-> bash' -# separator=" =": 'WM = dwm' -separator=":" - - # Text Colors @@ -541,6 +525,18 @@ underline_enabled="on" underline_char="-" +# Info Separator +# Replace the default separator with the specified string. +# +# Default: ':' +# Flag: --separator +# +# Example: +# separator="->": 'Shell-> bash' +# separator=" =": 'WM = dwm' +separator=":" + + # Color Blocks @@ -4337,14 +4333,13 @@ INFO: --music_player player-name Manually specify a player to use. Available values are listed in the config file - --separator string Changes the default ':' separator to the specified string. - TEXT FORMATTING: --colors x x x x x x Changes the text colors in this order: title, @, underline, subtitle, colon, info --underline on/off Enable/Disable the underline. --underline_char char Character to use when underlining title --bold on/off Enable/Disable bold text + --separator string Changes the default ':' separator to the specified string. COLOR BLOCKS: --color_blocks on/off Enable/Disable the color blocks diff --git a/neofetch.1 b/neofetch.1 index 5107a1ac1..ae57b426f 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -.TH NEOFETCH "1" "June 2018" "Neofetch 5.0.1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.7. +.TH NEOFETCH "1" "October 2018" "Neofetch 5.0.1" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -143,6 +143,9 @@ Character to use when underlining title .TP \fB\-\-bold\fR on/off Enable/Disable bold text +.TP +\fB\-\-separator\fR string +Changes the default ':' separator to the specified string. .SS "COLOR BLOCKS:" .TP \fB\-\-color_blocks\fR on/off From 1bca06c0db776cfe9113f5c51aa4531cc1c35d84 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Mon, 22 Oct 2018 22:08:34 +1100 Subject: [PATCH 0576/1133] get_memory: fix awk for vm_stat on macOS --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 400db8ffc..f1442fd62 100755 --- a/neofetch +++ b/neofetch @@ -2220,9 +2220,9 @@ get_memory() { "Mac OS X" | "iPhone OS") mem_total="$(($(sysctl -n hw.memsize) / 1024 / 1024))" - mem_wired="$(vm_stat | awk '/wired/ { print $4 }')" - mem_active="$(vm_stat | awk '/active / { printf $3 }')" - mem_compressed="$(vm_stat | awk '/occupied/ { printf $5 }')" + mem_wired="$(vm_stat | awk '/ wired/ { print $4 }')" + mem_active="$(vm_stat | awk '/ active/ { printf $3 }')" + mem_compressed="$(vm_stat | awk '/ occupied/ { printf $5 }')" mem_compressed="${mem_compressed:-0}" mem_used="$(((${mem_wired//.} + ${mem_active//.} + ${mem_compressed//.}) * 4 / 1024))" ;; From 936b3b6b73ff1e341ddafaa47afdecbdec10eee7 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Mon, 22 Oct 2018 22:21:12 +1100 Subject: [PATCH 0577/1133] get_song: stop iTunesHelper from being detected --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 400db8ffc..1b33bb8e0 100755 --- a/neofetch +++ b/neofetch @@ -2358,7 +2358,7 @@ get_song() { printf -v players "|%s" "${players[@]}" player="$(ps aux | awk -v pattern="(${players:1})" \ - '!/ awk / && match($0,pattern){print substr($0,RSTART,RLENGTH); exit}')" + '!/ awk / && !/iTunesHelper/ && match($0,pattern){print substr($0,RSTART,RLENGTH); exit}')" [[ "$music_player" && "$music_player" != "auto" ]] && \ player="$music_player" From a9ec78656b4748890ed590b3f8ec7c6c56e9e7b6 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Tue, 23 Oct 2018 09:16:38 +1100 Subject: [PATCH 0578/1133] OS: Add Reborn OS --- neofetch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/neofetch b/neofetch index 400db8ffc..4547fc273 100755 --- a/neofetch +++ b/neofetch @@ -7482,6 +7482,30 @@ ${c1} `.::///+:/-. --///+//-:`` EOF ;; + "Reborn OS"* | "Reborn"*) + set_colors 2 2 8 + read -rd '' ascii_data <<'EOF' +${c3} + mMMMMMMMMM MMMMMMMMMm + NM MN + MM ${c1}dddddddd dddddddd ${c3}MN + mM ${c1}dd dd ${c3}MM + ${c1}dd hhhhhh hhhhh dd + ${c3}mM ${c1}hh hh ${c3}Mm + NM ${c1}hd ${c3}mMMMMMMd ${c1}dh ${c3}MN + NM ${c1}dd hh ${c3}mMMMMMMMMm ${c1}hh dd ${c3}MN +NM ${c1}dd hh ${c3}mMMMMMMMMMMm ${c1}hh dd ${c3}MN + NM ${c1}dd hh ${c3}mMMMMMMMMm ${c1}hh dd ${c3}MN + NM ${c1}hd ${c3}mMMMMMMm ${c1}dh ${c3}MN + mM ${c1}hh hh ${c3}Mm + ${c1}dd hhhhhh hhhhhh dd + ${c3}MM ${c1}dd dd ${c3}MM + MM ${c1}dddddddd dddddddd ${c3}MN + NM MN + mMMMMMMMMM MMMMMMMMMm +EOF + ;; + "Red Star"* | "Redstar"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' From 6cbd5c41149947ab786703ee98d71d80a1e1cd69 Mon Sep 17 00:00:00 2001 From: marlonn <19227239+marlonn@users.noreply.github.com> Date: Tue, 23 Oct 2018 12:26:54 +0000 Subject: [PATCH 0579/1133] new logo for Lubuntu Lubuntu changed from LXDE to LXQt with the current release (Lubuntu 18.10), and changed their logo accordingly. --- neofetch | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/neofetch b/neofetch index 9142ff8e1..326220d8b 100755 --- a/neofetch +++ b/neofetch @@ -6454,26 +6454,26 @@ EOF "Lubuntu"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} `-/+oyyhhhhyyo+/-` - ./shhhhhhhhhhhhhhhhhhs/. - `:shhhhhhhhhhhhhhhhhhhhhhhhs:` - :yhhhhhhhhhhhhhhhs++yhhhhhhhhhy: - `ohhhhhhhhhhhhhs+:. .yhhhhhhhhhhhho` - `shhhhhhhhhhy+:` /yhhhhhhhhhhhhhs` - shhhhhhhhy+. .ohhhhhhhhhhhhhs -:hhhhhhy/. /hhhhhhhhhhhhh: -shhhy/. :hhhhhhhhhhhhs -hy+. ` `+yhs/` +hhhhhhhhhhhh --.:/oshy- ` :yhhhhhy/ shhhhhhhhhhh -shhhhhy-`/s. .shhhhhhhhho` .hhhhhhhhhhs -:hhhho`:ys` /yhhhhhhhhhhhs` +hhhhhhhhh: - shh/.sh+ `ohhhhhhhhhhhhhhs` .hhhhhhhhs - `o-+hh: :yhhhhhhhhhhhhhhhho ohhhhhhs` - +hy-`ohhhhhhhhhhhhhhhhhhh+ -hhhhho` - :.-yhhhhhhhhhhhhhhhhhhhhh: yhhy: - :shhhhhhhhhhhhhhhhhhhhhy`+s:` - .+shhhhhhhhhhhhhhhhhhs:` - `-/+oyyhhhhyys+/-` +${c1} `-mddhhhhhhhhhddmss` + ./mdhhhhhhhhhhhhhhhhhhhhhh. + :mdhhhhhhhhhhhhhhhhhhhhhhhhhhhm` + :ymhhhhhhhhhhhhhhhyyyyyyhhhhhhhhhy: + `odhyyyhhhhhhhhhy+-````./syhhhhhhhho` + `hhy..:oyhhhhhhhy-`:osso/..:/++oosyyyh` + dhhs .-/syhhhhs`shhhhhhyyyyyyyyyyyyhs +:hhhy` yso/:+syhy/yhhhhhshhhhhhhhhhhhhh: +hhhhho. +hhhys++oyyyhhhhh-yhhhhhhhhhhhhhs +hhhhhhs-`/syhhhhyssyyhhhh:-yhhhhhhhhhhhhh +hhhhhhs `:/+ossyyhyyhhhhs -yhhhhhhhhhhhh +hhhhhhy/ `syyyssyyyyhhhhhh: :yhhhhhhhhhhs +:hhhhhhyo:-/osyhhhhhhhhhhho ohhhhhhhhhh: + sdhhhhhhhyyssyyhhhhhhhhhhh+ +hhhhhhhhs + `shhhhhhhhhhhhhhhhhhhhhhy+` .yhhhhhhhh` + +sdhhhhhhhhhhhhhhhhhyo/. `/yhhhhhhhd` + `:shhhhhhhhhh+---..``.:+yyhhhhhhh: + `:mdhhhhhh/.syssyyyyhhhhhhhd:` + `+smdhhh+shhhhhhhhhhhhdm` + `sNmdddhhhhhhhddm-` EOF ;; From 801760a01ba7cce2d2c0d02f704c75bd36adceae Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Fri, 9 Nov 2018 17:12:47 +0700 Subject: [PATCH 0580/1133] Distro: Add support for OpenMandriva Lx --- neofetch | 61 +++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index 326220d8b..c817e469e 100755 --- a/neofetch +++ b/neofetch @@ -6584,6 +6584,27 @@ o00. k0O${c2}dddddd${c1}occ EOF ;; + "Mandriva"*) + set_colors 4 3 + read -rd '' ascii_data <<'EOF' +${c2} `` + `-. +${c1} ` ${c2}.--- +${c1} -/ ${c2}-::--` +${c1} `++ ${c2}`----...```-:::::. +${c1} `os. ${c2}.::::::::::::::-``` ` ` +${c1} +s+ ${c2}.::::::::::::::::---...--` +${c1}-ss: ${c2}`-::::::::::::::::-.``.`` +${c1}/ss- ${c2}.::::::::::::-.`` ` +${c1}+ss: ${c2}.::::::::::::- +${c1}/sso ${c2}.::::::-::::::- +${c1}.sss/ ${c2}-:::-.` .::::: +${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: +${c1} -ossso+/:://+/-` ${c2}.:` +${c1} -/+ooo+/-. ${c2}` +EOF + ;; + "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' @@ -7010,24 +7031,32 @@ h+` `.-:+oyyyo/-` EOF ;; + "OpenMandriva"*) - set_colors 4 3 + set_colors 4 read -rd '' ascii_data <<'EOF' -${c2} `` - `-. -${c1} ` ${c2}.--- -${c1} -/ ${c2}-::--` -${c1} `++ ${c2}`----...```-:::::. -${c1} `os. ${c2}.::::::::::::::-``` ` ` -${c1} +s+ ${c2}.::::::::::::::::---...--` -${c1}-ss: ${c2}`-::::::::::::::::-.``.`` -${c1}/ss- ${c2}.::::::::::::-.`` ` -${c1}+ss: ${c2}.::::::::::::- -${c1}/sso ${c2}.::::::-::::::- -${c1}.sss/ ${c2}-:::-.` .::::: -${c1} /sss+. ${c2}..`${c1} `--` ${c2}.::: -${c1} -ossso+/:://+/-` ${c2}.:` -${c1} -/+ooo+/-. ${c2}` +${c1} `````` + `-:/+++++++//:-.` + .:+++oooo+/:.`` `` + `:+ooooooo+:. `-:/++++++/:.` + -+oooooooo:` `-++o+/::::://+o+/- + `/ooooooooo- -+oo/.` `-/oo+. + `+ooooooooo. :os/` .+so: + +sssssssss/ :ss/ `+ss- + :ssssssssss` sss` .sso + ossssssssss `yyo sys +`sssssssssss` `yys `yys +`sssssssssss: +yy/ +yy: + oyyyyyyyyyys. `oyy/` `+yy+ + :yyyyyyyyyyyo. `+yhs:. `./shy/ + oyyyyyyyyyyys:` .oyhys+:----/+syhy+. ` + `syyyyyyyyyyyyo-` .:osyhhhhhyys+:``.:` + `oyyyyyyyyyyyyys+-`` `.----.```./oo. + /yhhhhhhhhhhhhhhyso+//://+osyhy/` + `/yhhhhhhhhhhhhhhhhhhhhhhhhy/` + `:oyhhhhhhhhhhhhhhhhhhyo:` + .:+syhhhhhhhhys+:-` + ``....`` EOF ;; From 0168516a2c00b115b7b0ace7e36ac7f2da6ece7e Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Wed, 14 Nov 2018 07:05:40 +0700 Subject: [PATCH 0581/1133] Memory [Solaris]: Detect using a new method using pages --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index c817e469e..eab326945 100755 --- a/neofetch +++ b/neofetch @@ -2269,8 +2269,9 @@ get_memory() { ;; "Solaris") - mem_total="$(prtconf | awk '/Memory/ {print $3}')" - mem_free="$(($(vmstat | awk 'NR==3{printf $5}') / 1024))" + hw_pagesize="$(pagesize)" + mem_total="$(($(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}') * hw_pagesize / 1024 / 1024))" + mem_free="$(($(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}') * hw_pagesize / 1024 / 1024))" mem_used="$((mem_total - mem_free))" ;; From ed0b0a9746fee66f24b3ccb35674603fcd7c1166 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Tue, 27 Nov 2018 19:30:04 +0700 Subject: [PATCH 0582/1133] Misc: Fix 100 character limit --- neofetch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index eab326945..38477f0a9 100755 --- a/neofetch +++ b/neofetch @@ -2270,8 +2270,10 @@ get_memory() { "Solaris") hw_pagesize="$(pagesize)" - mem_total="$(($(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}') * hw_pagesize / 1024 / 1024))" - mem_free="$(($(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}') * hw_pagesize / 1024 / 1024))" + pages_total=$(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}') + pages_free=$(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}') + mem_total="$((pages_total * hw_pagesize / 1024 / 1024))" + mem_free="$((pages_free * hw_pagesize / 1024 / 1024))" mem_used="$((mem_total - mem_free))" ;; @@ -2359,7 +2361,7 @@ get_song() { printf -v players "|%s" "${players[@]}" player="$(ps aux | awk -v pattern="(${players:1})" \ - '!/ awk / && !/iTunesHelper/ && match($0,pattern){print substr($0,RSTART,RLENGTH); exit}')" + '!/ awk / && !/iTunesHelper/ && match($0,pattern){print substr($0,RSTART,RLENGTH); exit}')" [[ "$music_player" && "$music_player" != "auto" ]] && \ player="$music_player" From 92c3ad7493e42d7ddb319b9e530f0392f5582f3b Mon Sep 17 00:00:00 2001 From: xPMo Date: Mon, 10 Sep 2018 16:59:14 -0500 Subject: [PATCH 0583/1133] extra spaces in song information --- neofetch | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/neofetch b/neofetch index 38477f0a9..28bc86cc4 100755 --- a/neofetch +++ b/neofetch @@ -2374,18 +2374,18 @@ get_song() { org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' \ string:'Metadata' |\ awk -F '"' 'BEGIN {RS=" entry"}; /xesam:artist/ {a = $4} /xesam:album/ {b = $4} - /xesam:title/ {t = $4} END {print a " \n " b " \n " t}' + /xesam:title/ {t = $4} END {print a "\n" b "\n" t}' )" } case "${player/*\/}" in "mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;; - "mocp"*) song="$(mocp -Q '%artist \n %album \n %song')" ;; + "mocp"*) song="$(mocp -Q '%artist\n%album\n%song')" ;; "google play"*) song="$(gpmdp-remote current)" ;; - "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta \n %at \n %tt')" ;; - "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% \n %album% \n %title%')" ;; + "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta\n%at\n%tt')" ;; + "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist%\n%album%\n%title%')" ;; "xmms2d"*) song="$(xmms2 current -f "\${artist}"$'\n'"\${album}"$'\n'"\${title}")" ;; - "qmmp"*) song="$(qmmp --nowplaying '%p \n %a \n %t')" ;; + "qmmp"*) song="$(qmmp --nowplaying '%p\n%a\n%t')" ;; "gnome-music"*) get_song_dbus "GnomeMusic" ;; "lollypop"*) get_song_dbus "Lollypop" ;; "clementine"*) get_song_dbus "clementine" ;; @@ -2416,7 +2416,7 @@ get_song() { /tag title/ { $1=$2=""; sub(" ", ""); t=$0 } - END { print a " \n " b " \n " t }')" + END { print a "\n" b "\n" t }')" ;; "spotify"*) @@ -2425,36 +2425,36 @@ get_song() { "Mac OS X") song="$(osascript -e 'tell application "Spotify" to artist of current track as¬ - string & " \n " & album of current track as¬ - string & " \n " & name of current track as string')" + string & "\n" & album of current track as¬ + string & "\n" & name of current track as string')" ;; esac ;; "itunes"*) song="$(osascript -e 'tell application "iTunes" to artist of current track as¬ - string & " \n " & album of current track as¬ - string & " \n " & name of current track as string')" + string & "\n" & album of current track as¬ + string & "\n" & name of current track as string')" ;; "banshee"*) song="$(banshee --query-artist --query-album --query-title |\ awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} - END {print a " \n " b " \n "t}')" + END {print a "\n" b "\n"t}')" ;; "exaile"*) # NOTE: Exaile >= 4.0.0 will support mpris2. song="$(dbus-send --print-reply --dest=org.exaile.Exaile /org/exaile/Exaile \ org.exaile.Exaile.Query | - awk -F':|,' '{if ($6 && $8 && $4) printf $6 " \n" $8 " \n" $4}')" + awk -F':|,' '{if ($6 && $8 && $4) printf $6 "\n" $8 "\n" $4}')" ;; "quodlibet"*) song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \ /net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\ awk -F'"' '/artist/ {getline; a=$2} /album/ {getline; b=$2} - /title/ {getline; t=$2} END {print a " \n " b " \n " t}')" + /title/ {getline; t=$2} END {print a "\n" b "\n" t}')" ;; "pogo"*) @@ -2472,10 +2472,10 @@ get_song() { getline; t=$2 } - END {print a " \n " b " \n " t}')" + END {print a "\n" b "\n" t}')" ;; - *) mpc &>/dev/null && song="$(mpc -f '%artist% \n %album% \n %title%' current)" ;; + *) mpc &>/dev/null && song="$(mpc -f '%artist%\n%album%\n%title%' current)" ;; esac [[ "$song" != *[a-z]* ]] && { unset -v song; return; } From 90ddcbd3e1cf06b82a14f198b915ae172629b8ee Mon Sep 17 00:00:00 2001 From: xPMo Date: Mon, 10 Sep 2018 17:03:18 -0500 Subject: [PATCH 0584/1133] awk: Match exactly "album", not "albumArtist" --- neofetch | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index 28bc86cc4..484c47b39 100755 --- a/neofetch +++ b/neofetch @@ -2373,7 +2373,7 @@ get_song() { dbus-send --print-reply --dest=org.mpris.MediaPlayer2."${1}" /org/mpris/MediaPlayer2 \ org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' \ string:'Metadata' |\ - awk -F '"' 'BEGIN {RS=" entry"}; /xesam:artist/ {a = $4} /xesam:album/ {b = $4} + awk -F '"' 'BEGIN {RS=" entry"}; /"xesam:artist"/ {a = $4} /"xesam:album"/ {b = $4} /xesam:title/ {t = $4} END {print a "\n" b "\n" t}' )" } @@ -2453,26 +2453,15 @@ get_song() { "quodlibet"*) song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \ /net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\ - awk -F'"' '/artist/ {getline; a=$2} /album/ {getline; b=$2} - /title/ {getline; t=$2} END {print a "\n" b "\n" t}')" + awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4} + /"title"/ {t=$4} END {print a "\n" b "\n" t}')" ;; "pogo"*) song="$(dbus-send --print-reply --dest=org.mpris.pogo /Player \ org.freedesktop.MediaPlayer.GetMetadata | - awk -F'"' '/string "artist"/ { - getline; - a=$2 - } - /string "album"/ { - getline; - b=$2 - } - /string "title"/ { - getline; - t=$2 - } - END {print a "\n" b "\n" t}')" + awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4} + /"title"/ {t=$4} END {print a "\n" b "\n" t}')" ;; *) mpc &>/dev/null && song="$(mpc -f '%artist%\n%album%\n%title%' current)" ;; From e85a6a03f1eb81b60aeea09544ba5be20ac2c2cd Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 30 Oct 2018 07:53:54 +0100 Subject: [PATCH 0585/1133] song: also quote xesam:title in get_song_dbus matching --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 484c47b39..164d0b5f5 100755 --- a/neofetch +++ b/neofetch @@ -2374,7 +2374,7 @@ get_song() { org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' \ string:'Metadata' |\ awk -F '"' 'BEGIN {RS=" entry"}; /"xesam:artist"/ {a = $4} /"xesam:album"/ {b = $4} - /xesam:title/ {t = $4} END {print a "\n" b "\n" t}' + /"xesam:title"/ {t = $4} END {print a "\n" b "\n" t}' )" } From 3da0b5cfb4ceaf0be78351ad27b395c3a4ee1942 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 30 Oct 2018 07:55:50 +0100 Subject: [PATCH 0586/1133] song: use get_song_dbus for rhythmbox --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 164d0b5f5..5e9aafed0 100755 --- a/neofetch +++ b/neofetch @@ -2382,7 +2382,6 @@ get_song() { "mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;; "mocp"*) song="$(mocp -Q '%artist\n%album\n%song')" ;; "google play"*) song="$(gpmdp-remote current)" ;; - "rhythmbox"*) song="$(rhythmbox-client --print-playing-format '%ta\n%at\n%tt')" ;; "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist%\n%album%\n%title%')" ;; "xmms2d"*) song="$(xmms2 current -f "\${artist}"$'\n'"\${album}"$'\n'"\${title}")" ;; "qmmp"*) song="$(qmmp --nowplaying '%p\n%a\n%t')" ;; @@ -2404,6 +2403,7 @@ get_song() { "amarok"*) get_song_dbus "amarok" ;; "dragon"*) get_song_dbus "dragonplayer" ;; "smplayer"*) get_song_dbus "smplayer" ;; + "rhythmbox"*) get_song_dbus "rhythmbox" ;; "cmus"*) song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; From fcb302f649ea73b06dd452a34016d23de5f641e4 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 27 Oct 2018 14:33:18 +0200 Subject: [PATCH 0587/1133] song: fix elisa detection --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 5e9aafed0..3e8492505 100755 --- a/neofetch +++ b/neofetch @@ -2332,7 +2332,7 @@ get_song() { "deadbeef" "deepin-music" "dragon" - "elise" + "elisa" "exaile" "gnome-music" "gmusicbrowser" From acdd6828f8d919b15f8f5e03e386bed8d7198538 Mon Sep 17 00:00:00 2001 From: Phuurl Date: Thu, 6 Dec 2018 22:58:29 +0000 Subject: [PATCH 0588/1133] Adds scoop package manager support --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 38477f0a9..d46aae580 100755 --- a/neofetch +++ b/neofetch @@ -1341,6 +1341,9 @@ get_packages() { "MSYS"*) has "pacman" && tot pacman -Qq --color never ;; esac + # Scoop environment throws errors if `tot scoop list` is used + has "scoop" && dir ~/scoop/apps/* && ((packages-=1)) + # Count chocolatey packages. [[ -d "/cygdrive/c/ProgramData/chocolatey/lib" ]] && \ dir /cygdrive/c/ProgramData/chocolatey/lib/* From 71e22d842edd4efda5d1c048c7201e97bc4386cd Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 8 Dec 2018 15:51:21 +0100 Subject: [PATCH 0589/1133] Misc: Use comma syntax in awk to print spaces --- neofetch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 38477f0a9..4770a1579 100755 --- a/neofetch +++ b/neofetch @@ -989,8 +989,8 @@ get_distro() { "Solaris") case "$distro_shorthand" in - "on" | "tiny") distro="$(awk 'NR==1{print $1 " " $3;}' /etc/release)" ;; - *) distro="$(awk 'NR==1{print $1 " " $2 " " $3;}' /etc/release)" ;; + "on" | "tiny") distro="$(awk 'NR==1 {print $1,$3}' /etc/release)" ;; + *) distro="$(awk 'NR==1 {print $1,$2,$3}' /etc/release)" ;; esac distro="${distro/\(*}" ;; @@ -2862,13 +2862,13 @@ END ;; "deepin-terminal"*) - term_font="$(awk -F '=' '/font=/ {a=$2} /font_size/ {b=$2} END {print a " " b}' \ + term_font="$(awk -F '=' '/font=/ {a=$2} /font_size/ {b=$2} END {print a,b}' \ "${XDG_CONFIG_HOME}/deepin/deepin-terminal/config.conf")" ;; "GNUstep_Terminal") term_font="$(awk -F '>|<' '/>TerminalFontTerminalFontSizeTerminalFontSize Date: Sun, 23 Dec 2018 23:10:49 +0100 Subject: [PATCH 0590/1133] Distro: Add support for Star --- neofetch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/neofetch b/neofetch index 4770a1579..84fb5e47a 100755 --- a/neofetch +++ b/neofetch @@ -7999,6 +7999,31 @@ ${c1} EOF ;; + "Star"*) + set_colors 7 + read -rd '' ascii_data <<'EOF' +${c1} ./ + `yy- + `y.`y` + `` s- .y ` + +h//:..` +/ /o ``..:/so + /o``.-::/:/+ o/://::-.`+o` + :s` `. .` `s/ + .y. .s- + `y- :s` + .-//. /+:. + .:/:. .:/:. +-+o:. .:+:. +-///++///:::` .-::::///+so- + ``..o/ d-....``` + s. `/. d + h .+o-+o- h. + h -o/` `/o: s: + -s/o:` `:o/+/ + /s- -yo +EOF + ;; + "SteamOS"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' From 52ea4774a3ffad3521e5e24fab792b8f0722b901 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 Jan 2019 20:42:31 +0200 Subject: [PATCH 0591/1133] ascii: Added small arcolinux ascii. Closes #1146 #1147 --- neofetch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/neofetch b/neofetch index 2aaba06e4..68d3289e8 100755 --- a/neofetch +++ b/neofetch @@ -4939,6 +4939,23 @@ dhhyys+/-` EOF ;; + "arcolinux_small"*) + set_colors 7 4 + read -rd '' ascii_data <<'EOF' +${c2} A + ooo + ooooo + ooooooo + ooooooooo + ooooo ooooo + ooooo ooooo + ooooo ooooo + ooooo ${c1}${c2} + ooooo ${c1}${c2} +ooooo ${c1}${c2} +EOF + ;; + "ArcoLinux"*) set_colors 7 4 read -rd '' ascii_data <<'EOF' From a2b7de8e6a4a941553b8b1d3a075ddc0fd813d99 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 Jan 2019 20:52:33 +0200 Subject: [PATCH 0592/1133] ascii: Added support for BlueLight OS. Closes #1139 --- neofetch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/neofetch b/neofetch index 68d3289e8..497da49cf 100755 --- a/neofetch +++ b/neofetch @@ -5260,6 +5260,31 @@ ${c2} `.:/++++/:.` ${c1}:oys+. EOF ;; + "BlueLight"*) + set_colors 7 4 + read -rd '' ascii_data <<'EOF' +${c1} oMMNMMMMMMMMMMMMMMMMMMMMMM + oMMMMMMMMMMMMMMMMMMMMMMMMM + oMMMMMMMMMMMMMMMMMMMMMMMMM + oMMMMMMMMMMMMMMMMMMMMMMMMM + -+++++++++++++++++++++++mM${c2} + ```````````````````````..${c1}dM${c2} + ```````````````````````....${c1}dM${c2} + ```````````````````````......${c1}dM${c2} + ```````````````````````........${c1}dM${c2} + ```````````````````````..........${c1}dM${c2} + ```````````````````````............${c1}dM${c2} +.::::::::::::::::::::::-..............${c1}dM${c2} + `-+yyyyyyyyyyyyyyyyyyyo............${c1}+mMM${c2} + -+yyyyyyyyyyyyyyyyo..........${c1}+mMMMM${c2} + ./syyyyyyyyyyyyo........${c1}+mMMMMMM${c2} + ./oyyyyyyyyyo......${c1}+mMMMMMMMM${c2} + omdyyyyyyo....${c1}+mMMMMMMMMMM${c2} + ${c1}oMMM${c2}mdhyyo..${c1}+mMMMMMMMMMMMM + oNNNNNNm${c2}dso${c1}mMMMMMMMMMMMMMM +EOF + ;; + "BSD") set_colors 1 7 4 3 6 read -rd '' ascii_data <<'EOF' From cc1be73077d34be5342d93cba26a6846dc6d2d2b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 Jan 2019 21:21:59 +0200 Subject: [PATCH 0593/1133] docs: update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8e69d6b63..b3ada9a95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,6 @@ install: script: - time ./neofetch --travis -v - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck neofetch; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck -e SC2244 neofetch; fi # Check for lines longer than 100 chars. - if grep '.\{102\}' neofetch; then (exit 1); else (exit 0); fi From 45d632d1f68b0fa984cb2e7514a2563c0cc8a925 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 Jan 2019 21:22:41 +0200 Subject: [PATCH 0594/1133] docs: update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b3ada9a95..f313c14a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,6 @@ install: script: - time ./neofetch --travis -v - - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck -e SC2244 neofetch; fi + - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck -e SC2244 -e SC2243 neofetch; fi # Check for lines longer than 100 chars. - if grep '.\{102\}' neofetch; then (exit 1); else (exit 0); fi From 8a96fd545d71041b61cef8c1e9aa220bdeeaea08 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 09:03:24 +0200 Subject: [PATCH 0595/1133] song: Fix issues with non-english tags --- neofetch | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 455b744c6..d71f4c0a1 100755 --- a/neofetch +++ b/neofetch @@ -2467,22 +2467,28 @@ get_song() { /"title"/ {t=$4} END {print a "\n" b "\n" t}')" ;; - *) mpc &>/dev/null && song="$(mpc -f '%artist%\n%album%\n%title%' current)" ;; + *) mpc &>/dev/null && song="$(mpc -f '%artist%\n%album%\n%title%' current)" || return ;; esac - [[ "$song" != *[a-z]* ]] && { unset -v song; return; } - IFS=$'\n' read -d "" -r artist album title <<< "$song" + # Make sure empty tags are truly empty. + artist="$(trim "$artist")" + album="$(trim "$album")" + title="$(trim "$title")" + + # Set default values if no tags were found. + : "${artist:=Unknown Artist}" "${album:=Unknown Album}" "${title:=Unknown Song}" + # Display Artist, Album and Title on separate lines. if [[ "$song_shorthand" == "on" ]]; then - [[ "$(trim "$artist")" ]] && prin "Artist" "$artist" - [[ "$(trim "$album")" ]] && prin "Album" "$album" - [[ "$(trim "$song")" ]] && prin "Song" "$title" + prin "Artist" "$artist" + prin "Album" "$album" + prin "Song" "$title" else - song="${song_format/\%artist\%/${artist}}" - song="${song/\%album\%/${album}}" - song="${song/\%title\%/${title}}" + song="${song_format/\%artist\%/$artist}" + song="${song/\%album\%/$album}" + song="${song/\%title\%/$title}" fi } From 86711645a05f1f8f640d6b5a0c967d7f6f52b648 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 09:07:24 +0200 Subject: [PATCH 0596/1133] song: Fix issues with broken newlines --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d71f4c0a1..5c9096d12 100755 --- a/neofetch +++ b/neofetch @@ -2470,7 +2470,7 @@ get_song() { *) mpc &>/dev/null && song="$(mpc -f '%artist%\n%album%\n%title%' current)" || return ;; esac - IFS=$'\n' read -d "" -r artist album title <<< "$song" + IFS=$'\n' read -d "" -r artist album title <<< "${song//'\n'/$'\n'}" # Make sure empty tags are truly empty. artist="$(trim "$artist")" From 27258fb93ca8953636cdad039e3d98523c96d17f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 09:17:40 +0200 Subject: [PATCH 0597/1133] ascii: Added support for Huayra Linux. Closes #1138 --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index 455b744c6..0d0ee7dfd 100755 --- a/neofetch +++ b/neofetch @@ -6182,6 +6182,29 @@ ${c2} :dc' EOF ;; + "Huayra"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c2} ` + . . ` + `` - . . + `.` -` `. - `` .` + ..`-`-` + - / .` ``` + .--.+--`+:- :/.` .-``.` + -+/so::h:.d-`./:`.` + :hNhyMomy:os-...-. ```` + .dhsshNmNhoo+:-``.``` + ${c1}`ohy:-${c2}NMds+::-.`` + ````${c1}.hNN+`${c2}mMNho/:-....```` + ````` ${c1}`..${c2}/dmNhoo+/:..`` + ```` .dh++o/:....` +.+s/` `/s-.-.:.`` ```` +::` `::`..` + .` `.. + `` +EOF + ;; + "Hyperbola"*) set_colors 8 read -rd '' ascii_data <<'EOF' From 17a56081a5e0b52b80dd8aa476630e7e4520109b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 09:18:35 +0200 Subject: [PATCH 0598/1133] ascii: Added support for Huayra Linux. Closes #1138 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 0d0ee7dfd..e3786a2ef 100755 --- a/neofetch +++ b/neofetch @@ -6196,7 +6196,7 @@ ${c2} ` .dhsshNmNhoo+:-``.``` ${c1}`ohy:-${c2}NMds+::-.`` ````${c1}.hNN+`${c2}mMNho/:-....```` - ````` ${c1}`..${c2}/dmNhoo+/:..`` + ````` `../dmNhoo+/:..`` ```` .dh++o/:....` .+s/` `/s-.-.:.`` ```` ::` `::`..` From c47826225e13838fdef85967bded870d30a3381b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 15:17:05 +0200 Subject: [PATCH 0599/1133] song: Added support for netease cloud music --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 5c9096d12..f0f0d2da0 100755 --- a/neofetch +++ b/neofetch @@ -2347,6 +2347,7 @@ get_song() { "mocp" "mopidy" "mpd" + "netease-cloud-music" "pogo" "pragha" "qmmp" @@ -2407,6 +2408,7 @@ get_song() { "dragon"*) get_song_dbus "dragonplayer" ;; "smplayer"*) get_song_dbus "smplayer" ;; "rhythmbox"*) get_song_dbus "rhythmbox" ;; + "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "cmus"*) song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; From 6f6b67f3871c26da3c3c940fe2bd546e3e6d9c5b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 16:10:53 +0200 Subject: [PATCH 0600/1133] general: Added new simple mode for script usage --- neofetch | 46 +++++++++++++++++++++++++++++++++------------- neofetch.1 | 14 +++++++++++--- 2 files changed, 44 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index e3786a2ef..6c29c6f13 100755 --- a/neofetch +++ b/neofetch @@ -4033,18 +4033,8 @@ color() { stdout() { image_backend="off" - unset subtitle_color - unset colon_color - unset info_color - unset underline_color - unset bold - unset title_color - unset at_color - unset text_padding - unset zws - unset reset - unset color_blocks - unset get_line_break + unset subtitle_color colon_color info_color underline_color bold title_color at_color \ + text_padding zws reset color_blocks get_line_break bar_color_elapsed bar_color_total } err() { @@ -4242,7 +4232,7 @@ decode_url() { # FINISH UP usage() { printf "%s" "\ -Usage: neofetch --option \"value\" --option \"value\" +Usage: neofetch func_name --option \"value\" --option \"value\" Neofetch is a CLI system information tool written in BASH. Neofetch displays information about your system next to an image, your OS logo, @@ -4253,6 +4243,22 @@ NOTE: Every launch flag has a config option. Options: INFO: + func_name Specify a function name (second part of info() from config) to + quickly display only that function's information. + + Example: neofetch uptime --uptime_shorthand tiny + + Example: neofetch uptime disk wm memory + + This can be used in bars and scripts like so: + + memory=\"\$(neofetch memory)\"; memory=\"\${memory##*: }\" + + For multiple outputs at once (each line of info in an array): + + IFS=\$'\\n' read -d \"\" -ra info < <(neofetch memory uptime wm) + info=(\"\${info[@]##*: }\") + --disable infoname Allows you to disable an info line from appearing in the output. 'infoname' is the function name from the 'print_info()' function inside the config file. @@ -4696,6 +4702,19 @@ get_args() { done } +get_simple() { + while [[ "$1" ]]; do + [[ $(type -t "get_$1") == function ]] && { + get_distro + stdout + simple=1 + info "$1" "$1" + } + shift + done + ((simple)) && exit +} + get_distro_ascii() { # This function gets the distro ascii art and colors. # @@ -8666,6 +8685,7 @@ main() { eval "$config" get_args "$@" + get_simple "$@" [[ "$verbose" != "on" ]] && exec 2>/dev/null get_distro get_bold diff --git a/neofetch.1 b/neofetch.1 index ae57b426f..1e328c40b 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,10 +1,10 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.7. -.TH NEOFETCH "1" "October 2018" "Neofetch 5.0.1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8. +.TH NEOFETCH "1" "January 2019" "Neofetch 5.0.1" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS .B neofetch -\fI\,--option "value" --option "value"\/\fR +\fI\,func_name --option "value" --option "value"\/\fR .SH DESCRIPTION Neofetch is a CLI system information tool written in BASH. Neofetch displays information about your system next to an image, your OS logo, @@ -14,6 +14,14 @@ NOTE: Every launch flag has a config option. .SH OPTIONS .SS "INFO:" .TP +func_name +Specify a function name (second part of info() from config) to +quickly display only that function's information. +.IP +Example: neofetch uptime \fB\-\-uptime_shorthand\fR tiny +.IP +Example: neofetch uptime disk wm memory +.TP \fB\-\-disable\fR infoname Allows you to disable an info line from appearing in the output. 'infoname' is the function name from the From c29ecc3faef82df7f7abb31828b16f52764e06dd Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 16:11:00 +0200 Subject: [PATCH 0601/1133] general: Added new simple mode for script usage --- neofetch.1 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/neofetch.1 b/neofetch.1 index 1e328c40b..bfb861c29 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -21,6 +21,15 @@ quickly display only that function's information. Example: neofetch uptime \fB\-\-uptime_shorthand\fR tiny .IP Example: neofetch uptime disk wm memory +.IP +This can be used in bars and scripts like so: +.IP +memory="$(neofetch memory)"; memory="${memory##*: }" +.IP +For multiple outputs at once (each line of info in an array): +.TP +IFS=$'\en' read \fB\-d\fR "" \fB\-ra\fR info < <(neofetch memory uptime wm) +info=("${info[@]##*: }") .TP \fB\-\-disable\fR infoname Allows you to disable an info line from appearing From 9b2796e168c15b049f0ba12f0295e78eca708acd Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 16:13:59 +0200 Subject: [PATCH 0602/1133] general: Added new simple mode for script usage --- neofetch | 1 + neofetch.1 | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6c29c6f13..23c80a632 100755 --- a/neofetch +++ b/neofetch @@ -4257,6 +4257,7 @@ INFO: For multiple outputs at once (each line of info in an array): IFS=\$'\\n' read -d \"\" -ra info < <(neofetch memory uptime wm) + info=(\"\${info[@]##*: }\") --disable infoname Allows you to disable an info line from appearing diff --git a/neofetch.1 b/neofetch.1 index bfb861c29..5cde4afb6 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -27,8 +27,9 @@ This can be used in bars and scripts like so: memory="$(neofetch memory)"; memory="${memory##*: }" .IP For multiple outputs at once (each line of info in an array): -.TP +.IP IFS=$'\en' read \fB\-d\fR "" \fB\-ra\fR info < <(neofetch memory uptime wm) +.IP info=("${info[@]##*: }") .TP \fB\-\-disable\fR infoname From ae2384dca8f164fe76697109183d297c07ebc31f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 16:25:44 +0200 Subject: [PATCH 0603/1133] song: Fix deadbeef --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f0f0d2da0..d6e9e3ca4 100755 --- a/neofetch +++ b/neofetch @@ -2386,7 +2386,7 @@ get_song() { "mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;; "mocp"*) song="$(mocp -Q '%artist\n%album\n%song')" ;; "google play"*) song="$(gpmdp-remote current)" ;; - "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist%\n%album%\n%title%')" ;; + "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist%\\n%album%\\n%title%')" ;; "xmms2d"*) song="$(xmms2 current -f "\${artist}"$'\n'"\${album}"$'\n'"\${title}")" ;; "qmmp"*) song="$(qmmp --nowplaying '%p\n%a\n%t')" ;; "gnome-music"*) get_song_dbus "GnomeMusic" ;; From 186093ddc089ea6adb6282f35ed12708831be4a7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 16:28:36 +0200 Subject: [PATCH 0604/1133] song: Fix qmmp --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d6e9e3ca4..490e6ff34 100755 --- a/neofetch +++ b/neofetch @@ -2388,7 +2388,7 @@ get_song() { "google play"*) song="$(gpmdp-remote current)" ;; "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist%\\n%album%\\n%title%')" ;; "xmms2d"*) song="$(xmms2 current -f "\${artist}"$'\n'"\${album}"$'\n'"\${title}")" ;; - "qmmp"*) song="$(qmmp --nowplaying '%p\n%a\n%t')" ;; + "qmmp"*) song="$(qmmp --nowplaying '%p\\n%a\\n%t')" ;; "gnome-music"*) get_song_dbus "GnomeMusic" ;; "lollypop"*) get_song_dbus "Lollypop" ;; "clementine"*) get_song_dbus "clementine" ;; From faae04f0eec427cfdb5f97876bf1816cf62186e7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 16:39:56 +0200 Subject: [PATCH 0605/1133] song: Remove gpmdp-remote support as tool is unmaintained. --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index 490e6ff34..cb48230e7 100755 --- a/neofetch +++ b/neofetch @@ -2385,7 +2385,6 @@ get_song() { case "${player/*\/}" in "mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;; "mocp"*) song="$(mocp -Q '%artist\n%album\n%song')" ;; - "google play"*) song="$(gpmdp-remote current)" ;; "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist%\\n%album%\\n%title%')" ;; "xmms2d"*) song="$(xmms2 current -f "\${artist}"$'\n'"\${album}"$'\n'"\${title}")" ;; "qmmp"*) song="$(qmmp --nowplaying '%p\\n%a\\n%t')" ;; From bbb06ad4a9fafa22952c3480fec935e5adb23c72 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 16:40:55 +0200 Subject: [PATCH 0606/1133] song: Remove gpmdp-remote support as tool is unmaintained. --- neofetch | 2 -- 1 file changed, 2 deletions(-) diff --git a/neofetch b/neofetch index cb48230e7..0daa03675 100755 --- a/neofetch +++ b/neofetch @@ -429,7 +429,6 @@ disk_subtitle="mount" # exaile # gnome-music # gmusicbrowser -# Google Play # guayadeque # iTunes # juk @@ -2339,7 +2338,6 @@ get_song() { "exaile" "gnome-music" "gmusicbrowser" - "Google Play" "guayadeque" "iTunes" "juk" From 763f3a9af5fcf20dd24b2986648ea4e8b3c54374 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 17:09:29 +0200 Subject: [PATCH 0607/1133] song: Add netease to comment. --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 0daa03675..57a2856df 100755 --- a/neofetch +++ b/neofetch @@ -436,6 +436,7 @@ disk_subtitle="mount" # mocp # mopidy # mpd +# netease-cloud-music # pogo # pragha # qmmp From ee30f29da9476f12833003d569dded710ffecd15 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 17:16:18 +0200 Subject: [PATCH 0608/1133] song: Added config option to display music player --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 57a2856df..bcebeecf1 100755 --- a/neofetch +++ b/neofetch @@ -76,6 +76,7 @@ print_info() { # info "Battery" battery # info "Font" font # info "Song" song + # [[ $player ]] && prin "Music Player" "$player" # info "Local IP" local_ip # info "Public IP" public_ip # info "Users" users From a52115b364af33684c67ec5e5a9cd45e1ef68993 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 17:33:46 +0200 Subject: [PATCH 0609/1133] ascii: Added support for Pentoo. Closes #1069 --- neofetch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/neofetch b/neofetch index e9769b8eb..5f1eb181d 100755 --- a/neofetch +++ b/neofetch @@ -6072,6 +6072,33 @@ yM${c2}MNNNNNNNmmmmmNNMmhs+/${c1}-` EOF ;; + "Pentoo"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c2} `:oydNNMMMMNNdyo:` + :yNMMMMMMMMMMMMMMMMNy: + :dMMMMMMMMMMMMMMMMMMMMMMd: + oMMMMMMMho/-....-/ohMMMMMMMo + oMMMMMMy. .yMMMMMMo + .MMMMMMo oMMMMMM. + +MMMMMm mMMMMM+ + oMMMMMh hMMMMMo + //hMMMMMm//${c1}`${c2} ${c1}`${c2}////mMMMMMh// +MMMMMMMMMMM${c1}/${c2} ${c1}/o/`${c2} ${c1}.${c2}smMMMMMMMMMMM +MMMMMMMMMMm ${c1}`NMN:${c2} ${c1}.${c2}yMMMMMMMMMM +MMMMMMMMMMMh${c1}:.${c2} dMMMMMMMMM +MMMMMMMMMMMMMy${c1}.${c2} ${c1}-${c2}NMMMMMMMMM +MMMMMMMMMMMd:${c1}`${c2} ${c1}-${c2}yNMMMMMMMMMM +MMMMMMMMMMh${c1}`${c2} ${c1}./${c2}hNMMMMMMMMMMMM +MMMMMMMMMM${c1}s${c2} ${c1}.:${c2}ymMMMMMMMMMMMMMMM +MMMMMMMMMMN${c1}s:..-/${c2}ohNMMMMMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM +MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM + MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM + +EOF + ;; + "gNewSense"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' From 1b356da175e030a3170f524d2d0cf7e95655a5ac Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 18:04:25 +0200 Subject: [PATCH 0610/1133] ascii: Added support for command output --- neofetch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 5f1eb181d..6ced94d3a 100755 --- a/neofetch +++ b/neofetch @@ -3418,8 +3418,9 @@ image_backend() { get_ascii() { if [[ -f "$image_source" && ! "$image_source" =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then ascii_data="$(< "$image_source")" - else - err "Ascii: Ascii file not found, using distro ascii." + + elif [[ "$image_source" != "auto" ]]; then + ascii_data="$image_source" fi # Set locale to get correct padding. @@ -3430,6 +3431,9 @@ get_ascii() { ((++lines,${#line}>ascii_length)) && ascii_length="${#line}" done <<< "${ascii_data//\$\{??\}}" + # Fallback if file not found. + ((lines==1)) && { image_source="auto"; get_distro_ascii; get_ascii; return; } + # Colors. ascii_data="${ascii_data//\$\{c1\}/$c1}" ascii_data="${ascii_data//\$\{c2\}/$c2}" @@ -4595,7 +4599,6 @@ get_args() { "--ascii_distro") image_backend="ascii" ascii_distro="$2" - case "$2" in "-"* | "") ascii_distro="$distro" ;; esac ;; "--ascii_bold") ascii_bold="$2" ;; From 4fb30c040a8bd11f557877c8576789e95f4b0688 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 18:09:10 +0200 Subject: [PATCH 0611/1133] ascii: Added support for command output --- neofetch | 6 +++++- neofetch.1 | 8 +++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 6ced94d3a..f4c19a52d 100755 --- a/neofetch +++ b/neofetch @@ -4375,8 +4375,12 @@ IMAGE BACKEND: '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/' + '/path/to/ascii', '/path/to/dir/', 'command output' [ascii] + --ascii source Shortcut to use 'ascii' backend. + + NEW: neofetch --ascii \"\$(fortune | cowsay -W 30)\" + --caca source Shortcut to use 'caca' backend. --iterm2 source Shortcut to use 'iterm2' backend. --jp2a source Shortcut to use 'jp2a' backend. diff --git a/neofetch.1 b/neofetch.1 index ae57b426f..2bf661588 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.7. -.TH NEOFETCH "1" "October 2018" "Neofetch 5.0.1" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8. +.TH NEOFETCH "1" "January 2019" "Neofetch 5.0.1" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -199,10 +199,12 @@ Possible values: 'ascii', 'caca', 'jp2a', 'iterm2', 'off', \fB\-\-source\fR source Which image or ascii file to use. Possible values: 'auto', 'ascii', 'wallpaper', '/path/to/img', -\&'/path/to/ascii', '/path/to/dir/' +\&'/path/to/ascii', '/path/to/dir/', 'command output' [ascii] .TP \fB\-\-ascii\fR source Shortcut to use 'ascii' backend. +.IP +NEW: neofetch \fB\-\-ascii\fR "$(fortune | cowsay \fB\-W\fR 30)" .TP \fB\-\-caca\fR source Shortcut to use 'caca' backend. From defee48d14d93ab4f2fc4a34f375586b1e84a905 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 18:09:55 +0200 Subject: [PATCH 0612/1133] ascii: Added support for command output --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index f4c19a52d..c6f092b96 100755 --- a/neofetch +++ b/neofetch @@ -660,6 +660,7 @@ image_backend="ascii" # # Default: 'auto' # Values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/' +# 'command output (neofetch --ascii "$(fortune | cowsay -W 30)")' # Flag: --source # # NOTE: 'auto' will pick the best image source for whatever image backend is used. From b399f49077a98790ab52b5c70efba5dc39120835 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 18:17:56 +0200 Subject: [PATCH 0613/1133] ascii: Fixed bug when files named auto or ascii were found. --- neofetch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index c6f092b96..bf120339f 100755 --- a/neofetch +++ b/neofetch @@ -3417,12 +3417,12 @@ image_backend() { } get_ascii() { - if [[ -f "$image_source" && ! "$image_source" =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then - ascii_data="$(< "$image_source")" - - elif [[ "$image_source" != "auto" ]]; then - ascii_data="$image_source" - fi + [[ ! "$image_source" =~ (ascii|auto) ]] && + if [[ -f "$image_source" && ! "$image_source" =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then + ascii_data="$(< "$image_source")" + else + ascii_data="$image_source" + fi # Set locale to get correct padding. LC_ALL="$sys_locale" From c99b864590902ab61f61a6e4530b9b14208a475e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 18:34:20 +0200 Subject: [PATCH 0614/1133] ascii: Fixed bug when long line is input --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index bf120339f..3b56ea56e 100755 --- a/neofetch +++ b/neofetch @@ -3429,11 +3429,11 @@ get_ascii() { # Calculate size of ascii file in line length / line count. while IFS=$'\n' read -r line; do - ((++lines,${#line}>ascii_length)) && ascii_length="${#line}" + ((++lines,${#line}>ascii_len)) && ascii_len="${#line}" done <<< "${ascii_data//\$\{??\}}" # Fallback if file not found. - ((lines==1)) && { image_source="auto"; get_distro_ascii; get_ascii; return; } + ((lines==1)) && { lines=; ascii_len=; image_source="auto"; get_distro_ascii; get_ascii; return; } # Colors. ascii_data="${ascii_data//\$\{c1\}/$c1}" @@ -3443,7 +3443,7 @@ get_ascii() { ascii_data="${ascii_data//\$\{c5\}/$c5}" ascii_data="${ascii_data//\$\{c6\}/$c6}" - ((text_padding=ascii_length+gap)) + ((text_padding=ascii_len+gap)) printf '%b\n' "$ascii_data${reset}" LC_ALL=C } From 981b2da634f9b46df3ceb3aba6f607c8005c6797 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 18:56:09 +0200 Subject: [PATCH 0615/1133] general: Fix issues when printing ascii --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 23c80a632..b410844c0 100755 --- a/neofetch +++ b/neofetch @@ -4034,7 +4034,8 @@ color() { stdout() { image_backend="off" unset subtitle_color colon_color info_color underline_color bold title_color at_color \ - text_padding zws reset color_blocks get_line_break bar_color_elapsed bar_color_total + text_padding zws reset color_blocks get_line_break bar_color_elapsed bar_color_total \ + c1 c2 c3 c4 c5 c6 c7 c8 } err() { From ea44816a3c91507958d025474f51895f44b44e95 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 19:36:14 +0200 Subject: [PATCH 0616/1133] simple mode: expose window size and terminal size --- neofetch | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index b410844c0..930210480 100755 --- a/neofetch +++ b/neofetch @@ -3581,19 +3581,19 @@ get_window_size() { # -put as a variable. # The 1 second timeout is required for older bash case "${BASH_VERSINFO[0]}" in - 4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;; - *) IFS=';t' read -d t -t 1 -sra term_size ;; + 4|5) IFS=';t' read -d t -t 0.05 -sra win_size ;; + *) IFS=';t' read -d t -t 1 -sra win_size ;; esac unset IFS # Split the string into height/width. if [[ "$image_backend" == "tycat" ]]; then - term_width="$((term_size[2] * term_size[0]))" - term_height="$((term_size[3] * term_size[1]))" + term_width="$((win_size[2] * win_size[0]))" + term_height="$((win_size[3] * win_size[1]))" else - term_height="${term_size[1]}" - term_width="${term_size[2]}" + term_height="${win_size[1]}" + term_width="${win_size[2]}" fi [[ "$image_backend" == "kitty" ]] && \ @@ -3623,16 +3623,16 @@ get_window_size() { # If the ID was found get the window size. if [[ "$current_window" ]]; then - term_size="$(xwininfo -id "$current_window")" - term_width="${term_size#*Width: }" + win_size="$(xwininfo -id "$current_window")" + term_width="${win_size#*Width: }" term_width="${term_width/$'\n'*}" - term_height="${term_size/*Height: }" + term_height="${win_size/*Height: }" term_height="${term_height/$'\n'*}" fi fi fi - term_width="${term_width:-0}" + window_size="${term_width:=0}x${term_height:=0}" } @@ -3643,6 +3643,7 @@ get_term_size() { # Calculate font size. font_width="$((term_width / columns))" font_height="$((term_height / lines))" + term_size="${lines}x${columns}" } get_image_size() { @@ -4696,7 +4697,7 @@ get_args() { # Known implicit unused variables. mpc_args=() - printf '%s\n' "$kernel $icons $font $battery $locale ${mpc_args[*]}" + : "$term_size $window_size $kernel $icons $font $battery $locale ${mpc_args[*]}" ;; esac From 7e96b428606b63b65acd59eb00e94165f960da97 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 19:40:37 +0200 Subject: [PATCH 0617/1133] simple mode: expose window size and terminal size --- neofetch | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 930210480..b410844c0 100755 --- a/neofetch +++ b/neofetch @@ -3581,19 +3581,19 @@ get_window_size() { # -put as a variable. # The 1 second timeout is required for older bash case "${BASH_VERSINFO[0]}" in - 4|5) IFS=';t' read -d t -t 0.05 -sra win_size ;; - *) IFS=';t' read -d t -t 1 -sra win_size ;; + 4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;; + *) IFS=';t' read -d t -t 1 -sra term_size ;; esac unset IFS # Split the string into height/width. if [[ "$image_backend" == "tycat" ]]; then - term_width="$((win_size[2] * win_size[0]))" - term_height="$((win_size[3] * win_size[1]))" + term_width="$((term_size[2] * term_size[0]))" + term_height="$((term_size[3] * term_size[1]))" else - term_height="${win_size[1]}" - term_width="${win_size[2]}" + term_height="${term_size[1]}" + term_width="${term_size[2]}" fi [[ "$image_backend" == "kitty" ]] && \ @@ -3623,16 +3623,16 @@ get_window_size() { # If the ID was found get the window size. if [[ "$current_window" ]]; then - win_size="$(xwininfo -id "$current_window")" - term_width="${win_size#*Width: }" + term_size="$(xwininfo -id "$current_window")" + term_width="${term_size#*Width: }" term_width="${term_width/$'\n'*}" - term_height="${win_size/*Height: }" + term_height="${term_size/*Height: }" term_height="${term_height/$'\n'*}" fi fi fi - window_size="${term_width:=0}x${term_height:=0}" + term_width="${term_width:-0}" } @@ -3643,7 +3643,6 @@ get_term_size() { # Calculate font size. font_width="$((term_width / columns))" font_height="$((term_height / lines))" - term_size="${lines}x${columns}" } get_image_size() { @@ -4697,7 +4696,7 @@ get_args() { # Known implicit unused variables. mpc_args=() - : "$term_size $window_size $kernel $icons $font $battery $locale ${mpc_args[*]}" + printf '%s\n' "$kernel $icons $font $battery $locale ${mpc_args[*]}" ;; esac From 8aab756a153e4a19e72aa765ebdc3dec9040f23d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 19:48:05 +0200 Subject: [PATCH 0618/1133] packages: Don't run pkginfo on linux --- neofetch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 3b56ea56e..a0b2454d9 100755 --- a/neofetch +++ b/neofetch @@ -1289,7 +1289,6 @@ get_packages() { has "sorcery" && tot gaze installed has "alps" && tot alps showinstalled has "butch" && tot butch list - has "pkginfo" && tot pkginfo -i # Counting files/dirs. has "emerge" && dir /var/db/pkg/*/*/ @@ -1305,6 +1304,9 @@ get_packages() { # Other (Needs complex command) has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) + # pkginfo is also the name of a python package manager. + [[ $os != "Linux" ]] && has "pkginfo" && tot pkginfo -i + case "$kernel_name" in "FreeBSD") has "pkg" && tot pkg info ;; *) From 04420479dc452b37957afdbd936ad70a25f33645 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 20:22:59 +0200 Subject: [PATCH 0619/1133] image: store thumbnail with path name --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index a0b2454d9..84dbc1834 100755 --- a/neofetch +++ b/neofetch @@ -3702,7 +3702,7 @@ get_image_size() { make_thumbnail() { # Name the thumbnail using variables so we can # use it later. - image_name="${crop_mode}-${crop_offset}-${width}-${height}-${image##*/}" + image_name="${crop_mode}-${crop_offset}-${width}-${height}-${image//\/}" # Handle file extensions. case "${image##*.}" in From e155df7a726177d2bbde55cbb7ddd6dd123ad69b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 20:42:49 +0200 Subject: [PATCH 0620/1133] os: Initial support for Bedrock Linux --- neofetch | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 1eea1091e..afd5f1e20 100755 --- a/neofetch +++ b/neofetch @@ -829,7 +829,12 @@ get_distro() { case "$os" in "Linux" | "BSD" | "MINIX") - if [[ -f "/etc/redstar-release" ]]; then + if [[ -f "/bedrock/etc/bedrock-release" ]] && [[ $PATH == */bedrock/cross/* ]]; then + case "$distro_shorthand" in + "on" | "tiny") distro="Bedrock Linux" ;; + *) distro="$(< /bedrock/etc/bedrock-release)" + esac + elif [[ -f "/etc/redstar-release" ]]; then case "$distro_shorthand" in "on" | "tiny") distro="Red Star OS" ;; *) distro="Red Star OS $(awk -F'[^0-9*]' '$0=$2' /etc/redstar-release)" @@ -3431,6 +3436,7 @@ get_ascii() { # Calculate size of ascii file in line length / line count. while IFS=$'\n' read -r line; do + line="${line//\\\\/\\}" ((++lines,${#line}>ascii_len)) && ascii_len="${#line}" done <<< "${ascii_data//\$\{??\}}" @@ -5232,6 +5238,29 @@ ${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy EOF ;; + "Bedrock"*) + set_colors 0 7 + read -rd '' ascii_data <<'EOF' +${c1}-------------------------------------- +-------------------------------------- +-------------------------------------- +---${c2}\\\\\\\\\\\\\\\\\\\\\\\\${c1}----------------------- +----${c2}\\\\\\ \\\\\\${c1}---------------------- +-----${c2}\\\\\\ \\\\\\${c1}--------------------- +------${c2}\\\\\\ \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\${c1}------ +-------${c2}\\\\\\ \\\\\\${c1}----- +--------${c2}\\\\\\ \\\\\\${c1}---- +---------${c2}\\\\\\ ______ \\\\\\${c1}--- +----------${c2}\\\\\\ ///${c1}--- +-----------${c2}\\\\\\ ///${c1}---- +------------${c2}\\\\\\ ///${c1}----- +-------------${c2}\\\\\\////////////////${c1}------ +-------------------------------------- +-------------------------------------- +-------------------------------------- +EOF + ;; + "Bitrig"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' From d36ee68f2cc603507bc65068917e3bef0155c3b0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 20:56:38 +0200 Subject: [PATCH 0621/1133] os: Initial support for Bedrock Linux --- neofetch | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index afd5f1e20..1af63da7a 100755 --- a/neofetch +++ b/neofetch @@ -829,7 +829,7 @@ get_distro() { case "$os" in "Linux" | "BSD" | "MINIX") - if [[ -f "/bedrock/etc/bedrock-release" ]] && [[ $PATH == */bedrock/cross/* ]]; then + if [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]]; then case "$distro_shorthand" in "on" | "tiny") distro="Bedrock Linux" ;; *) distro="$(< /bedrock/etc/bedrock-release)" @@ -1277,6 +1277,16 @@ get_packages() { pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } tot() { IFS=$'\n' read -d "" -ra pkgs < <("$@");((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; } + # Redefine tot() for Bedrock Linux. + [[ -f /bedrock/etc/bedrock-release && "$PATH" == */bedrock/cross/* ]] && { + tot() { + IFS=$'\n' read -d "" -ra pkgs < <(for s in $(brl list); do strat -r "$s" "$@"; done) + ((packages+="${#pkgs[@]}")) + pac "${#pkgs[@]}" + } + br_prefix="/bedrock/strata/*" + } + case "$os" in "Linux" | "BSD" | "iPhone OS" | "Solaris") # Package Manager Programs. @@ -1296,15 +1306,20 @@ get_packages() { has "butch" && tot butch list # Counting files/dirs. - has "emerge" && dir /var/db/pkg/*/*/ - has "nix-env" && dir /nix/store/*/ - has "guix" && dir /gnu/store/*/ - has "Compile" && dir /Programs/*/ - has "eopkg" && dir /var/lib/eopkg/package/* - has "crew" && dir /usr/local/etc/crew/meta/*.filelist - has "pkgtool" && dir /var/log/packages/* - has "cave" && dir /var/db/paludis/repositories/cross-installed/*/data/*/ \ - /var/db/paludis/repositories/installed/data/*/ + # Variables need to be unquoted here. Only Bedrock Linux is affected. + # $br_prefix is fixed and won't change based on user input so this is safe either way. + # shellcheck disable=SC2086 + { + has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ + has "nix-env" && dir ${br_prefix}/nix/store/*/ + has "guix" && dir ${br_prefix}/gnu/store/*/ + has "Compile" && dir ${br_prefix}/Programs/*/ + has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* + has "crew" && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist + has "pkgtool" && dir ${br_prefix}/var/log/packages/* + has "cave" && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ + ${br_prefix}/var/db/paludis/repositories/installed/data/*/ + } # Other (Needs complex command) has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) From a450fc88c5c8f1de15922cf4ee524dd88aead73f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 21:18:33 +0200 Subject: [PATCH 0622/1133] terminal font [kitty]: Use kitty command instead of parsing config files. Closes #1150 --- neofetch | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/neofetch b/neofetch index 1eea1091e..3050d4487 100755 --- a/neofetch +++ b/neofetch @@ -2880,21 +2880,11 @@ END ;; "kitty"*) - shopt -s nullglob - confs=({$KITTY_CONFIG_DIRECTORY,$XDG_CONFIG_HOME,~/Library/Preferences}/kitty/kitty.con?) - shopt -u nullglob - - [[ -f "${confs[0]}" ]] || return - - term_font="$(awk '/^([[:space:]]*|[^#_])font_family[[:space:]]+/ { - $1 = ""; - gsub(/^[[:space:]]/, ""); - font = $0 - } - /^([[:space:]]*|[^#_])font_size[[:space:]]+/ { - size = $2 - } - END {print font,size}' "${confs[0]}")" + kitty_config="$(kitty --debug-config)" + term_font_size="${kitty_config/*font_size}" + term_font_size="${term_font_size/$'\n'*}" + term_font="${kitty_config/*font_family}" + term_font="${term_font/$'\n'*} $term_font_size" ;; "konsole" | "yakuake") From fbb69625a7e3a75c01d636e61a0c7a494e33b710 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 22:49:46 +0200 Subject: [PATCH 0623/1133] cleanup --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 1af63da7a..17f87a7d9 100755 --- a/neofetch +++ b/neofetch @@ -1278,7 +1278,7 @@ get_packages() { tot() { IFS=$'\n' read -d "" -ra pkgs < <("$@");((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; } # Redefine tot() for Bedrock Linux. - [[ -f /bedrock/etc/bedrock-release && "$PATH" == */bedrock/cross/* ]] && { + [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]] && { tot() { IFS=$'\n' read -d "" -ra pkgs < <(for s in $(brl list); do strat -r "$s" "$@"; done) ((packages+="${#pkgs[@]}")) From 594e1fa10da92a21a4313b69c7b0a4e8cdf498e4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 7 Jan 2019 22:53:51 +0200 Subject: [PATCH 0624/1133] cleanup --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 3050d4487..de905efec 100755 --- a/neofetch +++ b/neofetch @@ -2277,8 +2277,8 @@ get_memory() { "Solaris") hw_pagesize="$(pagesize)" - pages_total=$(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}') - pages_free=$(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}') + pages_total="$(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}')" + pages_free="$(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}')" mem_total="$((pages_total * hw_pagesize / 1024 / 1024))" mem_free="$((pages_free * hw_pagesize / 1024 / 1024))" mem_used="$((mem_total - mem_free))" From 804f88aa7a851311e983d1428f1d080b44005c6c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 08:27:33 +0200 Subject: [PATCH 0625/1133] packages: revert pkginfo change --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index de905efec..e6b488619 100755 --- a/neofetch +++ b/neofetch @@ -1304,8 +1304,9 @@ get_packages() { # Other (Needs complex command) has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) - # pkginfo is also the name of a python package manager. - [[ $os != "Linux" ]] && has "pkginfo" && tot pkginfo -i + # pkginfo is also the name of a python package manager which is painfully slow. + # TODO: Fix this somehow. + has pkginfo && tot pkginfo -i case "$kernel_name" in "FreeBSD") has "pkg" && tot pkg info ;; From ccabbbe6782a8c06097254f86ac2888eb3e92ed9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 08:37:19 +0200 Subject: [PATCH 0626/1133] docs: CHANGELOG --- CHANGELOG.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 834fac391..f13149e44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,9 +17,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [**@HolyStephano**](https://github.com/HolyStephano) - [**@nikitenich**](https://github.com/nikitenich) +**OS** + +- Added support for Namib GNU/Linux. [*@arisinfenix*](https://github.com/arisinfenix) +- Added support for Reborn OS. [*@iandrewt*](https://github.com/iandrewt) +- Added support for OpenMandriva Lx. [*@konimex*](https://github.com/konimex) + **Info** - **Shell**: Fixed output for mksh [**@nero**](https://github.com/nero) +- **Packages**: Added support for `puyo`. [*@Appadeia*](https://github.com/Appadeia) +- **Packages**: Added support for `spm`. [*@Appadeia*](https://github.com/author=Appadeia) - **Packages** [macOS]: Added detection of Nix [**@alyssais**](https://github.com/alyssais) - **Packages**: Fixed packages from pkginfo (pkgutils) not appearing in CRUX/Janus Linux. - **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener) @@ -28,9 +36,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - **WM**: Added detection for FVWM. [**@julianaito**](https://github.com/julianaito) - **WM** [OpenBSD]: Added a new `ps_flags` to correctly detect non-EWMH WMs. [**@julianaito**](https://github.com/julianaito) - **Disk** [OpenBSD]: Added a separate disk array creation using `awk` since one cannot directly use `/dev/...` unless being root or in the `operator` group. [**@julianaito**](https://github.com/julianaito) +- **Battery** [OpenBSD]: Improve charge `%` and add status. **Charlène** +- **GPU** [AMD]: Remove unnecessary check. **ASCII** +- Added new Lubuntu logo. [*@marlonn*](https://github.com/marlonn) - Fixed a bug where ASCII logo changes the terminal foreground color. [**@plgruener**](https://github.com/plgruener) - Do not parse file as ASCII if the source is an image file. @@ -38,6 +49,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - **macOS**: Unset IFS to get window size. [**@StarryTony**](https://github.com/StarryTony) - **Kitty**: Use `kitty +kitten icat` instead of the deprecated `kitty icat`. [**@HolyStephano**](https://github.com/HolyStephano) +- **Kitty**: Update docs. [*@Snuggle*](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) ## [5.0.0] - 2018-06-18 From ad2727620c908f20f70573a8cc2c1522c36b6bb6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 08:49:52 +0200 Subject: [PATCH 0627/1133] docs: CHANGELOG --- CHANGELOG.md | 58 +++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f13149e44..bc25747a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. **Contributors** +- [**@konimex**](https://github.com/konimex) +- [**@iandrewt**](https://github.com/iandrewt) +- [**@arisinfenix**](https://github.com/arisinfenix) +- [**@xPMo**](https://github.com/xPMo) - [**@nero**](https://github.com/nero) - [**@alyssais**](https://github.com/alyssais) - [**@plgruener**](https://github.com/plgruener) @@ -16,21 +20,60 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - [**@julianaito**](https://github.com/julianaito) - [**@HolyStephano**](https://github.com/HolyStephano) - [**@nikitenich**](https://github.com/nikitenich) +- [**@Appadeia**](https://github.com/Appadeia) +- [**@marlonn**](https://github.com/marlonn) +- [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) +- [**@Phuurl**](https://github.com/Phuurl) +- [**@erikdubois**](https://github.com/erikdubois) **OS** -- Added support for Namib GNU/Linux. [*@arisinfenix*](https://github.com/arisinfenix) -- Added support for Reborn OS. [*@iandrewt*](https://github.com/iandrewt) -- Added support for OpenMandriva Lx. [*@konimex*](https://github.com/konimex) +- Added support for Namib GNU/Linux. [**@arisinfenix**](https://github.com/arisinfenix) +- Added support for Reborn OS. [**@iandrewt**](https://github.com/iandrewt) +- Added support for OpenMandriva Lx. [**@konimex**](https://github.com/konimex) +- Added support for Star. [**@arisinfenix**](https://github.com/arisinfenix) +- Added support for BlueLight OS. +- Added support for Huayra Linux. + +**General** + +- Added a new "simple" mode. You can now use neofetch for scripting by getting it to output individual info functions in plain text. + +```sh +# Example: +neofetch uptime --uptime_shorthand tiny +> uptime: 32m + +# Example: +neofetch uptime disk wm memory +> uptime: 33 mins +> disk (/): 212G / 235G (96%) +> wm: Openbox +> memory: 1215MiB / 7881MiB + +# This can be used in bars and scripts like so: +memory="$(neofetch memory)"; memory="${memory##*: }" + +# For multiple outputs at once (each line of info in an array): +# Much faster than running neofetch multiple times. +IFS=$'\n' read -d "" -ra info < <(neofetch memory uptime wm) +info=("${info[@]##*: }") +``` **Info** +- **Song**: Added support for Netease Cloud. +- **Song**: Fixed issues in various players. [**@arisinfenix**](https://github.com/arisinfenix) [**@xPMo**](https://github.com/xPMo) +- **Song**: Fixed issues with non-English tags. +- **Song**: Fixed issues with broken newlines. - **Shell**: Fixed output for mksh [**@nero**](https://github.com/nero) -- **Packages**: Added support for `puyo`. [*@Appadeia*](https://github.com/Appadeia) -- **Packages**: Added support for `spm`. [*@Appadeia*](https://github.com/author=Appadeia) +- **Packages**: Added support for `scoop`. [**@Phuurl**](https://github.com/Phuurl) +- **Packages**: Added support for `puyo`. [**@Appadeia**](https://github.com/Appadeia) +- **Packages**: Added support for `spm`. [**@Appadeia**](https://github.com/author=Appadeia) - **Packages** [macOS]: Added detection of Nix [**@alyssais**](https://github.com/alyssais) - **Packages**: Fixed packages from pkginfo (pkgutils) not appearing in CRUX/Janus Linux. - **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener) +- **Memory** [Solaris]: Updated memory detection to use pages. [**@konimex**](https://github.com/konimex) - **Model** [OpenBSD]: Added vmm (OpenBSD hypervisor) support [**@julianaito**](https://github.com/julianaito) - **Model** [macOS]: Added VirtualSMC as a new FakeSMC alternative for Hackintosh. [**@nikitenich**](https://github.com/nikitenich) - **WM**: Added detection for FVWM. [**@julianaito**](https://github.com/julianaito) @@ -41,7 +84,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. **ASCII** -- Added new Lubuntu logo. [*@marlonn*](https://github.com/marlonn) +- Added small ArcoLinux logo. [**@erikdubois**](https://github.com/erikdubois) +- Added new Lubuntu logo. [**@marlonn**](https://github.com/marlonn) - Fixed a bug where ASCII logo changes the terminal foreground color. [**@plgruener**](https://github.com/plgruener) - Do not parse file as ASCII if the source is an image file. @@ -49,7 +93,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - **macOS**: Unset IFS to get window size. [**@StarryTony**](https://github.com/StarryTony) - **Kitty**: Use `kitty +kitten icat` instead of the deprecated `kitty icat`. [**@HolyStephano**](https://github.com/HolyStephano) -- **Kitty**: Update docs. [*@Snuggle*](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) +- **Kitty**: Update docs. [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) ## [5.0.0] - 2018-06-18 From 62ada359fcdb5c9799fa2632e59735fdde31eeb7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 09:04:09 +0200 Subject: [PATCH 0628/1133] docs: CHANGELOG --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index bc25747a1..723f35775 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -28,12 +28,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. **OS** +- Added support for Bedrock Linux. [**@paradigm**](https://github.com/paradigm) - Added support for Namib GNU/Linux. [**@arisinfenix**](https://github.com/arisinfenix) - Added support for Reborn OS. [**@iandrewt**](https://github.com/iandrewt) - Added support for OpenMandriva Lx. [**@konimex**](https://github.com/konimex) - Added support for Star. [**@arisinfenix**](https://github.com/arisinfenix) - Added support for BlueLight OS. - Added support for Huayra Linux. +- Added support for Pentoo. **General** @@ -62,10 +64,16 @@ info=("${info[@]##*: }") **Info** +- **Song**: Added snippet to display music player. + - `[[ $player ]] && prin "Music Player" "$player"` + - NOTE: Must have `info "Song" song` enabled. - **Song**: Added support for Netease Cloud. - **Song**: Fixed issues in various players. [**@arisinfenix**](https://github.com/arisinfenix) [**@xPMo**](https://github.com/xPMo) - **Song**: Fixed issues with non-English tags. - **Song**: Fixed issues with broken newlines. +- **Song**: Fixed issues with Deadbeef. +- **Song**: Fixed issues with `qmmp`. +- **Song**: Removed `gpmdp-remote` support (unmaintained/no longer works). - **Shell**: Fixed output for mksh [**@nero**](https://github.com/nero) - **Packages**: Added support for `scoop`. [**@Phuurl**](https://github.com/Phuurl) - **Packages**: Added support for `puyo`. [**@Appadeia**](https://github.com/Appadeia) @@ -73,6 +81,7 @@ info=("${info[@]##*: }") - **Packages** [macOS]: Added detection of Nix [**@alyssais**](https://github.com/alyssais) - **Packages**: Fixed packages from pkginfo (pkgutils) not appearing in CRUX/Janus Linux. - **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener) +- **Terminal Font** [Kitty]: Use `kitty --debug-config` to get font information. - **Memory** [Solaris]: Updated memory detection to use pages. [**@konimex**](https://github.com/konimex) - **Model** [OpenBSD]: Added vmm (OpenBSD hypervisor) support [**@julianaito**](https://github.com/julianaito) - **Model** [macOS]: Added VirtualSMC as a new FakeSMC alternative for Hackintosh. [**@nikitenich**](https://github.com/nikitenich) @@ -84,9 +93,13 @@ info=("${info[@]##*: }") **ASCII** +- Added support for command output. + - `neofetch --ascii "$(fortune|cowsay -W 30)"` + - `neofetch --ascii "$(figlet -w 30 hello world)"` - Added small ArcoLinux logo. [**@erikdubois**](https://github.com/erikdubois) - Added new Lubuntu logo. [**@marlonn**](https://github.com/marlonn) - Fixed a bug where ASCII logo changes the terminal foreground color. [**@plgruener**](https://github.com/plgruener) +- Fixed a bug when files named `auto` or `ascii` exist. - Do not parse file as ASCII if the source is an image file. **Image** @@ -94,6 +107,7 @@ info=("${info[@]##*: }") - **macOS**: Unset IFS to get window size. [**@StarryTony**](https://github.com/StarryTony) - **Kitty**: Use `kitty +kitten icat` instead of the deprecated `kitty icat`. [**@HolyStephano**](https://github.com/HolyStephano) - **Kitty**: Update docs. [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) +- Cached thumbnails are now stored with PATH to prevent collision issues. ## [5.0.0] - 2018-06-18 From 3a0e2ec68ccc1a71e0f17a493296cb6caa8d1339 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 09:09:02 +0200 Subject: [PATCH 0629/1133] docs: CHANGELOG --- CHANGELOG.md | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 723f35775..fdef4815d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +logo + **Contributors** - [**@konimex**](https://github.com/konimex) @@ -37,7 +39,19 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. - Added support for Huayra Linux. - Added support for Pentoo. -**General** +**Highlights** + +- [ASCII] Added support for command output. You can now use whatever terminal commands you like as the ASCII art. + +```sh +# Use fortune and cowsay as ascii art. +neofetch --ascii "$(fortune|cowsay -W 30)" + +# use figlet as ascii art. +neofetch --ascii "$(figlet -w 30 hello world)" +``` + +scrot - Added a new "simple" mode. You can now use neofetch for scripting by getting it to output individual info functions in plain text. From 7677cd2b4b9f4c6dbb9dfdb49c27067cc206b8de Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 10:14:43 +0200 Subject: [PATCH 0630/1133] image: higher quality thumbs. Closes #1079 --- neofetch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 7ebef458a..be8d711cb 100755 --- a/neofetch +++ b/neofetch @@ -3769,11 +3769,9 @@ make_thumbnail() { -background none \ "$image" \ -strip \ - -define "jpeg:size=100x100" \ -gravity "$crop_offset" \ -crop "${size}x${size}+0+0" \ - -quality 40 \ - -sample "${width}x${height}" \ + -scale "${width}x${height}" \ "${thumbnail_dir}/${image_name}" ;; esac From 5316b568e711595bef0794f1e8e3782460ecfdc1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 10:15:01 +0200 Subject: [PATCH 0631/1133] docs: CHANGELOG --- CHANGELOG.md | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fdef4815d..2cfcad062 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,22 +11,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. **Contributors** -- [**@konimex**](https://github.com/konimex) -- [**@iandrewt**](https://github.com/iandrewt) -- [**@arisinfenix**](https://github.com/arisinfenix) -- [**@xPMo**](https://github.com/xPMo) -- [**@nero**](https://github.com/nero) -- [**@alyssais**](https://github.com/alyssais) -- [**@plgruener**](https://github.com/plgruener) -- [**@StarryTony**](https://github.com/StarryTony) -- [**@julianaito**](https://github.com/julianaito) -- [**@HolyStephano**](https://github.com/HolyStephano) -- [**@nikitenich**](https://github.com/nikitenich) -- [**@Appadeia**](https://github.com/Appadeia) -- [**@marlonn**](https://github.com/marlonn) -- [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) -- [**@Phuurl**](https://github.com/Phuurl) -- [**@erikdubois**](https://github.com/erikdubois) +[**@konimex**](https://github.com/konimex), [**@iandrewt**](https://github.com/iandrewt), [**@arisinfenix**](https://github.com/arisinfenix), [**@xPMo**](https://github.com/xPMo), [**@nero**](https://github.com/nero), [**@alyssais**](https://github.com/alyssais), [**@plgruener**](https://github.com/plgruener), [**@StarryTony**](https://github.com/StarryTony), [**@julianaito**](https://github.com/julianaito), [**@HolyStephano**](https://github.com/HolyStephano), [**@nikitenich**](https://github.com/nikitenich), [**@Appadeia**](https://github.com/Appadeia), [**@marlonn**](https://github.com/marlonn), [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle), [**@Phuurl**](https://github.com/Phuurl), [**@erikdubois**](https://github.com/erikdubois) **OS** From 85a1bd0af7e5b5752683c586305164f0d6444550 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 10:48:32 +0200 Subject: [PATCH 0632/1133] color_blocks: Fix newlines when disabled. --- neofetch | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/neofetch b/neofetch index be8d711cb..95da6417b 100755 --- a/neofetch +++ b/neofetch @@ -82,9 +82,7 @@ print_info() { # info "Users" users # info "Locale" locale # This only works on glibc systems. - info line_break info cols - info line_break } @@ -3326,6 +3324,7 @@ get_gpu_driver() { gpu_driver="NVIDIA ${gpu_driver/ *}" fi ;; + "Mac OS X") if [[ "$(kextstat | grep "GeForceWeb")" != "" ]]; then gpu_driver="NVIDIA Web Driver" @@ -3368,9 +3367,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_height+2)) - printf '\e[%bC%b' "$text_padding" "${zws}${cols}" + printf '\n\e[%bC%b\n' "$text_padding" "${zws}${cols}" fi unset -v blocks blocks2 cols @@ -3947,17 +3946,6 @@ get_underline() { prin=1 } -get_line_break() { - # Print it directly. - printf '%b\n' "$zws" - - # Calculate info height. - ((++info_height)) - - # Tell info() that we printed manually. - prin=1 -} - get_bold() { case "$ascii_bold" in "on") ascii_bold='\e[1m' ;; @@ -4058,7 +4046,7 @@ color() { stdout() { image_backend="off" unset subtitle_color colon_color info_color underline_color bold title_color at_color \ - text_padding zws reset color_blocks get_line_break bar_color_elapsed bar_color_total \ + text_padding zws reset color_blocks bar_color_elapsed bar_color_total \ c1 c2 c3 c4 c5 c6 c7 c8 } @@ -4629,7 +4617,7 @@ get_args() { "--ascii_bold") ascii_bold="$2" ;; "--logo" | "-L") image_backend="ascii" - print_info() { info line_break; } + print_info() { printf '\n'; } ;; # Other @@ -4659,7 +4647,7 @@ get_args() { "--json") json="on" - unset -f get_title get_cols get_line_break get_underline + unset -f get_title get_cols get_underline printf '{\n' print_info 2>/dev/null @@ -4701,9 +4689,7 @@ get_args() { info "Public IP" public_ip info "Users" users - info line_break info cols - info line_break # Testing. prin "prin" @@ -4744,6 +4730,11 @@ get_simple() { ((simple)) && exit } +old_functions() { + # Removed functions for backwards compatability. + get_line_break() { :; } +} + get_distro_ascii() { # This function gets the distro ascii art and colors. # @@ -8782,6 +8773,7 @@ main() { image_backend get_cache_dir + old_functions print_info dynamic_prompt From 4d6a4fb4256d00aa9a2a8693c6ac8f0fa67057f5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 10:57:33 +0200 Subject: [PATCH 0633/1133] cursor: Fix issues in urxvt with padding --- neofetch | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 95da6417b..8dab53056 100755 --- a/neofetch +++ b/neofetch @@ -3367,7 +3367,7 @@ get_cols() { cols="${cols//nl/\\n\\e[${text_padding}C${zws}}" # Add block height to info height. - ((info_height+=block_height+2)) + ((info_height+=block_height+1)) printf '\n\e[%bC%b\n' "$text_padding" "${zws}${cols}" fi @@ -4166,9 +4166,23 @@ kde_config_dir() { kde_config_dir="${kde_config_dir/$'/:'*}" } +term_padding() { + # Get terminal padding to properly align cursor. + [[ -z $term ]] && get_term + + case "$term" in + urxvt*|"rxvt-unicode") + [[ -z "$xrdb" ]] && xrdb="$(xrdb -query)" + padding="${xrdb/*.internalBorder:}" + ((padding=${padding/$'\n'*}*2)) + ;; + esac +} + dynamic_prompt() { [[ "$image_backend" == "off" ]] && { printf '\n'; return; } - [[ "$image_backend" != "ascii" ]] && lines="$(((height + yoffset) / font_height + 1))" + [[ "$image_backend" != "ascii" ]] && { + term_padding; lines="$(((height + yoffset + padding) / font_height + 1))"; } # If the ascii art is taller than the info. ((lines=lines>info_height?lines-info_height+1:1)) From 617769059bcdb58582f842a03f9e7531fa051c7e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 11:09:42 +0200 Subject: [PATCH 0634/1133] memory: Added option to display memory percentage. --- neofetch | 22 +++++++++++++++++++++- neofetch.1 | 3 +++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8dab53056..e928c5e5b 100755 --- a/neofetch +++ b/neofetch @@ -142,6 +142,21 @@ os_arch="on" uptime_shorthand="on" +# Memory + + +# Show memory pecentage in output. +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --memory_percent +# +# Example: +# on: '1801MiB / 7881MiB (22%)' +# off: '1801MiB / 7881MiB' +memory_percent="off" + + # Packages @@ -2337,7 +2352,10 @@ get_memory() { ;; esac - memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB}" + + [[ $memory_percent == on ]] && ((mem_perc=mem_used * 100 / mem_total)) + + memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB} ${mem_perc:+(${mem_perc}%)}" # Bars. case "$memory_display" in @@ -4359,6 +4377,7 @@ INFO: --ip_host url URL to query for public IP --song_format format Print the song data in a specific format (see config file). --song_shorthand on/off Print the Artist/Album/Title on separate lines. + --memory_percent on/off Display memory percentage. --music_player player-name Manually specify a player to use. Available values are listed in the config file @@ -4512,6 +4531,7 @@ get_args() { "--song_format") song_format="$2" ;; "--song_shorthand") song_shorthand="$2" ;; "--music_player") music_player="$2" ;; + "--memory_percent") memory_percent="$2" ;; "--cpu_temp") cpu_temp="$2" [[ "$cpu_temp" == "on" ]] && cpu_temp="C" diff --git a/neofetch.1 b/neofetch.1 index 6b80ab905..ccca6a552 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -144,6 +144,9 @@ Print the song data in a specific format (see config file). \fB\-\-song_shorthand\fR on/off Print the Artist/Album/Title on separate lines. .TP +\fB\-\-memory_percent\fR on/off +Display memory percentage. +.TP \fB\-\-music_player\fR player\-name Manually specify a player to use. Available values are listed in the config file From de5a260f6b6fb0f5186a833a0612007e5c4ba8ad Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 12:12:11 +0200 Subject: [PATCH 0635/1133] public_ip: Added configurable timeout --- neofetch | 12 ++++++++++-- neofetch.1 | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index e928c5e5b..c4078c54d 100755 --- a/neofetch +++ b/neofetch @@ -375,6 +375,12 @@ gtk3="on" # Flag: --ip_host public_ip_host="http://ident.me" +# Public IP timeout. +# +# Default: '2' +# Values: 'int' +# Flag: --ip_timeout +public_ip_timeout=2 # Disk @@ -3312,11 +3318,11 @@ get_public_ip() { fi if [[ -z "$public_ip" ]] && type -p curl >/dev/null; then - public_ip="$(curl --max-time 10 -w '\n' "$public_ip_host")" + public_ip="$(curl --max-time "$public_ip_timeout" -w '\n' "$public_ip_host")" fi if [[ -z "$public_ip" ]] && type -p wget >/dev/null; then - public_ip="$(wget -T 10 -qO- "$public_ip_host")" + public_ip="$(wget -T "$public_ip_timeout" -qO- "$public_ip_host")" fi } @@ -4375,6 +4381,7 @@ INFO: 'dir' shows the basename of the disks's path. (/, Local Disk, etc) --ip_host url URL to query for public IP + --ip_timeout int Public IP timeout (in seconds). --song_format format Print the song data in a specific format (see config file). --song_shorthand on/off Print the Artist/Album/Title on separate lines. --memory_percent on/off Display memory percentage. @@ -4528,6 +4535,7 @@ get_args() { "--shell_path") shell_path="$2" ;; "--shell_version") shell_version="$2" ;; "--ip_host") public_ip_host="$2" ;; + "--ip_timeout") public_ip_timeout="$2" ;; "--song_format") song_format="$2" ;; "--song_shorthand") song_shorthand="$2" ;; "--music_player") music_player="$2" ;; diff --git a/neofetch.1 b/neofetch.1 index ccca6a552..bb7d0b4e5 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -138,6 +138,9 @@ Takes: name, mount, dir \fB\-\-ip_host\fR url URL to query for public IP .TP +\fB\-\-ip_timeout\fR int +Public IP timeout (in seconds). +.TP \fB\-\-song_format\fR format Print the song data in a specific format (see config file). .TP From 653712c06a4421e513be7c2231573b04df9018f6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 15:00:45 +0200 Subject: [PATCH 0636/1133] image: fix various bugs --- neofetch | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index c4078c54d..e84f58b42 100755 --- a/neofetch +++ b/neofetch @@ -3729,9 +3729,12 @@ get_image_size() { *) image_size="${image_size/px}" ;; esac + # Check for terminal padding. + [[ $image_backend == w3m ]] && term_padding + width="${width:-$image_size}" height="${height:-$image_size}" - text_padding="$((width / font_width + gap + xoffset/font_width))" + text_padding="$(((width + padding + xoffset) / font_width + gap))" } make_thumbnail() { @@ -3816,9 +3819,9 @@ display_image() { "jp2a") jp2a \ + --colors \ --width="$((width / font_width))" \ --height="$((height / font_height))" \ - --colors \ "$image" ;; @@ -3872,7 +3875,7 @@ display_image() { # Add a tiny delay to fix issues with images not # appearing in specific terminal emulators. - sleep 0.05 + ((BASH_VERSINFO[0]>3)) && sleep 0.05 printf '%b\n%s;\n%s\n' "0;1;$xoffset;$yoffset;$width;$height;;;;;$image" 3 4 |\ "${w3m_img_path:-false}" -bg "$background_color" &>/dev/null ;; @@ -4198,15 +4201,15 @@ term_padding() { urxvt*|"rxvt-unicode") [[ -z "$xrdb" ]] && xrdb="$(xrdb -query)" padding="${xrdb/*.internalBorder:}" - ((padding=${padding/$'\n'*}*2)) + ((padding=${padding/$'\n'*})) ;; esac } dynamic_prompt() { - [[ "$image_backend" == "off" ]] && { printf '\n'; return; } - [[ "$image_backend" != "ascii" ]] && { - term_padding; lines="$(((height + yoffset + padding) / font_height + 1))"; } + [[ $image_backend == off ]] && { printf '\n'; return; } + [[ $image_backend != ascii ]] && ((lines=(height + yoffset) / font_height + 1)) + [[ $image_backend == w3m ]] && ((lines=lines + padding / font_height + 1)) # If the ascii art is taller than the info. ((lines=lines>info_height?lines-info_height+1:1)) From 4f89361e50e33bd6a7c5aa215f346a5af93d09c6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 15:34:08 +0200 Subject: [PATCH 0637/1133] color_blocks: Fix cursor bug --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e84f58b42..0a8e503e1 100755 --- a/neofetch +++ b/neofetch @@ -3391,7 +3391,7 @@ 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+2:block_height+1)) printf '\n\e[%bC%b\n' "$text_padding" "${zws}${cols}" fi From 86372fe6a8849eecb3e69637a22b31e500022ea0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 15:52:12 +0200 Subject: [PATCH 0638/1133] distro: Remove broken distro lines --- neofetch | 5 ----- 1 file changed, 5 deletions(-) diff --git a/neofetch b/neofetch index 0a8e503e1..85a23bee2 100755 --- a/neofetch +++ b/neofetch @@ -924,11 +924,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")" From f24fed6df37ca8b53bee62d053495d83c9471deb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 15:53:08 +0200 Subject: [PATCH 0639/1133] version: bump --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 85a23bee2..239e8d934 100755 --- a/neofetch +++ b/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="5.1.0" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" From 074323f0eddd3c306fa70d54bb51c75954071424 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 16:14:24 +0200 Subject: [PATCH 0640/1133] version: bump --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index bb7d0b4e5..e1cfe00b8 100644 --- a/neofetch.1 +++ b/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 5.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From 056a99bfa2d6b05900cc00ae5c7667eaa72c1417 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 16:26:28 +0200 Subject: [PATCH 0641/1133] resolution: If resolution is empty don't print it. --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 239e8d934..39f0600ed 100755 --- a/neofetch +++ b/neofetch @@ -2617,6 +2617,7 @@ get_resolution() { esac resolution="${resolution%,*}" + [[ -z ${resolution/x} ]] && resolution= } get_style() { From eaa59da1e9450cdfb9d37c019bc8efe1cc2ceaa3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 17:13:32 +0200 Subject: [PATCH 0642/1133] ascii: Fix bedrock colors. Closes #1156 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 39f0600ed..0b18d238a 100755 --- a/neofetch +++ b/neofetch @@ -5275,7 +5275,7 @@ EOF ;; "Bedrock"*) - set_colors 0 7 + set_colors 8 7 read -rd '' ascii_data <<'EOF' ${c1}-------------------------------------- -------------------------------------- From c76c122650faf31438bf683cd9b056c78e42c0a0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 17:27:23 +0200 Subject: [PATCH 0643/1133] image: Added support for Chafa. --- neofetch | 20 +++++++++++++------- neofetch.1 | 7 +++++-- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 0b18d238a..60741189c 100755 --- a/neofetch +++ b/neofetch @@ -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" @@ -3412,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 @@ -3437,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 @@ -3807,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 \ @@ -4419,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] @@ -4430,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. @@ -4614,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 diff --git a/neofetch.1 b/neofetch.1 index e1cfe00b8..925ac354a 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -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 From e2e98a6c7c60808e1dcdc6e4c1585155215cc794 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 17:36:27 +0200 Subject: [PATCH 0644/1133] general: Fixed bug with line_break alternative. Closes #1157 --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 60741189c..1c5cf2cac 100755 --- a/neofetch +++ b/neofetch @@ -3388,9 +3388,9 @@ get_cols() { cols="${cols//nl/\\n\\e[${text_padding}C${zws}}" # Add block height to info height. - ((info_height+=block_range[1]>7?block_height+2: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 @@ -3953,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)) From 32a44b4d62240348e2260126081dcf14bfe3b257 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 17:54:42 +0200 Subject: [PATCH 0645/1133] ascii: Fixed gobo linux ascii bug --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 1c5cf2cac..8c3103cfd 100755 --- a/neofetch +++ b/neofetch @@ -6246,8 +6246,8 @@ EOF "GoboLinux"*) set_colors 5 4 6 2 read -rd '' ascii_data <<'EOF' -${c1}_____ _ -/ ____| | | +${c1} _____ _ + / ____| | | | | __ ___ | |__ ___ | | |_ |/ _ \| '_ \ / _ \ | |__| | (_) | |_) | (_) | From 12d9f93750713a07dfcad02fa239a28373f7b85f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 17:55:22 +0200 Subject: [PATCH 0646/1133] ascii: Fixed debian linux ascii bug --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8c3103cfd..51899228b 100755 --- a/neofetch +++ b/neofetch @@ -5738,7 +5738,7 @@ EOF "debian_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - ${c1}_____ +${c1} _____ / __ \\ | / | | \\___- From c1da5eb09a1eaac52a66bd5c6d1e189d135b63bc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 18:00:54 +0200 Subject: [PATCH 0647/1133] ascii: Fixed void linux ascii bug --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 51899228b..ebaf26605 100755 --- a/neofetch +++ b/neofetch @@ -8522,12 +8522,12 @@ EOF set_colors 2 8 read -rd '' ascii_data <<'EOF' ${c1} _______ - _ \______ - -| \ ___ \ | + _ \\______ - +| \\ ___ \\ | | | / \ | | | | \___/ | | -| \______ \_| - -_______\ +| \\______ \\_| + -_______\\ EOF ;; From c6bd0461a09290315e32c855e8455316ba8367a4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 18:23:38 +0200 Subject: [PATCH 0648/1133] image: Added support for Chafa. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index ebaf26605..cd3ca28dc 100755 --- a/neofetch +++ b/neofetch @@ -4435,7 +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. + --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. From c9d6ef5c408eb1e6d710b511f4b77aaaef5e4e67 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 18:32:04 +0200 Subject: [PATCH 0649/1133] version: bump --- neofetch | 2 +- neofetch.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index cd3ca28dc..ae32366f0 100755 --- a/neofetch +++ b/neofetch @@ -28,7 +28,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -version="5.1.0" +version="6.0.0" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" diff --git a/neofetch.1 b/neofetch.1 index 925ac354a..5a4ddc3a0 100644 --- a/neofetch.1 +++ b/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.1.0" "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 From 7a64ce22a829cc782e9a43ffb8a4e26f65250dcf Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 18:39:59 +0200 Subject: [PATCH 0650/1133] docs: update --- CHANGELOG.md | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2cfcad062..f0d231d1e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,13 +5,30 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [6.0.0] - 2019-01-08 logo +This release fixes a wide range of bugs and adds some neat new features. +Scroll down to "highlights" to see the bigger changes from this release. +A big thank you to @konimex, @iandrewt and the contributors below who +kept development going during my absence. + +Expect a minor bug fix release sometime this week as I'm sure new bugs +will come up. I've done extensive testing but things always slip through. + **Contributors** -[**@konimex**](https://github.com/konimex), [**@iandrewt**](https://github.com/iandrewt), [**@arisinfenix**](https://github.com/arisinfenix), [**@xPMo**](https://github.com/xPMo), [**@nero**](https://github.com/nero), [**@alyssais**](https://github.com/alyssais), [**@plgruener**](https://github.com/plgruener), [**@StarryTony**](https://github.com/StarryTony), [**@julianaito**](https://github.com/julianaito), [**@HolyStephano**](https://github.com/HolyStephano), [**@nikitenich**](https://github.com/nikitenich), [**@Appadeia**](https://github.com/Appadeia), [**@marlonn**](https://github.com/marlonn), [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle), [**@Phuurl**](https://github.com/Phuurl), [**@erikdubois**](https://github.com/erikdubois) +[**@konimex**](https://github.com/konimex), [**@iandrewt**](https://github.com/iandrewt), [**@arisinfenix**](https://github.com/arisinfenix), [**@xPMo**](https://github.com/xPMo), [**@nero**](https://github.com/nero), [**@alyssais**](https://github.com/alyssais), +[**@plgruener**](https://github.com/plgruener), [**@StarryTony**](https://github.com/StarryTony), [**@julianaito**](https://github.com/julianaito), [**@HolyStephano**](https://github.com/HolyStephano), +[**@nikitenich**](https://github.com/nikitenich), [**@Appadeia**](https://github.com/Appadeia), [**@marlonn**](https://github.com/marlonn), [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle), [**@Phuurl**](https://github.com/Phuurl), [**@erikdubois**](https://github.com/erikdubois) + + +**Breaking Changes** + +- **Config**: Removed `get_line_break()`. + - Alternative: `prin '\n'` + - Rationale: fix a bug that's been lingering for a couple of years now. **OS** @@ -26,7 +43,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. **Highlights** -- [ASCII] Added support for command output. You can now use whatever terminal commands you like as the ASCII art. +[ASCII] Added support for command output. You can now use whatever +terminal commands you like as the ASCII art. ```sh # Use fortune and cowsay as ascii art. @@ -38,7 +56,8 @@ neofetch --ascii "$(figlet -w 30 hello world)" scrot -- Added a new "simple" mode. You can now use neofetch for scripting by getting it to output individual info functions in plain text. +Added a new "simple" mode. You can now use neofetch for scripting +by getting it to output individual info functions in plain text. ```sh # Example: @@ -61,8 +80,20 @@ IFS=$'\n' read -d "" -ra info < <(neofetch memory uptime wm) info=("${info[@]##*: }") ``` +Added new image backend [chafa](https://hpjansson.org/chafa/) (`--chafa`) +which displays images in the terminal using unicode characters. + +```sh +neofetch --chafa ~/Pictures/meow.jpg +``` + +scrot + + **Info** +- **Color Blocks**: Fixed issue where disabling blocks caused an extra newline to appear. +- **Color Blocks**: Color blocks now have their padding built in. No more need for `get_line_break()`. - **Song**: Added snippet to display music player. - `[[ $player ]] && prin "Music Player" "$player"` - NOTE: Must have `info "Song" song` enabled. @@ -82,6 +113,7 @@ info=("${info[@]##*: }") - **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener) - **Terminal Font** [Kitty]: Use `kitty --debug-config` to get font information. - **Memory** [Solaris]: Updated memory detection to use pages. [**@konimex**](https://github.com/konimex) +- **Memory**: Added option to show memory percentage (`--memory_percent`). - **Model** [OpenBSD]: Added vmm (OpenBSD hypervisor) support [**@julianaito**](https://github.com/julianaito) - **Model** [macOS]: Added VirtualSMC as a new FakeSMC alternative for Hackintosh. [**@nikitenich**](https://github.com/nikitenich) - **WM**: Added detection for FVWM. [**@julianaito**](https://github.com/julianaito) @@ -89,9 +121,12 @@ info=("${info[@]##*: }") - **Disk** [OpenBSD]: Added a separate disk array creation using `awk` since one cannot directly use `/dev/...` unless being root or in the `operator` group. [**@julianaito**](https://github.com/julianaito) - **Battery** [OpenBSD]: Improve charge `%` and add status. **Charlène** - **GPU** [AMD]: Remove unnecessary check. +- **Public IP**: Added configurable timeout to requests. +- **Resolution**: If resolution is not found, don't print anything. **ASCII** +- Fixed issues with various ASCII arts (namely the `_small` ones). - Added support for command output. - `neofetch --ascii "$(fortune|cowsay -W 30)"` - `neofetch --ascii "$(figlet -w 30 hello world)"` @@ -103,9 +138,14 @@ info=("${info[@]##*: }") **Image** +- Added new image backend [chafa](https://hpjansson.org/chafa/) (`--chafa`). +- **w3m**: Fixed issues with URxvt and internal borders. +- **w3m**: Fixed issues with URxvt and cursor position. +- **w3m**: Fixed issue with `bash 3`. - **macOS**: Unset IFS to get window size. [**@StarryTony**](https://github.com/StarryTony) - **Kitty**: Use `kitty +kitten icat` instead of the deprecated `kitty icat`. [**@HolyStephano**](https://github.com/HolyStephano) - **Kitty**: Update docs. [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) +- Thumbnails are high quality again. - Cached thumbnails are now stored with PATH to prevent collision issues. ## [5.0.0] - 2018-06-18 From ca9d161bc91c86e586d3fb114aad896be683c03e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 18:40:32 +0200 Subject: [PATCH 0651/1133] version: bump --- neofetch | 2 +- neofetch.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index ae32366f0..2af20d8bf 100755 --- a/neofetch +++ b/neofetch @@ -28,7 +28,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -version="6.0.0" +version="6.0.1" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" diff --git a/neofetch.1 b/neofetch.1 index 5a4ddc3a0..269638e0b 100644 --- a/neofetch.1 +++ b/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 6.0.0" "User Commands" +.TH NEOFETCH "1" "January 2019" "Neofetch 6.0.1" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From b49ecb68f8ca736dd1a1ed0940f8d6f676e0ffc2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 20:53:00 +0200 Subject: [PATCH 0652/1133] term_font [kitty]: Fix bug with empty config --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 2af20d8bf..553ea324c 100755 --- a/neofetch +++ b/neofetch @@ -2921,6 +2921,8 @@ END "kitty"*) kitty_config="$(kitty --debug-config)" + [[ $kitty_config != *font_family* ]] && return + term_font_size="${kitty_config/*font_size}" term_font_size="${term_font_size/$'\n'*}" term_font="${kitty_config/*font_family}" From b6b320a75ad7abe2567240a0fd8d7e980bfb7ae5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 8 Jan 2019 21:39:07 +0200 Subject: [PATCH 0653/1133] docs: update --- README.md | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/README.md b/README.md index 3e61cfe5f..58b2a8592 100644 --- a/README.md +++ b/README.md @@ -26,37 +26,3 @@ Neofetch supports almost 150 different operating systems. From Linux to Windows, ### More: \[[Dependencies](https://github.com/dylanaraps/neofetch/wiki/Dependencies)\] \[[Installation](https://github.com/dylanaraps/neofetch/wiki/Installation)\] \[[Wiki](https://github.com/dylanaraps/neofetch/wiki)\] - -## Articles - -- https://lamiradadelreplicante.com/2016/05/15/la-informacion-de-tu-sistema-en-la-terminal-con-neofetch/ -- https://linuxconfig.org/how-to-display-system-information-with-neofetch -- https://www.2daygeek.com/neofetch-display-linux-systems-information-ascii-distribution-logo-terminal/ -- https://www.cyberciti.biz/howto/neofetch-awesome-system-info-bash-script-for-linux-unix-macos/ -- https://www.lffl.org/2016/11/neofetch-le-informazioni-sistema-sul-terminale-stile.html -- https://www.maketecheasier.com/display-system-information-neofetch-linux/ -- https://www.omgubuntu.co.uk/2016/11/neofetch-terminal-system-info-app -- https://www.omgubuntu.co.uk/2016/12/cli-system-tool-neofetch-2-0-released -- https://www.omgubuntu.co.uk/2017/01/neofetch-3-0-released -- https://www.ostechnix.com/neofetch-display-linux-systems-information/ -- https://www.techrepublic.com/article/how-to-get-all-the-information-you-need-about-your-linux-machine-with-a-single-command/ -- https://www.tecmint.com/neofetch-shows-linux-system-information-with-logo/ -- https://www.youtube.com/watch?v=bgepGW858fc -- https://www.linuxuprising.com/2018/05/display-system-information-on-linux.html -- https://esgeeks.com/neofetch-informacion-sistema-linux/ - - -## Thanks - -- [Contributors](https://github.com/dylanaraps/neofetch/contributors) -- [Packagers](https://github.com/dylanaraps/neofetch/issues/115) -- [Screenfetch](https://github.com/KittyKatt/screenFetch) -- [ufetch](https://github.com/jschx/ufetch) - - -## Donate - -Donations allow me to spend more time working on `neofetch` and my other Open Source projects. If you like `neofetch` and want to give back in some way you can donate at the links below. - - - From 2ecd8102d02086277313a3171bf5e8acda342043 Mon Sep 17 00:00:00 2001 From: Andres Santamaria Artigas Date: Tue, 8 Jan 2019 20:32:34 -0500 Subject: [PATCH 0654/1133] Made variables local in get_cols function The variables blocks, blocks2, and cols were not set as local in the get_cols function, which made neofetch print whatever value they had before showing the colorblocks. This commit makes these variables local so the output doesn't get affected if they are set beforehand. --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 553ea324c..647e42833 100755 --- a/neofetch +++ b/neofetch @@ -3359,6 +3359,7 @@ get_gpu_driver() { } get_cols() { + local blocks blocks2 cols if [[ "$color_blocks" == "on" ]]; then # Convert the width to space chars. printf -v block_width "%${block_width}s" From 661d003be26f56802e4ceb2a82fb9fe545c7b122 Mon Sep 17 00:00:00 2001 From: xPMo Date: Tue, 8 Jan 2019 19:47:31 -0600 Subject: [PATCH 0655/1133] order options "on, tiny, off" --- neofetch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 553ea324c..5a3bd2cb3 100755 --- a/neofetch +++ b/neofetch @@ -108,7 +108,7 @@ kernel_shorthand="on" # Shorten the output of the distro function # # Default: 'off' -# Values: 'on', 'off', 'tiny' +# Values: 'on', 'tiny', 'off' # Flag: --distro_shorthand # Supports: Everything except Windows and Haiku distro_shorthand="off" @@ -132,13 +132,13 @@ os_arch="on" # Shorten the output of the uptime function # # Default: 'on' -# Values: 'on', 'off', 'tiny' +# Values: 'on', 'tiny', 'off' # Flag: --uptime_shorthand # # Example: # on: '2 days, 10 hours, 3 mins' -# off: '2 days, 10 hours, 3 minutes' # tiny: '2d 10h 3m' +# off: '2 days, 10 hours, 3 minutes' uptime_shorthand="on" @@ -4324,7 +4324,7 @@ INFO: NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' - --package_managers on/off Hide/Show Package Manager names . (tiny, on, off) + --package_managers on/off Hide/Show Package Manager names . (on, tiny, off) --os_arch on/off Hide/Show OS architecture. --speed_type type Change the type of cpu speed to display. Possible values: current, min, max, bios, @@ -4351,7 +4351,7 @@ INFO: NOTE: For FreeBSD and NetBSD-based systems, you need to enable coretemp kernel module. This only supports newer Intel processors. - --distro_shorthand on/off Shorten the output of distro (tiny, on, off) + --distro_shorthand on/off Shorten the output of distro (on, tiny, off) NOTE: This option won't work in Windows (Cygwin) @@ -4359,7 +4359,7 @@ INFO: NOTE: This option won't work in BSDs (except PacBSD and PC-BSD) - --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) + --uptime_shorthand on/off Shorten the output of uptime (on, tiny, off) --refresh_rate on/off Whether to display the refresh rate of each monitor Unsupported on Windows --gpu_brand on/off Enable/Disable GPU brand in output. (AMD/NVIDIA/Intel) From 766113a0c2e51646ad7ba67e9fc3103fb09dddb6 Mon Sep 17 00:00:00 2001 From: xPMo Date: Tue, 8 Jan 2019 19:49:07 -0600 Subject: [PATCH 0656/1133] manpage: add "tiny" where supported --- neofetch.1 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 269638e0b..e5733d419 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -40,8 +40,8 @@ For example: 'info "Memory" memory' would be '\-\-disable memory' .IP NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu' .TP -\fB\-\-package_managers\fR on/off -Hide/Show Package Manager names . (tiny, on, off) +\fB\-\-package_managers\fR on/tiny/off +Hide/Show Package Manager names . (on, tiny, off) .TP \fB\-\-os_arch\fR on/off Hide/Show OS architecture. @@ -79,8 +79,8 @@ NOTE: This only works on Linux and BSD. NOTE: For FreeBSD and NetBSD\-based systems, you need to enable coretemp kernel module. This only supports newer Intel processors. .TP -\fB\-\-distro_shorthand\fR on/off -Shorten the output of distro (tiny, on, off) +\fB\-\-distro_shorthand\fR on/tiny/off +Shorten the output of distro (on, tiny, off) .IP NOTE: This option won't work in Windows (Cygwin) .TP @@ -89,8 +89,8 @@ Shorten the output of kernel .IP NOTE: This option won't work in BSDs (except PacBSD and PC\-BSD) .TP -\fB\-\-uptime_shorthand\fR on/off -Shorten the output of uptime (tiny, on, off) +\fB\-\-uptime_shorthand\fR on/tiny/off +Shorten the output of uptime (on, tiny, off) .TP \fB\-\-refresh_rate\fR on/off Whether to display the refresh rate of each monitor From 7df1d0e3ef6b7e8fd5ed3a2b55f4cf78ca0a2c30 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 Jan 2019 07:50:44 +0200 Subject: [PATCH 0657/1133] misc: cleanup --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 8cf4d8884..0c1cd782e 100755 --- a/neofetch +++ b/neofetch @@ -3360,6 +3360,7 @@ get_gpu_driver() { get_cols() { local blocks blocks2 cols + if [[ "$color_blocks" == "on" ]]; then # Convert the width to space chars. printf -v block_width "%${block_width}s" From 23fc5aff3d08675160685a3caceb93bc4c5fe489 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 Jan 2019 08:00:16 +0200 Subject: [PATCH 0658/1133] docs: update --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0d231d1e..dc3aa35cc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). + +## [6.0.1] - N/A + +- **term_font** [kitty]: Fixed bug with empty config. +- **get_cols**: Variables are now local. [**@asantam**](https://github.com/asantam) +- **man_page**: More consistent arg documentation. [**@xPMo**](https://github.com/xPMo) + + ## [6.0.0] - 2019-01-08 logo From 9431a593f6ce3e6501635fbb11e54084c6c52df9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 Jan 2019 08:48:07 +0200 Subject: [PATCH 0659/1133] ascii: Fixed bug causing ascii files to not work. --- neofetch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 0c1cd782e..857c74014 100755 --- a/neofetch +++ b/neofetch @@ -3454,12 +3454,13 @@ image_backend() { } get_ascii() { - [[ ! "$image_source" =~ (ascii|auto) ]] && - if [[ -f "$image_source" && ! "$image_source" =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then - ascii_data="$(< "$image_source")" - else - ascii_data="$image_source" - fi + if [[ -f $image_source && ! $image_source =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then + ascii_data="$(< "$image_source")" + elif [[ $image_source == ascii || $image_source == auto ]]; then + : + else + ascii_data="$image_source" + fi # Set locale to get correct padding. LC_ALL="$sys_locale" From 64188697b85a26fb522fc5fa7edca019493e9a53 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 Jan 2019 08:50:01 +0200 Subject: [PATCH 0660/1133] ascii: Fixed bug causing files named ascii to not work. --- neofetch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 857c74014..240ed4f05 100755 --- a/neofetch +++ b/neofetch @@ -3414,7 +3414,7 @@ image_backend() { { image_backend="ascii"; err "Image: Imagemagick not found, falling back to ascii mode."; } case "${image_backend:-off}" in - "ascii") get_ascii ;; + "ascii") print_ascii ;; "off") image_backend="off" ;; "caca" | "chafa" | "jp2a" | "iterm2" | "termpix" |\ @@ -3445,7 +3445,7 @@ image_backend() { 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 + print_ascii ;; esac @@ -3453,7 +3453,7 @@ image_backend() { [[ "$image_backend" != "off" ]] && printf '\e[%sA\e[9999999D' "${lines:-0}" } -get_ascii() { +print_ascii() { if [[ -f $image_source && ! $image_source =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then ascii_data="$(< "$image_source")" elif [[ $image_source == ascii || $image_source == auto ]]; then @@ -3472,7 +3472,7 @@ get_ascii() { done <<< "${ascii_data//\$\{??\}}" # Fallback if file not found. - ((lines==1)) && { lines=; ascii_len=; image_source="auto"; get_distro_ascii; get_ascii; return; } + ((lines==1)) && { lines=; ascii_len=; image_source="auto"; get_distro_ascii; print_ascii; return; } # Colors. ascii_data="${ascii_data//\$\{c1\}/$c1}" @@ -3891,7 +3891,7 @@ display_image() { to_ascii() { err "$1" image_backend="ascii" - get_ascii + print_ascii # Set cursor position next image/ascii. printf '\e[%sA\e[9999999D' "${lines:-0}" From 78e0fa3212d134ec8c679a596100b737bf579ac6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 Jan 2019 08:50:57 +0200 Subject: [PATCH 0661/1133] docs: update --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index dc3aa35cc..6835f367d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [6.0.1] - N/A +- **ascii**: Fixed bug causing files to not work. +- **ascii**: Fixed bug causing files named `ascii` to not load. - **term_font** [kitty]: Fixed bug with empty config. - **get_cols**: Variables are now local. [**@asantam**](https://github.com/asantam) - **man_page**: More consistent arg documentation. [**@xPMo**](https://github.com/xPMo) From acc8103dde1b6df361d0d430b11b8777b10cabf7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 Jan 2019 08:59:23 +0200 Subject: [PATCH 0662/1133] fixed travis --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 240ed4f05..0cbab5f17 100755 --- a/neofetch +++ b/neofetch @@ -3472,7 +3472,7 @@ print_ascii() { done <<< "${ascii_data//\$\{??\}}" # Fallback if file not found. - ((lines==1)) && { lines=; ascii_len=; image_source="auto"; get_distro_ascii; print_ascii; return; } + ((lines==1)) && { lines=; ascii_len=; image_source=auto; get_distro_ascii; print_ascii; return; } # Colors. ascii_data="${ascii_data//\$\{c1\}/$c1}" From 415ef5d4aeb1cced7afcf9fd1223dd09c3306b9c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 9 Jan 2019 10:43:22 +0200 Subject: [PATCH 0663/1133] misc: Quote all the things --- neofetch | 69 ++++++++++++++++++++++++-------------------------------- 1 file changed, 30 insertions(+), 39 deletions(-) diff --git a/neofetch b/neofetch index 0cbab5f17..64c75f6e2 100755 --- a/neofetch +++ b/neofetch @@ -76,7 +76,7 @@ print_info() { # info "Battery" battery # info "Font" font # info "Song" song - # [[ $player ]] && prin "Music Player" "$player" + # [[ "$player" ]] && prin "Music Player" "$player" # info "Local IP" local_ip # info "Public IP" public_ip # info "Users" users @@ -849,7 +849,7 @@ get_distro() { case "$os" in "Linux" | "BSD" | "MINIX") - if [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]]; then + if [[ -f "/bedrock/etc/bedrock-release" && "$PATH" == */bedrock/cross/* ]]; then case "$distro_shorthand" in "on" | "tiny") distro="Bedrock Linux" ;; *) distro="$(< /bedrock/etc/bedrock-release)" @@ -906,7 +906,7 @@ get_distro() { # Chrome OS doesn't conform to the /etc/*-release standard. # While the file is a series of variables they can't be sourced # by the shell since the values aren't quoted. - elif [[ -f /etc/lsb-release && "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then + elif [[ -f "/etc/lsb-release" && "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then distro="$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release)" elif [[ -f "/etc/os-release" || \ @@ -938,7 +938,7 @@ get_distro() { distro="${distro/DragonFly/DragonFlyBSD}" # Workarounds for FreeBSD based distros. - [[ -f "/etc/pcbsd-lang" ]] && distro="PCBSD" + [[ -f "/etc/pcbsd-lang" ]] && distro="PCBSD" [[ -f "/etc/trueos-lang" ]] && distro="TrueOS" # /etc/pacbsd-release is an empty file @@ -946,15 +946,14 @@ get_distro() { fi fi - if [[ "$(< /proc/version)" == *"Microsoft"* || - "$kernel_version" == *"Microsoft"* ]]; then + if [[ "$(< /proc/version)" == *Microsoft* || "$kernel_version" == *Microsoft* ]]; then case "$distro_shorthand" in "on") distro+=" [Windows 10]" ;; "tiny") distro="Windows 10" ;; *) distro+=" on Windows 10" ;; esac - elif [[ "$(< /proc/version)" == *"chrome-bot"* || -f "/dev/cros_ec" ]]; then + elif [[ "$(< /proc/version)" == *chrome-bot* || -f "/dev/cros_ec" ]]; then case "$distro_shorthand" in "on") distro+=" [Chrome OS]" ;; "tiny") distro="Chrome OS" ;; @@ -1059,15 +1058,15 @@ get_model() { if [[ -d "/system/app/" && -d "/system/priv-app" ]]; then model="$(getprop ro.product.brand) $(getprop ro.product.model)" - elif [[ -f /sys/devices/virtual/dmi/id/product_name || - -f /sys/devices/virtual/dmi/id/product_version ]]; then + elif [[ -f "/sys/devices/virtual/dmi/id/product_name" || + -f "/sys/devices/virtual/dmi/id/product_version" ]]; then model="$(< /sys/devices/virtual/dmi/id/product_name)" model+=" $(< /sys/devices/virtual/dmi/id/product_version)" - elif [[ -f /sys/firmware/devicetree/base/model ]]; then + elif [[ -f "/sys/firmware/devicetree/base/model" ]]; then model="$(< /sys/firmware/devicetree/base/model)" - elif [[ -f /tmp/sysinfo/model ]]; then + elif [[ -f "/tmp/sysinfo/model" ]]; then model="$(< /tmp/sysinfo/model)" fi ;; @@ -1293,7 +1292,7 @@ get_packages() { tot() { IFS=$'\n' read -d "" -ra pkgs < <("$@");((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; } # Redefine tot() for Bedrock Linux. - [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]] && { + [[ -f "/bedrock/etc/bedrock-release" && "$PATH" == */bedrock/cross/* ]] && { tot() { IFS=$'\n' read -d "" -ra pkgs < <(for s in $(brl list); do strat -r "$s" "$@"; done) ((packages+="${#pkgs[@]}")) @@ -1839,8 +1838,7 @@ get_cpu() { fi # Get CPU temp. - [[ -f "$temp_dir" ]] && \ - deg="$(($(< "$temp_dir") * 100 / 10000))" + [[ -f "$temp_dir" ]] && deg="$(($(< "$temp_dir") * 100 / 10000))" # Get CPU cores. case "$cpu_cores" in @@ -2103,9 +2101,7 @@ get_gpu() { # Checking the first two array elements should # be safe since there won't be 2 intel outputs if # there's a dedicated GPU in play. - [[ "${gpus[0]}" == *Intel* && \ - "${gpus[1]}" == *Intel* ]] && \ - unset -v "gpus[0]" + [[ "${gpus[0]}" == *Intel* && "${gpus[1]}" == *Intel* ]] && unset -v "gpus[0]" for gpu in "${gpus[@]}"; do # GPU shorthand tests. @@ -2355,7 +2351,7 @@ get_memory() { esac - [[ $memory_percent == on ]] && ((mem_perc=mem_used * 100 / mem_total)) + [[ "$memory_percent" == "on" ]] && ((mem_perc=mem_used * 100 / mem_total)) memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB} ${mem_perc:+(${mem_perc}%)}" @@ -2409,8 +2405,7 @@ get_song() { player="$(ps aux | awk -v pattern="(${players:1})" \ '!/ awk / && !/iTunesHelper/ && match($0,pattern){print substr($0,RSTART,RLENGTH); exit}')" - [[ "$music_player" && "$music_player" != "auto" ]] && \ - player="$music_player" + [[ "$music_player" && "$music_player" != "auto" ]] && player="$music_player" get_song_dbus() { # Multiple players use an almost identical dbus command to get the information. @@ -2618,7 +2613,7 @@ get_resolution() { esac resolution="${resolution%,*}" - [[ -z ${resolution/x} ]] && resolution= + [[ -z "${resolution/x}" ]] && resolution= } get_style() { @@ -2797,11 +2792,8 @@ get_term() { esac # Most likely TosWin2 on FreeMiNT - quick check - [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && \ - term="TosWin2" - - [[ "$SSH_CONNECTION" ]] && \ - term="$SSH_TTY" + [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && term="TosWin2" + [[ "$SSH_CONNECTION" ]] && term="$SSH_TTY" # Check $PPID for terminal emulator. while [[ -z "$term" ]]; do @@ -2921,7 +2913,7 @@ END "kitty"*) kitty_config="$(kitty --debug-config)" - [[ $kitty_config != *font_family* ]] && return + [[ "$kitty_config" != *font_family* ]] && return term_font_size="${kitty_config/*font_size}" term_font_size="${term_font_size/$'\n'*}" @@ -2967,7 +2959,7 @@ END mateterm_config="/tmp/mateterm.cfg" # Ensure /tmp exists and we do not overwrite anything. - if [[ -d /tmp && ! -f "$mateterm_config" ]]; then + if [[ -d "/tmp" && ! -f "$mateterm_config" ]]; then mate-terminal --save-config="$mateterm_config" role="$(xprop -id "${WINDOWID}" WM_WINDOW_ROLE)" @@ -3032,7 +3024,7 @@ END # On Linux we can get the exact path to the running binary through the procfs # (in case `st` is launched from outside of $PATH) on other systems we just # have to guess and assume `st` is invoked from somewhere in the users $PATH - [[ -L /proc/$parent/exe ]] && binary="/proc/$parent/exe" || binary="$(type -p st)" + [[ -L "/proc/$parent/exe" ]] && binary="/proc/$parent/exe" || binary="$(type -p st)" # Grep the output of strings on the `st` binary for anything that looks vaguely # like a font definition. NOTE: There is a slight limitation in this approach. @@ -3085,8 +3077,7 @@ END term_font="$(trim "${term_font/*"faceName:"}")" # xft: isn't required at the beginning so we prepend it if it's missing - [[ "${term_font:0:1}" != "-" && \ - "${term_font:0:4}" != "xft:" ]] && \ + [[ "${term_font:0:1}" != "-" && "${term_font:0:4}" != "xft:" ]] && \ term_font="xft:$term_font" # Xresources has two different font formats, this checks which @@ -3454,9 +3445,9 @@ image_backend() { } print_ascii() { - if [[ -f $image_source && ! $image_source =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then + if [[ -f "$image_source" && ! "$image_source" =~ (png|jpg|jpeg|jpe|svg|gif) ]]; then ascii_data="$(< "$image_source")" - elif [[ $image_source == ascii || $image_source == auto ]]; then + elif [[ "$image_source" == "ascii" || $image_source == auto ]]; then : else ascii_data="$image_source" @@ -3732,7 +3723,7 @@ get_image_size() { esac # Check for terminal padding. - [[ $image_backend == w3m ]] && term_padding + [[ "$image_backend" == "w3m" ]] && term_padding width="${width:-$image_size}" height="${height:-$image_size}" @@ -4201,7 +4192,7 @@ kde_config_dir() { term_padding() { # Get terminal padding to properly align cursor. - [[ -z $term ]] && get_term + [[ -z "$term" ]] && get_term case "$term" in urxvt*|"rxvt-unicode") @@ -4213,9 +4204,9 @@ term_padding() { } dynamic_prompt() { - [[ $image_backend == off ]] && { printf '\n'; return; } - [[ $image_backend != ascii ]] && ((lines=(height + yoffset) / font_height + 1)) - [[ $image_backend == w3m ]] && ((lines=lines + padding / font_height + 1)) + [[ "$image_backend" == "off" ]] && { printf '\n'; return; } + [[ "$image_backend" != "ascii" ]] && ((lines=(height + yoffset) / font_height + 1)) + [[ "$image_backend" == "w3m" ]] && ((lines=lines + padding / font_height + 1)) # If the ascii art is taller than the info. ((lines=lines>info_height?lines-info_height+1:1)) @@ -4771,7 +4762,7 @@ get_args() { get_simple() { while [[ "$1" ]]; do - [[ $(type -t "get_$1") == function ]] && { + [[ "$(type -t "get_$1")" == "function" ]] && { get_distro stdout simple=1 From 68645339d33e52197cf99201375e0411d5c33b33 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 15 Jan 2019 19:56:37 +0200 Subject: [PATCH 0664/1133] general: fix image sizing in VTE terminals. --- neofetch | 43 ++----------------------------------------- 1 file changed, 2 insertions(+), 41 deletions(-) diff --git a/neofetch b/neofetch index 64c75f6e2..75304a114 100755 --- a/neofetch +++ b/neofetch @@ -3599,49 +3599,10 @@ get_w3m_img_path() { get_window_size() { # This functions gets the current window size in # pixels. - # - # We first try to use the escape sequence "\033[14t" - # to get the terminal window size in pixels. If this - # fails we then fallback to using "xdotool" or other - # programs. - - # Tmux has a special way of reading escape sequences - # so we have to use a slightly different sequence to - # get the terminal size. - if [[ "$image_backend" == "tycat" ]]; then - printf '%b' '\e}qs\000' - - else - case "${TMUX:-null}" in - "null") printf '%b' '\e[14t' ;; - *) printf '%b' '\ePtmux;\e\e[14t\e\\ ' ;; - esac - fi - - # The escape codes above print the desired output as - # user input so we have to use read to store the out - # -put as a variable. - # The 1 second timeout is required for older bash - case "${BASH_VERSINFO[0]}" in - 4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;; - *) IFS=';t' read -d t -t 1 -sra term_size ;; - esac - unset IFS - - # Split the string into height/width. - if [[ "$image_backend" == "tycat" ]]; then - term_width="$((term_size[2] * term_size[0]))" - term_height="$((term_size[3] * term_size[1]))" - - else - term_height="${term_size[1]}" - term_width="${term_size[2]}" - fi - - [[ "$image_backend" == "kitty" ]] && \ + [[ "$image_backend" == "kitty" ]] && IFS=x read -r term_width term_height < <(kitty +kitten icat --print-window-size) - # Get terminal width/height if \e[14t is unsupported. + # Get terminal width/heigh. if (( "${term_width:-0}" < 50 )) && [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then if type -p xdotool &>/dev/null; then IFS=$'\n' read -d "" -ra win < <(xdotool getactivewindow getwindowgeometry --shell %1) From 5b301c773bf52ff5a27802ff2cce268e51aa341c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 15 Jan 2019 19:58:32 +0200 Subject: [PATCH 0665/1133] docs: update --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 75304a114..208aea4bf 100755 --- a/neofetch +++ b/neofetch @@ -3602,7 +3602,7 @@ get_window_size() { [[ "$image_backend" == "kitty" ]] && IFS=x read -r term_width term_height < <(kitty +kitten icat --print-window-size) - # Get terminal width/heigh. + # Get terminal width/height. if (( "${term_width:-0}" < 50 )) && [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then if type -p xdotool &>/dev/null; then IFS=$'\n' read -d "" -ra win < <(xdotool getactivewindow getwindowgeometry --shell %1) From 91f8510ef3f3be19da51dd113b844adfceeda737 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sat, 19 Jan 2019 17:40:49 +0700 Subject: [PATCH 0666/1133] Memory [AIX]: Detect memory based on pages (like Solaris) for more accuracy --- neofetch | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 64c75f6e2..dfeb57a9c 100755 --- a/neofetch +++ b/neofetch @@ -2307,10 +2307,20 @@ get_memory() { esac ;; - "Solaris") + "Solaris" | "AIX") hw_pagesize="$(pagesize)" - pages_total="$(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}')" - pages_free="$(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}')" + case "$os" in + "Solaris") + pages_total="$(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}')" + pages_free="$(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}')" + ;; + + "AIX") + IFS=$'\n'"| " read -d "" -ra mem_stat <<< "$(svmon -G -O unit=page)" + pages_total="${mem_stat[11]}" + pages_free="${mem_stat[16]}" + ;; + esac mem_total="$((pages_total * hw_pagesize / 1024 / 1024))" mem_free="$((pages_free * hw_pagesize / 1024 / 1024))" mem_used="$((mem_total - mem_free))" @@ -2322,15 +2332,6 @@ get_memory() { mem_used="$((${mem_used/max} / 1024 / 1024))" ;; - "AIX") - IFS=$'\n'"| " read -d "" -ra mem_stat <<< "$(svmon -G -O unit=MB)" - - mem_total="${mem_stat[11]/.*}" - mem_free="${mem_stat[16]/.*}" - mem_used="$((mem_total - mem_free))" - mem_label="MB" - ;; - "IRIX") IFS=$'\n' read -d "" -ra mem_cmd <<< "$(pmem)" IFS=" " read -ra mem_stat <<< "${mem_cmd[0]}" From 0b812fbc5dd2102ea5481a30c3fb254ba22cb313 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 20 Jan 2019 05:36:25 +0200 Subject: [PATCH 0667/1133] general: Fix issue with URxvt and no internal border. Closes #1174 --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 64c75f6e2..fbc983a55 100755 --- a/neofetch +++ b/neofetch @@ -4197,6 +4197,7 @@ term_padding() { case "$term" in urxvt*|"rxvt-unicode") [[ -z "$xrdb" ]] && xrdb="$(xrdb -query)" + [[ $xrdb != *.internalBorder:* ]] && return padding="${xrdb/*.internalBorder:}" ((padding=${padding/$'\n'*})) ;; From cb6e78efecebc64f698e2a978194c636a70fff15 Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Thu, 17 Jan 2019 12:19:00 -0600 Subject: [PATCH 0668/1133] postmarketOS: Replace ASCII logo --- neofetch | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 0ed8c0abe..96dc7259d 100755 --- a/neofetch +++ b/neofetch @@ -7587,23 +7587,24 @@ EOF "PostMarketOS"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} ss - `hMMh` - .dMMMMd. - -NMMMMMMN- - /MMMMMMMMMN/ - hMMMMMMMMMMMo - y+`mMMmdNMMMMMMy - `dMM-.-:- .mMMMMMMh` - .mMMMMMMd` `dMMMMMMm. - :NMMMMMMy yMMMMMMN: - /MMMMMMMo oMMMmdmN/ - oMMMMMMM/ /MN.-/:-. - `yMMMMMMN- -:.NMMMMy` - `dMMMMMMM- -/////////////dMMMMMMd` - -mMMMMMMMMN+`sMMMMMMMMMMMMMMMMMMMMm- - :NMMMMMMMMMMM/ yMMMMMMMMMMMMMMMMMMMMN: -+MMMMMMMMMMMh.:mMMMMMMMMMMMMMMMMMMMMMMM+ +${c1} /\\ + / \\ + / \\ + / \\ + / \\ + / \\ + \\ \\ + /\\ \\____ \\ + / \\____ \\ \\ + / / \\ \\ + / / \\ ___\\ + / / \\ / ____ + / / \\/ / \\ + / / __________/ \\ + / \\ \\ \\ + / \\ \\ \\ + / / / \\ +/___________/ /____________________\\ EOF ;; From c8d2a0442cec35226cb4d0f13d70dcc3252c9286 Mon Sep 17 00:00:00 2001 From: Grant Miller Date: Fri, 25 Jan 2019 16:46:18 -0600 Subject: [PATCH 0669/1133] postmarketOS: Add small ASCII logo --- neofetch | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 96dc7259d..67f7c184c 100755 --- a/neofetch +++ b/neofetch @@ -4461,7 +4461,7 @@ ASCII: 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, - OpenBSD, and Void have a smaller logo variant. + OpenBSD, postmarketOS, and Void have a smaller logo variant. NOTE: Use '{distro name}_small' to use the small variants. @@ -7584,6 +7584,21 @@ s: yNm+` .smNd+. EOF ;; + "postmarketos_small") + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} /\\ + / \\ + / \\ + \\__ \\ + /\\__ \\ _\\ + / / \\/ __ + / / ____/ \\ + / \\ \\ \\ +/_____/ /________\\ +EOF + ;; + "PostMarketOS"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' From 78aed92b39b21e4b0ea535d9dd2674a06ebe70e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charl=C3=A8ne?= Date: Wed, 30 Jan 2019 21:44:16 +0100 Subject: [PATCH 0670/1133] Fix big Puffy ascii logo --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 67f7c184c..4b662f593 100755 --- a/neofetch +++ b/neofetch @@ -7199,7 +7199,7 @@ ${c1} `-|.' /_. ${c4}\_| ${c1} F |/`. `-. `._) / .-.\\ \\ ( `\\ - `.\ + `.\\ EOF ;; From 95fb38e73fd974d3a89ec38762407ade7d26e4e2 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 3 Feb 2019 09:50:44 +0100 Subject: [PATCH 0671/1133] term_font: fix issue with konsole font detection Closes #1186 --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 67f7c184c..9d90d8525 100755 --- a/neofetch +++ b/neofetch @@ -2926,7 +2926,8 @@ END # Get Process ID of current konsole window / tab child="$(get_ppid "$$")" - IFS=$'\n' read -d "" -ra konsole_instances < <(qdbus | grep -F 'org.kde.konsole') + IFS=$'\n' read -d "" -ra konsole_instances \ + < <(qdbus | awk '/org.kde.konsole/ {print $1}') for i in "${konsole_instances[@]}"; do IFS=$'\n' read -d "" -ra konsole_sessions < <(qdbus "$i" | grep -F '/Sessions/') From 60d3aa3f10f8f17ef25d2adab91cb60f5cc65a49 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 3 Feb 2019 18:40:00 +0700 Subject: [PATCH 0672/1133] CPU [Linux/ARM]: Use Hardware field directly --- neofetch | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index de798e880..70866b992 100755 --- a/neofetch +++ b/neofetch @@ -1805,13 +1805,9 @@ get_cpu() { ;; *) - cpu="$(awk -F ': | @' '/model name|Processor|^cpu model|chip type|^cpu type/ { - printf $2; - exit - }' "$cpu_file")" - - [[ "$cpu" == *"processor rev"* ]] && \ - cpu="$(awk -F':' '/Hardware/ {print $2; exit}' "$cpu_file")" + cpu="$(awk -F ': | @' \ + '/model name|Hardware|Processor|^cpu model|chip type|^cpu type/ { + printf $2; exit}' "$cpu_file")" ;; esac From 6e9f00445ff731a20b47acb0f253fa0302b6f09c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 4 Feb 2019 08:53:06 +0200 Subject: [PATCH 0673/1133] os: Added support for Radix Linux --- neofetch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/neofetch b/neofetch index 70866b992..eeb70f239 100755 --- a/neofetch +++ b/neofetch @@ -7689,6 +7689,30 @@ ${c1} `..--..` EOF ;; + "Radix"*) + set_colors 1 2 + read -rd '' ascii_data <<'EOF' +${c2} .:oyhdmNo + `/yhyoosdms` + -o+/ohmmho- + ..`.:/:-` + `.--:::-.``${c1} + .+ydNMMMMMMNmhs:` +`omMMMMMMMMMMMMMMNh- +oNMMMNmddhhyyhhhddmy. +mMMMMNmmddhhysoo+/:-` +yMMMMMMMMMMMMMMMMNNh. +-dmmmmmNNMMMMMMMMMMs` + -+oossyhmMMMMMMMMd- + `sNMMMMMMMMMMMMMm: + `yMMMMMMNmdhhhh: + `sNMMMMMNmmho. + `+mMMMMMMMy. + .yNMMMm+` + `:yd+. +EOF + ;; + "Raspbian"*) set_colors 2 1 read -rd '' ascii_data <<'EOF' From c7c1cf59ecbe3a27b16331fad9596a339554f34b Mon Sep 17 00:00:00 2001 From: Crestwave Date: Wed, 6 Feb 2019 08:02:49 +0000 Subject: [PATCH 0674/1133] packages: Specify Haiku's pkgman --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index eeb70f239..fe1cc3680 100755 --- a/neofetch +++ b/neofetch @@ -1389,7 +1389,7 @@ get_packages() { ;; "Haiku") - dir /boot/system/package-links/* + has "pkgman" && dir /boot/system/package-links/* ;; "IRIX") From 6f423e3970183dcb86c64a7803ad97cb304538fe Mon Sep 17 00:00:00 2001 From: Sibren Vasse Date: Thu, 7 Feb 2019 23:48:09 +0100 Subject: [PATCH 0675/1133] Robuster kitty font parsing --- neofetch | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/neofetch b/neofetch index fe1cc3680..27e320c7f 100755 --- a/neofetch +++ b/neofetch @@ -2912,10 +2912,7 @@ END kitty_config="$(kitty --debug-config)" [[ "$kitty_config" != *font_family* ]] && return - term_font_size="${kitty_config/*font_size}" - term_font_size="${term_font_size/$'\n'*}" - term_font="${kitty_config/*font_family}" - term_font="${term_font/$'\n'*} $term_font_size" + term_font="$(awk '/^font_family|^font_size/ {printf $2 " "}' <<< "$kitty_config")" ;; "konsole" | "yakuake") From 7fd9ff75a35ed3394530d645227c59ad2eab6184 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 11 Feb 2019 17:12:31 +0200 Subject: [PATCH 0676/1133] term_font: Fix crash when parsing Xresources. Closes #1195 --- neofetch | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index eeb70f239..95026c6c6 100755 --- a/neofetch +++ b/neofetch @@ -4194,10 +4194,17 @@ term_padding() { case "$term" in urxvt*|"rxvt-unicode") - [[ -z "$xrdb" ]] && xrdb="$(xrdb -query)" - [[ $xrdb != *.internalBorder:* ]] && return + [[ -z "$xrdb" ]] && + xrdb="$(xrdb -query)" + + [[ $xrdb != *".internalBorder:"* ]] && + return + padding="${xrdb/*.internalBorder:}" - ((padding=${padding/$'\n'*})) + padding="${padding/$'\n'*}" + + [[ $padding =~ ^[0-9]+$ ]] || + padding= ;; esac } From 1abc2ada772cd21cc8228b43df34f4e1236f020d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 12 Feb 2019 18:36:18 +0200 Subject: [PATCH 0677/1133] docs: update --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 58b2a8592..8532bd869 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,6 @@ Packaging status -

neofetch From 1b756083041bdce745c9d515baaaa7d9f639cb88 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 14 Feb 2019 08:19:51 +0200 Subject: [PATCH 0678/1133] general: fixed gnome shell mutter issue Closes #1194 --- neofetch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 60ec91619..045667268 100755 --- a/neofetch +++ b/neofetch @@ -1574,8 +1574,10 @@ get_wm() { wm="${wm/\"*}" fi - # Window Maker does not set _NET_WM_NAME + # Rename window managers to their proper values. [[ "$wm" =~ "WINDOWMAKER" ]] && wm="wmaker" + [[ "$wm" =~ "GNOME Shell" ]] && wm="Mutter" + # Fallback for non-EWMH WMs. [[ -z "$wm" ]] && \ wm="$(ps "${ps_flags[@]}" | grep -m 1 -o -F \ From 2fccec783e6822aaa7ce67c93d05857d2962eb8c Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sat, 16 Feb 2019 21:53:03 +0700 Subject: [PATCH 0679/1133] ASCII: Updated Artix ASCII with new logo --- neofetch | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/neofetch b/neofetch index 045667268..79653f1da 100755 --- a/neofetch +++ b/neofetch @@ -5197,27 +5197,24 @@ EOF ;; "Artix"*) - set_colors 6 4 2 7 - read -rd '' ascii_data <<'EOF' -${c1} d${c2}c. -${c1} x${c2}dc. -${c1} '.${c4}.${c1} d${c2}dlc. -${c1} c${c2}0d:${c1}o${c2}xllc; -${c1} :${c2}0ddlolc,lc, -${c1} :${c1}ko${c4}.${c1}:${c2}0ddollc..dlc. -${c1} ;${c1}K${c2}kxoOddollc' cllc. -${c1} ,${c1}K${c2}kkkxdddllc, ${c4}.${c2}lll: -${c1} ,${c1}X${c2}kkkddddlll;${c3}...';${c1}d${c2}llll${c3}dxk: -${c1} ,${c1}X${c2}kkkddddllll${c3}oxxxddo${c2}lll${c3}oooo, -${c3} xxk${c1}0${c2}kkkdddd${c1}o${c2}lll${c1}o${c3}ooooooolooooc;${c1}. -${c3} ddd${c2}kkk${c1}d${c2}ddd${c1}ol${c2}lc:${c3}:;,'.${c3}... .${c2}lll; -${c1} .${c3}xd${c1}x${c2}kk${c1}xd${c2}dl${c1}'cl:${c4}. ${c2}.llc, -${c1} .${c1}0${c2}kkkxddl${c4}. ${c2};'${c4}. ${c2};llc. -${c1} .${c1}K${c2}Okdcddl${c4}. ${c2}cllc${c4}. -${c1} 0${c2}Okd''dc. .cll; -${c1} k${c2}Okd' .llc, -${c1} d${c2}Od, 'lc. -${c1} :,${c4}. ${c2}... + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} .' + .cc' + .cccc. + cccccc. + :ccccccc. + ;ccccccccc + .;cccccc: + .. .;cccc; + 'cccc;.. .,cc; + 'ccccccccc:'. '' + .cccccccccccccc:;. + .cccccccccccccc:,. . + ccccccccccc;'. .;cc. + cccccccc,.. ':cccccc. + :ccc:'. .';ccccc +;;.. .';: EOF ;; From fcca6982299dd9f54758e4fd15fdd05512e4f1f3 Mon Sep 17 00:00:00 2001 From: chrisweeksnz Date: Mon, 18 Feb 2019 17:47:04 +1300 Subject: [PATCH 0680/1133] Add ascii art for Clear Linux --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 79653f1da..90454dd0d 100755 --- a/neofetch +++ b/neofetch @@ -5582,6 +5582,32 @@ ${c1} `.--::::::--.` EOF ;; + "Clear Linux OS"*) + set_colors 4 3 7 6 + read -rd '' ascii_data <<'EOF' +${c1} BBB + BBBBBBBBB + BBBBBBBBBBBBBBB + BBBBBBBBBBBBBBBBBBBB + BBBBBBBBBBB BBB + BBBBBBBB${c2}YYYYY +${c1} BBBBBBBB${c2}YYYYYY +${c1} BBBBBBBB${c2}YYYYYYY +${c1} BBBBBBBBB${c2}YYYYY${c3}W +${c4} GG${c1}BBBBBBBY${c2}YYYY${c3}WWW +${c4} GGG${c1}BBBBBBB${c2}YY${c3}WWWWWWWW +${c4} GGGGGG${c1}BBBBBB${c3}WWWWWWWW +${c4} GGGGGGGG${c1}BBBB${c3}WWWWWWWW +${c4}GGGGGGGGGGG${c1}BBB${c3}WWWWWWW +${c4}GGGGGGGGGGGGG${c1}B${c3}WWWWWW +${c4}GGGGGGGG${c3}WWWWWWWWWWW +${c4}GG${c3}WWWWWWWWWWWWWWWW + WWWWWWWWWWWWWWWW + WWWWWWWWWW + WWW +EOF + ;; + "Clover"*) set_colors 2 6 read -rd '' ascii_data <<'EOF' From 3dc7720c5265bc9d0df2b38e7c48e4db0495656f Mon Sep 17 00:00:00 2001 From: nee-san Date: Sat, 23 Feb 2019 22:52:28 +0900 Subject: [PATCH 0681/1133] new logo for janus Signed-off-by: nee-san --- neofetch | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/neofetch b/neofetch index 90454dd0d..577e281c3 100755 --- a/neofetch +++ b/neofetch @@ -6348,21 +6348,25 @@ WW W EOF ;; - "januslinux"*) - set_colors 7 - read -rd '' ascii_data <<'EOF' -${c1} ________________ -|\ \ -| \ \ -| \ \ -| \ ______________\ -| | | -| | | -| | | - \ | januslinux | - \ | | - \ | | - \|______________| + "januslinux"*|"janus"*) + set_colors 4 7 4 + read -rd '' ascii_data <<'EOF' +${c1}oooooooooooooooooooooooooooooooo +oooooooooooooooooooooooooooooooo +oooooooooooooooooooooooooooooooo +ooooooooooooo${c2}dOWWOd${c1}ooooooooooooo +oooooooooood${c2}0WMMMMWkd${c1}ooooooooooo +oooooooood${c2}0WMMMMMX0KN0d${c1}oooolllll +ooooooo${c2}xKWMMMMWKxKWMMMWKx${c3}lllllll +ooooo${c2}xXMMMMMW0doooOWMMMMMXx${c3}lllll +ooooo${c2}xXMMMMMW0doloONMMMMMXx${c3}lllll +ooooooo${c2}xKWMMMWXO0WMMMMMKx${c3}lllllll +ooooooooo${c2}d0NX0KWMMMMW0d${c3}lllllllll +oooooooooooo${c2}xWMMMMW0o${c3}llllllccccc +oooooooooooll${c2}o0WW0o${c3}lllllcccccccc +ooooooooooollll${c2}oo${c3}llllllccccccccc +oooooooooollllllllllllcccccccccc +oooooooooollllllllllllcccccccccc EOF ;; From 288a81a9e213eeb37c877edd74134e58e141c480 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Tue, 26 Feb 2019 08:22:01 +0700 Subject: [PATCH 0682/1133] ASCII: Update Artix logo --- neofetch | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index 577e281c3..9b4df0e90 100755 --- a/neofetch +++ b/neofetch @@ -5199,22 +5199,26 @@ EOF "Artix"*) set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} .' - .cc' - .cccc. - cccccc. - :ccccccc. - ;ccccccccc - .;cccccc: - .. .;cccc; - 'cccc;.. .,cc; - 'ccccccccc:'. '' - .cccccccccccccc:;. - .cccccccccccccc:,. . - ccccccccccc;'. .;cc. - cccccccc,.. ':cccccc. - :ccc:'. .';ccccc -;;.. .';: +${c1} ' + 'o' + 'ooo' + 'ooxoo' + 'ooxxxoo' + 'oookkxxoo' + 'oiioxkkxxoo' + ':;:iiiioxxxoo' + `'.;::ioxxoo' + '-. `':;jiooo' + 'oooio-.. `'i:io' + 'ooooxxxxoio:,. `'-;' + 'ooooxxxxxkkxoooIi:-. `' + 'ooooxxxxxkkkkxoiiiiiji' + 'ooooxxxxxkxxoiiii:'` .i' + 'ooooxxxxxoi:::'` .;ioxo' + 'ooooxooi::'` .:iiixkxxo' + 'ooooi:'` `'';ioxxo' + 'i:'` '':io' +'` `' EOF ;; From 625fdcf7c4b8796691d4efd9ff0207049ce4259d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 11 Mar 2019 14:19:57 +0200 Subject: [PATCH 0683/1133] packages: Show IRIX package manager name --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 577e281c3..4f228f786 100755 --- a/neofetch +++ b/neofetch @@ -1393,6 +1393,7 @@ get_packages() { ;; "IRIX") + manager="swpkg" tot versions -b && ((packages-=3)) ;; esac From c690118884615b756f5649a0e426aecf98635297 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 11 Mar 2019 22:18:33 +0200 Subject: [PATCH 0684/1133] general: Added --no_config to disable config file creation. --- neofetch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index c1271e0e9..19a5f8b2c 100755 --- a/neofetch +++ b/neofetch @@ -4067,8 +4067,6 @@ get_full_path() { } get_user_config() { - mkdir -p "${XDG_CONFIG_HOME}/neofetch/" - # --config /path/to/config.conf if [[ -f "$config_file" ]]; then source "$config_file" @@ -4083,10 +4081,11 @@ get_user_config() { source "${XDG_CONFIG_HOME}/neofetch/config" err "Config: Sourced user config. (${XDG_CONFIG_HOME}/neofetch/config)" - else + elif [[ -z "$no_config" ]]; then config_file="${XDG_CONFIG_HOME}/neofetch/config.conf" # The config file doesn't exist, create it. + mkdir -p "${XDG_CONFIG_HOME}/neofetch/" printf '%s\n' "$config" > "$config_file" fi } @@ -4460,6 +4459,7 @@ IMAGE: OTHER: --config /path/to/config Specify a path to a custom config file --config none Launch the script without a config file + --no_config Don't create the user config file. --print_config Print the default config file to stdout. --stdout Turn off all colors and disables any ASCII/image backend. --help Print this text and exit @@ -4479,7 +4479,7 @@ exit 1 get_args() { # Check the commandline flags early for '--config'. - [[ "$*" != *--config* ]] && get_user_config + [[ "$*" != *--config* && "$*" != *--no_config* ]] && get_user_config while [[ "$1" ]]; do case "$1" in @@ -4640,6 +4640,7 @@ get_args() { ;; esac ;; + "--no_config") no_config="on" ;; "--stdout") stdout="on" ;; "-v") verbose="on" ;; "--print_config") printf '%s\n' "$config"; exit ;; From 3b713ca92f6fec2f2d3a75d49671cef260c3af62 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Tue, 12 Mar 2019 17:32:43 +1100 Subject: [PATCH 0685/1133] WM Theme: update for Mojave --- neofetch | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 19a5f8b2c..6e1950f6d 100755 --- a/neofetch +++ b/neofetch @@ -1753,15 +1753,23 @@ get_wm_theme() { "Quartz Compositor") global_preferences="${HOME}/Library/Preferences/.GlobalPreferences.plist" wm_theme="$(PlistBuddy -c "Print AppleInterfaceStyle" "$global_preferences")" - wm_theme_color="$(PlistBuddy -c "Print AppleAquaColorVariant" "$global_preferences")" + wm_theme_color="$(PlistBuddy -c "Print AppleAccentColor" "$global_preferences")" [[ -z "$wm_theme" ]] && \ wm_theme="Light" - [[ -z "$wm_theme_color" ]] || ((wm_theme_color == 1)) && \ - wm_theme_color="Blue" + case "$wm_theme_color" in + "-1") wm_theme_color="Graphite" ;; + "0") wm_theme_color="Red" ;; + "1") wm_theme_color="Orange" ;; + "2") wm_theme_color="Yellow" ;; + "3") wm_theme_color="Green" ;; + "5") wm_theme_color="Purple" ;; + "6") wm_theme_color="Pink" ;; + *) wm_theme_color="Blue" ;; + esac - wm_theme="${wm_theme_color:-Graphite} ($wm_theme)" + wm_theme="${wm_theme_color} ($wm_theme)" ;; *"Explorer") From 3132d0a0902f161e10526c6f930a3ece87370f8d Mon Sep 17 00:00:00 2001 From: zyg812 Date: Tue, 12 Mar 2019 12:38:54 +0100 Subject: [PATCH 0686/1133] ASCII: Add fedora_small --- neofetch | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/neofetch b/neofetch index 6e1950f6d..00749c55e 100755 --- a/neofetch +++ b/neofetch @@ -5987,6 +5987,21 @@ KX '0XdKMMK;.xMMMk, .0MMMMMXx; ... EOF ;; + "fedora_small") + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} _____ + / __)${c1}\\${c2} + | / ${c1}\\ \\${c2} + ${c1}__${c2}_| |_${c1}_/ /${c2} + ${c1}/ ${c2}(_ _)${c1}_/${c2} +${c1}/ /${c2} | | +${c1}\\ \\${c2}__/ | + ${c1}\\${c2}(_____/ +EOF + ;; + + "Fedora"* | "RFRemix"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From a3ce498f856fc660997c8e55d645cffbefed9473 Mon Sep 17 00:00:00 2001 From: zyg812 <46135240+zyg812@users.noreply.github.com> Date: Tue, 12 Mar 2019 12:53:47 +0100 Subject: [PATCH 0687/1133] Update neofetch Fix my mistake --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index 00749c55e..55e53238b 100755 --- a/neofetch +++ b/neofetch @@ -6001,7 +6001,6 @@ ${c1}\\ \\${c2}__/ | EOF ;; - "Fedora"* | "RFRemix"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From d0cd21c01e3e73dc4af5026d8b25d31c11d3eb81 Mon Sep 17 00:00:00 2001 From: jkhsjdhjs Date: Wed, 13 Mar 2019 19:02:18 +0100 Subject: [PATCH 0688/1133] cache_uname: improve reading from 'SystemVersion.plist' on macOS and iOS and thus fix neofetch for iOS 11.3+ --- neofetch | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 55e53238b..1063a950c 100755 --- a/neofetch +++ b/neofetch @@ -4199,11 +4199,16 @@ cache_uname() { kernel_machine="${uname[2]}" if [[ "$kernel_name" == "Darwin" ]]; then - IFS=$'\n' read -d "" -ra sw_vers < <(awk -F'<|>' '/string/ {print $3}' \ + IFS=$'\n' read -d "" -ra sw_vers < <(awk -F'<|>' '/key|string/ {print $3}' \ "/System/Library/CoreServices/SystemVersion.plist") - darwin_name="${sw_vers[2]}" - osx_version="${sw_vers[3]}" - osx_build="${sw_vers[0]}" + for i in "${!sw_vers[@]}"; do + local value="${sw_vers[(( $i + 1 ))]}" + case "${sw_vers[$i]}" in + "ProductName") darwin_name="$value" ;; + "ProductVersion") osx_version="$value" ;; + "ProductBuildVersion") osx_build="$value" ;; + esac + done fi } From b7ffa9e9bfbd4496377acb4c551f749a1bccd054 Mon Sep 17 00:00:00 2001 From: jkhsjdhjs Date: Fri, 22 Mar 2019 18:45:57 +0100 Subject: [PATCH 0689/1133] cache_uname: change reading variables from 'SystemVersion.plist' as suggested in review --- neofetch | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 1063a950c..ff5b551d9 100755 --- a/neofetch +++ b/neofetch @@ -4201,14 +4201,13 @@ cache_uname() { if [[ "$kernel_name" == "Darwin" ]]; then IFS=$'\n' read -d "" -ra sw_vers < <(awk -F'<|>' '/key|string/ {print $3}' \ "/System/Library/CoreServices/SystemVersion.plist") - for i in "${!sw_vers[@]}"; do - local value="${sw_vers[(( $i + 1 ))]}" - case "${sw_vers[$i]}" in - "ProductName") darwin_name="$value" ;; - "ProductVersion") osx_version="$value" ;; - "ProductBuildVersion") osx_build="$value" ;; + for ((i=0;i<${#sw_vers[@]};i+=2)) { + case ${sw_vers[i]} in + ProductName) darwin_name=${sw_vers[i+1]} ;; + ProductVersion) osx_version=${sw_vers[i+1]} ;; + ProductBuildVersion) osx_build=${sw_vers[i+1]} ;; esac - done + } fi } From 66f3a07a42390653204dbbb21ad2d1a589ed4b98 Mon Sep 17 00:00:00 2001 From: chrissx Date: Sun, 24 Mar 2019 22:06:06 +0100 Subject: [PATCH 0690/1133] Added a case for displaying the Ubuntu logo for i3buntu. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 55e53238b..a176d5583 100755 --- a/neofetch +++ b/neofetch @@ -8549,7 +8549,7 @@ ${c1} ..-::::::-.` EOF ;; - "Ubuntu"*) + "Ubuntu"* | "i3buntu"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' ${c1} .-/+oossssoo+/-. From 6f1ae617ff60bb9251b0b8c14aa763d829639158 Mon Sep 17 00:00:00 2001 From: edward-p Date: Mon, 1 Apr 2019 00:03:02 +0800 Subject: [PATCH 0691/1133] Handle ${GTK2_RC_FILES} with multiple values --- neofetch | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 55e53238b..27ce9b0bb 100755 --- a/neofetch +++ b/neofetch @@ -2683,8 +2683,15 @@ get_style() { # Check for general GTK2 Theme. if [[ -z "$gtk2_theme" ]]; then - if [[ -f "${GTK2_RC_FILES:-${HOME}/.gtkrc-2.0}" ]]; then - gtk2_theme="$(grep "^[^#]*${name}" "${GTK2_RC_FILES:-${HOME}/.gtkrc-2.0}")" + if [[ -n "${GTK2_RC_FILES}" ]]; then + for gtkrc in ${GTK2_RC_FILES//:/ }; do + _gtk2_theme="$(grep "^[^#]*${name}" "${gtkrc}")" + [[ -n "${_gtk2_theme}" ]] && gtk2_theme="${_gtk2_theme}" + done + unset _gtk2_theme + + elif [[ -f "${HOME}/.gtkrc-2.0" ]]; then + gtk2_theme="$(grep "^[^#]*${name}" "${HOME}/.gtkrc-2.0")" elif [[ -f "/etc/gtk-2.0/gtkrc" ]]; then gtk2_theme="$(grep "^[^#]*${name}" /etc/gtk-2.0/gtkrc)" From cdd447f95afc45dfedf3633cb06e97c94af32236 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 3 Apr 2019 16:37:09 +0200 Subject: [PATCH 0692/1133] song: add strawberry player --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 55e53238b..9c7790c1f 100755 --- a/neofetch +++ b/neofetch @@ -465,6 +465,7 @@ disk_subtitle="mount" # sayonara # smplayer # spotify +# strawberry # tomahawk # vlc # xmms2d @@ -2403,6 +2404,7 @@ get_song() { "smplayer" "spotify" "Spotify" + "strawberry" "tomahawk" "vlc" "xmms2d" @@ -2452,6 +2454,7 @@ get_song() { "dragon"*) get_song_dbus "dragonplayer" ;; "smplayer"*) get_song_dbus "smplayer" ;; "rhythmbox"*) get_song_dbus "rhythmbox" ;; + "strawberry"*) get_song_dbus "strawberry" ;; "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "cmus"*) From fa3684b3953ac9f0b30628c5769a6878ba76dfa3 Mon Sep 17 00:00:00 2001 From: jkhsjdhjs Date: Tue, 16 Apr 2019 03:35:51 +0200 Subject: [PATCH 0693/1133] add device information for latest ios devices - iPhone9,[1-4] (gpu) - iPhone10,[1-6] (cpu) - iPhone11,2 iPhone11,4 iPhone11,6 iPhone11,8 (model, cpu, gpu) - iPad6,11 iPad6,12 (cpu, gpu) - iPad7,[1-4] (cpu) - iPad7,[5-6] (model, cpu, gpu) - iPad8,[1-8] (model, cpu) - iPad11,[1-4] (model, cpu) source: https://en.wikipedia.org/wiki/List_of_iOS_devices --- neofetch | 57 +++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 40 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index ff5b551d9..30d7408ba 100755 --- a/neofetch +++ b/neofetch @@ -1081,20 +1081,25 @@ get_model() { "iPhone OS") case "$kernel_machine" in - "iPad1,1"): "iPad" ;; - "iPad2,"[1-4]): "iPad 2" ;; - "iPad3,"[1-3]): "iPad 3" ;; - "iPad3,"[4-6]): "iPad 4" ;; - "iPad4,"[1-3]): "iPad Air" ;; - "iPad5,"[3-4]): "iPad Air 2" ;; - "iPad6,"[7-8]): "iPad Pro (12.9 Inch)" ;; - "iPad6,"[3-4]): "iPad Pro (9.7 Inch)" ;; - "iPad7,"[1-2]): "iPad Pro 2 (12.9 Inch)" ;; - "iPad7,"[3-4]): "iPad Pro (10.5 Inch)" ;; - "iPad2,"[5-7]): "iPad mini" ;; - "iPad4,"[4-6]): "iPad mini 2" ;; - "iPad4,"[7-9]): "iPad mini 3" ;; - "iPad5,"[1-2]): "iPad mini 4" ;; + "iPad1,1"): "iPad" ;; + "iPad2,"[1-4]): "iPad 2" ;; + "iPad3,"[1-3]): "iPad 3" ;; + "iPad3,"[4-6]): "iPad 4" ;; + "iPad7,"[5-6]): "iPad 6" ;; + "iPad4,"[1-3]): "iPad Air" ;; + "iPad5,"[3-4]): "iPad Air 2" ;; + "iPad11,"[3-4]): "iPad Air 3" ;; + "iPad6,"[7-8]): "iPad Pro (12.9 Inch)" ;; + "iPad6,"[3-4]): "iPad Pro (9.7 Inch)" ;; + "iPad7,"[1-2]): "iPad Pro 2 (12.9 Inch)" ;; + "iPad7,"[3-4]): "iPad Pro (10.5 Inch)" ;; + "iPad8,"[1-4]): "iPad Pro (11 Inch)" ;; + "iPad8,"[5-8]): "iPad Pro 3 (12.9 Inch)" ;; + "iPad2,"[5-7]): "iPad mini" ;; + "iPad4,"[4-6]): "iPad mini 2" ;; + "iPad4,"[7-9]): "iPad mini 3" ;; + "iPad5,"[1-2]): "iPad mini 4" ;; + "iPad11,"[1-2]): "iPad mini 5" ;; "iPad6,11" | "iPad 6,12") : "iPad 5" @@ -1113,12 +1118,15 @@ get_model() { "iPhone8,1"): "iPhone 6s" ;; "iPhone8,2"): "iPhone 6s Plus" ;; "iPhone8,4"): "iPhone SE" ;; + "iPhone11,2"): "iPhone XS" ;; + "iPhone11,8"): "iPhone XR" ;; "iPhone9,1" | "iPhone9,3"): "iPhone 7" ;; "iPhone9,2" | "iPhone9,4"): "iPhone 7 Plus" ;; "iPhone10,1" | "iPhone10,4"): "iPhone 8" ;; "iPhone10,2" | "iPhone10,5"): "iPhone 8 Plus" ;; "iPhone10,3" | "iPhone10,6"): "iPhone X" ;; + "iPhone11,4" | "iPhone11,6"): "iPhone XS Max" ;; "iPod1,1"): "iPod touch" ;; "ipod2,1"): "iPod touch 2G" ;; @@ -1873,8 +1881,10 @@ get_cpu() { "iPhone5,"[1-4]): "Apple A6 (2) @ 1.3GHz" ;; "iPhone6,"[1-2]): "Apple A7 (2) @ 1.3GHz" ;; "iPhone7,"[1-2]): "Apple A8 (2) @ 1.4GHz" ;; - "iPhone8,"[1-4]): "Apple A9 (2) @ 1.85GHz" ;; - "iPhone9,"[1-4]): "Apple A10 Fusion (4) @ 2.34GHz" ;; + "iPhone8,"[1-4] | "iPad6,11" | "iPad6,12"): "Apple A9 (2) @ 1.85GHz" ;; + "iPhone9,"[1-4] | "iPad7,"[5-6]): "Apple A10 Fusion (4) @ 2.34GHz" ;; + "iPhone10,"[1-6]): "Apple A11 (6) @ 2.39GHz" ;; + "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8" | "iPad11,"[1-4]): "Apple A12 (6) @ 2.49GHz" ;; "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; "iPod3,1"): "Samsung S5L8922 (1) @ 600MHz" ;; "iPod7,1"): "Apple A8 (2) @ 1.1GHz" ;; @@ -1888,6 +1898,8 @@ get_cpu() { "iPad5,"[3-4]): "Apple A8X (3) @ 1.5GHz" ;; "iPad6,"[3-4]): "Apple A9X (2) @ 2.16GHz" ;; "iPad6,"[7-8]): "Apple A9X (2) @ 2.26GHz" ;; + "iPad7,"[1-4]): "Apple A10X (6) @ 2.39GHz" ;; + "iPad8,"[1-8]): "Apple A12X (8) @ 2.49GHz" ;; esac cpu="$_" ;; @@ -2183,7 +2195,6 @@ get_gpu() { case "$kernel_machine" in "iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;; "iPhone5,"[1-4]): "PowerVR SGX543MP3" ;; - "iPhone8,"[1-4]): "PowerVR GT7600" ;; "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; "iPad5,"[3-4]): "PowerVR GXA6850" ;; @@ -2205,6 +2216,18 @@ get_gpu() { : "PowerVR GX6450" ;; + "iPhone8,"[1-4] | "iPad6,11" | "iPad6,12") + : "PowerVR GT7600" + ;; + + "iPhone9,"[1-4] | "iPad7,"[5-6]) + : "PowerVR GT7600 Plus" + ;; + + "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8") + : "G11P" + ;; + "iPod1,1" | "iPod2,1") : "PowerVR MBX Lite" ;; From c17173a93bf29cd9058a81d5bb3e5e33d5a137cd Mon Sep 17 00:00:00 2001 From: jkhsjdhjs Date: Tue, 16 Apr 2019 04:13:34 +0200 Subject: [PATCH 0694/1133] shorten too long line --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 30d7408ba..8c8fcd466 100755 --- a/neofetch +++ b/neofetch @@ -1884,7 +1884,11 @@ get_cpu() { "iPhone8,"[1-4] | "iPad6,11" | "iPad6,12"): "Apple A9 (2) @ 1.85GHz" ;; "iPhone9,"[1-4] | "iPad7,"[5-6]): "Apple A10 Fusion (4) @ 2.34GHz" ;; "iPhone10,"[1-6]): "Apple A11 (6) @ 2.39GHz" ;; - "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8" | "iPad11,"[1-4]): "Apple A12 (6) @ 2.49GHz" ;; + + "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8" | "iPad11,"[1-4]) + : "Apple A12 (6) @ 2.49GHz" + ;; + "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; "iPod3,1"): "Samsung S5L8922 (1) @ 600MHz" ;; "iPod7,1"): "Apple A8 (2) @ 1.1GHz" ;; From 3cdcfc2d45ebb9a454c375f533225ee7b3e66b45 Mon Sep 17 00:00:00 2001 From: jkhsjdhjs Date: Tue, 16 Apr 2019 15:12:18 +0200 Subject: [PATCH 0695/1133] include Fusion/Bionic in iDevice processor names --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 8c8fcd466..7ac63ed5f 100755 --- a/neofetch +++ b/neofetch @@ -1883,10 +1883,10 @@ get_cpu() { "iPhone7,"[1-2]): "Apple A8 (2) @ 1.4GHz" ;; "iPhone8,"[1-4] | "iPad6,11" | "iPad6,12"): "Apple A9 (2) @ 1.85GHz" ;; "iPhone9,"[1-4] | "iPad7,"[5-6]): "Apple A10 Fusion (4) @ 2.34GHz" ;; - "iPhone10,"[1-6]): "Apple A11 (6) @ 2.39GHz" ;; + "iPhone10,"[1-6]): "Apple A11 Bionic (6) @ 2.39GHz" ;; "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8" | "iPad11,"[1-4]) - : "Apple A12 (6) @ 2.49GHz" + : "Apple A12 Bionic (6) @ 2.49GHz" ;; "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; @@ -1902,8 +1902,8 @@ get_cpu() { "iPad5,"[3-4]): "Apple A8X (3) @ 1.5GHz" ;; "iPad6,"[3-4]): "Apple A9X (2) @ 2.16GHz" ;; "iPad6,"[7-8]): "Apple A9X (2) @ 2.26GHz" ;; - "iPad7,"[1-4]): "Apple A10X (6) @ 2.39GHz" ;; - "iPad8,"[1-8]): "Apple A12X (8) @ 2.49GHz" ;; + "iPad7,"[1-4]): "Apple A10X Fusion (6) @ 2.39GHz" ;; + "iPad8,"[1-8]): "Apple A12X Bionic (8) @ 2.49GHz" ;; esac cpu="$_" ;; From ff53d8d30bc752e853f53ed476e5b89e329ca107 Mon Sep 17 00:00:00 2001 From: jkhsjdhjs Date: Wed, 17 Apr 2019 13:03:36 +0200 Subject: [PATCH 0696/1133] get_cpu, get_gpu, get_model: shorten iPhone OS cases --- neofetch | 41 +++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 24 deletions(-) diff --git a/neofetch b/neofetch index 7ac63ed5f..2daf4e049 100755 --- a/neofetch +++ b/neofetch @@ -1085,6 +1085,7 @@ get_model() { "iPad2,"[1-4]): "iPad 2" ;; "iPad3,"[1-3]): "iPad 3" ;; "iPad3,"[4-6]): "iPad 4" ;; + "iPad6,1"[12]): "iPad 5" ;; "iPad7,"[5-6]): "iPad 6" ;; "iPad4,"[1-3]): "iPad Air" ;; "iPad5,"[3-4]): "iPad Air 2" ;; @@ -1101,10 +1102,6 @@ get_model() { "iPad5,"[1-2]): "iPad mini 4" ;; "iPad11,"[1-2]): "iPad mini 5" ;; - "iPad6,11" | "iPad 6,12") - : "iPad 5" - ;; - "iPhone1,1"): "iPhone" ;; "iPhone1,2"): "iPhone 3G" ;; "iPhone2,1"): "iPhone 3GS" ;; @@ -1118,16 +1115,15 @@ get_model() { "iPhone8,1"): "iPhone 6s" ;; "iPhone8,2"): "iPhone 6s Plus" ;; "iPhone8,4"): "iPhone SE" ;; + "iPhone9,"[13]): "iPhone 7" ;; + "iPhone9,"[24]): "iPhone 7 Plus" ;; + "iPhone10,"[14]): "iPhone 8" ;; + "iPhone10,"[25]): "iPhone 8 Plus" ;; + "iPhone10,"[36]): "iPhone X" ;; "iPhone11,2"): "iPhone XS" ;; + "iPhone11,"[46]): "iPhone XS Max" ;; "iPhone11,8"): "iPhone XR" ;; - "iPhone9,1" | "iPhone9,3"): "iPhone 7" ;; - "iPhone9,2" | "iPhone9,4"): "iPhone 7 Plus" ;; - "iPhone10,1" | "iPhone10,4"): "iPhone 8" ;; - "iPhone10,2" | "iPhone10,5"): "iPhone 8 Plus" ;; - "iPhone10,3" | "iPhone10,6"): "iPhone X" ;; - "iPhone11,4" | "iPhone11,6"): "iPhone XS Max" ;; - "iPod1,1"): "iPod touch" ;; "ipod2,1"): "iPod touch 2G" ;; "ipod3,1"): "iPod touch 3G" ;; @@ -1881,11 +1877,11 @@ get_cpu() { "iPhone5,"[1-4]): "Apple A6 (2) @ 1.3GHz" ;; "iPhone6,"[1-2]): "Apple A7 (2) @ 1.3GHz" ;; "iPhone7,"[1-2]): "Apple A8 (2) @ 1.4GHz" ;; - "iPhone8,"[1-4] | "iPad6,11" | "iPad6,12"): "Apple A9 (2) @ 1.85GHz" ;; + "iPhone8,"[1-4] | "iPad6,1"[12]): "Apple A9 (2) @ 1.85GHz" ;; "iPhone9,"[1-4] | "iPad7,"[5-6]): "Apple A10 Fusion (4) @ 2.34GHz" ;; "iPhone10,"[1-6]): "Apple A11 Bionic (6) @ 2.39GHz" ;; - "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8" | "iPad11,"[1-4]) + "iPhone11,"[2468] | "iPad11,"[1-4]) : "Apple A12 Bionic (6) @ 2.49GHz" ;; @@ -2197,12 +2193,13 @@ get_gpu() { "iPhone OS") case "$kernel_machine" in - "iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;; - "iPhone5,"[1-4]): "PowerVR SGX543MP3" ;; - "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; - "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; - "iPad5,"[3-4]): "PowerVR GXA6850" ;; - "iPad6,"[3-8]): "PowerVR 7XT" ;; + "iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;; + "iPhone5,"[1-4]): "PowerVR SGX543MP3" ;; + "iPhone11,"[2468]): "G11P" ;; + "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; + "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; + "iPad5,"[3-4]): "PowerVR GXA6850" ;; + "iPad6,"[3-8]): "PowerVR 7XT" ;; "iPhone2,1" | "iPhone3,"[1-3] | "iPod3,1" | "iPod4,1" | "iPad1,1") : "PowerVR SGX535" @@ -2220,7 +2217,7 @@ get_gpu() { : "PowerVR GX6450" ;; - "iPhone8,"[1-4] | "iPad6,11" | "iPad6,12") + "iPhone8,"[1-4] | "iPad6,1"[12]) : "PowerVR GT7600" ;; @@ -2228,10 +2225,6 @@ get_gpu() { : "PowerVR GT7600 Plus" ;; - "iPhone11,2" | "iPhone11,4" | "iPhone11,6" | "iPhone11,8") - : "G11P" - ;; - "iPod1,1" | "iPod2,1") : "PowerVR MBX Lite" ;; From 78b9d3e16093971a690ce6d951646d0edb494185 Mon Sep 17 00:00:00 2001 From: Ciriaco Garcia de Celis Date: Fri, 26 Apr 2019 01:31:58 +0200 Subject: [PATCH 0697/1133] support uptime from Android 9+ --- neofetch | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 55e53238b..9b40412de 100755 --- a/neofetch +++ b/neofetch @@ -1211,8 +1211,14 @@ get_uptime() { # Get uptime in seconds. case "$os" in "Linux" | "Windows" | "MINIX") - seconds="$(< /proc/uptime)" - seconds="${seconds/.*}" + if [ -f /proc/uptime ]; then + seconds="$(< /proc/uptime)" + seconds="${seconds/.*}" + else # Android >= 9 denies /proc/uptime access + boot=$(date -d"$(uptime -s)" +%s) \ + && now="$(date +%s)" \ + && seconds="$((now - boot))" + fi ;; "Mac OS X" | "iPhone OS" | "BSD" | "FreeMiNT") From c5f3f7626a9b1d9b663cd19c994245f8674c77f1 Mon Sep 17 00:00:00 2001 From: Ciriaco Garcia de Celis Date: Fri, 26 Apr 2019 01:47:05 +0200 Subject: [PATCH 0698/1133] give precedence to "Hardware" entry in /proc/cpuinfo --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 55e53238b..bb4dd2a46 100755 --- a/neofetch +++ b/neofetch @@ -1816,9 +1816,9 @@ get_cpu() { ;; *) - cpu="$(awk -F ': | @' \ + cpu="$(awk -F '\\s*: | @' \ '/model name|Hardware|Processor|^cpu model|chip type|^cpu type/ { - printf $2; exit}' "$cpu_file")" + cpu=$2; if ($1 == "Hardware") exit } END { print cpu }' "$cpu_file")" ;; esac From 7c976754e18daf15642ac1414449ff932eebd133 Mon Sep 17 00:00:00 2001 From: Mark Greaves Date: Tue, 30 Apr 2019 14:56:37 +0100 Subject: [PATCH 0699/1133] New Peppermint Logo Edited ASCII artwork for Peppermint with our new logo --- neofetch | 44 +++++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/neofetch b/neofetch index b1ae7f4b4..6e7c60c57 100755 --- a/neofetch +++ b/neofetch @@ -7551,27 +7551,29 @@ EOF ;; "Peppermint"*) - set_colors 1 7 3 - read -rd '' ascii_data <<'EOF' -${c1} 8ZZZZZZ${c2}MMMMM -${c1} .ZZZZZZZZZ${c2}MMMMMMM. -${c2} MM${c1}ZZZZZZZZZ${c2}MMMMMMM${c1}ZZZZ -${c2} MMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}ZZZZZZZM -${c2} MMMMMMM${c1}ZZZZZZZ${c2}MMMM${c1}ZZZZZZZZZ. -${c2} MMMMMMMMM${c1}ZZZZZZ${c2}MMM${c1}ZZZZZZZZZZZI -${c2}MMMMMMMMMMM${c1}ZZZZZZ${c2}MM${c1}ZZZZZZZZZZ${c2}MMM -${c1}.ZZZ${c2}MMMMMMMMMM${c1}IZZ${c2}MM${c1}ZZZZZ${c2}MMMMMMMMM -${c1}ZZZZZZZ${c2}MMMMMMMM${c1}ZZ${c2}M${c1}ZZZZ${c2}MMMMMMMMMMM -${c1}ZZZZZZZZZZZZZZZZ${c2}M${c1}Z${c2}MMMMMMMMMMMMMMM -${c1}.ZZZZZZZZZZZZZ${c2}MMM${c1}Z${c2}M${c1}ZZZZZZZZZZ${c2}MMMM -${c1}.ZZZZZZZZZZZ${c2}MMM${c1}7ZZ${c2}MM${c1}ZZZZZZZZZZ7${c2}M -${c1} ZZZZZZZZZ${c2}MMMM${c1}ZZZZ${c2}MMMM${c1}ZZZZZZZ77 -${c2} MMMMMMMMMMMM${c1}ZZZZZ${c2}MMMM${c1}ZZZZZ77 -${c2} MMMMMMMMMM${c1}7ZZZZZZ${c2}MMMMM${c1}ZZ77 -${c2} .MMMMMMM${c1}ZZZZZZZZ${c2}MMMMM${c1}Z7Z -${c2} MMMMM${c1}ZZZZZZZZZ${c2}MMMMMMM -${c1} NZZZZZZZZZZZ${c2}MMMMM -${c1} ZZZZZZZZZ${c2}MM) + set_colors 1 15 3 + read -rd '' ascii_data <<'EOF' +${c1} PPPPPPPPPPPPPP +${c1} PPPP${c2}MMMMMMM${c1}PPPPPPPPPPP +${c1} PPPP${c2}MMMMMMMMMM${c1}PPPPPPPP${c2}MM${c1}PP +${c1} PPPPPPPP${c2}MMMMMMM${c1}PPPPPPPP${c2}MMMMM${c1}PP +${c1} PPPPPPPPPPPP${c2}MMMMMM${c1}PPPPPPP${c2}MMMMMMM${c1}PP +${c1} PPPPPPPPPPPP${c2}MMMMMMM${c1}PPPP${c2}M${c1}P${c2}MMMMMMMMM${c1}PP +${c1} PP${c2}MMMM${c1}PPPPPPPPPP${c2}MMM${c1}PPPPP${c2}MMMMMMM${c1}P${c2}MM${c1}PPPP +${c1} P${c2}MMMMMMMMMM${c1}PPPPPP${c2}MM${c1}PPPPP${c2}MMMMMM${c1}PPPPPPPP +${c1} P${c2}MMMMMMMMMMMM${c1}PPPPP${c2}MM${c1}PP${c2}M${c1}P${c2}MM${c1}P${c2}MM${c1}PPPPPPPPPPP +${c1} P${c2}MMMMMMMMMMMMMMMM${c1}PP${c2}M${c1}P${c2}MMM${c1}PPPPPPPPPPPPPPPP +${c1} P${c2}MMM${c1}PPPPPPPPPPPPPPPPPPPPPPPPPPPPPP${c2}MMMMM${c1}P +${c1} PPPPPPPPPPPPPPPP${c2}MMM${c1}P${c2}M${c1}P${c2}MMMMMMMMMMMMMMMM${c1}PP +${c1} PPPPPPPPPPP${c2}MM${c1}P${c2}MM${c1}PPPP${c2}MM${c1}PPPPP${c2}MMMMMMMMMMM${c1}PP +${c1} PPPPPPPP${c2}MMMMMM${c1}PPPPP${c2}MM${c1}PPPPPP${c2}MMMMMMMMM${c1}PP +${c1} PPPP${c2}MM${c1}P${c2}MMMMMMM${c1}PPPPPP${c2}MM${c1}PPPPPPPPPP${c2}MMMM${c1}PP +${c1} PP${c2}MMMMMMMMM${c1}P${c2}M${c1}PPPP${c2}MMMMMM${c1}PPPPPPPPPPPPP +${c1} PP${c2}MMMMMMM${c1}PPPPPPP${c2}MMMMMM${c1}PPPPPPPPPPPP +${c1} PP${c2}MMMM${c1}PPPPPPPPP${c2}MMMMMMM${c1}PPPPPPPP +${c1} PP${c2}MM${c1}PPPPPPPP${c2}MMMMMMMMMM${c1}PPPP +${c1} PPPPPPPPPP${c2}MMMMMMMM${c1}PPPP +${c1} PPPPPPPPPPPPPP EOF ;; From 83925702fc26785f27e5b2b6bf49cdfbabb86838 Mon Sep 17 00:00:00 2001 From: spacelike Date: Tue, 30 Apr 2019 07:38:14 -0600 Subject: [PATCH 0700/1133] Use guix directly to report package count instead of counting directories --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6e7c60c57..b9719687d 100755 --- a/neofetch +++ b/neofetch @@ -1331,7 +1331,6 @@ get_packages() { { has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ has "nix-env" && dir ${br_prefix}/nix/store/*/ - has "guix" && dir ${br_prefix}/gnu/store/*/ has "Compile" && dir ${br_prefix}/Programs/*/ has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* has "crew" && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist @@ -1342,6 +1341,7 @@ get_packages() { # Other (Needs complex command) has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) + has "guix" && ( manager="guix-system" && tot guix package -p /run/current-system/profile -I ; manager="guix-user" && tot guix package -I ) # pkginfo is also the name of a python package manager which is painfully slow. # TODO: Fix this somehow. From 619ebdacd6a1f4c9dfb9e5643716374cb65afbee Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Wed, 1 May 2019 07:26:04 +0700 Subject: [PATCH 0701/1133] Packages [Guix/Nix]: Use if for detecting system and user packages --- neofetch | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index b9719687d..92a38a696 100755 --- a/neofetch +++ b/neofetch @@ -1330,7 +1330,6 @@ get_packages() { # shellcheck disable=SC2086 { has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ - has "nix-env" && dir ${br_prefix}/nix/store/*/ has "Compile" && dir ${br_prefix}/Programs/*/ has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* has "crew" && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist @@ -1341,7 +1340,16 @@ get_packages() { # Other (Needs complex command) has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) - has "guix" && ( manager="guix-system" && tot guix package -p /run/current-system/profile -I ; manager="guix-user" && tot guix package -I ) + + if has "guix"; then + manager="guix-system" && tot guix package -p "/run/current-system/profile" -I + manager="guix-user" && tot guix package -I + fi + + if has "nix-store"; then + manager="nix-system" && tot nix-store -q --requisites "/run/current-system/sw" + manager="nix-user" && tot nix-store -q --requisites "$HOME/.nix-profile" + fi # pkginfo is also the name of a python package manager which is painfully slow. # TODO: Fix this somehow. @@ -1371,7 +1379,11 @@ get_packages() { has "port" && tot port installed && ((packages-=1)) has "brew" && dir /usr/local/Cellar/* has "pkgin" && tot pkgin list - has "nix-env" && dir /nix/store/*/ + + if has "nix-store"; then + manager="nix-system" && tot nix-store -q --requisites "/run/current-system/sw" + manager="nix-user" && tot nix-store -q --requisites "$HOME/.nix-profile" + fi ;; "AIX"| "FreeMiNT") @@ -1415,7 +1427,6 @@ get_packages() { fi packages="${packages/pacman-key/pacman}" - packages="${packages/nix-env/nix}" } get_shell() { From c1ddea8edd8077ba85728735fe94cd3b5936fec1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 1 May 2019 10:08:34 +0300 Subject: [PATCH 0702/1133] ascii: Fix void. Closes #1244 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 92a38a696..4742870af 100755 --- a/neofetch +++ b/neofetch @@ -8638,7 +8638,7 @@ ${c1} __.;=====;.__ _vi, ` --+=++++: .uvnvi. _._ -==+==+. .vvnvnI` .;==|==;. :|=||=|. -${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQmL +${c2}+QmQQm${c1}pvvnv; ${c2}_yYsyQQWUUQQQm #QmQ#${c1}:${c2}QQQWUV$QQm. ${c2} -QQWQW${c1}pvvo${c2}wZ?.wQQQE${c1}==<${c2}QWWQ/QWQW.QQWW${c1}(: ${c2}jQWQE ${c2} -$QQQQmmU' jQQQ@${c1}+=<${c2}QWQQ)mQQQ.mQQQC${c1}+;${c2}jWQQ@' ${c2} -$WQ8Y${c1}nI: ${c2}QWQQwgQQWV${c1}`${c2}mWQQ.jQWQQgyyWW@! From c7685b4cfb993702e8dca52cf58a549e0136fdc1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 1 May 2019 10:46:34 +0300 Subject: [PATCH 0703/1133] config: Show 15 color blocks by default. Closes #1224 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 4742870af..d00a6ce72 100755 --- a/neofetch +++ b/neofetch @@ -564,7 +564,7 @@ separator=":" # Color block range # The range of colors to print. # -# Default: '0', '7' +# Default: '0', '15' # Values: 'num' # Flag: --block_range # @@ -575,7 +575,7 @@ separator=":" # # Display colors 0-15 in the blocks. (16 colors) # neofetch --block_range 0 15 -block_range=(0 7) +block_range=(0 15) # Toggle color blocks # From c86413c18ada1655ec4131f493254ee71e06530c Mon Sep 17 00:00:00 2001 From: Ciriaco Garcia de Celis Date: Wed, 1 May 2019 12:04:44 +0200 Subject: [PATCH 0704/1133] uptime for Android 9+ (refactorized) --- neofetch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 9b40412de..496af9465 100755 --- a/neofetch +++ b/neofetch @@ -1211,13 +1211,13 @@ get_uptime() { # Get uptime in seconds. case "$os" in "Linux" | "Windows" | "MINIX") - if [ -f /proc/uptime ]; then + if [[ -r /proc/uptime ]]; then seconds="$(< /proc/uptime)" seconds="${seconds/.*}" - else # Android >= 9 denies /proc/uptime access - boot=$(date -d"$(uptime -s)" +%s) \ - && now="$(date +%s)" \ - && seconds="$((now - boot))" + else + boot="$(date -d"$(uptime -s)" +%s)" + now="$(date +%s)" + seconds="$((now - boot))" fi ;; From ad16b5925c7eae850d8324417a9a6e1d873f8b35 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 1 May 2019 13:34:42 +0300 Subject: [PATCH 0705/1133] song: Added support for plasma-browser-integration --- neofetch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d00a6ce72..9cf0d249f 100755 --- a/neofetch +++ b/neofetch @@ -2426,6 +2426,7 @@ get_song() { "mopidy" "mpd" "netease-cloud-music" + "plasma-browser-integration" "pogo" "pragha" "qmmp" @@ -2486,7 +2487,8 @@ get_song() { "smplayer"*) get_song_dbus "smplayer" ;; "rhythmbox"*) get_song_dbus "rhythmbox" ;; "strawberry"*) get_song_dbus "strawberry" ;; - "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; + "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; + "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; "cmus"*) song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; From 3f13df386c0ae426e15e2b75358b3da1c7f412b7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 2 May 2019 16:22:41 +0300 Subject: [PATCH 0706/1133] underline: Fix bugs with incorrect lengths --- neofetch | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 9cf0d249f..7af1b3b74 100755 --- a/neofetch +++ b/neofetch @@ -3939,13 +3939,10 @@ prin() { string="${2:-$1}" local subtitle_color="$info_color" fi - string="$(trim "${string//$'\e[0m'}")" - # Log length if it doesn't exist. - if [[ -z "$length" ]]; then - length="$(strip_sequences "$string")" - length="${#length}" - fi + string="$(trim "${string//$'\e[0m'}")" + length="$(strip_sequences "$string")" + length="${#length}" # Format the output. string="${string/:/${reset}${colon_color}${separator:=:}${info_color}}" @@ -3962,14 +3959,14 @@ prin() { } get_underline() { - if [[ "$underline_enabled" == "on" ]]; then + [[ "$underline_enabled" == "on" ]] && { printf -v underline "%${length}s" printf '%b%b\n' "${text_padding:+\e[${text_padding}C}${zws}${underline_color}" \ "${underline// /$underline_char}${reset} " - unset -v length - fi + } ((++info_height)) + length= prin=1 } @@ -4001,6 +3998,8 @@ trim_quotes() { strip_sequences() { strip="${1//$'\e['3[0-9]m}" + strip="${strip//$'\e['[0-9]m}" + strip="${strip//\\e\[[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}" From 836197fc2e24ee0b7d63b358c77100eea80c42af Mon Sep 17 00:00:00 2001 From: edward-p Date: Fri, 3 May 2019 02:27:59 +0800 Subject: [PATCH 0707/1133] make some changes --- neofetch | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 27ce9b0bb..fb94116fd 100755 --- a/neofetch +++ b/neofetch @@ -2684,12 +2684,8 @@ get_style() { # Check for general GTK2 Theme. if [[ -z "$gtk2_theme" ]]; then if [[ -n "${GTK2_RC_FILES}" ]]; then - for gtkrc in ${GTK2_RC_FILES//:/ }; do - _gtk2_theme="$(grep "^[^#]*${name}" "${gtkrc}")" - [[ -n "${_gtk2_theme}" ]] && gtk2_theme="${_gtk2_theme}" - done - unset _gtk2_theme - + IFS=: read -ra rc_files <<< "$GTK2_RC_FILES" + gtk2_theme="$(grep "^[^#]*${name}" "${rc_files[@]}")" elif [[ -f "${HOME}/.gtkrc-2.0" ]]; then gtk2_theme="$(grep "^[^#]*${name}" "${HOME}/.gtkrc-2.0")" @@ -2701,7 +2697,7 @@ get_style() { fi - gtk2_theme="${gtk2_theme/${name}*=}" + gtk2_theme="${gtk2_theme/*${name}*=}" fi # Check for general GTK3 Theme. From d128f1cf1e95b06d89a0a43328e582e05c456313 Mon Sep 17 00:00:00 2001 From: edward-p Date: Fri, 3 May 2019 16:28:22 +0800 Subject: [PATCH 0708/1133] use "$GTK2_RC_FILES" --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index fb94116fd..60c5cbe29 100755 --- a/neofetch +++ b/neofetch @@ -2683,7 +2683,7 @@ get_style() { # Check for general GTK2 Theme. if [[ -z "$gtk2_theme" ]]; then - if [[ -n "${GTK2_RC_FILES}" ]]; then + if [[ -n "$GTK2_RC_FILES" ]]; then IFS=: read -ra rc_files <<< "$GTK2_RC_FILES" gtk2_theme="$(grep "^[^#]*${name}" "${rc_files[@]}")" elif [[ -f "${HOME}/.gtkrc-2.0" ]]; then From 77c4e7d799994b7d973a1b0d583db9cf91103a15 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 4 May 2019 16:56:36 +0200 Subject: [PATCH 0709/1133] song: add gogglesmm --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 776167d63..50350aed6 100755 --- a/neofetch +++ b/neofetch @@ -449,6 +449,7 @@ disk_subtitle="mount" # exaile # gnome-music # gmusicbrowser +# gogglesmm # guayadeque # iTunes # juk @@ -2424,6 +2425,7 @@ get_song() { "exaile" "gnome-music" "gmusicbrowser" + "gogglesmm" "guayadeque" "iTunes" "juk" @@ -2493,6 +2495,7 @@ get_song() { "smplayer"*) get_song_dbus "smplayer" ;; "rhythmbox"*) get_song_dbus "rhythmbox" ;; "strawberry"*) get_song_dbus "strawberry" ;; + "gogglesmm"*) get_song_dbus "gogglesmm" ;; "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; From 497dd4303ec3fb484620a265b365df665c566942 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 4 May 2019 17:00:49 +0200 Subject: [PATCH 0710/1133] song: add xnoise --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 50350aed6..fbc287333 100755 --- a/neofetch +++ b/neofetch @@ -470,6 +470,7 @@ disk_subtitle="mount" # tomahawk # vlc # xmms2d +# xnoise # yarock music_player="auto" @@ -2448,6 +2449,7 @@ get_song() { "tomahawk" "vlc" "xmms2d" + "xnoise" "yarock" ) @@ -2496,6 +2498,7 @@ get_song() { "rhythmbox"*) get_song_dbus "rhythmbox" ;; "strawberry"*) get_song_dbus "strawberry" ;; "gogglesmm"*) get_song_dbus "gogglesmm" ;; + "xnoise"*) get_song_dbus "xnoise" ;; "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; From de99d9b0e458ffe776f7fc39678f1c721a499bfa Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 May 2019 19:48:13 +0300 Subject: [PATCH 0711/1133] os: Fix HAIKU issues --- neofetch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/neofetch b/neofetch index 3d5f1d510..2331d93f4 100755 --- a/neofetch +++ b/neofetch @@ -1189,6 +1189,12 @@ get_kernel() { # Since these OS are integrated systems, it's better to skip this function altogether [[ "$os" =~ (AIX|IRIX) ]] && return + # Haiku uses 'uname -v' and not - 'uname -r'. + [[ "$os" == HAIKU ]] && { + kernel=$(uname -v) + return + } + case "$kernel_shorthand" in "on") kernel="$kernel_version" ;; "off") kernel="$kernel_name $kernel_version" ;; @@ -1413,6 +1419,7 @@ get_packages() { "Haiku") has "pkgman" && dir /boot/system/package-links/* + packages=${packages/pkgman/depot} ;; "IRIX") From bbc492aac157b14960899b1c56d6cb053e9cf5ac Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 May 2019 19:48:37 +0300 Subject: [PATCH 0712/1133] os: Fix HAIKU issues --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2331d93f4..ec48eff63 100755 --- a/neofetch +++ b/neofetch @@ -1190,7 +1190,7 @@ get_kernel() { [[ "$os" =~ (AIX|IRIX) ]] && return # Haiku uses 'uname -v' and not - 'uname -r'. - [[ "$os" == HAIKU ]] && { + [[ "$os" == Haiku ]] && { kernel=$(uname -v) return } From 7fc0b07cc4d8a874c6d60f470f4d82b8f51d110b Mon Sep 17 00:00:00 2001 From: Brad Smith Date: Wed, 8 May 2019 11:23:47 -0400 Subject: [PATCH 0713/1133] update Red Hat with new 2019 logo --- neofetch | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 250ad1712..8f84afe1d 100755 --- a/neofetch +++ b/neofetch @@ -7898,24 +7898,26 @@ EOF ;; "Redhat"* | "Red Hat"* | "rhel"*) - set_colors 1 7 3 + set_colors 1 read -rd '' ascii_data <<'EOF' -${c1} `.-..........` - `////////::.`-/. - -: ....-////////. - //:-::///////////` - `--::: `-://////////////: - //////- ``.-:///////// .` - `://////:-.` :///////::///:` - .-/////////:---/////////////: - .-://////////////////////. -${c2} yMN+`.-${c1}::///////////////-` -${c2} .-`:NMMNMs` `..-------..` - MN+/mMMMMMhoooyysshsss -MMM MMMMMMMMMMMMMMyyddMMM+ - MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM - MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM - MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM +${c1} .MMM..:MMMMMMM + MMMMMMMMMMMMMMMMMM + MMMMMMMMMMMMMMMMMMMM. + MMMMMMMMMMMMMMMMMMMMMM + ,MMMMMMMMMMMMMMMMMMMMMM: + MMMMMMMMMMMMMMMMMMMMMMMM + .MMMM' MMMMMMMMMMMMMMMMMMMMMM + MMMMMM `MMMMMMMMMMMMMMMMMMMM. +MMMMMMMM MMMMMMMMMMMMMMMMMM . +MMMMMMMMM. `MMMMMMMMMMMMM' MM. +MMMMMMMMMMM. MMMM +`MMMMMMMMMMMMM. ,MMMMM. + `MMMMMMMMMMMMMMMMM. ,MMMMMMMM. + MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM + MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM: + MMMMMMMMMMMMMMMMMMMMMMMMMMMMMM + `MMMMMMMMMMMMMMMMMMMMMMMM: + ``MMMMMMMMMMMMMMMMM' EOF ;; From 757a673252b75de10ec2afc89dea4fc24a7df3be Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 8 May 2019 21:25:30 +0300 Subject: [PATCH 0714/1133] ascii: Add back old redhat logo (--ascii_distro redhat_old). --- neofetch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/neofetch b/neofetch index 8f84afe1d..0c7d24fb4 100755 --- a/neofetch +++ b/neofetch @@ -7897,6 +7897,28 @@ RRRR RRRRRRRRRRRRRRRRRRR R RRRR EOF ;; + "redhat_old") + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} `.-..........` + `////////::.`-/. + -: ....-////////. + //:-::///////////` + `--::: `-://////////////: + //////- ``.-:///////// .` + `://////:-.` :///////::///:` + .-/////////:---/////////////: + .-://////////////////////. +${c2} yMN+`.-${c1}::///////////////-` +${c2} .-`:NMMNMs` `..-------..` + MN+/mMMMMMhoooyysshsss +MMM MMMMMMMMMMMMMMyyddMMM+ + MMMM MMMMMMMMMMMMMNdyNMMh` hyhMMM + MMMMMMMMMMMMMMMMyoNNNMMM+. MMMMMMMM + MMNMMMNNMMMMMNM+ mhsMNyyyyMNMMMMsMM +EOF + ;; + "Redhat"* | "Red Hat"* | "rhel"*) set_colors 1 read -rd '' ascii_data <<'EOF' From 4b399f06a2e200eccce60414a0fc8c40dbbef290 Mon Sep 17 00:00:00 2001 From: Ishimoto Shinobu Date: Fri, 10 May 2019 21:59:38 +0900 Subject: [PATCH 0715/1133] januslinux is ataraxia linux! Signed-off-by: Ishimoto Shinobu --- neofetch | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/neofetch b/neofetch index 250ad1712..c70a20fea 100755 --- a/neofetch +++ b/neofetch @@ -6437,25 +6437,33 @@ WW W EOF ;; - "januslinux"*|"janus"*) - set_colors 4 7 4 - read -rd '' ascii_data <<'EOF' -${c1}oooooooooooooooooooooooooooooooo -oooooooooooooooooooooooooooooooo -oooooooooooooooooooooooooooooooo -ooooooooooooo${c2}dOWWOd${c1}ooooooooooooo -oooooooooood${c2}0WMMMMWkd${c1}ooooooooooo -oooooooood${c2}0WMMMMMX0KN0d${c1}oooolllll -ooooooo${c2}xKWMMMMWKxKWMMMWKx${c3}lllllll -ooooo${c2}xXMMMMMW0doooOWMMMMMXx${c3}lllll -ooooo${c2}xXMMMMMW0doloONMMMMMXx${c3}lllll -ooooooo${c2}xKWMMMWXO0WMMMMMKx${c3}lllllll -ooooooooo${c2}d0NX0KWMMMMW0d${c3}lllllllll -oooooooooooo${c2}xWMMMMW0o${c3}llllllccccc -oooooooooooll${c2}o0WW0o${c3}lllllcccccccc -ooooooooooollll${c2}oo${c3}llllllccccccccc -oooooooooollllllllllllcccccccccc -oooooooooollllllllllllcccccccccc + "januslinux"*|"janus"*|"Ataraxia Linux"*|"Ataraxia"*) + set_colors 4 5 6 2 + read -rd '' ascii_data <<'EOF' +${c1} 'l: + loooooo + loooo coooool + looooooooooooooooooool + looooooooooooooooo + lool cooo + coooooooloooooooo + clooooo ;lood cloooo + :loooocooo cloo loooo + loooo :ooooool loooo +looo cooooo cooooo +looooooooooooo ;loooooo ${c2}looooooc +${c1}looooooooo loo cloooooool ${c2}looooc +${c1} cooo cooooooooooo ${c2}looolooooool +${c1} cooo: ${c2}coooooooooooooooooool + loooooooooooolc: loooc; + cooo: loooooooooooc + ;oool looooooo: + coool olc, + looooc ,, + coooooc loc + :oooool, coool:, looool:, + looool: ooooooooooooooo: + cooolc .ooooooooooool EOF ;; From 85c6a5dd16ac54b350255acdbf3b3122b2bd358a Mon Sep 17 00:00:00 2001 From: Vlad Glagolev Date: Tue, 14 May 2019 06:33:24 +0000 Subject: [PATCH 0716/1133] Retrieve public IP info via drill --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index 2064d9d07..3bd821fed 100755 --- a/neofetch +++ b/neofetch @@ -3371,6 +3371,11 @@ get_public_ip() { [[ "$public_ip" =~ ^\; ]] && unset public_ip fi + if [[ -z "$public_ip" ]] && type -p drill >/dev/null; then + public_ip="$(drill myip.opendns.com @resolver1.opendns.com | \ + awk '/^myip\./ && $3 == "IN" {print $5}')" + fi + if [[ -z "$public_ip" ]] && type -p curl >/dev/null; then public_ip="$(curl --max-time "$public_ip_timeout" -w '\n' "$public_ip_host")" fi From accccca8e9039d7bfbcf1d8871d64049d3e1f4cb Mon Sep 17 00:00:00 2001 From: Lucius Hu Date: Mon, 3 Jun 2019 00:23:05 -0400 Subject: [PATCH 0717/1133] kitty font parsing where font name has whitespaces --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 3bd821fed..cb4b9fe41 100755 --- a/neofetch +++ b/neofetch @@ -2981,7 +2981,7 @@ END kitty_config="$(kitty --debug-config)" [[ "$kitty_config" != *font_family* ]] && return - term_font="$(awk '/^font_family|^font_size/ {printf $2 " "}' <<< "$kitty_config")" + term_font="$(awk '/^font_family|^font_size/ {$1="";gsub("^ *","",$0);print $0}' <<< "$kitty_config")" ;; "konsole" | "yakuake") From b58942d6c6229c5dcac7c3914b1f9b161b8721bc Mon Sep 17 00:00:00 2001 From: Lucius Hu Date: Mon, 3 Jun 2019 03:38:30 -0400 Subject: [PATCH 0718/1133] Work for multiple GPUs now 1. Replace `\\"` with `\"`, otherwise awk warns `\"' is not a known regexp operator 2. Use the slot number of `lspci -mm` return value to determine whether two video cards are in different PCI slots, and therefore are two different GPUS. --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 3bd821fed..2ca108805 100755 --- a/neofetch +++ b/neofetch @@ -2135,9 +2135,9 @@ get_gpu() { case "$os" in "Linux") # Read GPUs into array. - gpu_cmd="$(lspci -mm | awk -F '\\"|\\" \\"|\\(' \ - '/"Display|"3D|"VGA/ {a[$0] = $3 " " $4} END {for(i in a) - {if(!seen[a[i]]++) print a[i]}}')" + gpu_cmd="$(lspci -mm | awk -F '\"|\" \"|\\(' \ + '/"Display|"3D|"VGA/ {a[$0] = $1 " " $3 " " $4} + END {for(i in a) {if(!seen[a[i]]++) print a[i]}}')" IFS=$'\n' read -d "" -ra gpus <<< "$gpu_cmd" # Remove duplicate Intel Graphics outputs. From f3dbd54a6b0ddb9364008073baf1ddade14bf3b7 Mon Sep 17 00:00:00 2001 From: Lucius Hu Date: Fri, 7 Jun 2019 02:56:57 -0400 Subject: [PATCH 0719/1133] make line below 100 columns --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index cb4b9fe41..6058b2e05 100755 --- a/neofetch +++ b/neofetch @@ -2981,7 +2981,8 @@ END kitty_config="$(kitty --debug-config)" [[ "$kitty_config" != *font_family* ]] && return - term_font="$(awk '/^font_family|^font_size/ {$1="";gsub("^ *","",$0);print $0}' <<< "$kitty_config")" + term_font="$(awk '/^font_family|^font_size/ {$1="";gsub("^ *","",$0);print $0}' \ + <<< "$kitty_config")" ;; "konsole" | "yakuake") From 9320275a6e06c0c5c1fcd6055b831f55a3ff70e7 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 7 Jun 2019 20:02:18 +0300 Subject: [PATCH 0720/1133] packages: Fix DragonFlyBSD. Thanks pornguy --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 0c7d24fb4..a3c30ecaf 100755 --- a/neofetch +++ b/neofetch @@ -1370,7 +1370,7 @@ get_packages() { has pkginfo && tot pkginfo -i case "$kernel_name" in - "FreeBSD") has "pkg" && tot pkg info ;; + "FreeBSD"|"DragonFly") has "pkg" && tot pkg info ;; *) has "pkg" && dir /var/db/pkg/* From 3e92b3b202657a6c259863e8bc19f86526edb210 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 12 Jun 2019 20:29:21 +0300 Subject: [PATCH 0721/1133] term: Fix wrapper scripts in NixOS. Thanks Tdeo. --- neofetch | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d02c0191c..62a420f15 100755 --- a/neofetch +++ b/neofetch @@ -2882,7 +2882,16 @@ get_term() { "urxvtd") term="urxvt" ;; *"nvim") term="Neovim Terminal" ;; *"NeoVimServer"*) term="VimR Terminal" ;; - *) term="${name##*/}" ;; + + *) + term="${name##*/}" + + # Fix wrapper names in NixOS. + [[ "$term" == .*-wrapped ]] && { + term="${term#.}" + term="${term%-wrapped}" + } + ;; esac done From 2caec13bf3f66d516d839e01f57cf706a13440fc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 12 Jun 2019 20:35:04 +0300 Subject: [PATCH 0722/1133] term: Fix wrapper scripts in NixOS. Thanks Tdeo. --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 62a420f15..34a3020ba 100755 --- a/neofetch +++ b/neofetch @@ -2887,9 +2887,9 @@ get_term() { term="${name##*/}" # Fix wrapper names in NixOS. - [[ "$term" == .*-wrapped ]] && { + [[ "$term" == .*-wrap* ]] && { term="${term#.}" - term="${term%-wrapped}" + term="${term%-wrap*}" } ;; esac From 4f727b1de3e9f42fefef4a4d77801e90156b43a8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 12 Jun 2019 20:41:12 +0300 Subject: [PATCH 0723/1133] term: Fix wrapper scripts in NixOS. Thanks Tdeo. --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 34a3020ba..f888a7450 100755 --- a/neofetch +++ b/neofetch @@ -2887,9 +2887,9 @@ get_term() { term="${name##*/}" # Fix wrapper names in NixOS. - [[ "$term" == .*-wrap* ]] && { + [[ "$distro" == NixOS* && $term == .*-* ]] && { term="${term#.}" - term="${term%-wrap*}" + term="${term%-*}" } ;; esac From c0cfcb3b36e2f265054d30977214c0aff318e070 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 12 Jun 2019 20:50:04 +0300 Subject: [PATCH 0724/1133] term: Fix wrapper scripts in NixOS. Thanks Tdeo. --- neofetch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index f888a7450..6efa8bffb 100755 --- a/neofetch +++ b/neofetch @@ -2884,12 +2884,15 @@ get_term() { *"NeoVimServer"*) term="VimR Terminal" ;; *) + # Fix issues with long process names on Linux. + [[ $os == Linux ]] && term=$(realpath "/proc/$parent/exe") + term="${name##*/}" # Fix wrapper names in NixOS. - [[ "$distro" == NixOS* && $term == .*-* ]] && { + [[ $term == .*-wrapped ]] && { term="${term#.}" - term="${term%-*}" + term="${term%-wrapped}" } ;; esac From 4ac452cc64910a7b1e93eb4e7791519664574b24 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 12 Jun 2019 20:51:56 +0300 Subject: [PATCH 0725/1133] docs: update --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6efa8bffb..f20701c92 100755 --- a/neofetch +++ b/neofetch @@ -2889,7 +2889,7 @@ get_term() { term="${name##*/}" - # Fix wrapper names in NixOS. + # Fix wrapper names in Nix. [[ $term == .*-wrapped ]] && { term="${term#.}" term="${term%-wrapped}" From 0f718d41b9a519c1c4a5dbb84fd833e83fd3853a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 13 Jun 2019 09:27:35 +0300 Subject: [PATCH 0726/1133] docs: update --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 8532bd869..581520e89 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,6 @@

- Packaging status From 2f2540bc2ebdae88bd9be104fb366781f1eeb647 Mon Sep 17 00:00:00 2001 From: Willem Mulder Date: Wed, 19 Jun 2019 19:49:55 +0200 Subject: [PATCH 0727/1133] Set nullglob for package counting This prevents package managers showing up as having installed 1 package, while it's actually 0. --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index f20701c92..042a2414d 100755 --- a/neofetch +++ b/neofetch @@ -1343,6 +1343,7 @@ get_packages() { # $br_prefix is fixed and won't change based on user input so this is safe either way. # shellcheck disable=SC2086 { + shopt -s nullglob has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ has "Compile" && dir ${br_prefix}/Programs/*/ has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* @@ -1350,6 +1351,7 @@ get_packages() { has "pkgtool" && dir ${br_prefix}/var/log/packages/* has "cave" && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ ${br_prefix}/var/db/paludis/repositories/installed/data/*/ + shopt -u nullglob } # Other (Needs complex command) From 1316df5df843fabeca511ba26188ddc7b59d7be3 Mon Sep 17 00:00:00 2001 From: Renzix Date: Thu, 20 Jun 2019 13:19:55 -0400 Subject: [PATCH 0728/1133] Moved guix check below /etc/os-release check --- neofetch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 042a2414d..efcac0d20 100755 --- a/neofetch +++ b/neofetch @@ -883,12 +883,6 @@ get_distro() { *) distro="GoboLinux $(< /etc/GoboLinuxVersion)" esac - elif type -p guix >/dev/null; then - case "$distro_shorthand" in - "on" | "tiny") distro="GuixSD" ;; - *) distro="GuixSD $(guix system -V | awk 'NR==1{printf $5}')" - esac - elif type -p crux >/dev/null; then distro="$(crux)" case "$distro_shorthand" in @@ -928,6 +922,13 @@ get_distro() { "tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;; "off") distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; esac + + elif type -p guix >/dev/null; then + case "$distro_shorthand" in + "on" | "tiny") distro="GuixSD" ;; + *) distro="GuixSD $(guix system -V | awk 'NR==1{printf $5}')" + esac + else for release_file in /etc/*-release; do distro+="$(< "$release_file")" From 177644c18e31f1b0d6de0c193841aa8e9223226d Mon Sep 17 00:00:00 2001 From: Weslly Date: Sun, 23 Jun 2019 14:31:31 -0300 Subject: [PATCH 0729/1133] WM: Add support for yabai on macOS --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index efcac0d20..311838c89 100755 --- a/neofetch +++ b/neofetch @@ -1626,11 +1626,12 @@ get_wm() { else case "$os" in "Mac OS X") - ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm')" + ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm\|[y]abai')" case "$ps_line" in *"chunkwm"*) wm="chunkwm" ;; *"kwm"*) wm="Kwm" ;; + *"yabai"*) wm="yabai" ;; *"Amethyst"*) wm="Amethyst" ;; *"Spectacle"*) wm="Spectacle" ;; *) wm="Quartz Compositor" ;; From 5e55c4dd1dcd1d233d04317b60ec41d7030a4e43 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 28 Jun 2019 14:53:34 +0300 Subject: [PATCH 0730/1133] simple: Hide stderr by default. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f20701c92..68cdbd0b9 100755 --- a/neofetch +++ b/neofetch @@ -8972,8 +8972,8 @@ main() { eval "$config" get_args "$@" - get_simple "$@" [[ "$verbose" != "on" ]] && exec 2>/dev/null + get_simple "$@" get_distro get_bold get_distro_ascii From 2da18caf958104df0f38c3e27459f09c15afd1f4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 18 Jul 2019 01:52:13 +0300 Subject: [PATCH 0731/1133] packages: Added package support for kiss --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 4c464c25e..756fa6d07 100755 --- a/neofetch +++ b/neofetch @@ -1324,6 +1324,7 @@ get_packages() { case "$os" in "Linux" | "BSD" | "iPhone OS" | "Solaris") # Package Manager Programs. + has "kiss" && tot kiss l has "pacman-key" && tot pacman -Qq --color never has "dpkg" && tot dpkg-query -f '.\n' -W has "rpm" && tot rpm -qa From 9d4855a18fd4dcbfbb334e50e31626a9d39bf1f3 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Thu, 18 Jul 2019 14:07:26 +0700 Subject: [PATCH 0732/1133] ASCII: Added Feren OS --- neofetch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/neofetch b/neofetch index 756fa6d07..814f1cead 100755 --- a/neofetch +++ b/neofetch @@ -6108,6 +6108,28 @@ ${c1} /:-------------:\\ EOF ;; + "Feren"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} `----------` + :+ooooooooo+. +-o+oooooooooo+- +..`/+++++++++++/...````````````````` + .++++++++++++++++++++++++++/////- + ++++++++++++++++++++++++++++++++//:` + -++++++++++++++++++++++++++++++/-` + ++++++++++++++++++++++++++++:. + -++++++++++++++++++++++++/. + +++++++++++++++++++++/-` + -++++++++++++++++++//-` + .:+++++++++++++//////- + .:++++++++//////////- + `-++++++---:::://///. + `.:///+++. ` + `......... +EOF + ;; + "freebsd_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' From f4cfdfa47cb519a1db825f00857ad4f21d414e20 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Thu, 18 Jul 2019 15:18:29 +0700 Subject: [PATCH 0733/1133] Linux: Move /etc/os-release directly below lsb_release We are assuming that people's /etc/os-release are standard, and any distro without it will use the "fallback" methods they have. --- neofetch | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 814f1cead..0b0507588 100755 --- a/neofetch +++ b/neofetch @@ -877,6 +877,23 @@ get_distro() { esac distro="$(lsb_release "$lsb_flags")" + elif [[ -f "/etc/os-release" || \ + -f "/usr/lib/os-release" || \ + -f "/etc/openwrt_release" ]]; then + files=("/etc/os-release" "/usr/lib/os-release" "/etc/openwrt_release") + + # Source the os-release file + for file in "${files[@]}"; do + source "$file" && break + done + + # Format the distro name. + case "$distro_shorthand" in + "on") distro="${NAME:-${DISTRIB_ID}} ${VERSION_ID:-${DISTRIB_RELEASE}}" ;; + "tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;; + "off") distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; + esac + elif [[ -f "/etc/GoboLinuxVersion" ]]; then case "$distro_shorthand" in "on" | "tiny") distro="GoboLinux" ;; @@ -906,23 +923,6 @@ get_distro() { elif [[ -f "/etc/lsb-release" && "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then distro="$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release)" - elif [[ -f "/etc/os-release" || \ - -f "/usr/lib/os-release" || \ - -f "/etc/openwrt_release" ]]; then - files=("/etc/os-release" "/usr/lib/os-release" "/etc/openwrt_release") - - # Source the os-release file - for file in "${files[@]}"; do - source "$file" && break - done - - # Format the distro name. - case "$distro_shorthand" in - "on") distro="${NAME:-${DISTRIB_ID}} ${VERSION_ID:-${DISTRIB_RELEASE}}" ;; - "tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;; - "off") distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; - esac - elif type -p guix >/dev/null; then case "$distro_shorthand" in "on" | "tiny") distro="GuixSD" ;; From 3a19c430261eed1423db229d15a56a5c75aa5589 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Thu, 18 Jul 2019 15:25:14 +0700 Subject: [PATCH 0734/1133] Linux: Update ASCII for Sailfish OS --- neofetch | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/neofetch b/neofetch index 0b0507588..31614b937 100755 --- a/neofetch +++ b/neofetch @@ -8116,24 +8116,19 @@ EOF "SailfishOS"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' -${c1} .+eWWW - .+ee+++eee e. - .ee++eeeeeeee +e. - .e++ee++eeeeeee+eee+e+ - ee.e+.ee+eee++eeeeee+ - W.+e.e+.e++ee+eee - W.+e.W.ee.W++ee' - +e.W W.e+.W.W+ - W.e.+e.W W W. - e e e +e.W.W - .W W W. - W.+e.W. - W++e.ee+. - ++ +ee++eeeee++. - ' '+++e 'ee. - ee - ee - e + _a@b + _#b (b + _@@ @_ _, + _#^@ _#*^^*gg,aa@^^ + #- @@^ _a@^^ + @_ *g#b + ^@_ ^@_ + ^@_ @ + @(b (b + #b(b#^ + _@_#@^ + _a@a*^ + ,a@*^ EOF ;; From ac610bd79b899c889eff9b1df5a05d6cb7a75d60 Mon Sep 17 00:00:00 2001 From: Ishimoto Shinobu <47295761+protonesso@users.noreply.github.com> Date: Thu, 18 Jul 2019 18:50:32 +0900 Subject: [PATCH 0735/1133] add support for kagami package manager --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 31614b937..d328fca31 100755 --- a/neofetch +++ b/neofetch @@ -1351,6 +1351,7 @@ get_packages() { has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* has "crew" && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist has "pkgtool" && dir ${br_prefix}/var/log/packages/* + has "kagami" && dir ${br_prefix}/var/lib/kagami/pkgs/* has "cave" && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ ${br_prefix}/var/db/paludis/repositories/installed/data/*/ shopt -u nullglob From 40dcf541de8de8a9815719e987a470497a0da0ff Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Thu, 18 Jul 2019 17:51:12 +0700 Subject: [PATCH 0736/1133] ASCII: Detect all of Sailfish instead of SailfishOS To maintain backward compatibility with older SailfishOS version. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d328fca31..c5ef4d298 100755 --- a/neofetch +++ b/neofetch @@ -8114,7 +8114,7 @@ ${c1} ........... EOF ;; - "SailfishOS"*) + "Sailfish"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' _a@b From 6cd7a8b1f2d0c5237067652c1792d78835fcdbde Mon Sep 17 00:00:00 2001 From: Michal-Szczepaniak Date: Thu, 18 Jul 2019 13:29:32 +0200 Subject: [PATCH 0737/1133] Linux: Fix ASCII for Sailfish OS --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c5ef4d298..df208368e 100755 --- a/neofetch +++ b/neofetch @@ -8117,7 +8117,7 @@ EOF "Sailfish"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' - _a@b +${c1} _a@b _#b (b _@@ @_ _, _#^@ _#*^^*gg,aa@^^ From 74a25bd377860454a274c03f461bddeea2b66668 Mon Sep 17 00:00:00 2001 From: The feren OS Dev Date: Thu, 18 Jul 2019 20:21:06 +0100 Subject: [PATCH 0738/1133] Small tweak to the colours used for the Feren OS Logo Changed the blue used in the Feren OS logo as most colour schemes make the logo appear to be teal instead of blue. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index df208368e..91aebf7c3 100755 --- a/neofetch +++ b/neofetch @@ -6110,7 +6110,7 @@ EOF ;; "Feren"*) - set_colors 6 6 7 1 + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c1} `----------` :+ooooooooo+. From e4dffc46736cf06c641146db33d3a6e3a6d73182 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 22 Jul 2019 00:18:04 +0200 Subject: [PATCH 0739/1133] The K Desktop Environment was renamed to Plasma --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 91aebf7c3..38cf4dedf 100755 --- a/neofetch +++ b/neofetch @@ -1516,6 +1516,7 @@ get_de() { de="${XDG_CURRENT_DESKTOP/X\-}" de="${de/Budgie:GNOME/Budgie}" de="${de/:Unity7:ubuntu}" + de="${de/KDE/Plasma}" elif [[ "$DESKTOP_SESSION" ]]; then de="${DESKTOP_SESSION##*/}" @@ -1544,7 +1545,7 @@ get_de() { # Format strings. case "$de" in - "KDE_SESSION_VERSION"*) de="KDE${de/* = }" ;; + "KDE_SESSION_VERSION"*) de="Plasma${de/* = }" ;; *"xfce4"*) de="Xfce4" ;; *"xfce5"*) de="Xfce5" ;; *"xfce"*) de="Xfce" ;; From 11dfe8d0163841931fc08944879ec35a780cfde5 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 22 Jul 2019 13:12:33 +0200 Subject: [PATCH 0740/1133] Only use Plasma instead of KDE, if KDE version is greater equal 4 --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 38cf4dedf..0e799a4be 100755 --- a/neofetch +++ b/neofetch @@ -1516,7 +1516,6 @@ get_de() { de="${XDG_CURRENT_DESKTOP/X\-}" de="${de/Budgie:GNOME/Budgie}" de="${de/:Unity7:ubuntu}" - de="${de/KDE/Plasma}" elif [[ "$DESKTOP_SESSION" ]]; then de="${DESKTOP_SESSION##*/}" @@ -1531,6 +1530,10 @@ get_de() { de="Trinity" fi + if [ "$KDE_SESSION_VERSION" -ge "4" ]; then + de="${de/KDE/Plasma}" + fi + # When a window manager is started from a display manager # the desktop variables are sometimes also set to the # window manager name. This checks to see if WM == DE From cc491fc59303501187d8ef6d94ee56322bc0902e Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Mon, 22 Jul 2019 15:15:31 +0200 Subject: [PATCH 0741/1133] Move check plasma >= 4 after de to KDE and revert some change --- neofetch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 0e799a4be..c2ac8c227 100755 --- a/neofetch +++ b/neofetch @@ -1530,10 +1530,6 @@ get_de() { de="Trinity" fi - if [ "$KDE_SESSION_VERSION" -ge "4" ]; then - de="${de/KDE/Plasma}" - fi - # When a window manager is started from a display manager # the desktop variables are sometimes also set to the # window manager name. This checks to see if WM == DE @@ -1548,7 +1544,7 @@ get_de() { # Format strings. case "$de" in - "KDE_SESSION_VERSION"*) de="Plasma${de/* = }" ;; + "KDE_SESSION_VERSION"*) de="KDE${de/* = }" ;; *"xfce4"*) de="Xfce4" ;; *"xfce5"*) de="Xfce5" ;; *"xfce"*) de="Xfce" ;; @@ -1564,6 +1560,9 @@ get_de() { ;; esac + if [ "$KDE_SESSION_VERSION" -ge "4" ]; then + de="${de/KDE/Plasma}" + fi # Log that the function was run. de_run=1 } From 1daac57e979c200d5cca3952c07c2ab522d3b265 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Tue, 23 Jul 2019 10:53:10 +0200 Subject: [PATCH 0742/1133] Use bash syntax --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c2ac8c227..a22bacca0 100755 --- a/neofetch +++ b/neofetch @@ -1560,9 +1560,10 @@ get_de() { ;; esac - if [ "$KDE_SESSION_VERSION" -ge "4" ]; then + if (( "$KDE_SESSION_VERSION" >= "4" )); then de="${de/KDE/Plasma}" fi + # Log that the function was run. de_run=1 } From af6160fbce990c9e9a2a09a05023aa1ce2cc60d2 Mon Sep 17 00:00:00 2001 From: Carl Schwan Date: Tue, 23 Jul 2019 10:56:10 +0200 Subject: [PATCH 0743/1133] Use && --- neofetch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/neofetch b/neofetch index a22bacca0..4eb6db0ba 100755 --- a/neofetch +++ b/neofetch @@ -1560,9 +1560,7 @@ get_de() { ;; esac - if (( "$KDE_SESSION_VERSION" >= "4" )); then - de="${de/KDE/Plasma}" - fi + (( "$KDE_SESSION_VERSION" >= "4" )) && de="${de/KDE/Plasma}" # Log that the function was run. de_run=1 From 4120ad49404f5d916653ba4862d702e73d4473d2 Mon Sep 17 00:00:00 2001 From: Mitch Weaver <20451170+MitchWeaver@users.noreply.github.com> Date: Thu, 25 Jul 2019 23:40:59 -0500 Subject: [PATCH 0744/1133] support other versions of ksh --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 4eb6db0ba..6d53d1ce3 100755 --- a/neofetch +++ b/neofetch @@ -1460,7 +1460,7 @@ get_shell() { "bash") shell+="${BASH_VERSION/-*}" ;; "sh" | "ash" | "dash") ;; - "mksh" | "ksh") + *"ksh") shell+="$("$SHELL" -c "printf %s \"\$KSH_VERSION\"")" shell="${shell/ * KSH}" shell="${shell/version}" From 247512baf5ff3942d40e4603bc910c46851673a3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 28 Jul 2019 09:57:36 +0300 Subject: [PATCH 0745/1133] general: Make neofetch compatible with libedit. --- neofetch | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index 4eb6db0ba..0cbaca03b 100755 --- a/neofetch +++ b/neofetch @@ -1021,7 +1021,7 @@ get_distro() { ;; "Haiku") - read -r name version _ < <(uname -sv) + read -r name version _ <<< "$(uname -sv)" distro="$name $version" ;; @@ -1309,12 +1309,12 @@ get_packages() { has() { type -p "$1" >/dev/null && manager="$_"; } dir() { ((packages+=$#)); pac "$#"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } - tot() { IFS=$'\n' read -d "" -ra pkgs < <("$@");((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; } + tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")";((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; } # Redefine tot() for Bedrock Linux. [[ -f "/bedrock/etc/bedrock-release" && "$PATH" == */bedrock/cross/* ]] && { tot() { - IFS=$'\n' read -d "" -ra pkgs < <(for s in $(brl list); do strat -r "$s" "$@"; done) + IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in $(brl list); do strat -r "$s" "$@"; done)" ((packages+="${#pkgs[@]}")) pac "${#pkgs[@]}" } @@ -2674,7 +2674,7 @@ get_resolution() { elif type -p xwininfo >/dev/null; then read -r w h \ - < <(xwininfo -root | awk -F':' '/Width|Height/ {printf $2}') + <<< "$(xwininfo -root | awk -F':' '/Width|Height/ {printf $2}')" resolution="${w}x${h}" elif type -p xdpyinfo >/dev/null; then @@ -3010,10 +3010,10 @@ END child="$(get_ppid "$$")" IFS=$'\n' read -d "" -ra konsole_instances \ - < <(qdbus | awk '/org.kde.konsole/ {print $1}') + <<< "$(qdbus | awk '/org.kde.konsole/ {print $1}')" for i in "${konsole_instances[@]}"; do - IFS=$'\n' read -d "" -ra konsole_sessions < <(qdbus "$i" | grep -F '/Sessions/') + IFS=$'\n' read -d "" -ra konsole_sessions <<< "$(qdbus "$i" | grep -F '/Sessions/')" for session in "${konsole_sessions[@]}"; do if ((child == "$(qdbus "$i" "$session" processId)")); then @@ -3690,12 +3690,13 @@ get_window_size() { # This functions gets the current window size in # pixels. [[ "$image_backend" == "kitty" ]] && - IFS=x read -r term_width term_height < <(kitty +kitten icat --print-window-size) + IFS=x read -r term_width term_height <<< "$(kitty +kitten icat --print-window-size)" # Get terminal width/height. if (( "${term_width:-0}" < 50 )) && [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then if type -p xdotool &>/dev/null; then - IFS=$'\n' read -d "" -ra win < <(xdotool getactivewindow getwindowgeometry --shell %1) + IFS=$'\n' read -d "" -ra win \ + <<< "$(xdotool getactivewindow getwindowgeometry --shell %1)" term_width="${win[3]/WIDTH=}" term_height="${win[4]/HEIGHT=}" @@ -3731,7 +3732,7 @@ get_window_size() { get_term_size() { # Get the terminal size in cells. - read -r lines columns < <(stty size) + read -r lines columns <<< "$(stty size)" # Calculate font size. font_width="$((term_width / columns))" @@ -4282,8 +4283,8 @@ cache_uname() { kernel_machine="${uname[2]}" if [[ "$kernel_name" == "Darwin" ]]; then - IFS=$'\n' read -d "" -ra sw_vers < <(awk -F'<|>' '/key|string/ {print $3}' \ - "/System/Library/CoreServices/SystemVersion.plist") + IFS=$'\n' read -d "" -ra sw_vers <<< "$(awk -F'<|>' '/key|string/ {print $3}' \ + "/System/Library/CoreServices/SystemVersion.plist")" for ((i=0;i<${#sw_vers[@]};i+=2)) { case ${sw_vers[i]} in ProductName) darwin_name=${sw_vers[i+1]} ;; From ff420471577386da4f5179e9b7b35abec6b07908 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 28 Jul 2019 10:06:31 +0300 Subject: [PATCH 0746/1133] general: Fix travis. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d3c747aa1..357f0fce2 100755 --- a/neofetch +++ b/neofetch @@ -1309,7 +1309,7 @@ get_packages() { has() { type -p "$1" >/dev/null && manager="$_"; } dir() { ((packages+=$#)); pac "$#"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } - tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")";((packages+="${#pkgs[@]}"));pac "${#pkgs[@]}"; } + tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")";((packages+=${#pkgs[@]}));pac "${#pkgs[@]}";} # Redefine tot() for Bedrock Linux. [[ -f "/bedrock/etc/bedrock-release" && "$PATH" == */bedrock/cross/* ]] && { From 42bed8b60e49246c355a09c87f9faffb088ebde5 Mon Sep 17 00:00:00 2001 From: Mitch Weaver <20451170+MitchWeaver@users.noreply.github.com> Date: Sun, 28 Jul 2019 07:48:55 -0500 Subject: [PATCH 0747/1133] add bonsai linux support add packages support --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index 357f0fce2..ff5b1bee0 100755 --- a/neofetch +++ b/neofetch @@ -1339,6 +1339,7 @@ get_packages() { has "sorcery" && tot gaze installed has "alps" && tot alps showinstalled has "butch" && tot butch list + has "bonsai" && tot bonsai list # Counting files/dirs. # Variables need to be unquoted here. Only Bedrock Linux is affected. @@ -5458,6 +5459,28 @@ ${c1} oMMNMMMMMMMMMMMMMMMMMMMMMM EOF ;; + "bonsai"*) + set_colors 6 2 3 + read -rd '' ascii_data <<'EOF' +${c2} ,####, + ${c2}#######, ${c2},#####, + ${c2}#####',# ${c2}'###### + ${c2}''###'${c3}';,,,'${c2}###' + ${c3} ,; '''' + ${c3} ;;; ${c2},#####, + ${c3} ;;;' ,,;${c2};;### + ${c3} ';;;;''${c2}'####' + ${c3} ;;; + ${c3} ,.;;';'',,, + ${c3} ' ' +${c1} # + # O + ##, ,##,',##, ,## ,#, , + # # # # #''# #,, # # # + '#' '##' # # ,,# '##;, # +EOF + ;; + "BSD") set_colors 1 7 4 3 6 read -rd '' ascii_data <<'EOF' From 22aaed4d92fc2dc95ef116cd44332067ce6ca47e Mon Sep 17 00:00:00 2001 From: Hans Petter Jansson Date: Wed, 31 Jul 2019 20:11:25 +0200 Subject: [PATCH 0748/1133] display_image: Allow Chafa backend to stretch image to desired size Fixes issue #1295. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index ff5b1bee0..f95b4e39b 100755 --- a/neofetch +++ b/neofetch @@ -3864,7 +3864,7 @@ display_image() { ;; "chafa") - chafa --size="$((width / font_width))x$((height / font_height))" "$image" + chafa --stretch --size="$((width / font_width))x$((height / font_height))" "$image" ;; "jp2a") From 8dca949e87ee2cbc986f37f7e25f346db3f9dbc8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 5 Aug 2019 11:05:43 +0300 Subject: [PATCH 0749/1133] Ascii: Make KISS use crux_small --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 357f0fce2..7107f9f16 100755 --- a/neofetch +++ b/neofetch @@ -5785,7 +5785,7 @@ ${c1} ..... EOF ;; - "crux_small") + "crux_small"|"KISS"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' ${c1} ___ From ca3291133646ce18155cfc5840385f1df9ee2710 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Mon, 5 Aug 2019 18:04:24 +0200 Subject: [PATCH 0750/1133] packages: Check brew on Linux --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index f95b4e39b..aace00e05 100755 --- a/neofetch +++ b/neofetch @@ -1347,6 +1347,7 @@ get_packages() { # shellcheck disable=SC2086 { shopt -s nullglob + has "brew" && dir $(brew --cellar)/* has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ has "Compile" && dir ${br_prefix}/Programs/*/ has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* From 296fb68564df0e96bf9a1278a8b01d88def243c9 Mon Sep 17 00:00:00 2001 From: Ryan Hanson <13651296+rxhanson@users.noreply.github.com> Date: Mon, 5 Aug 2019 21:19:24 -0400 Subject: [PATCH 0751/1133] WM: Add support for Rectangle on macOS Rectangle is a Swift rewrite of the Spectacle application. --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f95b4e39b..6a21314d1 100755 --- a/neofetch +++ b/neofetch @@ -1631,7 +1631,7 @@ get_wm() { else case "$os" in "Mac OS X") - ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm\|[y]abai')" + ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm\|[y]abai\|[R]ectangle')" case "$ps_line" in *"chunkwm"*) wm="chunkwm" ;; @@ -1639,6 +1639,7 @@ get_wm() { *"yabai"*) wm="yabai" ;; *"Amethyst"*) wm="Amethyst" ;; *"Spectacle"*) wm="Spectacle" ;; + *"Rectangle"*) wm="Rectangle" ;; *) wm="Quartz Compositor" ;; esac ;; From 4548c56ee7f95dbfb61c312b228af47d55a092b5 Mon Sep 17 00:00:00 2001 From: Ryan Hanson <13651296+rxhanson@users.noreply.github.com> Date: Wed, 7 Aug 2019 09:34:03 -0400 Subject: [PATCH 0752/1133] Refactored grep for macOS window manager detection Co-Authored-By: nibblonian --- neofetch | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6a21314d1..376da9395 100755 --- a/neofetch +++ b/neofetch @@ -1631,7 +1631,18 @@ get_wm() { else case "$os" in "Mac OS X") - ps_line="$(ps -e | grep -o '[S]pectacle\|[A]methyst\|[k]wm\|[c]hun[k]wm\|[y]abai\|[R]ectangle')" + wm_names=( + "[S]pectacle" + "[A]methyst" + "[k]wm" + "[c]chun[k]wm" + "[y]abai" + "[R]ectangle" + ) + + regex_part=$( IFS='|'; echo "${wm_names[*]}" ) + + ps_line=$(ps -e | grep -Eio "$regex_part") case "$ps_line" in *"chunkwm"*) wm="chunkwm" ;; From eb5cf17fdb43c64a78614328136d00996f60ef5e Mon Sep 17 00:00:00 2001 From: Ryan Hanson <13651296+rxhanson@users.noreply.github.com> Date: Wed, 7 Aug 2019 09:46:32 -0400 Subject: [PATCH 0753/1133] Remove unnecessary -i grep flag from wm ps --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 376da9395..8e8ca7e14 100755 --- a/neofetch +++ b/neofetch @@ -1642,7 +1642,7 @@ get_wm() { regex_part=$( IFS='|'; echo "${wm_names[*]}" ) - ps_line=$(ps -e | grep -Eio "$regex_part") + ps_line=$(ps -e | grep -Eo "$regex_part") case "$ps_line" in *"chunkwm"*) wm="chunkwm" ;; From a5c4a020c065623dc706985d83986e0103b1bf83 Mon Sep 17 00:00:00 2001 From: Ryan Hanson <13651296+rxhanson@users.noreply.github.com> Date: Wed, 7 Aug 2019 18:12:40 -0400 Subject: [PATCH 0754/1133] Removed extraneous c from chunkwm match --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8e8ca7e14..2d3adf8b2 100755 --- a/neofetch +++ b/neofetch @@ -1635,7 +1635,7 @@ get_wm() { "[S]pectacle" "[A]methyst" "[k]wm" - "[c]chun[k]wm" + "[c]hun[k]wm" "[y]abai" "[R]ectangle" ) From f9fc22eef0409147855860a3082ad4db9241f5d4 Mon Sep 17 00:00:00 2001 From: Dawid Dziurla Date: Fri, 9 Aug 2019 14:59:10 +0200 Subject: [PATCH 0755/1133] packages: Quote --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index aace00e05..ef7ac1fab 100755 --- a/neofetch +++ b/neofetch @@ -1347,7 +1347,7 @@ get_packages() { # shellcheck disable=SC2086 { shopt -s nullglob - has "brew" && dir $(brew --cellar)/* + has "brew" && dir "$(brew --cellar)"/* has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ has "Compile" && dir ${br_prefix}/Programs/*/ has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* From a476419d22093515f7bdc34a861efd65a1b478ec Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 9 Aug 2019 15:09:37 +0000 Subject: [PATCH 0756/1133] neofetch: add kiss --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 7107f9f16..57c0ef3cf 100755 --- a/neofetch +++ b/neofetch @@ -5785,7 +5785,7 @@ ${c1} ..... EOF ;; - "crux_small"|"KISS"*) + "crux_small"|KISS*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' ${c1} ___ From 5dc00cba146dd34ce9385344c729ccd0451f5449 Mon Sep 17 00:00:00 2001 From: Ryan Hanson <13651296+rxhanson@users.noreply.github.com> Date: Sat, 10 Aug 2019 17:41:21 -0400 Subject: [PATCH 0757/1133] Removed subshell from ps grep for macOS wm --- neofetch | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 2d3adf8b2..4b3d9fd01 100755 --- a/neofetch +++ b/neofetch @@ -1631,18 +1631,13 @@ get_wm() { else case "$os" in "Mac OS X") - wm_names=( - "[S]pectacle" - "[A]methyst" - "[k]wm" - "[c]hun[k]wm" - "[y]abai" - "[R]ectangle" - ) - - regex_part=$( IFS='|'; echo "${wm_names[*]}" ) - - ps_line=$(ps -e | grep -Eo "$regex_part") + ps_line="$(ps -e | grep -o \ + -e "[S]pectacle" \ + -e "[A]methyst" \ + -e "[k]wm" \ + -e "[c]hun[k]wm" \ + -e "[y]abai" \ + -e "[R]ectangle")" case "$ps_line" in *"chunkwm"*) wm="chunkwm" ;; From 87de174aef3e92049e771ddd11c69d55e51143df Mon Sep 17 00:00:00 2001 From: Alva Date: Tue, 27 Aug 2019 15:25:28 +0200 Subject: [PATCH 0758/1133] Rename GuixSD to Guix System --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index e9bc5743b..f9a1a58aa 100755 --- a/neofetch +++ b/neofetch @@ -925,8 +925,8 @@ get_distro() { elif type -p guix >/dev/null; then case "$distro_shorthand" in - "on" | "tiny") distro="GuixSD" ;; - *) distro="GuixSD $(guix system -V | awk 'NR==1{printf $5}')" + "on" | "tiny") distro="Guix System" ;; + *) distro="Guix System $(guix system -V | awk 'NR==1{printf $5}')" esac else From 940382fb97747d5547965713c60f58c0b41335be Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 28 Aug 2019 10:08:51 +0000 Subject: [PATCH 0759/1133] neofetch: Fix GPU parsing. Closes #1306 --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 57c0ef3cf..ee6cc8fd1 100755 --- a/neofetch +++ b/neofetch @@ -2198,6 +2198,8 @@ get_gpu() { *"virtualbox"*) gpu="VirtualBox Graphics Adapter" ;; + + *) continue ;; esac if [[ "$gpu_brand" == "off" ]]; then From 7cbd1b6d1782d3af5cc57ba81b2c4001c2065501 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 31 Aug 2019 07:38:41 +0000 Subject: [PATCH 0760/1133] neofetch: bump to 6.1.0 --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 33ed42778..64ec01c8f 100755 --- a/neofetch +++ b/neofetch @@ -28,7 +28,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -version="6.0.1" +version="6.1.0" bash_version="${BASH_VERSION/.*}" sys_locale="${LANG:-C}" @@ -5472,7 +5472,7 @@ EOF "bonsai"*) set_colors 6 2 3 read -rd '' ascii_data <<'EOF' -${c2} ,####, +${c2} ,####, ${c2}#######, ${c2},#####, ${c2}#####',# ${c2}'###### ${c2}''###'${c3}';,,,'${c2}###' @@ -5480,10 +5480,10 @@ ${c2} ,####, ${c3} ;;; ${c2},#####, ${c3} ;;;' ,,;${c2};;### ${c3} ';;;;''${c2}'####' - ${c3} ;;; + ${c3} ;;; ${c3} ,.;;';'',,, ${c3} ' ' -${c1} # +${c1} # # O ##, ,##,',##, ,## ,#, , # # # # #''# #,, # # # From c37332e42ba086f324d0e0a86d46ad7eab20ecd4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 31 Aug 2019 08:16:06 +0000 Subject: [PATCH 0761/1133] docs: update --- CHANGELOG.md | 128 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 122 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6835f367d..5053fbd79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,13 +6,129 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [6.0.1] - N/A +## [6.1.0] - 2019-31-08 -- **ascii**: Fixed bug causing files to not work. -- **ascii**: Fixed bug causing files named `ascii` to not load. -- **term_font** [kitty]: Fixed bug with empty config. -- **get_cols**: Variables are now local. [**@asantam**](https://github.com/asantam) -- **man_page**: More consistent arg documentation. [**@xPMo**](https://github.com/xPMo) +logo + +**Contributors**: + +**Charlène**, **Michael Straube**, @14mRh4X0r, @Crestwave, @GrantM11235, @Mark-Peppermint, @Michal-Szczepaniak, @Renzix, @SibrenVasse, @asantam, @chrissxYT, @chrisweeksnz, @dawidd6, @edward-p, @feren, @fjallarefur, @hpjansson, @iandrewt, @infinitewarp, @jkhsjdhjs, @konimex, @lebensterben, @lightful, @mitchweaver, @ognarb, @protonesso, @rxhanson, @spacelike, @vaygr, @weslly, @xPMo, @zyg812 + + +**OS**: + +- Added support for [KISS Linux](https://getkiss.org). +- Added support for [Bonsai Linux](bonsai-linux.org). @mitchweaver +- Added support for [Radix Linux](http://www.radixsystems.com/software.php). +- os: Fix HAIKU issues + +**ASCII**: + +- ascii: Fixed bug causing ascii files to not work. +- postmarketOS: Replace ASCII logo. @GrantM11235 +- postmarketOS: Add small ASCII logo. @GrantM11235 +- Fix big Puffy ascii logo. **Charlène** +- ASCII: Updated Artix ASCII with new logo. @konimex +- Add ascii art for Clear Linux. @chrisweeksnz +- new logo for Ataraxia Linux. @protonesso +- ASCII: Add fedora_small. @zyg812 +- Added a case for displaying the Ubuntu logo for i3buntu. @chrissxYT +- New Peppermint Logo. @Mark-Peppermint +- ascii: Fix void. +- update Red Hat with new 2019 logo. @infinitewarp +- ascii: Add back old redhat logo (--ascii_distro redhat_old). +- ASCII: Added Feren OS. @konimex +- Linux: Update ASCII for Sailfish OS. @konimex +- Linux: Fix ASCII for Sailfish OS. @Michal-Szczepaniak +- Small tweak to the colours used for the Feren OS Logo. @feren + +**Images**: + +- general: fix image sizing in VTE terminals. +- general: Fix issue with URxvt and no internal border. +- display_image: Allow Chafa backend to stretch image to desired size. @hpjansson + +**Terminal**: + +- term_font [kitty]: Fix bug with empty config. +- term_font: fix issue with konsole font detection. **Michael Straube** +- Robuster kitty font parsing. @SibrenVasse +- term_font: Fix crash when parsing Xresources. +- kitty font parsing where font name has whitespaces. @lebensterben +- term: Fix wrapper scripts in NixOS. Thanks Tdeo. + +**Memory**: + +- Memory [AIX]: Detect memory based on pages (like Solaris) for more accuracy. @konimex + +**CPU**: + +- CPU [Linux/ARM]: Use Hardware field directly. @konimex + +**GPU**: + +- Properly work with multiple GPUs. @lebensterben +- Fix GPU parsing. + +**Packages**: + +- packages: Specify Haiku's pkgman. @Crestwave +- packages: Show IRIX package manager name. +- Use guix directly to report package count instead of counting directories. @spacelike +- Packages [Guix/Nix]: Use if for detecting system and user packages. @konimex +- packages: Fix DragonFlyBSD. Thanks pornguy. +- Set nullglob for package counting. @14mRh4X0r +- packages: Check brew on Linux. @dawidd6 + +**Theme**: + +- WM Theme: update for Mojave. @iandrewt +- Handle ${GTK2_RC_FILES} with multiple values. @edward-p +- use "$GTK2_RC_FILES". @edward-p + +**Song**: + +- song: add strawberry player. **Michael Straube** +- song: Added support for plasma-browser-integration. +- song: add gogglesmm. **Michael Straube** +- song: add xnoise. **Michael Straube** + +**Uptime**: + +- support uptime from Android 9+. @lightful + +**IP**: + +- Retrieve public IP info via drill. @vaygr + +**WM**: + +- WM: Add support for yabai on macOS. @weslly +- WM: Add support for Rectangle on macOS. @rxhanson +- Removed subshell from ps grep for macOS wm. @rxhanson + +**Shell**: + +- support other versions of ksh. @mitchweaver + +**Misc**: + +- Make neofetch compatible with `libedit`. +- general: Added `--no_config` to disable config file creation. +- Made variables local in get_cols function. @asantam +- Fixed option documentation. @xPMo +- Fixed gnome shell mutter issues. +- cache_uname: improve reading from 'SystemVersion.plist' on macOS and iOS. @jkhsjdhjs +- add device information for latest ios devices. @jkhsjdhjs +- include Fusion/Bionic in iDevice processor names. @jkhsjdhjs +- give precedence to "Hardware" entry in /proc/cpuinfo. @lightful +- config: Show 15 color blocks by default. +- underline: Fix bugs with incorrect lengths. +- Moved guix check below /etc/os-release check. @Renzix +- simple mode: Hide stderr by default. +- Linux: Move /etc/os-release directly below lsb_release. @konimex +- The K Desktop Environment was renamed to Plasma. @ognarb +- Rename GuixSD to Guix System. @fjallarefur ## [6.0.0] - 2019-01-08 From 4b9589a9363444fef1ae798c4967a471448eaa15 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 31 Aug 2019 08:16:26 +0000 Subject: [PATCH 0762/1133] docs: update --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index e5733d419..525291a94 100644 --- a/neofetch.1 +++ b/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 6.0.1" "User Commands" +.TH NEOFETCH "1" "August 2019" "Neofetch 6.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From 92c07e2d31da32973e01cc6729afdded33f5483d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 31 Aug 2019 08:16:54 +0000 Subject: [PATCH 0763/1133] docs: update --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 64ec01c8f..1a6824756 100755 --- a/neofetch +++ b/neofetch @@ -8,7 +8,7 @@ # # The MIT License (MIT) # -# Copyright (c) 2016-2018 Dylan Araps +# Copyright (c) 2015-2019 Dylan Araps # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal From 1d17b4dfdb18066f866efe94b7ba58313af3f957 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 10 Sep 2019 08:44:30 +0300 Subject: [PATCH 0764/1133] docs: update --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 581520e89..6bfa74039 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,6 @@

A command-line system information tool written in bash 3.2+

- Packaging status From bb82bf83436109814b226fcd448c13b5f3a1d20d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 10 Sep 2019 16:07:25 +0300 Subject: [PATCH 0765/1133] neofetch: fix wm' --- neofetch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 1a6824756..d82542559 100755 --- a/neofetch +++ b/neofetch @@ -1621,13 +1621,13 @@ get_wm() { # Fallback for non-EWMH WMs. [[ -z "$wm" ]] && \ - wm="$(ps "${ps_flags[@]}" | grep -m 1 -o -F \ - -e "catwm" \ - -e "fvwm" \ - -e "dwm" \ - -e "2bwm" \ - -e "monsterwm" \ - -e "tinywm")" + wm="$(ps "${ps_flags[@]}" | grep -m 1 -o \ + -e "[c]atwm" \ + -e "[f]vwm" \ + -e "[d]wm" \ + -e "[2]bwm" \ + -e "[m]onsterwm" \ + -e "[t]inywm")" else case "$os" in From 3614099fd59c9cfeb842c10a3da9ab99db317e1a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 10 Sep 2019 23:49:09 +0300 Subject: [PATCH 0766/1133] image: fix terminal size issues. Closes #1314 --- neofetch | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/neofetch b/neofetch index d82542559..d6112c13c 100755 --- a/neofetch +++ b/neofetch @@ -3700,6 +3700,45 @@ get_w3m_img_path() { get_window_size() { # This functions gets the current window size in # pixels. + # + # We first try to use the escape sequence "\033[14t" + # to get the terminal window size in pixels. If this + # fails we then fallback to using "xdotool" or other + # programs. + + # Tmux has a special way of reading escape sequences + # so we have to use a slightly different sequence to + # get the terminal size. + if [[ "$image_backend" == "tycat" ]]; then + printf '%b' '\e}qs\000' + + elif [[ -z $VTE_VERSION ]]; then + case "${TMUX:-null}" in + "null") printf '%b' '\e[14t' ;; + *) printf '%b' '\ePtmux;\e\e[14t\e\\ ' ;; + esac + fi + + # The escape codes above print the desired output as + # user input so we have to use read to store the out + # -put as a variable. + # The 1 second timeout is required for older bash + case "${BASH_VERSINFO[0]}" in + 4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;; + *) IFS=';t' read -d t -t 1 -sra term_size ;; + esac + unset IFS + + # Split the string into height/width. + if [[ "$image_backend" == "tycat" ]]; then + term_width="$((term_size[2] * term_size[0]))" + term_height="$((term_size[3] * term_size[1]))" + + else + term_height="${term_size[1]}" + term_width="${term_size[2]}" + fi + [[ "$image_backend" == "kitty" ]] && IFS=x read -r term_width term_height <<< "$(kitty +kitten icat --print-window-size)" From d233fcd2d1663d5828290c8b8600d1ec83ad3cf4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 11 Sep 2019 00:16:50 +0300 Subject: [PATCH 0767/1133] neofetch: fix travis --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index d6112c13c..107301bec 100755 --- a/neofetch +++ b/neofetch @@ -3767,10 +3767,10 @@ get_window_size() { # If the ID was found get the window size. if [[ "$current_window" ]]; then - term_size="$(xwininfo -id "$current_window")" - term_width="${term_size#*Width: }" + term_size=("$(xwininfo -id "$current_window")") + term_width="${term_size[0]#*Width: }" term_width="${term_width/$'\n'*}" - term_height="${term_size/*Height: }" + term_height="${term_size[0]/*Height: }" term_height="${term_height/$'\n'*}" fi fi From 0d85283bdf2490c50178350c34b4ad43eda060c7 Mon Sep 17 00:00:00 2001 From: Hummenix <36206434+Hummenix@users.noreply.github.com> Date: Sat, 14 Sep 2019 05:27:49 +0200 Subject: [PATCH 0768/1133] Added BlackArch Added ASCII art for BlackArch as mentioned in #1311 As BlackArch has two logos - one is a red Arch logo with a black medieval sword (as seen here https://www.blackarch.org/blackarch-guide-en.pdf) and the other a neon blue version with a japanese katana (seen here https://www.blackarch.org/) - I did go with a middle thing. --- neofetch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/neofetch b/neofetch index 107301bec..a2bbc2a00 100755 --- a/neofetch +++ b/neofetch @@ -5437,6 +5437,33 @@ sm/ /ms EOF ;; + "BlackArch"*) + set_colors 1 1 0 1 + read -rd '' ascii_data <<'EOF' +${c3} 00 + 11 + ====${c1} + .${c3}//${c1} + `o${c3}//${c1}: + `+o${c3}//${c1}o: + `+oo${c3}//${c1}oo: + -+oo${c3}//${c1}oo+: + `/:-:+${c3}//${c1}ooo+: + `/+++++${c3}//${c1}+++++: + `/++++++${c3}//${c1}++++++: + `/+++o${c2}ooo${c3}//${c2}ooo${c1}oooo/` +${c2} ${c1}./${c2}ooosssso${c3}//${c2}osssssso${c1}+` +${c2} .oossssso-`${c3}//${c1}`/ossssss+` + -osssssso. ${c3}//${c1} :ssssssso. + :osssssss/ ${c3}//${c1} osssso+++. + /ossssssss/ ${c3}//${c1} +ssssooo/- + `/ossssso+/:- ${c3}//${c1} -:/+osssso+- + `+sso+:-` ${c3}//${c1} `.-/+oso: + `++:. ${c3}//${c1} `-/+/ + .` ${c3}/${c1} `/ +EOF + ;; + "BLAG"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' From 15153f78d7d7efb7402c431aaa48c9ddf519a1d0 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 17 Sep 2019 14:30:24 +0300 Subject: [PATCH 0769/1133] docs: update --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index 835c1789d..6867a5b23 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016-2018 Dylan Araps +Copyright (c) 2016-2019 Dylan Araps Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From da08c03310d66287c83e8ba9444c9c3a42718b8b Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 22 Sep 2019 09:27:33 +0200 Subject: [PATCH 0770/1133] OS: Add Neptune --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index a2bbc2a00..e3a6b8ffc 100755 --- a/neofetch +++ b/neofetch @@ -7208,6 +7208,29 @@ sd yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy ds EOF ;; + "Neptune"*) + set_colors 7 + read -rd '' ascii_data <<'EOF' +${c1} ./+sydddddddys/-. + .+ymNNdyooo/:+oooymNNmy/` + `/hNNh/.` `-+dNNy:` + /mMd/. .++.:oy/ .+mMd- + `sMN/ oMMmdy+. `oNNo + `hMd. `/ymy/. :NMo + oMN- `/dMd: /MM- +`mMy -dMN+` mMs +.MMo -NMM/ yMs + dMh mMMMo:` `NMo + /MM/ /ymMMMm- sMN. + +Mm: .hMMd` oMN/ + +mNs. `yNd/` -dMm- + .yMNs: `/.` `/yNNo` + .odNNy+-` .:ohNNd/. + -+ymNNmdyyyyyyydmNNmy+. + `-//sssssss//. +EOF + ;; + "NetBSD"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' From f481d9f59cfa4cab4cbd081e6c64e492d72becce Mon Sep 17 00:00:00 2001 From: Steve Forget Date: Sun, 22 Sep 2019 16:58:51 +0200 Subject: [PATCH 0771/1133] Added font detection for ConEmu --- neofetch | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/neofetch b/neofetch index a2bbc2a00..66968b216 100755 --- a/neofetch +++ b/neofetch @@ -3202,6 +3202,49 @@ END # Default fallback font hardcoded in terminal-preferences.c [[ -z "$term_font" ]] && term_font="Monospace 12" ;; + + "conemu-"*) + local ce_arg_list + local ce_arg_idx + local ce_conf + + # Could have used `eval set -- "$ConEmuArgs"` instead for arg parsing but eval is evil... + readarray -t ce_arg_list < <(xargs -n1 printf "%s\n" <<< "${ConEmuArgs-}") + + for ce_arg_idx in "${!ce_arg_list[@]}"; do + # Search for "-LoadCfgFile" arg + [[ "${ce_arg_list[$ce_arg_idx]}" != -LoadCfgFile ]] && continue + + # Conf path is the next arg + ((++ce_arg_idx)) + ce_conf="${ce_arg_list[$ce_arg_idx]}" + break + done + + # https://conemu.github.io/en/ConEmuXml.html#search-sequence + local ce_seq=( + "$ce_conf" + "$ConEmuDir\ConEmu.xml" + "$ConEmuDir\.ConEmu.xml" + "$ConEmuBaseDir\ConEmu.xml" + "$ConEmuBaseDir\.ConEmu.xml" + "$APPDATA\ConEmu.xml" + "$APPDATA\.ConEmu.xml" + ) + + for ce_conf in "${ce_seq[@]}"; do + # Search for first conf file available + [[ ! -f "$ce_conf" ]] && continue + + # Very basic XML parsing + term_font="$(awk '/name="FontName"/ && match($0, /data="([^"]*)"/) {print substr($0, RSTART+6, RLENGTH-7)}' "$ce_conf")" + break + done + + # Null-terminated contents in /proc/registry files triggers a Bash warning. Use read instead + [[ -z "$term_font" ]] && \ + read -r term_font < /proc/registry/HKEY_CURRENT_USER/Software/ConEmu/.Vanilla/FontName + ;; esac } From aaf4a5497e823b3a5d6af5c6479f6ff91c27837d Mon Sep 17 00:00:00 2001 From: Steve Forget Date: Sun, 22 Sep 2019 19:33:28 +0200 Subject: [PATCH 0772/1133] Fixed line length compliance --- neofetch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 66968b216..cc193efbc 100755 --- a/neofetch +++ b/neofetch @@ -3208,7 +3208,7 @@ END local ce_arg_idx local ce_conf - # Could have used `eval set -- "$ConEmuArgs"` instead for arg parsing but eval is evil... + # Could have used `eval set -- "$ConEmuArgs"` instead for arg parsing readarray -t ce_arg_list < <(xargs -n1 printf "%s\n" <<< "${ConEmuArgs-}") for ce_arg_idx in "${!ce_arg_list[@]}"; do @@ -3237,13 +3237,14 @@ END [[ ! -f "$ce_conf" ]] && continue # Very basic XML parsing - term_font="$(awk '/name="FontName"/ && match($0, /data="([^"]*)"/) {print substr($0, RSTART+6, RLENGTH-7)}' "$ce_conf")" + term_font="$(awk '/name="FontName"/ && match($0, /data="([^"]*)"/) \ + {print substr($0, RSTART+6, RLENGTH-7)}' "$ce_conf")" break done - # Null-terminated contents in /proc/registry files triggers a Bash warning. Use read instead - [[ -z "$term_font" ]] && \ - read -r term_font < /proc/registry/HKEY_CURRENT_USER/Software/ConEmu/.Vanilla/FontName + # Null-terminated contents in /proc/registry files triggers a Bash warning + [[ -z "$term_font" ]] && read -r term_font < \ + /proc/registry/HKEY_CURRENT_USER/Software/ConEmu/.Vanilla/FontName ;; esac } From 9b9ea1b9773fc0bf89f4b779ea6a0b21de581d95 Mon Sep 17 00:00:00 2001 From: Steve Forget Date: Sun, 22 Sep 2019 21:12:30 +0200 Subject: [PATCH 0773/1133] Refactoring according to reviews --- neofetch | 41 ++++++++++++++++------------------------- 1 file changed, 16 insertions(+), 25 deletions(-) diff --git a/neofetch b/neofetch index cc193efbc..41665860b 100755 --- a/neofetch +++ b/neofetch @@ -3203,7 +3203,7 @@ END [[ -z "$term_font" ]] && term_font="Monospace 12" ;; - "conemu-"*) + conemu-*) local ce_arg_list local ce_arg_idx local ce_conf @@ -3213,37 +3213,28 @@ END for ce_arg_idx in "${!ce_arg_list[@]}"; do # Search for "-LoadCfgFile" arg - [[ "${ce_arg_list[$ce_arg_idx]}" != -LoadCfgFile ]] && continue - - # Conf path is the next arg - ((++ce_arg_idx)) - ce_conf="${ce_arg_list[$ce_arg_idx]}" - break + [[ "${ce_arg_list[$ce_arg_idx]}" == -LoadCfgFile ]] && { + # Conf path is the next arg + ce_conf=${ce_arg_list[++ce_arg_idx]} + break + } done # https://conemu.github.io/en/ConEmuXml.html#search-sequence - local ce_seq=( - "$ce_conf" - "$ConEmuDir\ConEmu.xml" - "$ConEmuDir\.ConEmu.xml" - "$ConEmuBaseDir\ConEmu.xml" - "$ConEmuBaseDir\.ConEmu.xml" - "$APPDATA\ConEmu.xml" - "$APPDATA\.ConEmu.xml" - ) - - for ce_conf in "${ce_seq[@]}"; do + for ce_conf in "$ce_conf" "${ConEmuDir-}\ConEmu.xml" "${ConEmuDir-}\.ConEmu.xml" \ + "${ConEmuBaseDir-}\ConEmu.xml" "${ConEmuBaseDir-}\.ConEmu.xml" \ + "$APPDATA\ConEmu.xml" "$APPDATA\.ConEmu.xml"; do # Search for first conf file available - [[ ! -f "$ce_conf" ]] && continue - - # Very basic XML parsing - term_font="$(awk '/name="FontName"/ && match($0, /data="([^"]*)"/) \ - {print substr($0, RSTART+6, RLENGTH-7)}' "$ce_conf")" - break + [[ -f "$ce_conf" ]] && { + # Very basic XML parsing + term_font="$(awk '/name="FontName"/ && match($0, /data="([^"]*)"/) { + print substr($0, RSTART+6, RLENGTH-7)}' "$ce_conf")" + break + } done # Null-terminated contents in /proc/registry files triggers a Bash warning - [[ -z "$term_font" ]] && read -r term_font < \ + [[ "$term_font" ]] || read -r term_font < \ /proc/registry/HKEY_CURRENT_USER/Software/ConEmu/.Vanilla/FontName ;; esac From a0a7f3ec547052791d6a5e693ee498049f546af2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 26 Sep 2019 09:50:02 +0300 Subject: [PATCH 0774/1133] uptime: [haiku] Fix uptime --- neofetch | 103 ++++++++++++++++++++++++++----------------------------- 1 file changed, 48 insertions(+), 55 deletions(-) diff --git a/neofetch b/neofetch index 107301bec..ef4c3da8a 100755 --- a/neofetch +++ b/neofetch @@ -1213,72 +1213,65 @@ get_kernel() { } get_uptime() { - # Since Haiku's uptime cannot be fetched in seconds, a case outside - # the usual case is needed. + # Get uptime in seconds. case "$os" in - "Haiku") - uptime="$(uptime -u)" - uptime="${uptime/up }" + "Linux" | "Windows" | "MINIX") + if [[ -r /proc/uptime ]]; then + seconds="$(< /proc/uptime)" + seconds="${seconds/.*}" + else + boot="$(date -d"$(uptime -s)" +%s)" + now="$(date +%s)" + seconds="$((now - boot))" + fi ;; - *) - # Get uptime in seconds. - case "$os" in - "Linux" | "Windows" | "MINIX") - if [[ -r /proc/uptime ]]; then - seconds="$(< /proc/uptime)" - seconds="${seconds/.*}" - else - boot="$(date -d"$(uptime -s)" +%s)" - now="$(date +%s)" - seconds="$((now - boot))" - fi - ;; + "Mac OS X" | "iPhone OS" | "BSD" | "FreeMiNT") + boot="$(sysctl -n kern.boottime)" + boot="${boot/\{ sec = }" + boot="${boot/,*}" - "Mac OS X" | "iPhone OS" | "BSD" | "FreeMiNT") - boot="$(sysctl -n kern.boottime)" - boot="${boot/\{ sec = }" - boot="${boot/,*}" + # Get current date in seconds. + now="$(date +%s)" + seconds="$((now - boot))" + ;; - # Get current date in seconds. - now="$(date +%s)" - seconds="$((now - boot))" - ;; + "Solaris") + seconds="$(kstat -p unix:0:system_misc:snaptime | awk '{print $2}')" + seconds="${seconds/.*}" + ;; - "Solaris") - seconds="$(kstat -p unix:0:system_misc:snaptime | awk '{print $2}')" - seconds="${seconds/.*}" - ;; + "AIX" | "IRIX") + t="$(LC_ALL=POSIX ps -o etime= -p 1)" + d="0" h="0" + case "$t" in *"-"*) d="${t%%-*}"; t="${t#*-}";; esac + case "$t" in *":"*":"*) h="${t%%:*}"; t="${t#*:}";; esac + h="${h#0}" t="${t#0}" + seconds="$((d*86400 + h*3600 + ${t%%:*}*60 + ${t#*:}))" + ;; - "AIX" | "IRIX") - t="$(LC_ALL=POSIX ps -o etime= -p 1)" - d="0" h="0" - case "$t" in *"-"*) d="${t%%-*}"; t="${t#*-}";; esac - case "$t" in *":"*":"*) h="${t%%:*}"; t="${t#*:}";; esac - h="${h#0}" t="${t#0}" - seconds="$((d*86400 + h*3600 + ${t%%:*}*60 + ${t#*:}))" - ;; - esac + "Haiku") + seconds=$(($(system_time) / 1000000)) + ;; + esac - days="$((seconds / 60 / 60 / 24)) days" - hours="$((seconds / 60 / 60 % 24)) hours" - mins="$((seconds / 60 % 60)) minutes" + days="$((seconds / 60 / 60 / 24)) days" + hours="$((seconds / 60 / 60 % 24)) hours" + mins="$((seconds / 60 % 60)) minutes" - # Remove plural if < 2. - ((${days/ *} == 1)) && days="${days/s}" - ((${hours/ *} == 1)) && hours="${hours/s}" - ((${mins/ *} == 1)) && mins="${mins/s}" + # Remove plural if < 2. + ((${days/ *} == 1)) && days="${days/s}" + ((${hours/ *} == 1)) && hours="${hours/s}" + ((${mins/ *} == 1)) && mins="${mins/s}" - # Hide empty fields. - ((${days/ *} == 0)) && unset days - ((${hours/ *} == 0)) && unset hours - ((${mins/ *} == 0)) && unset mins + # Hide empty fields. + ((${days/ *} == 0)) && unset days + ((${hours/ *} == 0)) && unset hours + ((${mins/ *} == 0)) && unset mins - uptime="${days:+$days, }${hours:+$hours, }${mins}" - uptime="${uptime%', '}" - uptime="${uptime:-${seconds} seconds}" - ;; - esac + uptime="${days:+$days, }${hours:+$hours, }${mins}" + uptime="${uptime%', '}" + uptime="${uptime:-${seconds} seconds}" # Make the output of uptime smaller. case "$uptime_shorthand" in From eee523f06a18fcae6c7eb559cdf208f0c4ff2344 Mon Sep 17 00:00:00 2001 From: Bruno d'Arcangeli Date: Thu, 26 Sep 2019 10:37:36 +0200 Subject: [PATCH 0775/1133] [PATCH] Obarun added Signed-off-by: Bruno d'Arcangeli --- neofetch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/neofetch b/neofetch index 971b8305f..a1da40008 100755 --- a/neofetch +++ b/neofetch @@ -8843,6 +8843,31 @@ ${c1} -1vvnvv. `~+++` ++|+++ EOF ;; + "Obarun"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ,;::::; + ;cooolc;, + ,coool; + ,loool, + loooo; + :ooool + cooooc ,:ccc; + looooc :oooooool + cooooo ;oooooooooo, + :ooooo; :ooooooooooo + oooooo oooooooooooc + :oooooo :ooooooooool + loooooo ;oooooooool + looooooc .coooooooc + cooooooo: ,;co; + ,ooooooool; ,:loc + cooooooooooooloooooc + ;ooooooooooooool; + ;looooooolc; +EOF + ;; + *"[Windows 10]"*|*"on Windows 10"*|"Windows 8"*|\ "Windows 10"* |"windows10"|"windows8") set_colors 6 7 From 0ab8a2303f5f3d63d7c69e28a651f63a5a9c6141 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 28 Sep 2019 11:40:39 +0300 Subject: [PATCH 0776/1133] haiku: fix various issues --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 971b8305f..ef745c35e 100755 --- a/neofetch +++ b/neofetch @@ -1021,7 +1021,7 @@ get_distro() { ;; "Haiku") - read -r name version _ <<< "$(uname -sv)" + read -r name version _ <<< "$(uname -s)" distro="$name $version" ;; @@ -2653,7 +2653,7 @@ get_resolution() { ;; "Haiku") - resolution="$(screenmode | awk -F ' |, ' '{printf $2 "x" $3 " @ " $6 $7}')" + resolution="$(screenmode | awk -F ' |, ' 'END{printf $2 "x" $3 " @ " $6 $7}')" [[ "$refresh_rate" == "off" ]] && resolution="${resolution/ @*}" ;; From efb2042fa66569f7998af0e0010b1471b0a75fac Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 28 Sep 2019 11:48:28 +0300 Subject: [PATCH 0777/1133] distro: simpler haiku --- neofetch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 9319210c5..0895866b3 100755 --- a/neofetch +++ b/neofetch @@ -1021,8 +1021,7 @@ get_distro() { ;; "Haiku") - read -r name version _ <<< "$(uname -s)" - distro="$name $version" + distro=Haiku ;; "AIX") From 205a04477055e0b13a480b84e160bab324c4c56a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 1 Oct 2019 01:10:01 +0300 Subject: [PATCH 0778/1133] os: added support for Drauger OS --- neofetch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/neofetch b/neofetch index 0895866b3..57c610e7d 100755 --- a/neofetch +++ b/neofetch @@ -6089,6 +6089,28 @@ ${c1} | | EOF ;; + "Drauger"*) + set_colors 1 7 + read -rd '' ascii_data <<'EOF' +${c1} -``- + `:+``+:` + `/++``++/. + .++/. ./++. + :++/` `/++: + `/++: :++/` + ./+/- -/+/. + -++/. ./++- + :++:` `:++: + `/++- -++/` + ./++. ./+/. + -++/` `/++- + :++:` `:++: + `/++- -++/` +.:-.`..............................`.-:. +`.-/++++++++++++++++++++++++++++++++/-.` +EOF + ;; + "Elementary"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From 2302825dbca8118bd710ef2c2eb21af6d4afbc4a Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 3 Oct 2019 14:43:57 +0200 Subject: [PATCH 0779/1133] song: add comment about cmus mpris support --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 57e595772..aaaf43ce3 100755 --- a/neofetch +++ b/neofetch @@ -2521,6 +2521,7 @@ get_song() { "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; "cmus"*) + # NOTE: cmus >= 2.8.0 supports mpris2 song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; /tag artist/ { $1=$2=""; sub(" ", ""); a=$0 From 1faac662f9028d28a0a06509316d65b95381871e Mon Sep 17 00:00:00 2001 From: zyg812 Date: Sat, 5 Oct 2019 23:16:40 +0200 Subject: [PATCH 0780/1133] ASCII: Added and updated few small logos --- neofetch | 291 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 274 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index aaaf43ce3..6434fc3ad 100755 --- a/neofetch +++ b/neofetch @@ -5013,6 +5013,18 @@ EOF EOF ;; + "android_small"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} ;, ,; + ';,.-----.,;' + ,' ', + / O O \\ +| | +'-----------------' +EOF + ;; + "Android"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' @@ -5177,13 +5189,13 @@ EOF "arch_small") set_colors 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} /\ - /^^\ - /\ \ - /${c2} __ \ - / ( ) \ - / __| |__\\\ -/// \\\\\\ +${c1} /\\ + / \\ + /\\ \\ +${c2} / \\ + / ,, \\ + / | | -\\ +/_-'' ''-_\\ EOF ;; @@ -5337,6 +5349,19 @@ ${c2} .oossssso-````/ossssss+` EOF ;; + "artix_small"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} /\\ + / \\ + /`'.,\\ + / ', + / ,`\\ + / ,.'`. \\ +/.,'` `'.\\ +EOF + ;; + "Artix"*) set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' @@ -5627,6 +5652,19 @@ ${c1} ...... EOF ;; + "centos_small"*) + set_colors 3 2 4 5 7 + read -rd '' ascii_data <<'EOF' +${c2} ____${c1}^${c4}____ +${c2} |\\ ${c1}|${c4} /| +${c2} | \\ ${c1}|${c4} / | +${c4}<---- ${c3}----> +${c3} | / ${c2}|${c1} \\ | +${c3} |/__${c2}|${c1}__\\| +${c2} v +EOF + ;; + "CentOS"*) set_colors 3 2 4 5 7 read -rd '' ascii_data <<'EOF' @@ -6062,10 +6100,13 @@ EOF "dragonfly_small"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c2}(\${c3}"${c2}/) -${c2}(/${c1}|${c2}\) -${c1} | - | +${c2} ,${c1}_${c2}, +('-_${c1}|${c2}_-') + >--${c1}|${c2}--< +(_-'${c1}|${c2}'-_) + ${c1}| + | + | EOF ;; @@ -6112,6 +6153,18 @@ ${c1} -``- EOF ;; + "elementary_small"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c2} _______ + / ____ \\ +/ | / /\\ +|__\\ / / | +\\ /__/ / + \\_______/ +EOF + ;; + "Elementary"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' @@ -6251,13 +6304,12 @@ EOF "freebsd_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} /\\ _____ /\\ - \\_) (_/ - / \ +${c1}/\\,-'''''-,/\\ +\\_) (_/ | | | | - \ / - --_____-- + ; ; + '-_____-' EOF ;; @@ -6516,6 +6568,19 @@ eee ${c2}// \\ooo/ \\\ ${c1}eee EOF ;; + "guixsd_small"*) + set_colors 3 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1}|.__ __.| +|__ \\ / __| + \\ \\ / / + \\ \\ / / + \\ \\ / / + \\ \\/ / + \\__/ +EOF + ;; + "GuixSD"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' @@ -6532,6 +6597,20 @@ ${c1} .. `. EOF ;; + "haiku_small"*) + set_colors 2 8 + read -rd '' ascii_data <<'EOF' +${c1} ,^, + / \\ +*--_ ; ; _--* +\\ '" "' / + '. .' +.-'" "'-. + '-.__. .__.-' + |_| +EOF + ;; + "Haiku"*) set_colors 2 8 read -rd '' ascii_data <<'EOF' @@ -6578,6 +6657,19 @@ ${c2} ` EOF ;; + "hyperbola_small"*) + set_colors 8 + read -rd '' ascii_data <<'EOF' +${c1} |`__.`/ + \____/ + .--. + / \\ + / ___ \\ + / .` `.\\ +/.` `.\\ +EOF + ;; + "Hyperbola"*) set_colors 8 read -rd '' ascii_data <<'EOF' @@ -6847,8 +6939,21 @@ ${c3} #####${c2}#######${c3}##### EOF ;; + "linuxlite_small"*) + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} /\\ + / \\ + / ${c2}/ ${c1}/ +> ${c2}/ ${c1}/ +\\ ${c2}\\ ${c1}\\ + \\_${c2}\\${c1}_\\ +${c2} \\ +EOF + ;; + "Linux Lite"*) - set_colors 2 7 + set_colors 3 7 read -rd '' ascii_data <<'EOF' ${c1} ,xXc .l0MMMMMO @@ -6978,6 +7083,19 @@ ${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. EOF ;; + "mageia_small"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} * + * + ** +${c2} /\\__/\\ +/ \\ +\\ / + \\____/ +EOF + ;; + "Mageia"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' @@ -7050,6 +7168,19 @@ ${c1} -/+ooo+/-. ${c2}` EOF ;; + "manjaro_small"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1}||||||||| |||| +||||||||| |||| +|||| |||| +|||| |||| |||| +|||| |||| |||| +|||| |||| |||| +|||| |||| |||| +EOF + ;; + "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' @@ -7152,6 +7283,19 @@ ${c2} -sdhyo+:-` -/syymm: EOF ;; + "linuxmint_small"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} ___________ +|_ \\ + | ${c2}| _____ ${c1}| + | ${c2}| | | | ${c1}| + | ${c2}| | | | ${c1}| + | ${c2}\\__${c2}___/ ${c1}| + \\_________/ +EOF + ;; + "Linux Mint"* | "LinuxMint"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' @@ -7174,6 +7318,19 @@ ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm EOF ;; + "mx_small"*) + set_colors 4 6 7 + read -rd '' ascii_data <<'EOF' +${c3} \\\\ / + \\\\/ + \\\\ + /\\/ \\\\ + / \\ /\\ + / \\/ \\ +/__________\\ +EOF + ;; + "MX"*) set_colors 4 6 7 read -rd '' ascii_data <<'EOF' @@ -7246,6 +7403,19 @@ ${c1} ./+sydddddddys/-. EOF ;; + "netbsd_small"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c2}\\\\${c1}\`-______,----__ +${c2} \\\\ ${c1}__,---\`_ +${c2} \\\\ ${c1}\`.____ +${c2} \\\\${c1}-______,----\`- +${c2} \\\\ + \\\\ + \\\\ +EOF + ;; + "NetBSD"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' @@ -7617,6 +7787,18 @@ ${c1} :+sMs. EOF ;; + "parabola_small"*) + set_colors 5 7 + read -rd '' ascii_data <<'EOF' +${c1} __ __ __ _ +.`_//_//_/ / `. + / .` + / .` + /.` + /` +EOF + ;; + "Parabola"*) set_colors 5 7 read -rd '' ascii_data <<'EOF' @@ -7805,6 +7987,20 @@ ${c1} PPPPPPPPPPPPPP EOF ;; + "popos_small"*) + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1}______ +\\ _ \\ __ + \\ \\ \\ \\ / / + \\ \\_\\ \\ / / + \\ ___\\ /_/ + \\ \\ _ + __\\_\\__(_)_ + (___________)` +EOF + ;; + "Pop!_OS"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' @@ -7923,6 +8119,18 @@ ${c1} `-/osyyyysosyhhhhhyys+- EOF ;; + "pureos_small"*) + set_colors 2 7 7 + read -rd '' ascii_data <<'EOF' +${c1} _____________ +| _________ | +| | | | +| | | | +| |_________| | +|_____________| +EOF + ;; + "PureOS"*) set_colors 2 7 7 read -rd '' ascii_data <<'EOF' @@ -8372,6 +8580,19 @@ _Qh;.nm .QWc. {QL ]QQp;..vmQ/ EOF ;; + "slackware_small"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ________ + / ______| + | |______ + \\______ \\ + ______| | +| |________/ +|____________ +EOF + ;; + "Slackware"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' @@ -8574,6 +8795,17 @@ ${c2},',. '; ,+##############' EOF ;; + "sunos_small" | "solaris_small") + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} . .; . + . :; :: ;: . + .;. .. .. .;. +.. .. .. .. + .;, ,;. +EOF + ;; + "SunOS" | "Solaris") set_colors 3 7 read -rd '' ascii_data <<'EOF' @@ -8607,6 +8839,19 @@ ${c2} ...... EOF ;; + "opensuse_small" | "suse_small"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1} _______ +__| __ \\ + / .\\ \\ + \\__/ | + _______| + \\_______ +__________/ +EOF + ;; + "openSUSE"* | "open SUSE"* | "SUSE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' @@ -8825,6 +9070,18 @@ ${c1} ..-::::::-.` EOF ;; + "ubuntu_small") + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} _ + ---(_) + _/ --- \\ +(_) | | + \\ --- _/ + ---(_) +EOF + ;; + "Ubuntu"* | "i3buntu"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' From b404559cee077c23b2af6970a1726588d0b08b85 Mon Sep 17 00:00:00 2001 From: Michael Beasley Date: Wed, 9 Oct 2019 11:10:45 -0500 Subject: [PATCH 0781/1133] Add macOS Catalina --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 6434fc3ad..c8874b37a 100755 --- a/neofetch +++ b/neofetch @@ -982,6 +982,7 @@ get_distro() { "10.12"*) codename="macOS Sierra" ;; "10.13"*) codename="macOS High Sierra" ;; "10.14"*) codename="macOS Mojave" ;; + "10.15"*) codename="macOS Catalina" ;; *) codename="macOS" ;; esac distro="$codename $osx_version $osx_build" From 4d5bef9a4283af994e6546a982571e055f1d6475 Mon Sep 17 00:00:00 2001 From: Tommy Chak Date: Wed, 16 Oct 2019 02:28:31 +1100 Subject: [PATCH 0782/1133] Add ArcheStrike ASCII --- neofetch | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/neofetch b/neofetch index c8874b37a..4abf74402 100755 --- a/neofetch +++ b/neofetch @@ -5274,6 +5274,42 @@ ${c1} 'c' EOF ;; + "ArchStrike"*) + set_colors 6 + read -rd '' ascii_data <<'EOF' +${c1} ,#b + ,# b + # b + # b + # b + # p + # p + "@ b + m `@ b + # #W, "# b + ,# @###@ Q + ,# # , + ] #M"^##tommy##^"7@@` / + { @#` ,# #mQ '" ,## + @ #b ,## #" "@ #p + # b ;# #b` ,###Q 7@ #p + # b @ #M^ ;# #p^# b + ,# b @ @#" "@ \ # ! N + ]# # j@ #" .7 \ b @ # + { # @ ##pG "%# # @ # + # # j | `*G ,# b @ #p + # pt@ | ,# Chak# bj##Q" #--p + ,# #p^# | ;# *^ | b @ @#m + ,# #p@ |.# I^ |#b # !##m + @ ##__" I^ \-;# #w + # #W"` .##I^ #O^ ""W# # + # #"^ sl" #$#y#mot#-#@@sw##*' `"%# #p + ,# #M" ." "%# b + ;##W^ `"@ N +*` `* +EOF + ;; + *"XFerience"*) set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' From c16af3a3fd194e25027c3f78bc37479d9f23d1de Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 15 Oct 2019 18:00:24 +0200 Subject: [PATCH 0783/1133] OS: Add support for Cucumber Linux --- neofetch | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index c8874b37a..8695b4d78 100755 --- a/neofetch +++ b/neofetch @@ -879,8 +879,12 @@ get_distro() { elif [[ -f "/etc/os-release" || \ -f "/usr/lib/os-release" || \ - -f "/etc/openwrt_release" ]]; then - files=("/etc/os-release" "/usr/lib/os-release" "/etc/openwrt_release") + -f "/etc/openwrt_release" || \ + -f "/etc/lsb-release" ]]; then + files=("/etc/os-release" + "/usr/lib/os-release" + "/etc/openwrt_release" + "/etc/lsb-release") # Source the os-release file for file in "${files[@]}"; do @@ -5953,6 +5957,32 @@ ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; + *"Cucumber"*) + set_colors 2 3 + read -rd '' ascii_data <<'EOF' +${c1} `.-://++++++//:-.` + `:/+//${c2}::--------${c1}:://+/:` + -++/:${c2}----..........----${c1}:/++- + .++:${c2}---...........-......---${c1}:++. + /+:${c2}---....-::/:/--//:::-....---${c1}:+/ + `++:${c2}--.....:---::/--/::---:.....--${c1}:++` + /+:${c2}--.....--.--::::-/::--.--.....--${c1}:+/ +-o:${c2}--.......-:::://--/:::::-.......--${c1}:o- +/+:${c2}--...-:-::---:::..:::---:--:-...--${c1}:+/ +o/:${c2}-...-:.:.-/:::......::/:.--.:-...-${c1}:/o +o/${c2}--...::-:/::/:-......-::::::-/-...-${c1}:/o +/+:${c2}--..-/:/:::--:::..:::--::////-..--${c1}:+/ +-o:${c2}--...----::/:::/--/:::::-----...--${c1}:o- + /+:${c2}--....://:::.:/--/:.::://:....--${c1}:+/ + `++:${c2}--...-:::.--.:..:.--.:/:-...--${c1}:++` + /+:${c2}---....----:-..-:----....---${c1}:+/ + .++:${c2}---..................---${c1}:++. + -/+/:${c2}----..........----${c1}:/+/- + `:/+//${c2}::--------:::${c1}/+/:` + `.-://++++++//:-.` +EOF + ;; + "debian_small") set_colors 1 7 3 read -rd '' ascii_data <<'EOF' From c77859685ec091bf3cccce873ce533f07a271c36 Mon Sep 17 00:00:00 2001 From: Tommy Chak Date: Wed, 16 Oct 2019 05:33:22 +1100 Subject: [PATCH 0784/1133] Resize ArchStrike ASCII, no more signature ): --- neofetch | 53 ++++++++++++++++++++--------------------------------- 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/neofetch b/neofetch index 4abf74402..729373116 100755 --- a/neofetch +++ b/neofetch @@ -5274,39 +5274,26 @@ ${c1} 'c' EOF ;; - "ArchStrike"*) - set_colors 6 - read -rd '' ascii_data <<'EOF' -${c1} ,#b - ,# b - # b - # b - # b - # p - # p - "@ b - m `@ b - # #W, "# b - ,# @###@ Q - ,# # , - ] #M"^##tommy##^"7@@` / - { @#` ,# #mQ '" ,## - @ #b ,## #" "@ #p - # b ;# #b` ,###Q 7@ #p - # b @ #M^ ;# #p^# b - ,# b @ @#" "@ \ # ! N - ]# # j@ #" .7 \ b @ # - { # @ ##pG "%# # @ # - # # j | `*G ,# b @ #p - # pt@ | ,# Chak# bj##Q" #--p - ,# #p^# | ;# *^ | b @ @#m - ,# #p@ |.# I^ |#b # !##m - @ ##__" I^ \-;# #w - # #W"` .##I^ #O^ ""W# # - # #"^ sl" #$#y#mot#-#@@sw##*' `"%# #p - ,# #M" ." "%# b - ;##W^ `"@ N -*` `* + "ArchStrike"*) + set_colors 0 6 + read -rd '' ascii_data <<'EOF' +${c1}                   *    +                  **. +                 **** +                ****** +                ******* +              ** ******* +             **** ******* +            ${c1}****${c2}_____${c1}***${c2}/${c1}* +           ***${c2}/${c1}*******${c2}//${c1}*** +          **${c2}/${c1}********${c2}///${c1}*${c2}/${c1}** +         **${c2}/${c1}*******${c2}////${c1}***${c2}/${c1}** +        **${c2}/${c1}****${c2}//////.,${c1}****${c2}/${c1}** +       ***${c2}/${c1}*****${c2}/////////${c1}**${c2}/${c1}*** +      ****${c2}/${c1}****    ${c2}/////${c1}***${c2}/${c1}**** +     ******${c2}/${c1}*** ${c2}////   ${c1}**${c2}/${c1}****** +    ********${c2}/${c1}* ${c2}///      ${c1}*${c2}/${c1}******** +  ,******     ${c2}// ______ /    ${c1}******, EOF ;; From 3801345b72a6b41129c31e86a08023bc195ff8bc Mon Sep 17 00:00:00 2001 From: Tommy Chak Date: Wed, 16 Oct 2019 05:38:57 +1100 Subject: [PATCH 0785/1133] Change of "A" symbol colour. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 729373116..86c703a19 100755 --- a/neofetch +++ b/neofetch @@ -5275,7 +5275,7 @@ EOF ;; "ArchStrike"*) - set_colors 0 6 + set_colors 8 6 read -rd '' ascii_data <<'EOF' ${c1}                   *                      **. From a9dd750734e91e3098a63869615ee0ae2b6a4507 Mon Sep 17 00:00:00 2001 From: Alex Baranowski Date: Tue, 15 Oct 2019 21:35:04 +0200 Subject: [PATCH 0786/1133] Add support for EuroLinux --- neofetch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/neofetch b/neofetch index 2406d87a3..b85e2d5b6 100755 --- a/neofetch +++ b/neofetch @@ -6268,6 +6268,37 @@ dMm `/++/-``/yNNh+/sdNMNddMm- mMd EOF ;; + "EuroLinux"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} + DZZZZZZZZZZZZZ + ZZZZZZZZZZZZZZZZZZZ + ZZZZZZZZZZZZZZZZZZZZ + OZZZZZZZZZZZZZZZZZZZZ + ${c2}E${c1} ZZZ 8ZZZZZZZZZZZZ + Z${c2}U${c1}Z ZZZZZZZZZZ + ZZ${c2}R${c1}ZZN ZZZZZZZZZ + ZZ${c2}O${c1}ZZZZ ZZZZZZZZ +ZZE${c2}L${c1}ZZZZ OZZZZZZZ +ZZZ${c2}I${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ +ZZZ${c2}N${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ +ZZZ${c2}U${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ +ZZZ${c2}X${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ +ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ +ZZZZZZZZ + ZZZZZZZZ + OZZZZZZZZO + ZZZZZZZZZZZ + OZZZZZZZZZZZZZZZN + ZZZZZZZZZZZZZZZZ + DZZZZZZZZZZZZZZZ + ZZZZZZZZZZZZZ + NZZZZZZZZ + +EOF + ;; + "Exherbo"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From 40a85fa3c9b306e38a5e2aeaebdd9157ab3501d2 Mon Sep 17 00:00:00 2001 From: Alex Baranowski Date: Wed, 16 Oct 2019 12:16:14 +0200 Subject: [PATCH 0787/1133] Make EuroLinux logo smaller --- neofetch | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/neofetch b/neofetch index b85e2d5b6..394bf31b9 100755 --- a/neofetch +++ b/neofetch @@ -6271,31 +6271,26 @@ EOF "EuroLinux"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' -${c1} - DZZZZZZZZZZZZZ - ZZZZZZZZZZZZZZZZZZZ - ZZZZZZZZZZZZZZZZZZZZ - OZZZZZZZZZZZZZZZZZZZZ - ${c2}E${c1} ZZZ 8ZZZZZZZZZZZZ - Z${c2}U${c1}Z ZZZZZZZZZZ - ZZ${c2}R${c1}ZZN ZZZZZZZZZ - ZZ${c2}O${c1}ZZZZ ZZZZZZZZ -ZZE${c2}L${c1}ZZZZ OZZZZZZZ -ZZZ${c2}I${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -ZZZ${c2}N${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -ZZZ${c2}U${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -ZZZ${c2}X${c1}ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ -ZZZZZZZZ - ZZZZZZZZ - OZZZZZZZZO - ZZZZZZZZZZZ - OZZZZZZZZZZZZZZZN - ZZZZZZZZZZZZZZZZ - DZZZZZZZZZZZZZZZ - ZZZZZZZZZZZZZ - NZZZZZZZZ +${c1} + __ + -wwwWWWWWWWWWwww- + -WWWWWWWWWWWWWWWWWWw- + \WWWWWWWWWWWWWWWWWWW- + _Ww `WWWWWWWWWWWWWWWWWWWw + -W${c2}E${c1}Www -WWWWWWWWW- +_WW${c2}U${c1}WWWW- _WWWWWWWW +_WW${c2}R${c1}WWWWWWWWWWWWWWWWWWWWWWWWWWWWWW- +wWW${c2}O${c1}WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWW +WWW${c2}L${c1}WWWWWWWWWWWWWWWWWWWWWWWWWWWWWWw +WWW${c2}I${c1}WWWWWWWWWWWWWWWWWWWWWWWWWWWWww- +wWW${c2}N${c1}WWWWw + WW${c2}U${c1}WWWWWWw + wW${c2}X${c1}WWWWWWWWww + wWWWWWWWWWWWWWWWw + wWWWWWWWWWWWWWWWw + WWWWWWWWWWWWWw + wWWWWWWWw EOF ;; From 8fc1dfb996fe0383cd2c98c3e94f76e19e3cbd43 Mon Sep 17 00:00:00 2001 From: Alex Baranowski Date: Wed, 16 Oct 2019 12:32:04 +0200 Subject: [PATCH 0788/1133] Fix empty line --- neofetch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 394bf31b9..366650feb 100755 --- a/neofetch +++ b/neofetch @@ -6271,9 +6271,7 @@ EOF "EuroLinux"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' - -${c1} - __ +${c1} __ -wwwWWWWWWWWWwww- -WWWWWWWWWWWWWWWWWWw- \WWWWWWWWWWWWWWWWWWW- From 6758bfb7656f7e16a7b7fd4b88b16040c05c4812 Mon Sep 17 00:00:00 2001 From: Zhang Boyu <34395339+Zhboyu-BUAA@users.noreply.github.com> Date: Sat, 19 Oct 2019 16:11:59 +0800 Subject: [PATCH 0789/1133] Update neofetch --- neofetch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neofetch b/neofetch index 4274be075..1bbe09cd7 100755 --- a/neofetch +++ b/neofetch @@ -1210,6 +1210,12 @@ get_kernel() { return } + # In Windows 'uname -r' under MSYS returns a "virtual" kernel version, so use wmic + [[ "$os" == Windows ]] && { + kernel_version=$(wmic os get Version) + kernel_version="${kernel_version/Version}" + } + case "$kernel_shorthand" in "on") kernel="$kernel_version" ;; "off") kernel="$kernel_name $kernel_version" ;; From 2c3faf9469de01f7e74d397e05b68f8cd9e9d4c0 Mon Sep 17 00:00:00 2001 From: Zhang Boyu <34395339+Zhboyu-BUAA@users.noreply.github.com> Date: Sat, 19 Oct 2019 16:30:40 +0800 Subject: [PATCH 0790/1133] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 1bbe09cd7..eecc1469b 100755 --- a/neofetch +++ b/neofetch @@ -1210,7 +1210,7 @@ get_kernel() { return } - # In Windows 'uname -r' under MSYS returns a "virtual" kernel version, so use wmic + # In Windows 'uname -r' under MSYS returns version of MSYS, so use wmic [[ "$os" == Windows ]] && { kernel_version=$(wmic os get Version) kernel_version="${kernel_version/Version}" From 480b62edec8ed6cf189994d4e5ac82403bd7021a Mon Sep 17 00:00:00 2001 From: Zhang Boyu <34395339+Zhboyu-BUAA@users.noreply.github.com> Date: Sun, 20 Oct 2019 00:19:10 +0800 Subject: [PATCH 0791/1133] fix per suggestion --- neofetch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index eecc1469b..c26dc98f3 100755 --- a/neofetch +++ b/neofetch @@ -1210,10 +1210,11 @@ get_kernel() { return } - # In Windows 'uname -r' under MSYS returns version of MSYS, so use wmic + # In Windows 'uname' may return the info of GNUenv thus use wmic for OS kernel [[ "$os" == Windows ]] && { - kernel_version=$(wmic os get Version) - kernel_version="${kernel_version/Version}" + kernel=$(wmic os get Version) + kernel="${kernel/Version}" + return } case "$kernel_shorthand" in From cdce44255a903301d7c2d69239713805621e3814 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 19 Oct 2019 20:29:44 +0200 Subject: [PATCH 0792/1133] song: add muine player --- neofetch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/neofetch b/neofetch index 4274be075..efb6b4646 100755 --- a/neofetch +++ b/neofetch @@ -457,6 +457,7 @@ disk_subtitle="mount" # mocp # mopidy # mpd +# muine # netease-cloud-music # pogo # pragha @@ -2465,6 +2466,7 @@ get_song() { "mocp" "mopidy" "mpd" + "muine" "netease-cloud-music" "plasma-browser-integration" "pogo" @@ -2579,6 +2581,13 @@ get_song() { awk -F':|,' '{if ($6 && $8 && $4) printf $6 "\n" $8 "\n" $4}')" ;; + "muine"*) + song="$(dbus-send --print-reply --dest=org.gnome.Muine /org/gnome/Muine/Player \ + org.gnome.Muine.Player.GetCurrentSong | + awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} + END {print a "\n" b "\n" t}')" + ;; + "quodlibet"*) song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \ /net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\ From 25896145c26e69e20f0932e5786858239053606f Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 20 Oct 2019 11:43:50 +0200 Subject: [PATCH 0793/1133] song: add elementary music player --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index efb6b4646..35ce677fe 100755 --- a/neofetch +++ b/neofetch @@ -451,6 +451,7 @@ disk_subtitle="mount" # gmusicbrowser # gogglesmm # guayadeque +# io.elementary.music # iTunes # juk # lollypop @@ -2460,6 +2461,7 @@ get_song() { "gmusicbrowser" "gogglesmm" "guayadeque" + "io.elementary.music" "iTunes" "juk" "lollypop" @@ -2534,6 +2536,7 @@ get_song() { "xnoise"*) get_song_dbus "xnoise" ;; "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; + "io.elementary.music"*) get_song_dbus "Music" ;; "cmus"*) # NOTE: cmus >= 2.8.0 supports mpris2 From 78f788704e04478f66b0ca00bca0502e5459470d Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 20 Oct 2019 17:57:32 +0200 Subject: [PATCH 0794/1133] Add kitty to the list of available backends --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 35ce677fe..16ce10c4d 100755 --- a/neofetch +++ b/neofetch @@ -4551,7 +4551,7 @@ BARS: IMAGE BACKEND: --backend backend Which image backend to use. Possible values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', - 'off', 'sixel', 'tycat', 'w3m' + 'off', 'sixel', 'tycat', 'w3m', 'kitty' --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] From a9eeae8969cbdebefee15d1ec5d86511dc63b039 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 20 Oct 2019 22:04:25 +0200 Subject: [PATCH 0795/1133] Regenerate man page --- neofetch.1 | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 525291a94..3db17b787 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.8. -.TH NEOFETCH "1" "August 2019" "Neofetch 6.1.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11. +.TH NEOFETCH "1" "October 2019" "Neofetch 6.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -40,7 +40,7 @@ For example: 'info "Memory" memory' would be '\-\-disable memory' .IP NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu' .TP -\fB\-\-package_managers\fR on/tiny/off +\fB\-\-package_managers\fR on/off Hide/Show Package Manager names . (on, tiny, off) .TP \fB\-\-os_arch\fR on/off @@ -79,7 +79,7 @@ NOTE: This only works on Linux and BSD. NOTE: For FreeBSD and NetBSD\-based systems, you need to enable coretemp kernel module. This only supports newer Intel processors. .TP -\fB\-\-distro_shorthand\fR on/tiny/off +\fB\-\-distro_shorthand\fR on/off Shorten the output of distro (on, tiny, off) .IP NOTE: This option won't work in Windows (Cygwin) @@ -89,7 +89,7 @@ Shorten the output of kernel .IP NOTE: This option won't work in BSDs (except PacBSD and PC\-BSD) .TP -\fB\-\-uptime_shorthand\fR on/tiny/off +\fB\-\-uptime_shorthand\fR on/off Shorten the output of uptime (on, tiny, off) .TP \fB\-\-refresh_rate\fR on/off @@ -218,7 +218,7 @@ Possible values: bar, infobar, barinfo, off \fB\-\-backend\fR backend Which image backend to use. Possible values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', -\&'off', 'sixel', 'tycat', 'w3m' +\&'off', 'sixel', 'tycat', 'w3m', 'kitty' .TP \fB\-\-source\fR source Which image or ascii file to use. @@ -283,7 +283,7 @@ NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu\-GNOME', \&'Ubuntu\-Studio' or 'Ubuntu\-Budgie' to use the flavors. .TP NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, -OpenBSD, and Void have a smaller logo variant. +OpenBSD, postmarketOS, and Void have a smaller logo variant. .IP NOTE: Use '{distro name}_small' to use the small variants. .TP @@ -339,6 +339,9 @@ Specify a path to a custom config file \fB\-\-config\fR none Launch the script without a config file .TP +\fB\-\-no_config\fR +Don't create the user config file. +.TP \fB\-\-print_config\fR Print the default config file to stdout. .TP From 5ada1e6c4e43ca122c37fa427bd24a92c28aed09 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 26 Oct 2019 21:54:37 +0200 Subject: [PATCH 0796/1133] ascii: fix Guix logo --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 16ce10c4d..3bce1a6cc 100755 --- a/neofetch +++ b/neofetch @@ -6679,7 +6679,7 @@ ${c1}|.__ __.| EOF ;; - "GuixSD"*) + "Guix"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' ${c1} .. `. From c0d5508f0374fcc7b83f539c0981042a7649e106 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 26 Oct 2019 21:56:45 +0200 Subject: [PATCH 0797/1133] ascii: rename small Guix logo too --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 3bce1a6cc..292093bbc 100755 --- a/neofetch +++ b/neofetch @@ -6666,7 +6666,7 @@ eee ${c2}// \\ooo/ \\\ ${c1}eee EOF ;; - "guixsd_small"*) + "guix_small"*) set_colors 3 7 6 1 8 read -rd '' ascii_data <<'EOF' ${c1}|.__ __.| From 3be3b93634165918d524be6846346a83f471ce98 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 27 Oct 2019 09:30:28 +0100 Subject: [PATCH 0798/1133] style: fix Plasma themes --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 292093bbc..952ab7d6a 100755 --- a/neofetch +++ b/neofetch @@ -2726,7 +2726,7 @@ get_style() { # Check for DE Theme. case "$de" in - "KDE"*) + "KDE"* | "Plasma"*) kde_config_dir if [[ -f "${kde_config_dir}/kdeglobals" ]]; then @@ -2739,7 +2739,7 @@ get_style() { kde_font_size="${kde_font_size/,*}" kde_theme="${kde_theme/,*} ${kde_theme/*,} ${kde_font_size}" fi - kde_theme="$kde_theme [KDE], " + kde_theme="$kde_theme ["$de"], " else err "Theme: KDE config files not found, skipping." fi @@ -2845,6 +2845,7 @@ get_style() { theme="${theme// '[GTK'[0-9]']'}" theme="${theme/ '[GTK2/3]'}" theme="${theme/ '[KDE]'}" + theme="${theme/ '[Plasma]'}" fi fi } From 5fa7446fe05218ed81d68bafd1b414aadde3195b Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 27 Oct 2019 09:56:16 +0100 Subject: [PATCH 0799/1133] Remove quotes (shellcheck) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 952ab7d6a..6d1dc5868 100755 --- a/neofetch +++ b/neofetch @@ -2739,7 +2739,7 @@ get_style() { kde_font_size="${kde_font_size/,*}" kde_theme="${kde_theme/,*} ${kde_theme/*,} ${kde_font_size}" fi - kde_theme="$kde_theme ["$de"], " + kde_theme="$kde_theme [$de], " else err "Theme: KDE config files not found, skipping." fi From b81b69009e318ada5bead8c4256cb6a5cb6de6e4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 Oct 2019 09:00:04 +0200 Subject: [PATCH 0800/1133] neofetch: remove uneeded quotes --- neofetch | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/neofetch b/neofetch index 6d1dc5868..93b0116f7 100755 --- a/neofetch +++ b/neofetch @@ -28,12 +28,12 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -version="6.1.0" +version=6.1.0 -bash_version="${BASH_VERSION/.*}" -sys_locale="${LANG:-C}" -XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-${HOME}/.config}" -PATH="${PATH}:/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec" +bash_version=${BASH_VERSION/.*} +sys_locale=${LANG:-C} +XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-${HOME}/.config} +PATH=$PATH:/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec reset='\e[0m' shopt -s nocasematch @@ -42,7 +42,7 @@ LC_ALL=C LANG=C # Fix issues with gsettings. -export GIO_EXTRA_MODULES="/usr/lib/x86_64-linux-gnu/gio/modules/" +export GIO_EXTRA_MODULES=/usr/lib/x86_64-linux-gnu/gio/modules/ # Neofetch default config. read -rd '' config <<'EOF' @@ -819,25 +819,25 @@ EOF get_os() { # $kernel_name is set in a function called cache_uname and is # just the output of "uname -s". - case "$kernel_name" in - "Darwin"): "$darwin_name" ;; - "SunOS"): "Solaris" ;; - "Haiku"): "Haiku" ;; - "MINIX"): "MINIX" ;; - "AIX"): "AIX" ;; - "IRIX"*): "IRIX" ;; - "FreeMiNT"): "FreeMiNT" ;; + case $kernel_name in + Darwin): "$darwin_name" ;; + SunOS): Solaris ;; + Haiku): Haiku ;; + MINIX): MINIX ;; + AIX): AIX ;; + IRIX*): IRIX ;; + FreeMiNT): FreeMiNT ;; - "Linux" | "GNU"*) - : "Linux" + Linux|GNU*) + : Linux ;; - *"BSD" | "DragonFly" | "Bitrig") - : "BSD" + *BSD|DragonFly|Bitrig) + : BSD ;; - "CYGWIN"* | "MSYS"* | "MINGW"*) - : "Windows" + CYGWIN*|MSYS*|MINGW*) + : Windows ;; *) @@ -846,7 +846,8 @@ get_os() { exit 1 ;; esac - os="$_" + + os=$_ } get_distro() { From c154aebc402548af2e4269d69fd7f758d7801deb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 Oct 2019 09:13:17 +0200 Subject: [PATCH 0801/1133] neofetch: remove uneeded quotes --- neofetch | 238 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 120 insertions(+), 118 deletions(-) diff --git a/neofetch b/neofetch index 93b0116f7..a1c80e6e7 100755 --- a/neofetch +++ b/neofetch @@ -851,75 +851,74 @@ get_os() { } get_distro() { - [[ "$distro" ]] && return - - case "$os" in - "Linux" | "BSD" | "MINIX") - if [[ -f "/bedrock/etc/bedrock-release" && "$PATH" == */bedrock/cross/* ]]; then - case "$distro_shorthand" in - "on" | "tiny") distro="Bedrock Linux" ;; - *) distro="$(< /bedrock/etc/bedrock-release)" + [[ $distro ]] && return + + case $os in + Linux|BSD|MINIX) + if [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]]; then + case $distro_shorthand in + on|tiny) distro="Bedrock Linux" ;; + *) distro=$(< /bedrock/etc/bedrock-release) esac - elif [[ -f "/etc/redstar-release" ]]; then - case "$distro_shorthand" in - "on" | "tiny") distro="Red Star OS" ;; + + elif [[ -f /etc/redstar-release ]]; then + case $distro_shorthand in + on|tiny) distro="Red Star OS" ;; *) distro="Red Star OS $(awk -F'[^0-9*]' '$0=$2' /etc/redstar-release)" esac - elif [[ -f "/etc/siduction-version" ]]; then - case "$distro_shorthand" in - "on" | "tiny") distro="Siduction" ;; + elif [[ -f /etc/siduction-version ]]; then + case $distro_shorthand in + on|tiny) distro=Siduction ;; *) distro="Siduction ($(lsb_release -sic))" esac + elif type -p pveversion >/dev/null; then - case "$distro_shorthand" in - "on" | "tiny") distro="Proxmox VE" ;; + case $distro_shorthand in + on|tiny) distro="Proxmox VE" ;; *) - distro="$(pveversion)" - distro="${distro#pve-manager/}" + distro=$(pveversion) + distro=${distro#pve-manager/} distro="Proxmox VE ${distro%/*}" esac elif type -p lsb_release >/dev/null; then - case "$distro_shorthand" in - "on") lsb_flags="-sir" ;; - "tiny") lsb_flags="-si" ;; - *) lsb_flags="-sd" ;; + case $distro_shorthand in + on) lsb_flags=-si ;; + tiny) lsb_flags=-si ;; + *) lsb_flags=-sd ;; esac - distro="$(lsb_release "$lsb_flags")" + distro=$(lsb_release "$lsb_flags") - elif [[ -f "/etc/os-release" || \ - -f "/usr/lib/os-release" || \ - -f "/etc/openwrt_release" || \ - -f "/etc/lsb-release" ]]; then - files=("/etc/os-release" - "/usr/lib/os-release" - "/etc/openwrt_release" - "/etc/lsb-release") + elif [[ -f /etc/os-release || \ + -f /usr/lib/os-release || \ + -f /etc/openwrt_release || \ + -f /etc/lsb-release ]]; then # Source the os-release file - for file in "${files[@]}"; do + for file in /usr/lib/os-release /etc/os-release \ + /etc/openwrt_release /etc/lsb-release; do source "$file" && break done # Format the distro name. - case "$distro_shorthand" in - "on") distro="${NAME:-${DISTRIB_ID}} ${VERSION_ID:-${DISTRIB_RELEASE}}" ;; - "tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;; - "off") distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; + case $distro_shorthand in + on) distro="${NAME:-${DISTRIB_ID}} ${VERSION_ID:-${DISTRIB_RELEASE}}" ;; + tiny) distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;; + off) distro="${PRETTY_NAME:-${DISTRIB_DESCRIPTION}} ${UBUNTU_CODENAME}" ;; esac - elif [[ -f "/etc/GoboLinuxVersion" ]]; then - case "$distro_shorthand" in - "on" | "tiny") distro="GoboLinux" ;; + elif [[ -f /etc/GoboLinuxVersion ]]; then + case $distro_shorthand in + on|tiny) distro=GoboLinux ;; *) distro="GoboLinux $(< /etc/GoboLinuxVersion)" esac elif type -p crux >/dev/null; then - distro="$(crux)" - case "$distro_shorthand" in - "on") distro="${distro//version}" ;; - "tiny") distro="${distro//version*}" ;; + distro=$(crux) + case $distro_shorthand in + on) distro=${distro//version} ;; + tiny) distro=${distro//version*} esac elif type -p tazpkg >/dev/null; then @@ -927,90 +926,91 @@ get_distro() { elif type -p kpt >/dev/null && \ type -p kpm >/dev/null; then - distro="KSLinux" + distro=KSLinux - elif [[ -d "/system/app/" && -d "/system/priv-app" ]]; then + elif [[ -d /system/app/ && -d /system/priv-app ]]; then distro="Android $(getprop ro.build.version.release)" # Chrome OS doesn't conform to the /etc/*-release standard. # While the file is a series of variables they can't be sourced # by the shell since the values aren't quoted. - elif [[ -f "/etc/lsb-release" && "$(< /etc/lsb-release)" == *CHROMEOS* ]]; then - distro="$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release)" + elif [[ -f /etc/lsb-release && $(< /etc/lsb-release) == *CHROMEOS* ]]; then + distro=$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release) elif type -p guix >/dev/null; then - case "$distro_shorthand" in - "on" | "tiny") distro="Guix System" ;; + case $distro_shorthand in + on|tiny) distro="Guix System" ;; *) distro="Guix System $(guix system -V | awk 'NR==1{printf $5}')" esac else for release_file in /etc/*-release; do - distro+="$(< "$release_file")" + distro+=$(< "$release_file") done - if [[ -z "$distro" ]]; then - case "$distro_shorthand" in - "on" | "tiny") distro="$kernel_name" ;; + if [[ -z $distro ]]; then + case $distro_shorthand in + on|tiny) distro=$kernel_name ;; *) distro="$kernel_name $kernel_version" ;; esac - distro="${distro/DragonFly/DragonFlyBSD}" - # Workarounds for FreeBSD based distros. - [[ -f "/etc/pcbsd-lang" ]] && distro="PCBSD" - [[ -f "/etc/trueos-lang" ]] && distro="TrueOS" + distro=${distro/DragonFly/DragonFlyBSD} - # /etc/pacbsd-release is an empty file - [[ -f "/etc/pacbsd-release" ]] && distro="PacBSD" + # Workarounds for some BSD based distros. + [[ -f /etc/pcbsd-lang ]] && distro=PCBSD + [[ -f /etc/trueos-lang ]] && distro=TrueOS + [[ -f /etc/pacbsd-release ]] && distro=PacBSD fi fi - if [[ "$(< /proc/version)" == *Microsoft* || "$kernel_version" == *Microsoft* ]]; then - case "$distro_shorthand" in - "on") distro+=" [Windows 10]" ;; - "tiny") distro="Windows 10" ;; - *) distro+=" on Windows 10" ;; + if [[ $(< /proc/version) == *Microsoft* || $kernel_version == *Microsoft* ]]; then + case $distro_shorthand in + on) distro+=" [Windows 10]" ;; + tiny) distro="Windows 10" ;; + *) distro+=" on Windows 10" ;; esac - elif [[ "$(< /proc/version)" == *chrome-bot* || -f "/dev/cros_ec" ]]; then - case "$distro_shorthand" in - "on") distro+=" [Chrome OS]" ;; - "tiny") distro="Chrome OS" ;; - *) distro+=" on Chrome OS" ;; + elif [[ $(< /proc/version) == *chrome-bot* || -f /dev/cros_ec ]]; then + case $distro_shorthand in + on) distro+=" [Chrome OS]" ;; + tiny) distro="Chrome OS" ;; + *) distro+=" on Chrome OS" ;; esac fi - distro="$(trim_quotes "$distro")" - distro="${distro/NAME=}" + distro=$(trim_quotes "$distro") + distro=${distro/NAME=} ;; "Mac OS X") - case "$osx_version" in - "10.4"*) codename="Mac OS X Tiger" ;; - "10.5"*) codename="Mac OS X Leopard" ;; - "10.6"*) codename="Mac OS X Snow Leopard" ;; - "10.7"*) codename="Mac OS X Lion" ;; - "10.8"*) codename="OS X Mountain Lion" ;; - "10.9"*) codename="OS X Mavericks" ;; - "10.10"*) codename="OS X Yosemite" ;; - "10.11"*) codename="OS X El Capitan" ;; - "10.12"*) codename="macOS Sierra" ;; - "10.13"*) codename="macOS High Sierra" ;; - "10.14"*) codename="macOS Mojave" ;; - "10.15"*) codename="macOS Catalina" ;; - *) codename="macOS" ;; + case $osx_version in + 10.4*) codename="Mac OS X Tiger" ;; + 10.5*) codename="Mac OS X Leopard" ;; + 10.6*) codename="Mac OS X Snow Leopard" ;; + 10.7*) codename="Mac OS X Lion" ;; + 10.8*) codename="OS X Mountain Lion" ;; + 10.9*) codename="OS X Mavericks" ;; + 10.10*) codename="OS X Yosemite" ;; + 10.11*) codename="OS X El Capitan" ;; + 10.12*) codename="macOS Sierra" ;; + 10.13*) codename="macOS High Sierra" ;; + 10.14*) codename="macOS Mojave" ;; + 10.15*) codename="macOS Catalina" ;; + *) codename=macOS ;; esac + distro="$codename $osx_version $osx_build" - case "$distro_shorthand" in - "on") distro="${distro/ ${osx_build}}" ;; - "tiny") - case "$osx_version" in - "10."[4-7]*) distro="${distro/${codename}/Mac OS X}" ;; - "10."[8-9]* | "10.1"[0-1]*) distro="${distro/${codename}/OS X}" ;; - "10.1"[2-4]*) distro="${distro/${codename}/macOS}" ;; + case $distro_shorthand in + on) distro=${distro/ ${osx_build}} ;; + + tiny) + case $osx_version in + 10.[4-7]*) distro=${distro/${codename}/Mac OS X} ;; + 10.[8-9]*|10.1[0-1]*) distro=${distro/${codename}/OS X} ;; + 10.1[2-4]*) distro=${distro/${codename}/macOS} ;; esac - distro="${distro/ ${osx_build}}" + distro=${distro/ ${osx_build}} ;; esac ;; @@ -1018,57 +1018,59 @@ get_distro() { "iPhone OS") distro="iOS $osx_version" - # "uname -m" doesn't print architecture on iOS so we force it off. - os_arch="off" + # "uname -m" doesn't print architecture on iOS. + os_arch=off ;; - "Windows") - distro="$(wmic os get Caption)" - distro="${distro/Caption}" - distro="${distro/Microsoft }" + Windows) + distro=$(wmic os get Caption) + distro=${distro/Caption} + distro=${distro/Microsoft } ;; - "Solaris") - case "$distro_shorthand" in - "on" | "tiny") distro="$(awk 'NR==1 {print $1,$3}' /etc/release)" ;; - *) distro="$(awk 'NR==1 {print $1,$2,$3}' /etc/release)" ;; + Solaris) + case $distro_shorthand in + on|tiny) distro=$(awk 'NR==1 {print $1,$3}' /etc/release) ;; + *) distro=$(awk 'NR==1 {print $1,$2,$3}' /etc/release) ;; esac - distro="${distro/\(*}" + distro=${distro/\(*} ;; - "Haiku") + Haiku) distro=Haiku ;; - "AIX") + AIX) distro="AIX $(oslevel)" ;; - "IRIX") + IRIX) distro="IRIX ${kernel_version}" ;; - "FreeMiNT") - distro="FreeMiNT" + FreeMiNT) + distro=FreeMiNT ;; esac - distro="${distro//Enterprise Server}" + distro=${distro//Enterprise Server} - [[ -z "$distro" ]] && distro="$os (Unknown)" + [[ $distro ]] || distro="$os (Unknown)" # Get OS architecture. - case "$os" in - "Solaris" | "AIX" | "Haiku" | "IRIX" | "FreeMiNT") - machine_arch="$(uname -p)" ;; - *) machine_arch="$kernel_machine" ;; + case $os in + Solaris|AIX|Haiku|IRIX|FreeMiNT) + machine_arch=$(uname -p) + ;; + + *) machine_arch=$kernel_machine ;; esac - [[ "$os_arch" == "on" ]] && \ + [[ $os_arch == on ]] && \ distro+=" $machine_arch" - [[ "${ascii_distro:-auto}" == "auto" ]] && \ - ascii_distro="$(trim "$distro")" + [[ ${ascii_distro:-auto} == auto ]] && \ + ascii_distro=$(trim "$distro") } get_model() { From 85f7b7852a60bbcdc9976d3ce4d98781c262ba5c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 Oct 2019 09:28:23 +0200 Subject: [PATCH 0802/1133] neofetch: remove uneeded quotes --- neofetch | 311 +++++++++++++++++++++++++++---------------------------- 1 file changed, 155 insertions(+), 156 deletions(-) diff --git a/neofetch b/neofetch index a1c80e6e7..fe431be50 100755 --- a/neofetch +++ b/neofetch @@ -1074,239 +1074,238 @@ get_distro() { } get_model() { - case "$os" in - "Linux") - if [[ -d "/system/app/" && -d "/system/priv-app" ]]; then + case $os in + Linux) + if [[ -d /system/app/ && -d /system/priv-app ]]; then model="$(getprop ro.product.brand) $(getprop ro.product.model)" - elif [[ -f "/sys/devices/virtual/dmi/id/product_name" || - -f "/sys/devices/virtual/dmi/id/product_version" ]]; then - model="$(< /sys/devices/virtual/dmi/id/product_name)" + elif [[ -f /sys/devices/virtual/dmi/id/product_name || + -f /sys/devices/virtual/dmi/id/product_version ]]; then + model=$(< /sys/devices/virtual/dmi/id/product_name) model+=" $(< /sys/devices/virtual/dmi/id/product_version)" - elif [[ -f "/sys/firmware/devicetree/base/model" ]]; then - model="$(< /sys/firmware/devicetree/base/model)" + elif [[ -f /sys/firmware/devicetree/base/model ]]; then + model=$(< /sys/firmware/devicetree/base/model) - elif [[ -f "/tmp/sysinfo/model" ]]; then - model="$(< /tmp/sysinfo/model)" + elif [[ -f /tmp/sysinfo/model ]]; then + model=$(< /tmp/sysinfo/model) fi ;; "Mac OS X") - if [[ "$(kextstat | grep -F -e "FakeSMC" -e "VirtualSMC")" != "" ]]; then + if [[ $(kextstat | grep -F -e "FakeSMC" -e "VirtualSMC") != "" ]]; then model="Hackintosh (SMBIOS: $(sysctl -n hw.model))" else - model="$(sysctl -n hw.model)" + model=$(sysctl -n hw.model) fi ;; "iPhone OS") - case "$kernel_machine" in - "iPad1,1"): "iPad" ;; - "iPad2,"[1-4]): "iPad 2" ;; - "iPad3,"[1-3]): "iPad 3" ;; - "iPad3,"[4-6]): "iPad 4" ;; - "iPad6,1"[12]): "iPad 5" ;; - "iPad7,"[5-6]): "iPad 6" ;; - "iPad4,"[1-3]): "iPad Air" ;; - "iPad5,"[3-4]): "iPad Air 2" ;; - "iPad11,"[3-4]): "iPad Air 3" ;; - "iPad6,"[7-8]): "iPad Pro (12.9 Inch)" ;; - "iPad6,"[3-4]): "iPad Pro (9.7 Inch)" ;; - "iPad7,"[1-2]): "iPad Pro 2 (12.9 Inch)" ;; - "iPad7,"[3-4]): "iPad Pro (10.5 Inch)" ;; - "iPad8,"[1-4]): "iPad Pro (11 Inch)" ;; - "iPad8,"[5-8]): "iPad Pro 3 (12.9 Inch)" ;; - "iPad2,"[5-7]): "iPad mini" ;; - "iPad4,"[4-6]): "iPad mini 2" ;; - "iPad4,"[7-9]): "iPad mini 3" ;; - "iPad5,"[1-2]): "iPad mini 4" ;; - "iPad11,"[1-2]): "iPad mini 5" ;; - - "iPhone1,1"): "iPhone" ;; - "iPhone1,2"): "iPhone 3G" ;; - "iPhone2,1"): "iPhone 3GS" ;; - "iPhone3,"[1-3]): "iPhone 4" ;; - "iPhone4,1"): "iPhone 4S" ;; - "iPhone5,"[1-2]): "iPhone 5" ;; - "iPhone5,"[3-4]): "iPhone 5c" ;; - "iPhone6,"[1-2]): "iPhone 5s" ;; - "iPhone7,2"): "iPhone 6" ;; - "iPhone7,1"): "iPhone 6 Plus" ;; - "iPhone8,1"): "iPhone 6s" ;; - "iPhone8,2"): "iPhone 6s Plus" ;; - "iPhone8,4"): "iPhone SE" ;; - "iPhone9,"[13]): "iPhone 7" ;; - "iPhone9,"[24]): "iPhone 7 Plus" ;; - "iPhone10,"[14]): "iPhone 8" ;; - "iPhone10,"[25]): "iPhone 8 Plus" ;; - "iPhone10,"[36]): "iPhone X" ;; - "iPhone11,2"): "iPhone XS" ;; - "iPhone11,"[46]): "iPhone XS Max" ;; - "iPhone11,8"): "iPhone XR" ;; - - "iPod1,1"): "iPod touch" ;; - "ipod2,1"): "iPod touch 2G" ;; - "ipod3,1"): "iPod touch 3G" ;; - "ipod4,1"): "iPod touch 4G" ;; - "ipod5,1"): "iPod touch 5G" ;; - "ipod7,1"): "iPod touch 6G" ;; + case $kernel_machine in + iPad1,1): "iPad" ;; + iPad2,[1-4]): "iPad 2" ;; + iPad3,[1-3]): "iPad 3" ;; + iPad3,[4-6]): "iPad 4" ;; + iPad6,1[12]): "iPad 5" ;; + iPad7,[5-6]): "iPad 6" ;; + iPad4,[1-3]): "iPad Air" ;; + iPad5,[3-4]): "iPad Air 2" ;; + iPad11,[3-4]): "iPad Air 3" ;; + iPad6,[7-8]): "iPad Pro (12.9 Inch)" ;; + iPad6,[3-4]): "iPad Pro (9.7 Inch)" ;; + iPad7,[1-2]): "iPad Pro 2 (12.9 Inch)" ;; + iPad7,[3-4]): "iPad Pro (10.5 Inch)" ;; + iPad8,[1-4]): "iPad Pro (11 Inch)" ;; + iPad8,[5-8]): "iPad Pro 3 (12.9 Inch)" ;; + iPad2,[5-7]): "iPad mini" ;; + iPad4,[4-6]): "iPad mini 2" ;; + iPad4,[7-9]): "iPad mini 3" ;; + iPad5,[1-2]): "iPad mini 4" ;; + iPad11,[1-2]): "iPad mini 5" ;; + + iPhone1,1): "iPhone" ;; + iPhone1,2): "iPhone 3G" ;; + iPhone2,1): "iPhone 3GS" ;; + iPhone3,[1-3]): "iPhone 4" ;; + iPhone4,1): "iPhone 4S" ;; + iPhone5,[1-2]): "iPhone 5" ;; + iPhone5,[3-4]): "iPhone 5c" ;; + iPhone6,[1-2]): "iPhone 5s" ;; + iPhone7,2): "iPhone 6" ;; + iPhone7,1): "iPhone 6 Plus" ;; + iPhone8,1): "iPhone 6s" ;; + iPhone8,2): "iPhone 6s Plus" ;; + iPhone8,4): "iPhone SE" ;; + iPhone9,[13]): "iPhone 7" ;; + iPhone9,[24]): "iPhone 7 Plus" ;; + iPhone10,[14]): "iPhone 8" ;; + iPhone10,[25]): "iPhone 8 Plus" ;; + iPhone10,[36]): "iPhone X" ;; + iPhone11,2): "iPhone XS" ;; + iPhone11,[46]): "iPhone XS Max" ;; + iPhone11,8): "iPhone XR" ;; + + iPod1,1): "iPod touch" ;; + ipod2,1): "iPod touch 2G" ;; + ipod3,1): "iPod touch 3G" ;; + ipod4,1): "iPod touch 4G" ;; + ipod5,1): "iPod touch 5G" ;; + ipod7,1): "iPod touch 6G" ;; esac - model="$_" + + model=$_ ;; - "BSD" | "MINIX") - model="$(sysctl -n hw.vendor hw.product)" + BSD|MINIX) + model=$(sysctl -n hw.vendor hw.product) ;; - "Windows") - model="$(wmic computersystem get manufacturer,model)" - model="${model/Manufacturer}" - model="${model/Model}" + Windows) + model=$(wmic computersystem get manufacturer,model) + model=${model/Manufacturer} + model=${model/Model} ;; - "Solaris") - model="$(prtconf -b | awk -F':' '/banner-name/ {printf $2}')" + Solaris) + model=$(prtconf -b | awk -F':' '/banner-name/ {printf $2}') ;; - "AIX") - model="$(/usr/bin/uname -M)" + AIX) + model=$(/usr/bin/uname -M) ;; - "FreeMiNT") - model="$(sysctl -n hw.model)" + FreeMiNT) + model=$(sysctl -n hw.model) ;; esac # Remove dummy OEM info. - model="${model//To be filled by O.E.M.}" - model="${model//To Be Filled*}" - model="${model//OEM*}" - model="${model//Not Applicable}" - model="${model//System Product Name}" - model="${model//System Version}" - model="${model//Undefined}" - model="${model//Default string}" - model="${model//Not Specified}" - model="${model//Type1ProductConfigId}" - model="${model//INVALID}" - model="${model//�}" - - case "$model" in + model=${model//To be filled by O.E.M.} + model=${model//To Be Filled*} + model=${model//OEM*} + model=${model//Not Applicable} + model=${model//System Product Name} + model=${model//System Version} + model=${model//Undefined} + model=${model//Default string} + model=${model//Not Specified} + model=${model//Type1ProductConfigId} + model=${model//INVALID} + model=${model//�} + + case $model in "Standard PC"*) model="KVM/QEMU (${model})" ;; "OpenBSD"*) model="vmm ($model)" ;; esac } get_title() { - user="${USER:-$(whoami || printf "%s" "${HOME/*\/}")}" - hostname="${HOSTNAME:-$(hostname)}" - title="${title_color}${bold}${user}${at_color}@${title_color}${bold}${hostname}" - length="$((${#user} + ${#hostname} + 1))" + user=${USER:-$(id -un || printf %s "${HOME/*\/}")} + hostname=${HOSTNAME:-$(hostname)} + title=${title_color}${bold}${user}${at_color}@${title_color}${bold}${hostname} + length=$((${#user} + ${#hostname} + 1)) } get_kernel() { # Since these OS are integrated systems, it's better to skip this function altogether - [[ "$os" =~ (AIX|IRIX) ]] && return + [[ $os =~ (AIX|IRIX) ]] && return # Haiku uses 'uname -v' and not - 'uname -r'. - [[ "$os" == Haiku ]] && { + [[ $os == Haiku ]] && { kernel=$(uname -v) return } - case "$kernel_shorthand" in - "on") kernel="$kernel_version" ;; - "off") kernel="$kernel_name $kernel_version" ;; + case $kernel_shorthand in + on) kernel=$kernel_version ;; + off) kernel="$kernel_name $kernel_version" ;; esac # Hide kernel info if it's identical to the distro info. - if [[ "$os" =~ (BSD|MINIX) && "$distro" == *"$kernel_name"* ]]; then - case "$distro_shorthand" in - "on" | "tiny") kernel="$kernel_version" ;; - *) unset kernel ;; + [[ $os =~ (BSD|MINIX) && $distro == *"$kernel_name"* ]] && + case $distro_shorthand in + on|tiny) kernel=$kernel_version ;; + *) unset kernel ;; esac - fi } get_uptime() { # Get uptime in seconds. - case "$os" in - "Linux" | "Windows" | "MINIX") + case $os in + Linux|Windows|MINIX) if [[ -r /proc/uptime ]]; then - seconds="$(< /proc/uptime)" - seconds="${seconds/.*}" + s=$(< /proc/uptime) + s=${s/.*} else - boot="$(date -d"$(uptime -s)" +%s)" - now="$(date +%s)" - seconds="$((now - boot))" + boot=$(date -d"$(uptime -s)" +%s) + now=$(date +%s) + s=$((now - boot)) fi ;; - "Mac OS X" | "iPhone OS" | "BSD" | "FreeMiNT") - boot="$(sysctl -n kern.boottime)" - boot="${boot/\{ sec = }" - boot="${boot/,*}" + "Mac OS X"|"iPhone OS"|BSD|FreeMiNT) + boot=$(sysctl -n kern.boottime) + boot=${boot/\{ sec = } + boot=${boot/,*} # Get current date in seconds. - now="$(date +%s)" - seconds="$((now - boot))" + now=$(date +%s) + s=$((now - boot)) ;; - "Solaris") - seconds="$(kstat -p unix:0:system_misc:snaptime | awk '{print $2}')" - seconds="${seconds/.*}" + Solaris) + s=$(kstat -p unix:0:system_misc:snaptime | awk '{print $2}') + s=${s/.*} ;; - "AIX" | "IRIX") - t="$(LC_ALL=POSIX ps -o etime= -p 1)" - d="0" h="0" - case "$t" in *"-"*) d="${t%%-*}"; t="${t#*-}";; esac - case "$t" in *":"*":"*) h="${t%%:*}"; t="${t#*:}";; esac - h="${h#0}" t="${t#0}" - seconds="$((d*86400 + h*3600 + ${t%%:*}*60 + ${t#*:}))" + AIX|IRIX) + t=$(LC_ALL=POSIX ps -o etime= -p 1) + + [[ $t == *-* ]] && { d=${t%%-*}; t=${t#*-}; } + [[ $t == *:*:* ]] && { h=${t%%:*}; t=${t#*:}; } + + h=${h#0} + t=${t#0} + + s=$((${d:-0}*86400 + ${h:-0}*3600 + ${t%%:*}*60 + ${t#*:})) ;; - "Haiku") - seconds=$(($(system_time) / 1000000)) + Haiku) + s=$(($(system_time) / 1000000)) ;; esac - days="$((seconds / 60 / 60 / 24)) days" - hours="$((seconds / 60 / 60 % 24)) hours" - mins="$((seconds / 60 % 60)) minutes" + d="$((s / 60 / 60 / 24)) days" + h="$((s / 60 / 60 % 24)) hours" + m="$((s / 60 % 60)) mins" # Remove plural if < 2. - ((${days/ *} == 1)) && days="${days/s}" - ((${hours/ *} == 1)) && hours="${hours/s}" - ((${mins/ *} == 1)) && mins="${mins/s}" + ((${d/ *} == 1)) && d=${d/s} + ((${h/ *} == 1)) && h=${h/s} + ((${m/ *} == 1)) && m=${m/s} # Hide empty fields. - ((${days/ *} == 0)) && unset days - ((${hours/ *} == 0)) && unset hours - ((${mins/ *} == 0)) && unset mins + ((${d/ *} == 0)) && unset days + ((${h/ *} == 0)) && unset hours + ((${m/ *} == 0)) && unset mins - uptime="${days:+$days, }${hours:+$hours, }${mins}" - uptime="${uptime%', '}" - uptime="${uptime:-${seconds} seconds}" + uptime=${d:+$d, }${h:+$h, }$m + uptime=${uptime%', '} + uptime=${uptime:-$seconds secs} # Make the output of uptime smaller. - case "$uptime_shorthand" in - "on") - uptime="${uptime/minutes/mins}" - uptime="${uptime/minute/min}" - uptime="${uptime/seconds/secs}" - ;; - - "tiny") - uptime="${uptime/ days/d}" - uptime="${uptime/ day/d}" - uptime="${uptime/ hours/h}" - uptime="${uptime/ hour/h}" - uptime="${uptime/ minutes/m}" - uptime="${uptime/ minute/m}" - uptime="${uptime/ seconds/s}" - uptime="${uptime//,}" + case $uptime_shorthand in + on) ;; + + tiny) + uptime=${uptime/ days/d} + uptime=${uptime/ day/d} + uptime=${uptime/ hours/h} + uptime=${uptime/ hour/h} + uptime=${uptime/ mins/m} + uptime=${uptime/ min/m} + uptime=${uptime/ secs/s} + uptime=${uptime//,} ;; esac } From 93600efc6ae07fec1f8ea32cca1a863db3b357d9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 Oct 2019 09:40:04 +0200 Subject: [PATCH 0803/1133] neofetch: remove uneeded quotes --- neofetch | 282 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 143 insertions(+), 139 deletions(-) diff --git a/neofetch b/neofetch index fe431be50..be6ddcbeb 100755 --- a/neofetch +++ b/neofetch @@ -1315,13 +1315,13 @@ get_packages() { # dir: Count files or dirs in a glob. # pac: If packages > 0, log package manager name. # tot: Count lines in command output. - has() { type -p "$1" >/dev/null && manager="$_"; } + has() { type -p "$1" >/dev/null && manager=$_; } dir() { ((packages+=$#)); pac "$#"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")";((packages+=${#pkgs[@]}));pac "${#pkgs[@]}";} # Redefine tot() for Bedrock Linux. - [[ -f "/bedrock/etc/bedrock-release" && "$PATH" == */bedrock/cross/* ]] && { + [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]] && { tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in $(brl list); do strat -r "$s" "$@"; done)" ((packages+="${#pkgs[@]}")) @@ -1330,25 +1330,25 @@ get_packages() { br_prefix="/bedrock/strata/*" } - case "$os" in - "Linux" | "BSD" | "iPhone OS" | "Solaris") + case $os in + Linux|BSD|"iPhone OS"|Solaris) # Package Manager Programs. - has "kiss" && tot kiss l - has "pacman-key" && tot pacman -Qq --color never - has "dpkg" && tot dpkg-query -f '.\n' -W - has "rpm" && tot rpm -qa - has "xbps-query" && tot xbps-query -l - has "apk" && tot apk info - has "opkg" && tot opkg list-installed - has "pacman-g2" && tot pacman-g2 -Q - has "lvu" && tot lvu installed - has "tce-status" && tot tce-status -i - has "pkg_info" && tot pkg_info - has "tazpkg" && tot tazpkg list && ((packages-=6)) - has "sorcery" && tot gaze installed - has "alps" && tot alps showinstalled - has "butch" && tot butch list - has "bonsai" && tot bonsai list + has kiss && tot kiss l + has pacman-key && tot pacman -Qq --color never + has dpkg && tot dpkg-query -f '.\n' -W + has rpm && tot rpm -qa + has xbps-query && tot xbps-query -l + has apk && tot apk info + has opkg && tot opkg list-installed + has pacman-g2 && tot pacman-g2 -Q + has lvu && tot lvu installed + has tce-status && tot tce-status -i + has pkg_info && tot pkg_info + has tazpkg && tot tazpkg list && ((packages-=6)) + has sorcery && tot gaze installed + has alps && tot alps showinstalled + has butch && tot butch list + has bonsai && tot bonsai list # Counting files/dirs. # Variables need to be unquoted here. Only Bedrock Linux is affected. @@ -1356,92 +1356,93 @@ get_packages() { # shellcheck disable=SC2086 { shopt -s nullglob - has "brew" && dir "$(brew --cellar)"/* - has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ - has "Compile" && dir ${br_prefix}/Programs/*/ - has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* - has "crew" && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist - has "pkgtool" && dir ${br_prefix}/var/log/packages/* - has "kagami" && dir ${br_prefix}/var/lib/kagami/pkgs/* - has "cave" && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ - ${br_prefix}/var/db/paludis/repositories/installed/data/*/ + has brew && dir "$(brew --cellar)"/* + has emerge && dir ${br_prefix}/var/db/pkg/*/*/ + has Compile && dir ${br_prefix}/Programs/*/ + has eopkg && dir ${br_prefix}/var/lib/eopkg/package/* + has crew && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist + has pkgtool && dir ${br_prefix}/var/log/packages/* + has kagami && dir ${br_prefix}/var/lib/kagami/pkgs/* + has cave && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ + ${br_prefix}/var/db/paludis/repositories/installed/data/*/ shopt -u nullglob } # Other (Needs complex command) - has "kpm-pkg" && ((packages+="$(kpm --get-selections | grep -cv deinstall$)")) + has kpm-pkg && ((packages+=$(kpm --get-selections | grep -cv deinstall$))) - if has "guix"; then - manager="guix-system" && tot guix package -p "/run/current-system/profile" -I - manager="guix-user" && tot guix package -I - fi + has guix && { + manager=guix-system && tot guix package -p "/run/current-system/profile" -I + manager=guix-user && tot guix package -I + } - if has "nix-store"; then - manager="nix-system" && tot nix-store -q --requisites "/run/current-system/sw" - manager="nix-user" && tot nix-store -q --requisites "$HOME/.nix-profile" - fi + has nix-store && { + manager=nix-system && tot nix-store -q --requisites "/run/current-system/sw" + manager=nix-user && tot nix-store -q --requisites "$HOME/.nix-profile" + } # pkginfo is also the name of a python package manager which is painfully slow. # TODO: Fix this somehow. has pkginfo && tot pkginfo -i - case "$kernel_name" in - "FreeBSD"|"DragonFly") has "pkg" && tot pkg info ;; + case $kernel_name in + FreeBSD|DragonFly) has pkg && tot pkg info ;; + *) - has "pkg" && dir /var/db/pkg/* + has pkg && dir /var/db/pkg/* ((packages == 0)) && \ - has "pkg" && tot pkg list + has pkg && tot pkg list ;; esac # List these last as they accompany regular package managers. - has "flatpak" && tot flatpak list - has "spm" && tot spm list -i - has "puyo" && dir ~/.puyo/installed + has flatpak && tot flatpak list + has spm && tot spm list -i + has puyo && dir ~/.puyo/installed # Snap hangs if the command is run without the daemon running. # Only run snap if the daemon is also running. - has "snap" && ps -e | grep -qFm 1 "snapd" >/dev/null && tot snap list && ((packages-=1)) + has snap && ps -e | grep -qFm 1 snapd >/dev/null && tot snap list && ((packages-=1)) ;; - "Mac OS X" | "MINIX") - has "port" && tot port installed && ((packages-=1)) - has "brew" && dir /usr/local/Cellar/* - has "pkgin" && tot pkgin list + "Mac OS X"|MINIX) + has port && tot port installed && ((packages-=1)) + has brew && dir /usr/local/Cellar/* + has pkgin && tot pkgin list - if has "nix-store"; then - manager="nix-system" && tot nix-store -q --requisites "/run/current-system/sw" - manager="nix-user" && tot nix-store -q --requisites "$HOME/.nix-profile" - fi + has nix-store && { + manager=nix-system && tot nix-store -q --requisites "/run/current-system/sw" + manager=nix-user && tot nix-store -q --requisites "$HOME/.nix-profile" + } ;; - "AIX"| "FreeMiNT") - has "lslpp" && ((packages+="$(lslpp -J -l -q | grep -cv '^#')")) - has "rpm" && tot rpm -qa + AIX|FreeMiNT) + has lslpp && ((packages+=$(lslpp -J -l -q | grep -cv '^#'))) + has rpm && tot rpm -qa ;; - "Windows") - case "$kernel_name" in - "CYGWIN"*) has "cygcheck" && tot cygcheck -cd ;; - "MSYS"*) has "pacman" && tot pacman -Qq --color never ;; + Windows) + case $kernel_name in + CYGWIN*) has cygcheck && tot cygcheck -cd ;; + MSYS*) has pacman && tot pacman -Qq --color never ;; esac # Scoop environment throws errors if `tot scoop list` is used - has "scoop" && dir ~/scoop/apps/* && ((packages-=1)) + has scoop && dir ~/scoop/apps/* && ((packages-=1)) # Count chocolatey packages. - [[ -d "/cygdrive/c/ProgramData/chocolatey/lib" ]] && \ + [[ -d /cygdrive/c/ProgramData/chocolatey/lib ]] && \ dir /cygdrive/c/ProgramData/chocolatey/lib/* ;; - "Haiku") - has "pkgman" && dir /boot/system/package-links/* + Haiku) + has pkgman && dir /boot/system/package-links/* packages=${packages/pkgman/depot} ;; - "IRIX") - manager="swpkg" + IRIX) + manager=swpkg tot versions -b && ((packages-=3)) ;; esac @@ -1449,131 +1450,134 @@ get_packages() { if ((packages == 0)); then unset packages - elif [[ "$package_managers" == "on" ]]; then + elif [[ $package_managers == on ]]; then printf -v packages '%s, ' "${managers[@]}" - packages="${packages%,*}" + packages=${packages%,*} - elif [[ "$package_managers" == "tiny" ]]; then + elif [[ $package_managers == tiny ]]; then packages+=" (${manager_string%,*})" fi - packages="${packages/pacman-key/pacman}" + packages=${packages/pacman-key/pacman} } get_shell() { - case "$shell_path" in - "on") shell="$SHELL " ;; - "off") shell="${SHELL##*/} " ;; + case $shell_path in + on) shell="$SHELL " ;; + off) shell="${SHELL##*/} " ;; esac - if [[ "$shell_version" == "on" ]]; then - case "${shell_name:=${SHELL##*/}}" in - "bash") shell+="${BASH_VERSION/-*}" ;; - "sh" | "ash" | "dash") ;; + [[ $shell_version != on ]] && return - *"ksh") - shell+="$("$SHELL" -c "printf %s \"\$KSH_VERSION\"")" - shell="${shell/ * KSH}" - shell="${shell/version}" - ;; + case ${shell_name:=${SHELL##*/}} in + bash) shell+=${BASH_VERSION/-*} ;; - "tcsh") - shell+="$("$SHELL" -c "printf %s \$tcsh")" - ;; + sh|ash|dash) ;; - *) - shell+="$("$SHELL" --version 2>&1)" - shell="${shell/ "${shell_name}"}" - ;; - esac + *ksh) + shell+=$("$SHELL" -c "printf %s \"\$KSH_VERSION\"") + shell=${shell/ * KSH} + shell=${shell/version} + ;; - # Remove unwanted info. - shell="${shell/, version}" - shell="${shell/xonsh\//xonsh }" - shell="${shell/options*}" - shell="${shell/\(*\)}" - fi + tcsh) + shell+=$("$SHELL" -c "printf %s \$tcsh") + ;; + + *) + shell+=$("$SHELL" --version 2>&1) + shell=${shell/ $shell_name} + ;; + esac + + # Remove unwanted info. + shell=${shell/, version} + shell=${shell/xonsh\//xonsh } + shell=${shell/options*} + shell=${shell/\(*\)} } get_de() { # If function was run, stop here. ((de_run == 1)) && return - case "$os" in - "Mac OS X") de="Aqua" ;; - "Windows") - case "$distro" in - "Windows 8"* | "Windows 10"*) de="Modern UI/Metro" ;; - *) de="Aero" ;; + case $os in + "Mac OS X") de=Aqua ;; + + Windows) + case $distro in + "Windows 8"*|"Windows 10"*) de="Modern UI/Metro" ;; + *) de=Aero esac ;; - "FreeMiNT") + FreeMiNT) freemint_wm=(/proc/*) - case "${freemint_wm[*]}" in - *thing*) de="Thing" ;; - *jinnee*) de="Jinnee" ;; - *tera*) de="Teradesk" ;; - *neod*) de="NeoDesk" ;; - *zdesk*) de="zDesk" ;; - *mdesk*) de="mDesk" ;; + + case ${freemint_wm[*]} in + *thing*) de=Thing ;; + *jinnee*) de=Jinnee ;; + *tera*) de=Teradesk ;; + *neod*) de=NeoDesk ;; + *zdesk*) de=zDesk ;; + *mdesk*) de=mDesk ;; esac ;; *) ((wm_run != 1)) && get_wm - if [[ "$XDG_CURRENT_DESKTOP" ]]; then - de="${XDG_CURRENT_DESKTOP/X\-}" - de="${de/Budgie:GNOME/Budgie}" - de="${de/:Unity7:ubuntu}" + if [[ $XDG_CURRENT_DESKTOP ]]; then + de=${XDG_CURRENT_DESKTOP/X\-} + de=${de/Budgie:GNOME/Budgie} + de=${de/:Unity7:ubuntu} - elif [[ "$DESKTOP_SESSION" ]]; then - de="${DESKTOP_SESSION##*/}" + elif [[ $DESKTOP_SESSION ]]; then + de=${DESKTOP_SESSION##*/} - elif [[ "$GNOME_DESKTOP_SESSION_ID" ]]; then - de="GNOME" + elif [[ $GNOME_DESKTOP_SESSION_ID ]]; then + de=GNOME - elif [[ "$MATE_DESKTOP_SESSION_ID" ]]; then - de="MATE" + elif [[ $MATE_DESKTOP_SESSION_ID ]]; then + de=MATE - elif [[ "$TDE_FULL_SESSION" ]]; then - de="Trinity" + elif [[ $TDE_FULL_SESSION ]]; then + de=Trinity fi # When a window manager is started from a display manager # the desktop variables are sometimes also set to the # window manager name. This checks to see if WM == DE # and dicards the DE value. - [[ "$de" == "$wm" ]] && { unset -v de; return; } + [[ $de == "$wm" ]] && { unset -v de; return; } ;; esac # Fallback to using xprop. - [[ "$DISPLAY" && -z "$de" ]] && type -p xprop &>/dev/null && \ - de="$(xprop -root | awk '/KDE_SESSION_VERSION|^_MUFFIN|xfce4|xfce5/')" + [[ $DISPLAY && -z $de ]] && type -p xprop &>/dev/null && \ + de=$(xprop -root | awk '/KDE_SESSION_VERSION|^_MUFFIN|xfce4|xfce5/') # Format strings. - case "$de" in - "KDE_SESSION_VERSION"*) de="KDE${de/* = }" ;; - *"xfce4"*) de="Xfce4" ;; - *"xfce5"*) de="Xfce5" ;; - *"xfce"*) de="Xfce" ;; - *"mate"*) de="MATE" ;; + case $de in + KDE_SESSION_VERSION*) de=KDE${de/* = } ;; + *xfce4*) de=Xfce4 ;; + *xfce5*) de=Xfce5 ;; + *xfce*) de=Xfce ;; + *mate*) de=MATE ;; - *"MUFFIN"* | "Cinnamon") - de="$(cinnamon --version)"; de="${de:-Cinnamon}" + *MUFFIN*|Cinnamon) + de=$(cinnamon --version) + de=${de:-Cinnamon} ;; - *"GNOME"*) - de="$(gnome-shell --version)" - de="${de/Shell }" + *GNOME*) + de=$(gnome-shell --version) + de=${de/Shell } ;; esac - (( "$KDE_SESSION_VERSION" >= "4" )) && de="${de/KDE/Plasma}" + ((KDE_SESSION_VERSION >= 4)) && de=${de/KDE/Plasma} - # Log that the function was run. de_run=1 } From 1f035379ff19b46195ee25b2b4274ba7519d59b3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 Oct 2019 09:48:08 +0200 Subject: [PATCH 0804/1133] neofetch: remove uneeded quotes --- neofetch | 147 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 74 insertions(+), 73 deletions(-) diff --git a/neofetch b/neofetch index be6ddcbeb..2a93a1e2e 100755 --- a/neofetch +++ b/neofetch @@ -1585,111 +1585,112 @@ get_wm() { # If function was run, stop here. ((wm_run == 1)) && return - case "$uname" in - *"OpenBSD"*) ps_flags=(x -c) ;; - *) ps_flags=(-e) ;; + case $uname in + *OpenBSD*) ps_flags=(x -c) ;; + *) ps_flags=(-e) ;; esac - if [[ "$WAYLAND_DISPLAY" ]]; then - wm="$(ps "${ps_flags[@]}" | grep -m 1 -o -F \ - -e "arcan" \ - -e "asc" \ - -e "clayland" \ - -e "dwc" \ - -e "fireplace" \ - -e "greenfield" \ - -e "grefsen" \ - -e "lipstick" \ - -e "maynard" \ - -e "mazecompositor" \ - -e "motorcar" \ - -e "orbital" \ - -e "orbment" \ - -e "perceptia" \ - -e "rustland" \ - -e "sway" \ - -e "ulubis" \ - -e "velox" \ - -e "wavy" \ - -e "way-cooler" \ - -e "wayfire" \ - -e "wayhouse" \ - -e "westeros" \ - -e "westford" \ - -e "weston")" - - elif [[ "$DISPLAY" && "$os" != "Mac OS X" && "$os" != "FreeMiNT" ]]; then - if type -p xprop &>/dev/null; then - id="$(xprop -root -notype _NET_SUPPORTING_WM_CHECK)" - id="${id##* }" - wm="$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t)" - wm="${wm/*WM_NAME = }" - wm="${wm/\"}" - wm="${wm/\"*}" - fi + if [[ $WAYLAND_DISPLAY ]]; then + wm=$(ps "${ps_flags[@]}" | grep -m 1 -o -F \ + -e arcan \ + -e asc \ + -e clayland \ + -e dwc \ + -e fireplace \ + -e greenfield \ + -e grefsen \ + -e lipstick \ + -e maynard \ + -e mazecompositor \ + -e motorcar \ + -e orbital \ + -e orbment \ + -e perceptia \ + -e rustland \ + -e sway \ + -e ulubis \ + -e velox \ + -e wavy \ + -e way-cooler \ + -e wayfire \ + -e wayhouse \ + -e westeros \ + -e westford \ + -e weston) + + elif [[ $DISPLAY && $os != "Mac OS X" && $os != FreeMiNT ]]; then + type -p xprop &>/dev/null && { + id=$(xprop -root -notype _NET_SUPPORTING_WM_CHECK) + id=${id##* } + wm=$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t) + wm=${wm/*WM_NAME = } + wm=${wm/\"} + wm=${wm/\"*} + } # Rename window managers to their proper values. - [[ "$wm" =~ "WINDOWMAKER" ]] && wm="wmaker" - [[ "$wm" =~ "GNOME Shell" ]] && wm="Mutter" + [[ $wm == *WINDOWMAKER* ]] && wm=wmaker + [[ $wm == *"GNOME Shell"* ]] && wm=Mutter # Fallback for non-EWMH WMs. - [[ -z "$wm" ]] && \ - wm="$(ps "${ps_flags[@]}" | grep -m 1 -o \ + [[ $wm ]] || + wm=$(ps "${ps_flags[@]}" | grep -m 1 -o \ + -e "[s]owm" \ -e "[c]atwm" \ -e "[f]vwm" \ -e "[d]wm" \ -e "[2]bwm" \ -e "[m]onsterwm" \ - -e "[t]inywm")" + -e "[t]inywm") else - case "$os" in + case $os in "Mac OS X") - ps_line="$(ps -e | grep -o \ + ps_line=$(ps -e | grep -o \ -e "[S]pectacle" \ -e "[A]methyst" \ -e "[k]wm" \ -e "[c]hun[k]wm" \ -e "[y]abai" \ - -e "[R]ectangle")" - - case "$ps_line" in - *"chunkwm"*) wm="chunkwm" ;; - *"kwm"*) wm="Kwm" ;; - *"yabai"*) wm="yabai" ;; - *"Amethyst"*) wm="Amethyst" ;; - *"Spectacle"*) wm="Spectacle" ;; - *"Rectangle"*) wm="Rectangle" ;; - *) wm="Quartz Compositor" ;; + -e "[R]ectangle") + + case $ps_line in + *chunkwm*) wm=chunkwm ;; + *kwm*) wm=Kwm ;; + *yabai*) wm=yabai ;; + *Amethyst*) wm=Amethyst ;; + *Spectacle*) wm=Spectacle ;; + *Rectangle*) wm=Rectangle ;; + *) wm="Quartz Compositor" ;; esac ;; - "Windows") - wm="$(tasklist | grep -m 1 -o -F \ - -e "bugn" \ - -e "Windawesome" \ - -e "blackbox" \ - -e "emerge" \ - -e "litestep")" + Windows) + wm=$(tasklist | grep -m 1 -o -F \ + -e bugn \ + -e Windawesome \ + -e blackbox \ + -e emerge \ + -e litestep) - [[ "$wm" == "blackbox" ]] && wm="bbLean (Blackbox)" - wm="${wm:+$wm, }Explorer" + [[ $wm == blackbox ]] && wm="bbLean (Blackbox)" + wm=${wm:+$wm, }Explorer ;; - "FreeMiNT") + FreeMiNT) freemint_wm=(/proc/*) - case "${freemint_wm[*]}" in - *xaaes*) wm="XaAES" ;; - *myaes*) wm="MyAES" ;; - *naes*) wm="N.AES" ;; - geneva) wm="Geneva" ;; + + case ${freemint_wm[*]} in + *xaaes*) wm=XaAES ;; + *myaes*) wm=MyAES ;; + *naes*) wm=N.AES ;; + geneva) wm=Geneva ;; *) wm="Atari AES" ;; esac ;; esac fi - # Log that the function was run. wm_run=1 } From acdfbe2063d0a4f64c558b4dcd996b2f1fc95be4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 Oct 2019 13:14:06 +0200 Subject: [PATCH 0805/1133] uptime: fix bug --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 2a93a1e2e..a304cfad9 100755 --- a/neofetch +++ b/neofetch @@ -1285,9 +1285,9 @@ get_uptime() { ((${m/ *} == 1)) && m=${m/s} # Hide empty fields. - ((${d/ *} == 0)) && unset days - ((${h/ *} == 0)) && unset hours - ((${m/ *} == 0)) && unset mins + ((${d/ *} == 0)) && unset d + ((${h/ *} == 0)) && unset h + ((${m/ *} == 0)) && unset m uptime=${d:+$d, }${h:+$h, }$m uptime=${uptime%', '} From 9f25f34fa1d939634430bb7a72018932cb4778a6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 28 Oct 2019 22:15:57 +0000 Subject: [PATCH 0806/1133] neofetch: remove unneeded quotes --- neofetch | 152 +++++++++++++++++++++++++++---------------------------- 1 file changed, 76 insertions(+), 76 deletions(-) diff --git a/neofetch b/neofetch index a304cfad9..4984ffaf3 100755 --- a/neofetch +++ b/neofetch @@ -1698,7 +1698,7 @@ get_wm_theme() { ((wm_run != 1)) && get_wm ((de_run != 1)) && get_de - case "$wm" in + case $wm in "E16") wm_theme="$(awk -F "= " '/theme.name/ {print $2}' "${HOME}/.e16/e_config--0.0.cfg")" ;; @@ -1820,7 +1820,7 @@ get_wm_theme() { [[ -z "$wm_theme" ]] && \ wm_theme="Light" - case "$wm_theme_color" in + case $wm_theme_color in "-1") wm_theme_color="Graphite" ;; "0") wm_theme_color="Red" ;; "1") wm_theme_color="Orange" ;; @@ -1858,12 +1858,12 @@ get_wm_theme() { } get_cpu() { - case "$os" in + case $os in "Linux" | "MINIX" | "Windows") # Get CPU name. cpu_file="/proc/cpuinfo" - case "$kernel_machine" in + case $kernel_machine in "frv" | "hppa" | "m68k" | "openrisc" | "or"* | "powerpc" | "ppc"* | "sparc"*) cpu="$(awk -F':' '/^cpu\t|^CPU/ {printf $2; exit}' "$cpu_file")" ;; @@ -1910,7 +1910,7 @@ get_cpu() { [[ -f "$temp_dir" ]] && deg="$(($(< "$temp_dir") * 100 / 10000))" # Get CPU cores. - case "$cpu_cores" in + case $cpu_cores in "logical" | "on") cores="$(grep -c "^processor" "$cpu_file")" ;; "physical") cores="$(awk '/^core id/&&!a[$0]++{++i} END {print i}' "$cpu_file")" ;; esac @@ -1920,14 +1920,14 @@ get_cpu() { cpu="$(sysctl -n machdep.cpu.brand_string)" # Get CPU cores. - case "$cpu_cores" in + case $cpu_cores in "logical" | "on") cores="$(sysctl -n hw.logicalcpu_max)" ;; "physical") cores="$(sysctl -n hw.physicalcpu_max)" ;; esac ;; "iPhone OS") - case "$kernel_machine" in + case $kernel_machine in "iPhone1,"[1-2] | "iPod1,1"): "Samsung S5L8900 (1) @ 412MHz" ;; "iPhone2,1"): "Samsung S5PC100 (1) @ 600MHz" ;; "iPhone3,"[1-3] | "iPod4,1"): "Apple A4 (1) @ 800MHz" ;; @@ -1976,7 +1976,7 @@ get_cpu() { cores="$(sysctl -n hw.ncpu)" # Get CPU temp. - case "$kernel_name" in + case $kernel_name in "FreeBSD"* | "DragonFly"* | "NetBSD"*) deg="$(sysctl -n dev.cpu.0.temperature)" deg="${deg/C}" @@ -2001,7 +2001,7 @@ get_cpu() { speed="$(psrinfo -v | awk '/operates at/ {print $6; exit}')" # Get CPU cores. - case "$cpu_cores" in + case $cpu_cores in "logical" | "on") cores="$(kstat -m cpu_info | grep -c -F "chip_id")" ;; "physical") cores="$(psrinfo -p)" ;; esac @@ -2029,7 +2029,7 @@ get_cpu() { speed="${speed/MHz}" # Get CPU cores. - case "$cpu_cores" in + case $cpu_cores in "logical" | "on") cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" ;; @@ -2092,7 +2092,7 @@ get_cpu() { # Add CPU cores to the output. [[ "$cpu_cores" != "off" && "$cores" ]] && \ - case "$os" in + case $os in "Mac OS X") cpu="${cpu/@/(${cores}) @}" ;; *) cpu="$cpu ($cores)" ;; esac @@ -2122,7 +2122,7 @@ get_cpu() { } get_cpu_usage() { - case "$os" in + case $os in "Windows") cpu_usage="$(wmic cpu get loadpercentage)" cpu_usage="${cpu_usage/LoadPercentage}" @@ -2132,7 +2132,7 @@ get_cpu_usage() { *) # Get CPU cores if unset. if [[ "$cpu_cores" != "logical" ]]; then - case "$os" in + case $os in "Linux" | "MINIX") cores="$(grep -c "^processor" /proc/cpuinfo)" ;; "Mac OS X") cores="$(sysctl -n hw.logicalcpu_max)" ;; "BSD") cores="$(sysctl -n hw.ncpu)" ;; @@ -2154,7 +2154,7 @@ get_cpu_usage() { esac # Print the bar. - case "$cpu_display" in + case $cpu_display in "bar") cpu_usage="$(bar "$cpu_usage" 100)" ;; "infobar") cpu_usage="${cpu_usage}% $(bar "$cpu_usage" 100)" ;; "barinfo") cpu_usage="$(bar "$cpu_usage" 100)${info_color} ${cpu_usage}%" ;; @@ -2163,7 +2163,7 @@ get_cpu_usage() { } get_gpu() { - case "$os" in + case $os in "Linux") # Read GPUs into array. gpu_cmd="$(lspci -mm | awk -F '\"|\" \"|\\(' \ @@ -2186,7 +2186,7 @@ get_gpu() { [[ "$gpu_type" == "integrated" && ! "$gpu" == *Intel* ]] && \ { unset -v gpu; continue; } - case "$gpu" in + case $gpu in *"advanced"*) brand="${gpu/*AMD*ATI*/AMD ATI}" brand="${brand:-${gpu/*AMD*/AMD}}" @@ -2252,7 +2252,7 @@ get_gpu() { ;; "iPhone OS") - case "$kernel_machine" in + case $kernel_machine in "iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;; "iPhone5,"[1-4]): "PowerVR SGX543MP3" ;; "iPhone11,"[2468]): "G11P" ;; @@ -2303,7 +2303,7 @@ get_gpu() { ;; *) - case "$kernel_name" in + case $kernel_name in "FreeBSD"* | "DragonFly"*) gpu="$(pciconf -lv | grep -B 4 -F "VGA" | grep -F "device")" gpu="${gpu/*device*= }" @@ -2326,12 +2326,12 @@ get_gpu() { } get_memory() { - case "$os" in + case $os in "Linux" | "Windows") # MemUsed = Memtotal + Shmem - MemFree - Buffers - Cached - SReclaimable # Source: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716 while IFS=":" read -r a b; do - case "$a" in + case $a in "MemTotal") ((mem_used+=${b/kB})); mem_total="${b/kB}" ;; "Shmem") ((mem_used+=${b/kB})) ;; "MemFree" | "Buffers" | "Cached" | "SReclaimable") @@ -2355,13 +2355,13 @@ get_memory() { "BSD" | "MINIX") # Mem total. - case "$kernel_name" in + case $kernel_name in "NetBSD"*) mem_total="$(($(sysctl -n hw.physmem64) / 1024 / 1024))" ;; *) mem_total="$(($(sysctl -n hw.physmem) / 1024 / 1024))" ;; esac # Mem free. - case "$kernel_name" in + case $kernel_name in "NetBSD"*) mem_free="$(($(awk -F ':|kB' '/MemFree:/ {printf $2}' /proc/meminfo) / 1024))" ;; @@ -2384,7 +2384,7 @@ get_memory() { esac # Mem used. - case "$kernel_name" in + case $kernel_name in "OpenBSD"*) mem_used="$(vmstat | awk 'END {printf $3}')" mem_used="${mem_used/M}" @@ -2396,7 +2396,7 @@ get_memory() { "Solaris" | "AIX") hw_pagesize="$(pagesize)" - case "$os" in + case $os in "Solaris") pages_total="$(kstat -p unix:0:system_pages:pagestotal | awk '{print $2}')" pages_free="$(kstat -p unix:0:system_pages:pagesfree | awk '{print $2}')" @@ -2444,7 +2444,7 @@ get_memory() { memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB} ${mem_perc:+(${mem_perc}%)}" # Bars. - case "$memory_display" in + case $memory_display in "bar") memory="$(bar "${mem_used}" "${mem_total}")" ;; "infobar") memory="${memory} $(bar "${mem_used}" "${mem_total}")" ;; "barinfo") memory="$(bar "${mem_used}" "${mem_total}")${info_color} ${memory}" ;; @@ -2513,7 +2513,7 @@ get_song() { )" } - case "${player/*\/}" in + case ${player/*\/} in "mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;; "mocp"*) song="$(mocp -Q '%artist\n%album\n%song')" ;; "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist%\\n%album%\\n%title%')" ;; @@ -2561,7 +2561,7 @@ get_song() { ;; "spotify"*) - case "$os" in + case $os in "Linux") get_song_dbus "spotify" ;; "Mac OS X") @@ -2638,7 +2638,7 @@ get_song() { } get_resolution() { - case "$os" in + case $os in "Mac OS X") if type -p screenresolution >/dev/null; then resolution="$(screenresolution get 2>&1 | awk '/Display/ {printf $6 "Hz, "}')" @@ -2692,7 +2692,7 @@ get_resolution() { *) if type -p xrandr >/dev/null; then - case "$refresh_rate" in + case $refresh_rate in "on") resolution="$(xrandr --nograb --current |\ awk 'match($0,/[0-9]*\.[0-9]*\*/) { @@ -2732,7 +2732,7 @@ get_style() { ((de_run != 1)) && get_de # Check for DE Theme. - case "$de" in + case $de in "KDE"* | "Plasma"*) kde_config_dir @@ -2895,7 +2895,7 @@ get_term() { # Workaround for macOS systems that # don't support the block below. - case "$TERM_PROGRAM" in + case $TERM_PROGRAM in "iTerm.app") term="iTerm2" ;; "Terminal.app") term="Apple Terminal" ;; "Hyper") term="HyperTerm" ;; @@ -2912,7 +2912,7 @@ get_term() { [[ -z "$parent" ]] && break name="$(get_process_name "$parent")" - case "${name// }" in + case ${name// } in "${SHELL/*\/}"|*"sh"|"screen"|"su"*) ;; "login"*|*"Login"*|"init"|"(init)") @@ -2950,7 +2950,7 @@ get_term() { get_term_font() { ((term_run != 1)) && get_term - case "$term" in + case $term in "alacritty"*) shopt -s nullglob confs=({$XDG_CONFIG_HOME,$HOME}/{alacritty,}/{.,}alacritty.ym?) @@ -3204,7 +3204,7 @@ END # Xresources has two different font formats, this checks which # one is in use and formats it accordingly. - case "$term_font" in + case $term_font in *"xft:"*) term_font="${term_font/xft:}" term_font="${term_font/:*}" @@ -3237,7 +3237,7 @@ get_disk() { df_version="$(df --version 2>&1)" - case "$df_version" in + case $df_version in *"IMitv"*) df_flags=(-P -g) ;; # AIX *"befhikm"*) df_flags=(-P -k) ;; # IRIX *"hiklnP"*) df_flags=(-h) ;; # OpenBSD @@ -3266,7 +3266,7 @@ get_disk() { IFS=" " read -ra disk_info <<< "$disk" disk_perc="${disk_info[4]/\%}" - case "$df_version" in + case $df_version in *"befhikm"*) disk="$((disk_info[2]/1024/1024))G / $((disk_info[1]/1024/1024))G (${disk_perc}%)" ;; @@ -3277,7 +3277,7 @@ get_disk() { esac # Subtitle. - case "$disk_subtitle" in + case $disk_subtitle in "name") disk_sub="${disk_info[0]}" ;; @@ -3293,7 +3293,7 @@ get_disk() { esac # Bar. - case "$disk_display" in + case $disk_display in "bar") disk="$(bar "$disk_perc" "100")" ;; "infobar") disk+=" $(bar "$disk_perc" "100")" ;; "barinfo") disk="$(bar "$disk_perc" "100")${info_color} $disk" ;; @@ -3310,7 +3310,7 @@ get_disk() { } get_battery() { - case "$os" in + case $os in "Linux") # We use 'prin' here so that we can do multi battery support # with a single battery per line. @@ -3321,7 +3321,7 @@ get_battery() { if [[ "$capacity" ]]; then battery="${capacity}% [${status}]" - case "$battery_display" in + case $battery_display in "bar") battery="$(bar "$capacity" 100)" ;; "infobar") battery+=" $(bar "$capacity" 100)" ;; "barinfo") battery="$(bar "$capacity" 100)${info_color} ${battery}" ;; @@ -3335,7 +3335,7 @@ get_battery() { ;; "BSD") - case "$kernel_name" in + case $kernel_name in "FreeBSD"* | "DragonFly"*) battery="$(acpiconf -i 0 | awk -F ':\t' '/Remaining capacity/ {print $2}')" battery_state="$(acpiconf -i 0 | awk -F ':\t\t\t' '/State/ {print $2}')" @@ -3387,7 +3387,7 @@ get_battery() { [[ "$battery_state" ]] && battery+=" Charging" - case "$battery_display" in + case $battery_display in "bar") battery="$(bar "${battery/\%*}" 100)" ;; "infobar") battery="${battery} $(bar "${battery/\%*}" 100)" ;; "barinfo") battery="$(bar "${battery/\%*}" 100)${info_color} ${battery}" ;; @@ -3395,7 +3395,7 @@ get_battery() { } get_local_ip() { - case "$os" in + case $os in "Linux" | "BSD" | "Solaris" | "AIX" | "IRIX") local_ip="$(ip route get 1 | awk -F'src' '{print $2; exit}')" local_ip="${local_ip/uid*}" @@ -3453,7 +3453,7 @@ get_locale() { } get_gpu_driver() { - case "$os" in + case $os in "Linux") gpu_driver="$(lspci -nnk | awk -F ': ' \ '/Display|3D|VGA/{nr[NR+2]}; NR in nr {printf $2 ", "}')" @@ -3485,7 +3485,7 @@ get_cols() { # Generate the string. for ((block_range[0]; block_range[0]<=block_range[1]; block_range[0]++)); do - case "${block_range[0]}" in + case ${block_range[0]} in [0-7]) printf -v blocks '%b\e[3%bm\e[4%bm%b' \ "$blocks" "${block_range[0]}" "${block_range[0]}" "$block_width" @@ -3531,7 +3531,7 @@ image_backend() { [[ "$image_backend" != "off" ]] && ! type -p convert &>/dev/null && \ { image_backend="ascii"; err "Image: Imagemagick not found, falling back to ascii mode."; } - case "${image_backend:-off}" in + case ${image_backend:-off} in "ascii") print_ascii ;; "off") image_backend="off" ;; @@ -3606,7 +3606,7 @@ print_ascii() { } get_image_source() { - case "$image_source" in + case $image_source in "auto" | "wall" | "wallpaper") get_wallpaper ;; @@ -3631,7 +3631,7 @@ get_image_source() { } get_wallpaper() { - case "$os" in + case $os in "Mac OS X") image="$(osascript </dev/null && [[ -f "${HOME}/.cache/wal/wal" ]] && \ { image="$(< "${HOME}/.cache/wal/wal")"; return; } - case "$de" in + case $de in "MATE"*) image="$(gsettings get org.mate.background picture-filename)" ;; @@ -3739,7 +3739,7 @@ get_window_size() { printf '%b' '\e}qs\000' elif [[ -z $VTE_VERSION ]]; then - case "${TMUX:-null}" in + case ${TMUX:-null} in "null") printf '%b' '\e[14t' ;; *) printf '%b' '\ePtmux;\e\e[14t\e\\ ' ;; esac @@ -3749,7 +3749,7 @@ get_window_size() { # user input so we have to use read to store the out # -put as a variable. # The 1 second timeout is required for older bash - case "${BASH_VERSINFO[0]}" in + case ${BASH_VERSINFO[0]} in 4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;; *) IFS=';t' read -d t -t 1 -sra term_size ;; esac @@ -3819,7 +3819,7 @@ get_image_size() { # This functions determines the size to make the thumbnail image. get_term_size - case "$image_size" in + case $image_size in "auto") image_size="$((columns * font_width / 2))" term_height="$((term_height - term_height / 4))" @@ -3864,7 +3864,7 @@ make_thumbnail() { image_name="${crop_mode}-${crop_offset}-${width}-${height}-${image//\/}" # Handle file extensions. - case "${image##*.}" in + case ${image##*.} in "eps"|"pdf"|"svg"|"gif"|"png") image_name+=".png" ;; *) image_name+=".jpg" ;; @@ -3880,7 +3880,7 @@ make_thumbnail() { ((og_height > og_width)) && size="$og_width" || size="$og_height" } - case "$crop_mode" in + case $crop_mode in "fit") c="$(convert "$image" \ -colorspace srgb \ @@ -3929,7 +3929,7 @@ make_thumbnail() { } display_image() { - case "$image_backend" in + case $image_backend in "caca") img2txt \ -W "$((width / font_width))" \ @@ -4096,12 +4096,12 @@ get_underline() { } get_bold() { - case "$ascii_bold" in + case $ascii_bold in "on") ascii_bold='\e[1m' ;; "off") ascii_bold="" ;; esac - case "$bold" in + case $bold in "on") bold='\e[1m' ;; "off") bold="" ;; esac @@ -4177,15 +4177,15 @@ set_text_colors() { bar_color_elapsed="$(color "$bar_color_elapsed")" fi - case "$bar_color_total $1" in - "distro "[736]) bar_color_total="$(color "$1")" ;; - "distro "[0-9]) bar_color_total="$(color "$2")" ;; - *) bar_color_total="$(color "$bar_color_total")" ;; + case ${bar_color_total}${1} in + distro[736]) bar_color_total=$(color "$1") ;; + distro[0-9]) bar_color_total=$(color "$2") ;; + *) bar_color_total=$(color "$bar_color_total") ;; esac } color() { - case "$1" in + case $1 in [0-6]) printf '%b\e[3%sm' "$reset" "$1" ;; 7 | "fg") printf '\e[37m%b' "$reset" ;; *) printf '\e[38;5;%bm' "$1" ;; @@ -4285,7 +4285,7 @@ cache() { } get_cache_dir() { - case "$os" in + case $os in "Mac OS X") cache_dir="/Library/Caches" ;; *) cache_dir="/tmp" ;; esac @@ -4320,7 +4320,7 @@ term_padding() { # Get terminal padding to properly align cursor. [[ -z "$term" ]] && get_term - case "$term" in + case $term in urxvt*|"rxvt-unicode") [[ -z "$xrdb" ]] && xrdb="$(xrdb -query)" @@ -4373,7 +4373,7 @@ cache_uname() { get_ppid() { # Get parent process ID of PID. - case "$os" in + case $os in "Windows") ppid="$(ps -p "${1:-$PPID}" | awk '{printf $2}')" ppid="${ppid/PPID}" @@ -4394,7 +4394,7 @@ get_ppid() { get_process_name() { # Get PID name. - case "$os" in + case $os in "Windows") name="$(ps -p "${1:-$PPID}" | awk '{printf $8}')" name="${name/COMMAND}" @@ -4654,7 +4654,7 @@ get_args() { [[ "$*" != *--config* && "$*" != *--no_config* ]] && get_user_config while [[ "$1" ]]; do - case "$1" in + case $1 in # Info "--package_managers") package_managers="$2" ;; "--os_arch") os_arch="$2" ;; @@ -4689,7 +4689,7 @@ get_args() { "--disk_show") unset disk_show for arg in "$@"; do - case "$arg" in + case $arg in "--disk_show") ;; "-"*) break ;; *) disk_show+=("$arg") ;; @@ -4699,7 +4699,7 @@ get_args() { "--disable") for func in "$@"; do - case "$func" in + case $func in "--disable") continue ;; "-"*) break ;; *) @@ -4714,7 +4714,7 @@ get_args() { "--colors") unset colors for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in + case $arg in "-"*) break ;; *) colors+=("$arg") ;; esac @@ -4758,7 +4758,7 @@ get_args() { "--ascii" | "--caca" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") image_backend="${1/--}" - case "$2" in + case $2 in "-"* | "") ;; *) image_source="$2" ;; esac @@ -4783,7 +4783,7 @@ get_args() { "--ascii_colors") unset ascii_colors for arg in "$2" "$3" "$4" "$5" "$6" "$7"; do - case "$arg" in + case $arg in "-"*) break ;; *) ascii_colors+=("$arg") esac @@ -4804,7 +4804,7 @@ get_args() { # Other "--config") - case "$2" in + case $2 in "none" | "off" | "") ;; *) config_file="$(get_full_path "$2")" @@ -4922,7 +4922,7 @@ get_distro_ascii() { # This function gets the distro ascii art and colors. # # $ascii_distro is the same as $distro. - case "$(trim "$ascii_distro")" in + case $(trim "$ascii_distro") in "AIX"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' @@ -9400,7 +9400,7 @@ EOF ;; *) - case "$kernel_name" in + case $kernel_name in *"BSD") set_colors 1 7 4 3 6 read -rd '' ascii_data <<'EOF' From 13f2d3a1732e5c33b3238462a2f68972c5b0f11e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 30 Oct 2019 12:11:10 +0000 Subject: [PATCH 0807/1133] neofetch: Added initial support for HardenedBSD. Closes #1050 --- neofetch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 4984ffaf3..ef83acdc6 100755 --- a/neofetch +++ b/neofetch @@ -957,9 +957,10 @@ get_distro() { distro=${distro/DragonFly/DragonFlyBSD} # Workarounds for some BSD based distros. - [[ -f /etc/pcbsd-lang ]] && distro=PCBSD - [[ -f /etc/trueos-lang ]] && distro=TrueOS - [[ -f /etc/pacbsd-release ]] && distro=PacBSD + [[ -f /etc/pcbsd-lang ]] && distro=PCBSD + [[ -f /etc/trueos-lang ]] && distro=TrueOS + [[ -f /etc/pacbsd-release ]] && distro=PacBSD + [[ -f /etc/hbsd-update.conf ]] && distro=HardenedBSD fi fi @@ -6419,7 +6420,7 @@ ${c1}/\\,-'''''-,/\\ EOF ;; - "FreeBSD"*) + "FreeBSD"*|HardenedBSD*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' ${c2}``` ${c1}` From 96f3aa948dc0eea20a317fe447f154b6f9bc3ec3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 30 Oct 2019 12:13:42 +0000 Subject: [PATCH 0808/1133] ascii: fix Manjaro gap. Closes #1175 --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index ef83acdc6..5b3d7840a 100755 --- a/neofetch +++ b/neofetch @@ -3586,7 +3586,8 @@ print_ascii() { # Calculate size of ascii file in line length / line count. while IFS=$'\n' read -r line; do - line="${line//\\\\/\\}" + line=${line//\\\\/\\} + line=${line//█/ } ((++lines,${#line}>ascii_len)) && ascii_len="${#line}" done <<< "${ascii_data//\$\{??\}}" From 1c9db4af1ac876fdc28fc974dbc668ae8ccf60bd Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 30 Oct 2019 12:20:16 +0000 Subject: [PATCH 0809/1133] neofetch: fix #1279 --- neofetch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 5b3d7840a..b20f90b44 100755 --- a/neofetch +++ b/neofetch @@ -4323,15 +4323,14 @@ term_padding() { [[ -z "$term" ]] && get_term case $term in - urxvt*|"rxvt-unicode") - [[ -z "$xrdb" ]] && - xrdb="$(xrdb -query)" + urxvt*|rxvt-unicode) + [[ $xrdb ]] || xrdb=$(xrdb -query) - [[ $xrdb != *".internalBorder:"* ]] && + [[ $xrdb != *internalBorder:* ]] && return - padding="${xrdb/*.internalBorder:}" - padding="${padding/$'\n'*}" + padding=${xrdb/*internalBorder:} + padding=${padding/$'\n'*} [[ $padding =~ ^[0-9]+$ ]] || padding= From 9bb236eb4b8d1cf0353b8dc454b1e7030a97e006 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 30 Oct 2019 12:25:33 +0000 Subject: [PATCH 0810/1133] neofetch: Fix urxvt font, closes #1253 --- neofetch | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index b20f90b44..742349b41 100755 --- a/neofetch +++ b/neofetch @@ -3186,32 +3186,32 @@ END "$termite_config")" ;; - "urxvt" | "urxvtd" | "rxvt-unicode" | "xterm") - xrdb="$(xrdb -query)" - term_font="$(grep -im 1 -e "^${term/d}"'\**\.*font' -e '^\*font' <<< "$xrdb")" - term_font="${term_font/*"*font:"}" - term_font="${term_font/*".font:"}" - term_font="${term_font/*"*.font:"}" - term_font="$(trim "$term_font")" + urxvt|urxvtd|rxvt-unicode|xterm) + xrdb=$(xrdb -query) + term_font=$(grep -im 1 -e "^${term/d}"'\**\.*font:' -e '^\*font:' <<< "$xrdb") + term_font=${term_font/*"*font:"} + term_font=${term_font/*".font:"} + term_font=${term_font/*"*.font:"} + term_font=$(trim "$term_font") - [[ -z "$term_font" && "$term" == "xterm" ]] && \ - term_font="$(grep '^XTerm.vt100.faceName' <<< "$xrdb")" + [[ -z $term_font && $term == xterm ]] && \ + term_font=$(grep '^XTerm.vt100.faceName' <<< "$xrdb") - term_font="$(trim "${term_font/*"faceName:"}")" + term_font=$(trim "${term_font/*"faceName:"}") # xft: isn't required at the beginning so we prepend it if it's missing - [[ "${term_font:0:1}" != "-" && "${term_font:0:4}" != "xft:" ]] && \ - term_font="xft:$term_font" + [[ ${term_font:0:1} != '-' && ${term_font:0:4} != xft: ]] && \ + term_font=xft:$term_font # Xresources has two different font formats, this checks which # one is in use and formats it accordingly. case $term_font in - *"xft:"*) - term_font="${term_font/xft:}" - term_font="${term_font/:*}" + *xft:*) + term_font=${term_font/xft:} + term_font=${term_font/:*} ;; - "-"*) + -*) IFS=- read -r _ _ term_font _ <<< "$term_font" ;; esac From efc289463ca1f54191061e0ee7d2c9fe0136894d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 30 Oct 2019 12:31:55 +0000 Subject: [PATCH 0811/1133] neofetch: nitpicks --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 0b2358b38..e051622e2 100755 --- a/neofetch +++ b/neofetch @@ -1217,10 +1217,10 @@ get_kernel() { return } - # In Windows 'uname' may return the info of GNUenv thus use wmic for OS kernel - [[ "$os" == Windows ]] && { + # In Windows 'uname' may return the info of GNUenv thus use wmic for OS kernel. + [[ $os == Windows ]] && { kernel=$(wmic os get Version) - kernel="${kernel/Version}" + kernel=${kernel/Version} return } From e8763c9009b53bbc396e16a9fe0c552101c6db8f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 30 Oct 2019 12:39:26 +0000 Subject: [PATCH 0812/1133] neofetch: remove unneeded quotes --- neofetch | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index e051622e2..f42c31d22 100755 --- a/neofetch +++ b/neofetch @@ -9543,10 +9543,10 @@ EOF # Overwrite distro colors if '$ascii_colors' doesn't # equal 'distro'. - if [[ "${ascii_colors[0]}" != "distro" ]]; then - color_text="off" + [[ ${ascii_colors[0]} != distro ]] && { + color_text=off set_colors "${ascii_colors[@]}" - fi + } } main() { @@ -9557,21 +9557,21 @@ main() { eval "$config" get_args "$@" - [[ "$verbose" != "on" ]] && exec 2>/dev/null + [[ $verbose != on ]] && exec 2>/dev/null get_simple "$@" get_distro get_bold get_distro_ascii - [[ "$stdout" == "on" ]] && stdout + [[ $stdout == on ]] && stdout # Minix doesn't support these sequences. - if [[ "$TERM" != "minix" && "$stdout" != "on" ]]; then + [[ $TERM != minix && $stdout != on ]] && { # If the script exits for any reason, unhide the cursor. trap 'printf "\e[?25h\e[?7h"' EXIT # Hide the cursor and disable line wrap. printf '\e[?25l\e[?7l' - fi + } image_backend get_cache_dir @@ -9581,17 +9581,19 @@ main() { # w3m-img: Draw the image a second time to fix # rendering issues in specific terminal emulators. - [[ "$image_backend" == *w3m* ]] && display_image + [[ $image_backend == *w3m* ]] && display_image # Add neofetch info to verbose output. err "Neofetch command: $0 $*" err "Neofetch version: $version" - # Show error messages. - [[ "$verbose" == "on" ]] && printf "%b" "$err" >&2 + [[ $verbose == on ]] && printf %b "$err" >&2 # If `--loop` was used, constantly redraw the image. - while [[ "$image_loop" == "on" && "$image_backend" == "w3m" ]]; do display_image; sleep 1; done + while [[ $image_loop == on && $image_backend == w3m ]]; do + display_image + sleep 1 + done return 0 } From a0c05b57f0747e7dea78bc9e342d6985cf8a21ec Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 30 Oct 2019 17:07:09 +0000 Subject: [PATCH 0813/1133] neofetch: Add colors for hardenedBSD --- neofetch | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index f42c31d22..eca616edf 100755 --- a/neofetch +++ b/neofetch @@ -6427,8 +6427,12 @@ ${c1}/\\,-'''''-,/\\ EOF ;; - "FreeBSD"*|HardenedBSD*) - set_colors 1 7 3 + FreeBSD*|HardenedBSD*) + case $ascii_distro in + *HardenedBSD*) set_colors 4 7 3 ;; + *) set_colors 1 7 3 + esac + read -rd '' ascii_data <<'EOF' ${c2}``` ${c1}` ${c2}` `.....---...${c1}....--.``` -/ From b7153ce65816c551550fe294b04ae9601cb5a494 Mon Sep 17 00:00:00 2001 From: Yorper Date: Mon, 4 Nov 2019 13:58:21 +1100 Subject: [PATCH 0814/1133] Add Cleanjaro Logo --- neofetch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/neofetch b/neofetch index eca616edf..fd7528be2 100755 --- a/neofetch +++ b/neofetch @@ -5852,6 +5852,37 @@ ${c1} ..,:${c3}dOkxl:. EOF ;; + "cleanjaro_small"*) + set_colors 7 7 + read -rd '' ascii_data <<'EOF' +${c1}█████ ██████████ +█████ ██████████ +█████ +█████ +█████ +████████████████ +████████████████ +EOF + ;; + + "Cleanjaro"*) + set_colors 7 7 + read -rd '' ascii_data <<'EOF' +${c1}███████▌ ████████████████ +███████▌ ████████████████ +███████▌ ████████████████ +███████▌ +███████▌ +███████▌ +███████▌ +███████▌ +█████████████████████████ +█████████████████████████ +█████████████████████████ +▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ +EOF + ;; + "ClearOS"*) set_colors 2 read -rd '' ascii_data <<'EOF' From c7136162d950d5fa4baf9d5d7da293f840f28947 Mon Sep 17 00:00:00 2001 From: Zach Pearson Date: Wed, 27 Nov 2019 18:01:57 -0600 Subject: [PATCH 0815/1133] Add option to arbitrarily position color columns --- neofetch | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 4c464c25e..5f437c8f3 100755 --- a/neofetch +++ b/neofetch @@ -600,6 +600,19 @@ block_width=3 # Flag: --block_height block_height=1 +# Color Alignment +# +# Default: 'auto' +# Values: 'auto', 'num' +# Flag: --col_offset +# +# Number specifies how far from the left side of the terminal (in spaces) to +# begin printing the columns, in case you want to e.g. center them under your +# text. +# Example: +# col_offset="auto" - Default behavior of neofetch +# col_offset=7 - Leave 7 spaces then print the colors +col_offset="auto" # Progress Bars @@ -3471,7 +3484,10 @@ get_cols() { # Add block height to info height. ((info_height+=block_range[1]>7?block_height+3:block_height+2)) - printf '\n\e[%bC%b\n\n' "$text_padding" "${zws}${cols}" + case $col_offset in + "auto") printf '\n\e[%bC%b\n\n' "$text_padding" "${zws}${cols}" ;; + *) printf '\n\e[%bC%b\n\n' "$col_offset" "${zws}${cols}" ;; + esac fi unset -v blocks blocks2 cols @@ -4455,6 +4471,7 @@ TEXT FORMATTING: COLOR BLOCKS: --color_blocks on/off Enable/Disable the color blocks + --col_offset auto/num Left-padding of color blocks --block_width num Width of color blocks in spaces --block_height num Height of color blocks in lines --block_range num num Range of colors to print as blocks @@ -4652,6 +4669,7 @@ get_args() { "--block_range") block_range=("$2" "$3") ;; "--block_width") block_width="$2" ;; "--block_height") block_height="$2" ;; + "--col_offset") col_offset="$2" ;; # Bars "--bar_char") From 6b251e7a0c38ef5ff25c9afb1d53b4685f558e2c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 29 Nov 2019 19:21:21 +0000 Subject: [PATCH 0816/1133] ascii: Added raspbian_small + misc. Closes #1355 --- neofetch | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index eca616edf..978ab2e27 100755 --- a/neofetch +++ b/neofetch @@ -1061,7 +1061,7 @@ get_distro() { # Get OS architecture. case $os in Solaris|AIX|Haiku|IRIX|FreeMiNT) - machine_arch=$(uname -p) + machine_arch=$(uname -p) ;; *) machine_arch=$kernel_machine ;; @@ -1216,7 +1216,7 @@ get_kernel() { kernel=$(uname -v) return } - + # In Windows 'uname' may return the info of GNUenv thus use wmic for OS kernel. [[ $os == Windows ]] && { kernel=$(wmic os get Version) @@ -1272,7 +1272,7 @@ get_uptime() { [[ $t == *-* ]] && { d=${t%%-*}; t=${t#*-}; } [[ $t == *:*:* ]] && { h=${t%%:*}; t=${t#*:}; } - h=${h#0} + h=${h#0} t=${t#0} s=$((${d:-0}*86400 + ${h:-0}*3600 + ${t%%:*}*60 + ${t#*:})) @@ -8344,6 +8344,22 @@ yMMMMMMMMMMMMMMMMNNh. EOF ;; + "Raspbian_small"*) + set_colors 2 1 + read -rd '' ascii_data <<'EOF' +${c1} .~~. .~~. + '. \\ ' ' / .' +${c2} .~ .~~~..~. + : .~.'~'.~. : + ~ ( ) ( ) ~ +( : '~'.~.'~' : ) + ~ .~ ( ) ~. ~ + ( : '~' : ) + '~ .~~~. ~' + '~' +EOF + ;; + "Raspbian"*) set_colors 2 1 read -rd '' ascii_data <<'EOF' @@ -9594,7 +9610,7 @@ main() { [[ $verbose == on ]] && printf %b "$err" >&2 # If `--loop` was used, constantly redraw the image. - while [[ $image_loop == on && $image_backend == w3m ]]; do + while [[ $image_loop == on && $image_backend == w3m ]]; do display_image sleep 1 done From b408dd4487ec854f12fb2c7bab84dc0b8f839da5 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 1 Dec 2019 14:36:36 +0100 Subject: [PATCH 0817/1133] ascii: add septor linux logo --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index fac9bbb95..852b0a508 100755 --- a/neofetch +++ b/neofetch @@ -8742,6 +8742,32 @@ M- ,=;;;#:, ,:#;;:=, ,@ EOF ;; + "Septor"*) + set_colors 4 7 4 + read -rd '' ascii_data <<'EOF' +${c1}ssssssssssssssssssssssssssssssssssssssss +ssssssssssssssssssssssssssssssssssssssss +ssssssssssssssssssssssssssssssssssssssss +ssssssssssssssssssssssssssssssssssssssss +ssssssssss${c2};okOOOOOOOOOOOOOOko;${c1}ssssssssss +sssssssss${c2}oNWWWWWWWWWWWWWWWWWWNo${c1}sssssssss +ssssssss${c2}:WWWWWWWWWWWWWWWWWWWWWW:${c1}ssssssss +ssssssss${c2}lWWWWWk${c1}ssssssssss${c2}lddddd:${c1}ssssssss +ssssssss${c2}cWWWWWNKKKKKKKKKKKKOx:${c1}ssssssssss +${c3}yy${c1}sssssss${c2}OWWWWWWWWWWWWWWWWWWWWx${c1}sssssss${c3}yy +yyyyyyyyyy${c2}:kKNNNNNNNNNNNNWWWWWW:${c3}yyyyyyyy +yyyyyyyy${c2}sccccc;${c3}yyyyyyyyyy${c2}kWWWWW:${c3}yyyyyyyy +yyyyyyyy${c2}:WWWWWWNNNNNNNNNNWWWWWW;${c3}yyyyyyyy +yyyyyyyy${c2}.dWWWWWWWWWWWWWWWWWWWNd${c3}yyyyyyyyy +yyyyyyyyyy${c2}sdO0KKKKKKKKKKKK0Od;${c3}yyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy +EOF + ;; + "SharkLinux"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' From 8eb7944dcf3f5b4782708d51960c368081a1df30 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Fri, 6 Dec 2019 16:57:11 -0500 Subject: [PATCH 0818/1133] Update neofetch --- neofetch | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index 852b0a508..9a508b390 100755 --- a/neofetch +++ b/neofetch @@ -4612,17 +4612,18 @@ ASCII: --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro's ascii art to print - NOTE: Arch and Ubuntu have 'old' logo variants. + NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. - NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. + NOTE: Use '{distro name}_old' to use the old logos. NOTE: Ubuntu has flavor variants. - NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. + NOTE: Change this to 'Lubuntu', 'Kubuntu', 'Xubuntu', 'Ubuntu-GNOME', + 'Ubuntu-Studio', 'Ubuntu-Mate' or 'Ubuntu-Budgie' to use the flavors. - NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, - OpenBSD, postmarketOS, and Void have a smaller logo variant. + NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, + CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, + postmarketOS, and Void have a smaller logo variant. NOTE: Use '{distro name}_small' to use the small variants. @@ -6215,8 +6216,7 @@ EOF "dragonfly_old"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - ${c1} | - .-. + ${c1} .-. ${c3} ()${c1}I${c3}() ${c1} "==.__:-:__.==" "==.__/~|~\__.==" @@ -8154,7 +8154,7 @@ ${c1} PPPPPPPPPPPPPP EOF ;; - "popos_small"*) + "popos_small"* | "pop_os_small"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' ${c1}______ @@ -8168,7 +8168,7 @@ ${c1}______ EOF ;; - "Pop!_OS"*) + "Pop!_OS"* | "popos"* | "pop_os"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' ${c1} ///////////// @@ -8508,7 +8508,7 @@ RRRR RRRRRRRRRRRRRRRRRRR R RRRR EOF ;; - "redhat_old") + "redhat_old" | "rhel_old"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' ${c1} `.-..........` From d163dffa2425fcd72efa9602e9247bbc441fa837 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Fri, 6 Dec 2019 16:59:29 -0500 Subject: [PATCH 0819/1133] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9a508b390..efae9dc4a 100755 --- a/neofetch +++ b/neofetch @@ -6216,7 +6216,7 @@ EOF "dragonfly_old"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - ${c1} .-. + ${c1} .-. ${c3} ()${c1}I${c3}() ${c1} "==.__:-:__.==" "==.__/~|~\__.==" From 244e889f13c6b57f9676053035f5af26f49afa12 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Fri, 6 Dec 2019 17:00:06 -0500 Subject: [PATCH 0820/1133] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index efae9dc4a..cf8d59a04 100755 --- a/neofetch +++ b/neofetch @@ -6216,7 +6216,7 @@ EOF "dragonfly_old"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' - ${c1} .-. + ${c1} .-. ${c3} ()${c1}I${c3}() ${c1} "==.__:-:__.==" "==.__/~|~\__.==" From c18e705b97fb74c79afbfc7cac7ed6f166f268f6 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Fri, 6 Dec 2019 17:10:51 -0500 Subject: [PATCH 0821/1133] Update neofetch --- neofetch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index cf8d59a04..2e6a8926f 100755 --- a/neofetch +++ b/neofetch @@ -4621,8 +4621,11 @@ ASCII: NOTE: Change this to 'Lubuntu', 'Kubuntu', 'Xubuntu', 'Ubuntu-GNOME', 'Ubuntu-Studio', 'Ubuntu-Mate' or 'Ubuntu-Budgie' to use the flavors. - NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, - CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, + NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, + CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, + Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, + Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, + Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, postmarketOS, and Void have a smaller logo variant. NOTE: Use '{distro name}_small' to use the small variants. From 4e96742d4c3e25b9a89f42acfd86b63e6d49c319 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Fri, 6 Dec 2019 21:39:14 -0500 Subject: [PATCH 0822/1133] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2e6a8926f..1d504648b 100755 --- a/neofetch +++ b/neofetch @@ -4619,7 +4619,7 @@ ASCII: NOTE: Ubuntu has flavor variants. NOTE: Change this to 'Lubuntu', 'Kubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio', 'Ubuntu-Mate' or 'Ubuntu-Budgie' to use the flavors. + 'Ubuntu-Studio', 'Ubuntu-Mate' or 'Ubuntu-Budgie' to use the flavors. NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, From 46b18469d91c65a2bff5eea8a500276433f2efbb Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Fri, 6 Dec 2019 21:42:20 -0500 Subject: [PATCH 0823/1133] Update neofetch --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 1d504648b..3d6ca32ac 100755 --- a/neofetch +++ b/neofetch @@ -4618,8 +4618,8 @@ ASCII: NOTE: Ubuntu has flavor variants. - NOTE: Change this to 'Lubuntu', 'Kubuntu', 'Xubuntu', 'Ubuntu-GNOME', - 'Ubuntu-Studio', 'Ubuntu-Mate' or 'Ubuntu-Budgie' to use the flavors. + NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, + Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, From 39783d2594b8614db47141b29058667accdf5601 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Sat, 7 Dec 2019 00:47:20 -0500 Subject: [PATCH 0824/1133] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 3d6ca32ac..799d68d06 100755 --- a/neofetch +++ b/neofetch @@ -8930,7 +8930,7 @@ ${c2} -``````````` EOF ;; - "Source Mage"*) + "Source Mage"* | "Source_Mage"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c2} :ymNMNho. From fc08d090c1b4bc2053ba211314f6577e15e1f07c Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Sat, 7 Dec 2019 00:50:23 -0500 Subject: [PATCH 0825/1133] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 799d68d06..bc15cf0e0 100755 --- a/neofetch +++ b/neofetch @@ -8557,7 +8557,7 @@ MMMMMMMMMMM. MMMM EOF ;; - "Refracted Devuan"*) + "Refracted Devuan"* | "Refracted_Devuan"*) set_colors 8 7 read -rd '' ascii_data <<'EOF' ${c2} A From 8c99d4c4b26f9cdeaadb9a0591797c2d179a4c5b Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Sat, 7 Dec 2019 00:56:39 -0500 Subject: [PATCH 0826/1133] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index bc15cf0e0..c31cf47e5 100755 --- a/neofetch +++ b/neofetch @@ -7122,7 +7122,7 @@ ${c2} \\ EOF ;; - "Linux Lite"*) + "Linux Lite"* | "Linux_Lite"*) set_colors 3 7 read -rd '' ascii_data <<'EOF' ${c1} ,xXc From 9f188a31f37052cfee8a1e59f820584a85f26efa Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Sat, 7 Dec 2019 01:02:06 -0500 Subject: [PATCH 0827/1133] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c31cf47e5..9758f1352 100755 --- a/neofetch +++ b/neofetch @@ -6006,7 +6006,7 @@ ${c2}:sssssssssssso++${c1}${c3}`:/:--------.```````` EOF ;; - "Container Linux by CoreOS"*) + "Container Linux by CoreOS"* | "Container_Linux"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c1} ..... From 4cc220eae7594ca41d1b4e273d3cba17fed577f4 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Sat, 7 Dec 2019 01:03:06 -0500 Subject: [PATCH 0828/1133] Update neofetch --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9758f1352..766685433 100755 --- a/neofetch +++ b/neofetch @@ -5931,7 +5931,7 @@ ${c1} `.--::::::--.` EOF ;; - "Clear Linux OS"*) + "Clear Linux OS"* | "Clear_Linux"*) set_colors 4 3 7 6 read -rd '' ascii_data <<'EOF' ${c1} BBB From b49130be62d1860d9482070ed50d53f1553f4a1a Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 7 Dec 2019 08:54:38 +0100 Subject: [PATCH 0829/1133] Update man page --- neofetch.1 | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 3db17b787..292d092ef 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11. -.TH NEOFETCH "1" "October 2019" "Neofetch 6.1.0" "User Commands" +.TH NEOFETCH "1" "December 2019" "Neofetch 6.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -175,6 +175,9 @@ Changes the default ':' separator to the specified string. \fB\-\-color_blocks\fR on/off Enable/Disable the color blocks .TP +\fB\-\-col_offset\fR auto/num +Left\-padding of color blocks +.TP \fB\-\-block_width\fR num Width of color blocks in spaces .TP @@ -273,17 +276,21 @@ Colors to print the ascii art \fB\-\-ascii_distro\fR distro Which Distro's ascii art to print .IP -NOTE: Arch and Ubuntu have 'old' logo variants. +NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. .IP -NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. +NOTE: Use '{distro name}_old' to use the old logos. .IP NOTE: Ubuntu has flavor variants. .TP -NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu\-GNOME', -\&'Ubuntu\-Studio' or 'Ubuntu\-Budgie' to use the flavors. +NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu\-GNOME, +Ubuntu\-Studio, Ubuntu\-Mate or Ubuntu\-Budgie to use the flavors. .TP -NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, -OpenBSD, postmarketOS, and Void have a smaller logo variant. +NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, +CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, +Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, +Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, +Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, +postmarketOS, and Void have a smaller logo variant. .IP NOTE: Use '{distro name}_small' to use the small variants. .TP From cfe1014d1a6633e53975d6fd808f40a9dd4c63b0 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 7 Dec 2019 18:00:58 +0100 Subject: [PATCH 0830/1133] Add initial support for DE version --- neofetch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/neofetch b/neofetch index 766685433..e6a45c8a2 100755 --- a/neofetch +++ b/neofetch @@ -383,6 +383,17 @@ public_ip_host="http://ident.me" public_ip_timeout=2 +# Desktop Environment + + +# Show Desktop Environment version +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --de_version +de_version="off" + + # Disk @@ -1599,6 +1610,17 @@ get_de() { ((KDE_SESSION_VERSION >= 4)) && de=${de/KDE/Plasma} + if [[ $de_version == on && $de ]]; then + case $de in + "Plasma"*) + de_ver=$(plasmashell --version) + de_ver=${de_ver/* } + ;; + # TODO: Add other DEs + esac + de="$de $de_ver" + fi + de_run=1 } @@ -2752,6 +2774,9 @@ get_style() { # Get DE if user has disabled the function. ((de_run != 1)) && get_de + # remove version from $de + [[ $de_version == on ]] && de=${de/ *} + # Check for DE Theme. case $de in "KDE"* | "Plasma"*) @@ -4523,6 +4548,7 @@ INFO: NOTE: This only supports Linux. + --de_version on/off Show/Hide Desktop Environment version --gtk_shorthand on/off Shorten output of gtk theme/icons --gtk2 on/off Enable/Disable gtk2 theme/font/icons output --gtk3 on/off Enable/Disable gtk3 theme/font/icons output @@ -4698,6 +4724,7 @@ get_args() { "--gpu_brand") gpu_brand="$2" ;; "--gpu_type") gpu_type="$2" ;; "--refresh_rate") refresh_rate="$2" ;; + "--de_version") de_version="$2" ;; "--gtk_shorthand") gtk_shorthand="$2" ;; "--gtk2") gtk2="$2" ;; "--gtk3") gtk3="$2" ;; From 5ef4772bf02a48c9eeeab976aad37ceafd03e28f Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 8 Dec 2019 15:30:16 +0100 Subject: [PATCH 0831/1133] de_version: Add MATE --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index e6a45c8a2..d1fa01a0a 100755 --- a/neofetch +++ b/neofetch @@ -1616,6 +1616,10 @@ get_de() { de_ver=$(plasmashell --version) de_ver=${de_ver/* } ;; + "MATE"*) + de_ver=$(mate-session --version) + de_ver=${de_ver/* } + ;; # TODO: Add other DEs esac de="$de $de_ver" From 2d4ea78f7fd30ebaaedfdbcea77361b3c6bb0f93 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 8 Dec 2019 15:36:15 +0100 Subject: [PATCH 0832/1133] de_version: Add Xfce --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index d1fa01a0a..813ae5c37 100755 --- a/neofetch +++ b/neofetch @@ -1620,6 +1620,11 @@ get_de() { de_ver=$(mate-session --version) de_ver=${de_ver/* } ;; + "Xfce"*) + de_ver=$(xfce4-session --version) + de_ver=${de_ver/)*} + de_ver=${de_ver/* } + ;; # TODO: Add other DEs esac de="$de $de_ver" From 3c0d86bb59d5003c99c785e0ea00322e83efb32b Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 8 Dec 2019 16:05:06 +0100 Subject: [PATCH 0833/1133] de_version: Add GNOME --- neofetch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 813ae5c37..6c484dbfc 100755 --- a/neofetch +++ b/neofetch @@ -1596,16 +1596,12 @@ get_de() { *xfce5*) de=Xfce5 ;; *xfce*) de=Xfce ;; *mate*) de=MATE ;; + *GNOME*) de=GNOME ;; *MUFFIN*|Cinnamon) de=$(cinnamon --version) de=${de:-Cinnamon} ;; - - *GNOME*) - de=$(gnome-shell --version) - de=${de/Shell } - ;; esac ((KDE_SESSION_VERSION >= 4)) && de=${de/KDE/Plasma} @@ -1625,6 +1621,10 @@ get_de() { de_ver=${de_ver/)*} de_ver=${de_ver/* } ;; + "GNOME"*) + de_ver=$(gnome-shell --version) + de_ver=${de_ver/* } + ;; # TODO: Add other DEs esac de="$de $de_ver" From 22d1071d570dabc8326205c0c90d6dccf2a508b1 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 8 Dec 2019 16:17:39 +0100 Subject: [PATCH 0834/1133] de_version: simplify --- neofetch | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 6c484dbfc..14cf0d553 100755 --- a/neofetch +++ b/neofetch @@ -1608,25 +1608,15 @@ get_de() { if [[ $de_version == on && $de ]]; then case $de in - "Plasma"*) - de_ver=$(plasmashell --version) - de_ver=${de_ver/* } - ;; - "MATE"*) - de_ver=$(mate-session --version) - de_ver=${de_ver/* } - ;; - "Xfce"*) - de_ver=$(xfce4-session --version) - de_ver=${de_ver/)*} - de_ver=${de_ver/* } - ;; - "GNOME"*) - de_ver=$(gnome-shell --version) - de_ver=${de_ver/* } - ;; + "Plasma"*) de_ver=$(plasmashell --version) ;; + "MATE"*) de_ver=$(mate-session --version) ;; + "Xfce"*) de_ver=$(xfce4-session --version) ;; + "GNOME"*) de_ver=$(gnome-shell --version) ;; # TODO: Add other DEs esac + de_ver=${de_ver/)*} + de_ver=${de_ver/* } + de="$de $de_ver" fi From cfde63b5f4fd296390077814a4b743fc2c664aac Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 8 Dec 2019 18:33:50 +0100 Subject: [PATCH 0835/1133] de_version: Add Cinnamon --- neofetch | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 14cf0d553..64ca40a35 100755 --- a/neofetch +++ b/neofetch @@ -1597,21 +1597,18 @@ get_de() { *xfce*) de=Xfce ;; *mate*) de=MATE ;; *GNOME*) de=GNOME ;; - - *MUFFIN*|Cinnamon) - de=$(cinnamon --version) - de=${de:-Cinnamon} - ;; + *MUFFIN*|Cinnamon) de=Cinnamon ;; esac ((KDE_SESSION_VERSION >= 4)) && de=${de/KDE/Plasma} if [[ $de_version == on && $de ]]; then case $de in - "Plasma"*) de_ver=$(plasmashell --version) ;; - "MATE"*) de_ver=$(mate-session --version) ;; - "Xfce"*) de_ver=$(xfce4-session --version) ;; - "GNOME"*) de_ver=$(gnome-shell --version) ;; + "Plasma"*) de_ver=$(plasmashell --version) ;; + "MATE"*) de_ver=$(mate-session --version) ;; + "Xfce"*) de_ver=$(xfce4-session --version) ;; + "GNOME"*) de_ver=$(gnome-shell --version) ;; + "Cinnamon"*) de_ver=$(cinnamon --version) ;; # TODO: Add other DEs esac de_ver=${de_ver/)*} From 9303077f0e6ba7f586832f31e342bd22989d9494 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 8 Dec 2019 19:19:28 +0100 Subject: [PATCH 0836/1133] de_version: Add Deepin --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 64ca40a35..5edab4d9f 100755 --- a/neofetch +++ b/neofetch @@ -1609,6 +1609,7 @@ get_de() { "Xfce"*) de_ver=$(xfce4-session --version) ;; "GNOME"*) de_ver=$(gnome-shell --version) ;; "Cinnamon"*) de_ver=$(cinnamon --version) ;; + "Deepin"*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; # TODO: Add other DEs esac de_ver=${de_ver/)*} From 02fe4815407eaf20330841201abf403d5a40112b Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 8 Dec 2019 19:47:58 +0100 Subject: [PATCH 0837/1133] de_version: Add Budgie --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 5edab4d9f..e1536f8d6 100755 --- a/neofetch +++ b/neofetch @@ -1610,8 +1610,10 @@ get_de() { "GNOME"*) de_ver=$(gnome-shell --version) ;; "Cinnamon"*) de_ver=$(cinnamon --version) ;; "Deepin"*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; + "Budgie"*) de_ver=$(budgie-desktop --version) ;; # TODO: Add other DEs esac + de_ver=${de_ver/Copyright*} de_ver=${de_ver/)*} de_ver=${de_ver/* } From 96199eab1c58f88383250ec7073bea1982f2f61d Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 9 Dec 2019 17:21:12 +0100 Subject: [PATCH 0838/1133] de_version: Add LXQt --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index e1536f8d6..98db37e88 100755 --- a/neofetch +++ b/neofetch @@ -1611,8 +1611,10 @@ get_de() { "Cinnamon"*) de_ver=$(cinnamon --version) ;; "Deepin"*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; "Budgie"*) de_ver=$(budgie-desktop --version) ;; + "LXQt"*) de_ver=$(lxqt-session --version) ;; # TODO: Add other DEs esac + de_ver=${de_ver/liblxqt*} de_ver=${de_ver/Copyright*} de_ver=${de_ver/)*} de_ver=${de_ver/* } From 5070c39595c4f10214c8432b71564d4be4040bfc Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 9 Dec 2019 17:27:03 +0100 Subject: [PATCH 0839/1133] de_version: Add Lumina --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 98db37e88..efd85648b 100755 --- a/neofetch +++ b/neofetch @@ -1612,12 +1612,14 @@ get_de() { "Deepin"*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; "Budgie"*) de_ver=$(budgie-desktop --version) ;; "LXQt"*) de_ver=$(lxqt-session --version) ;; + "Lumina"*) de_ver=$(lumina-desktop --version 2>&1) ;; # TODO: Add other DEs esac de_ver=${de_ver/liblxqt*} de_ver=${de_ver/Copyright*} de_ver=${de_ver/)*} de_ver=${de_ver/* } + de_ver=${de_ver//\"} de="$de $de_ver" fi From 8c2ab8e4436b0f707fe7b7240b4d9fdcb684404f Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 9 Dec 2019 17:54:42 +0100 Subject: [PATCH 0840/1133] de_version: Add Trinity --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index efd85648b..d8049310d 100755 --- a/neofetch +++ b/neofetch @@ -1613,6 +1613,7 @@ get_de() { "Budgie"*) de_ver=$(budgie-desktop --version) ;; "LXQt"*) de_ver=$(lxqt-session --version) ;; "Lumina"*) de_ver=$(lumina-desktop --version 2>&1) ;; + "Trinity"*) de_ver=$(tde-config --version | awk '/TDE:/ {print $2}') ;; # TODO: Add other DEs esac de_ver=${de_ver/liblxqt*} From 9f75eaece23a3d41a0993755473e93a03487221c Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 9 Dec 2019 18:17:10 +0100 Subject: [PATCH 0841/1133] de_version: Avoid awk --- neofetch | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d8049310d..ab84ee06b 100755 --- a/neofetch +++ b/neofetch @@ -1613,9 +1613,11 @@ get_de() { "Budgie"*) de_ver=$(budgie-desktop --version) ;; "LXQt"*) de_ver=$(lxqt-session --version) ;; "Lumina"*) de_ver=$(lumina-desktop --version 2>&1) ;; - "Trinity"*) de_ver=$(tde-config --version | awk '/TDE:/ {print $2}') ;; + "Trinity"*) de_ver=$(tde-config --version) ;; # TODO: Add other DEs esac + de_ver=${de_ver/*TDE:} + de_ver=${de_ver/tde-config*} de_ver=${de_ver/liblxqt*} de_ver=${de_ver/Copyright*} de_ver=${de_ver/)*} From 3192036f324bf7e82ea6c28e47dc735c061437f6 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 9 Dec 2019 18:36:49 +0100 Subject: [PATCH 0842/1133] de_version: Remove comment --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index ab84ee06b..b896ce1fa 100755 --- a/neofetch +++ b/neofetch @@ -1614,7 +1614,6 @@ get_de() { "LXQt"*) de_ver=$(lxqt-session --version) ;; "Lumina"*) de_ver=$(lumina-desktop --version 2>&1) ;; "Trinity"*) de_ver=$(tde-config --version) ;; - # TODO: Add other DEs esac de_ver=${de_ver/*TDE:} de_ver=${de_ver/tde-config*} From 1ac90be01d44c3869cea67c3ba556a6f9a549b91 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 9 Dec 2019 19:07:05 +0100 Subject: [PATCH 0843/1133] de_version: apply review comments --- neofetch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index b896ce1fa..a0339c2ba 100755 --- a/neofetch +++ b/neofetch @@ -1592,12 +1592,12 @@ get_de() { # Format strings. case $de in KDE_SESSION_VERSION*) de=KDE${de/* = } ;; - *xfce4*) de=Xfce4 ;; - *xfce5*) de=Xfce5 ;; - *xfce*) de=Xfce ;; - *mate*) de=MATE ;; - *GNOME*) de=GNOME ;; - *MUFFIN*|Cinnamon) de=Cinnamon ;; + *xfce4*) de=Xfce4 ;; + *xfce5*) de=Xfce5 ;; + *xfce*) de=Xfce ;; + *mate*) de=MATE ;; + *GNOME*) de=GNOME ;; + *MUFFIN*) de=Cinnamon ;; esac ((KDE_SESSION_VERSION >= 4)) && de=${de/KDE/Plasma} @@ -1615,6 +1615,7 @@ get_de() { "Lumina"*) de_ver=$(lumina-desktop --version 2>&1) ;; "Trinity"*) de_ver=$(tde-config --version) ;; esac + de_ver=${de_ver/*TDE:} de_ver=${de_ver/tde-config*} de_ver=${de_ver/liblxqt*} @@ -2779,7 +2780,7 @@ get_style() { # Get DE if user has disabled the function. ((de_run != 1)) && get_de - # remove version from $de + # Remove version from '$de'. [[ $de_version == on ]] && de=${de/ *} # Check for DE Theme. From ba93e1bb0db8405b55ee5202045ccb69ae38c91e Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 9 Dec 2019 19:22:24 +0100 Subject: [PATCH 0844/1133] Update man page --- neofetch.1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch.1 b/neofetch.1 index 292d092ef..bd9533238 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -104,6 +104,9 @@ Which GPU to display. (all, dedicated, integrated) .IP NOTE: This only supports Linux. .TP +\fB\-\-de_version\fR on/off +Show/Hide Desktop Environment version +.TP \fB\-\-gtk_shorthand\fR on/off Shorten output of gtk theme/icons .TP From 5bbf221b4789ed1131d33d1d48533932462d23ea Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 10 Dec 2019 01:51:03 +0000 Subject: [PATCH 0845/1133] neofetch: Remove bonsai package detection. Need input from upstream. Closes #1351 --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index fac9bbb95..762aa76fa 100755 --- a/neofetch +++ b/neofetch @@ -1369,7 +1369,6 @@ get_packages() { has sorcery && tot gaze installed has alps && tot alps showinstalled has butch && tot butch list - has bonsai && tot bonsai list # Counting files/dirs. # Variables need to be unquoted here. Only Bedrock Linux is affected. From cd4b34a385551b584a888d8b1f1bd3da2d6a22ca Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 10 Dec 2019 10:19:21 +0100 Subject: [PATCH 0846/1133] de_version: Add Unity --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index f763eeb77..12c2d76f9 100755 --- a/neofetch +++ b/neofetch @@ -1613,6 +1613,7 @@ get_de() { "LXQt"*) de_ver=$(lxqt-session --version) ;; "Lumina"*) de_ver=$(lumina-desktop --version 2>&1) ;; "Trinity"*) de_ver=$(tde-config --version) ;; + "Unity"*) de_ver=$(unity --version) ;; esac de_ver=${de_ver/*TDE:} From 0fc6e33060cc0427ea00a893fc8a4101f4bbc50c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 10 Dec 2019 10:31:28 +0000 Subject: [PATCH 0847/1133] neofetch: Fix #1364 --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 63e4b133b..f763eeb77 100755 --- a/neofetch +++ b/neofetch @@ -1599,7 +1599,7 @@ get_de() { *MUFFIN*) de=Cinnamon ;; esac - ((KDE_SESSION_VERSION >= 4)) && de=${de/KDE/Plasma} + ((${KDE_SESSION_VERSION:-0} >= 4)) && de=${de/KDE/Plasma} if [[ $de_version == on && $de ]]; then case $de in @@ -4652,10 +4652,10 @@ ASCII: NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. - NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, - CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, + NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, + CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, - Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, + Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, postmarketOS, and Void have a smaller logo variant. From 1413533aa39c4429bdfc7effe5a5b392d022ad02 Mon Sep 17 00:00:00 2001 From: Cem Keylan Date: Tue, 10 Dec 2019 15:14:46 +0300 Subject: [PATCH 0848/1133] add Carbs Linux logo --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index 12c2d76f9..b65edbb37 100755 --- a/neofetch +++ b/neofetch @@ -5768,6 +5768,29 @@ ${c1} ...... ${c2}.,++*****+++${c1}*****************${c2}+++++,.${c1} ${c2},++++++**+++++${c1}***********${c2}+++++++++,${c1} ${c2}.,,,,++++,.. .,,,,,.....,+++,.,,${c1} +EOF + ;; + "Carbs"*) + set_colors 4 5 4 4 4 4 + read -rd '' ascii_data <<'EOF' +${c2} .......... + ..,;:ccccccc:;'.. + ..,clllc:;;;;;:cllc,. + .,cllc,... ..';;'. + .;lol;.. .. + .,lol;. + .coo:. + .'lol,. + .,lol,. + .,lol,. + 'col;. + .:ooc'. + .'col:. + .'cllc'.. .''. + ..:lolc,'.......',cll,. + ..;cllllccccclllc;'. + ...',;;;;;;,,... + ..... EOF ;; From 18f3d0c486321d177512749980037ff662a366bf Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 11 Dec 2019 18:46:14 +0100 Subject: [PATCH 0849/1133] wm: detect kwin on wayland --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index b65edbb37..9e94c28a3 100755 --- a/neofetch +++ b/neofetch @@ -1648,6 +1648,7 @@ get_wm() { -e fireplace \ -e greenfield \ -e grefsen \ + -e kwin \ -e lipstick \ -e maynard \ -e mazecompositor \ From 95223a6a11cbea7cd3fe69b4a95a4c4ad8ff9797 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 12 Dec 2019 10:59:42 +0100 Subject: [PATCH 0850/1133] wm: Detect Mutter on GNOME Wayland --- neofetch | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 9e94c28a3..585e4f8c6 100755 --- a/neofetch +++ b/neofetch @@ -1646,6 +1646,7 @@ get_wm() { -e clayland \ -e dwc \ -e fireplace \ + -e gnome-shell \ -e greenfield \ -e grefsen \ -e kwin \ @@ -1678,10 +1679,6 @@ get_wm() { wm=${wm/\"*} } - # Rename window managers to their proper values. - [[ $wm == *WINDOWMAKER* ]] && wm=wmaker - [[ $wm == *"GNOME Shell"* ]] && wm=Mutter - # Fallback for non-EWMH WMs. [[ $wm ]] || wm=$(ps "${ps_flags[@]}" | grep -m 1 -o \ @@ -1741,6 +1738,10 @@ get_wm() { esac fi + # Rename window managers to their proper values. + [[ $wm == *WINDOWMAKER* ]] && wm=wmaker + [[ $wm == *GNOME*Shell* ]] && wm=Mutter + wm_run=1 } From 5eafef80dc488f22bc0a06c6f0a0dbc9af646a4e Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 12 Dec 2019 11:03:06 +0100 Subject: [PATCH 0851/1133] wm_theme: Remove 'GNOME Shell' from wm case --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 585e4f8c6..b2ddd97e9 100755 --- a/neofetch +++ b/neofetch @@ -1765,7 +1765,7 @@ get_wm_theme() { wm_theme="$detheme (${wm_theme})" ;; - "Compiz" | "Mutter" | "GNOME Shell" | "Gala") + "Compiz" | "Mutter" | "Gala") if type -p gsettings >/dev/null; then wm_theme="$(gsettings get org.gnome.shell.extensions.user-theme name)" From 4204f79e5d050fd17400d00d61e99197c1d33c53 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 12 Dec 2019 11:10:49 +0100 Subject: [PATCH 0852/1133] wm_theme: Make Openbox config file parsing more robust --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index b2ddd97e9..e611308e5 100755 --- a/neofetch +++ b/neofetch @@ -1816,7 +1816,8 @@ get_wm_theme() { ob_file="rc" fi - wm_theme="$(awk -F "[<,>]" '/]"); print a[3]}' \ "${XDG_CONFIG_HOME}/openbox/${ob_file}.xml")"; ;; From 5c740aa4f2b8549eabffc019184ac723cf8e8ae4 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 12 Dec 2019 11:14:35 +0100 Subject: [PATCH 0853/1133] wm_theme: Add support for Openbox on LXQt --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index e611308e5..28ddb0ed8 100755 --- a/neofetch +++ b/neofetch @@ -1812,6 +1812,9 @@ get_wm_theme() { if [[ "$de" == "LXDE" && -f "${HOME}/.config/openbox/lxde-rc.xml" ]]; then ob_file="lxde-rc" + elif [[ "$de" == "LXQt" && -f "${HOME}/.config/openbox/lxqt-rc.xml" ]]; then + ob_file="lxqt-rc" + elif [[ -f "${HOME}/.config/openbox/rc.xml" ]]; then ob_file="rc" fi From 00f1dadb85e1917d963307e534720f951fae707c Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 12 Dec 2019 11:54:24 +0100 Subject: [PATCH 0854/1133] wm_theme: Refactor Openbox theme detection --- neofetch | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index 28ddb0ed8..efcea3199 100755 --- a/neofetch +++ b/neofetch @@ -1809,19 +1809,17 @@ get_wm_theme() { ;; "Openbox") - if [[ "$de" == "LXDE" && -f "${HOME}/.config/openbox/lxde-rc.xml" ]]; then - ob_file="lxde-rc" - - elif [[ "$de" == "LXQt" && -f "${HOME}/.config/openbox/lxqt-rc.xml" ]]; then - ob_file="lxqt-rc" + case $de in + "LXDE"*) ob_file="lxde-rc" ;; + "LXQt"*) ob_file="lxqt-rc" ;; + *) ob_file="rc" ;; + esac - elif [[ -f "${HOME}/.config/openbox/rc.xml" ]]; then - ob_file="rc" - fi + ob_file="${XDG_CONFIG_HOME}/openbox/${ob_file}.xml" - wm_theme="$(awk '// {while (getline n) {if (match(n, //)) {l=n; exit}}} - END {split(l, a, "[<>]"); print a[3]}' \ - "${XDG_CONFIG_HOME}/openbox/${ob_file}.xml")"; + [[ -f "$ob_file" ]] && \ + wm_theme="$(awk '// {while (getline n) {if (match(n, //)) + {l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file")" ;; "PekWM") From 07c3233d69d63d241ede109471aaf9d63591c502 Mon Sep 17 00:00:00 2001 From: Kid Date: Wed, 18 Dec 2019 18:47:31 +0800 Subject: [PATCH 0855/1133] get wallpaper for Plasma desktop --- neofetch | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index efcea3199..43313703b 100755 --- a/neofetch +++ b/neofetch @@ -3741,6 +3741,10 @@ END image="$(decode_url "$image")" ;; + "Plasma"*) + image="$(cat ${HOME}/.config/plasma-org.kde.plasma.desktop-appletsrc | grep --fixed-strings --after-context 1 "[Wallpaper][org.kde.image][General]" | grep --extended-regexp --only-matching "file.+")" + ;; + *) if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then image="$(awk -F\' '/feh/ {printf $(NF-1)}' "${HOME}/.fehbg")" @@ -5777,23 +5781,23 @@ EOF "Carbs"*) set_colors 4 5 4 4 4 4 read -rd '' ascii_data <<'EOF' -${c2} .......... - ..,;:ccccccc:;'.. - ..,clllc:;;;;;:cllc,. - .,cllc,... ..';;'. - .;lol;.. .. - .,lol;. - .coo:. - .'lol,. - .,lol,. - .,lol,. - 'col;. - .:ooc'. - .'col:. - .'cllc'.. .''. - ..:lolc,'.......',cll,. - ..;cllllccccclllc;'. - ...',;;;;;;,,... +${c2} .......... + ..,;:ccccccc:;'.. + ..,clllc:;;;;;:cllc,. + .,cllc,... ..';;'. + .;lol;.. .. + .,lol;. + .coo:. + .'lol,. + .,lol,. + .,lol,. + 'col;. + .:ooc'. + .'col:. + .'cllc'.. .''. + ..:lolc,'.......',cll,. + ..;cllllccccclllc;'. + ...',;;;;;;,,... ..... EOF ;; From c18965133876464a376fec6653c5bfb513e914ac Mon Sep 17 00:00:00 2001 From: Kid Date: Wed, 18 Dec 2019 18:51:45 +0800 Subject: [PATCH 0856/1133] revert spaces --- neofetch | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 43313703b..142dae932 100755 --- a/neofetch +++ b/neofetch @@ -5781,23 +5781,23 @@ EOF "Carbs"*) set_colors 4 5 4 4 4 4 read -rd '' ascii_data <<'EOF' -${c2} .......... - ..,;:ccccccc:;'.. - ..,clllc:;;;;;:cllc,. - .,cllc,... ..';;'. - .;lol;.. .. - .,lol;. - .coo:. - .'lol,. - .,lol,. - .,lol,. - 'col;. - .:ooc'. - .'col:. - .'cllc'.. .''. - ..:lolc,'.......',cll,. - ..;cllllccccclllc;'. - ...',;;;;;;,,... +${c2} .......... + ..,;:ccccccc:;'.. + ..,clllc:;;;;;:cllc,. + .,cllc,... ..';;'. + .;lol;.. .. + .,lol;. + .coo:. + .'lol,. + .,lol,. + .,lol,. + 'col;. + .:ooc'. + .'col:. + .'cllc'.. .''. + ..:lolc,'.......',cll,. + ..;cllllccccclllc;'. + ...',;;;;;;,,... ..... EOF ;; From 090c4e4e5b1d0eeae4c37f1b858201f9a6084d2b Mon Sep 17 00:00:00 2001 From: Kid Date: Wed, 18 Dec 2019 19:57:07 +0800 Subject: [PATCH 0857/1133] fix format --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 142dae932..15f7277ec 100755 --- a/neofetch +++ b/neofetch @@ -3742,7 +3742,8 @@ END ;; "Plasma"*) - image="$(cat ${HOME}/.config/plasma-org.kde.plasma.desktop-appletsrc | grep --fixed-strings --after-context 1 "[Wallpaper][org.kde.image][General]" | grep --extended-regexp --only-matching "file.+")" + image="${XDG_CONFIG_HOME}/plasma-org.kde.plasma.desktop-appletsrc" + image="$(awk -F '=' '$1 == "Image" { print $2 }' $image)" ;; *) From 1b99df310d86c898ebd346626f0042bacb19c170 Mon Sep 17 00:00:00 2001 From: Kid Date: Wed, 18 Dec 2019 20:11:41 +0800 Subject: [PATCH 0858/1133] fix quotes --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 15f7277ec..f660f2991 100755 --- a/neofetch +++ b/neofetch @@ -3743,7 +3743,7 @@ END "Plasma"*) image="${XDG_CONFIG_HOME}/plasma-org.kde.plasma.desktop-appletsrc" - image="$(awk -F '=' '$1 == "Image" { print $2 }' $image)" + image="$(awk -F '=' '$1 == "Image" { print $2 }' "$image")" ;; *) From 84d76a7ff3cb251d7a40c3f465fb9919e841c3c1 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 22 Dec 2019 13:38:20 +0100 Subject: [PATCH 0859/1133] term_font: Fix font detection for Konsole >= 19.12.0 --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index efcea3199..1f977cc0d 100755 --- a/neofetch +++ b/neofetch @@ -3112,6 +3112,7 @@ END if ((child == "$(qdbus "$i" "$session" processId)")); then profile="$(qdbus "$i" "$session" environment |\ awk -F '=' '/KONSOLE_PROFILE_NAME/ {print $2}')" + [[ ! $profile ]] && profile="$(qdbus "$i" "$session" profile)" break fi done From 618d5b23473c88cf787ccabbe8263aabb279f5a0 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 22 Dec 2019 13:39:38 +0100 Subject: [PATCH 0860/1133] term_font: konsole: Avoid wrong font info --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 1f977cc0d..e9c0cc316 100755 --- a/neofetch +++ b/neofetch @@ -3119,6 +3119,8 @@ END [[ "$profile" ]] && break done + [[ ! $profile ]] && return + # We could have two profile files for the same profile name, take first match profile_filename="$(grep -l "Name=${profile}" "$HOME"/.local/share/konsole/*.profile)" profile_filename="${profile_filename/$'\n'*}" From 7ed49d57220ce693f3b47e6f4b91ffb5fb4b2491 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 22 Dec 2019 13:40:40 +0100 Subject: [PATCH 0861/1133] Remove quotes --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index e9c0cc316..b772a7900 100755 --- a/neofetch +++ b/neofetch @@ -3116,7 +3116,7 @@ END break fi done - [[ "$profile" ]] && break + [[ $profile ]] && break done [[ ! $profile ]] && return @@ -3125,7 +3125,7 @@ END profile_filename="$(grep -l "Name=${profile}" "$HOME"/.local/share/konsole/*.profile)" profile_filename="${profile_filename/$'\n'*}" - [[ "$profile_filename" ]] && \ + [[ $profile_filename ]] && \ term_font="$(awk -F '=|,' '/Font=/ {print $2,$3}' "$profile_filename")" ;; From 9ad01bfe182799f53c537431a1b4c1b394b28d87 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 22 Dec 2019 14:15:37 +0100 Subject: [PATCH 0862/1133] Invert test logic --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index b772a7900..2c5465ce6 100755 --- a/neofetch +++ b/neofetch @@ -3112,14 +3112,14 @@ END if ((child == "$(qdbus "$i" "$session" processId)")); then profile="$(qdbus "$i" "$session" environment |\ awk -F '=' '/KONSOLE_PROFILE_NAME/ {print $2}')" - [[ ! $profile ]] && profile="$(qdbus "$i" "$session" profile)" + [[ $profile ]] || profile="$(qdbus "$i" "$session" profile)" break fi done [[ $profile ]] && break done - [[ ! $profile ]] && return + [[ $profile ]] || return # We could have two profile files for the same profile name, take first match profile_filename="$(grep -l "Name=${profile}" "$HOME"/.local/share/konsole/*.profile)" From 6e69a7183da9ffd3ec040b89a28e8eadd143a830 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 22 Dec 2019 20:08:24 +0100 Subject: [PATCH 0863/1133] term_font: Fix Konsole font on openSUSE --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 2c5465ce6..cac3540d3 100755 --- a/neofetch +++ b/neofetch @@ -3102,6 +3102,8 @@ END # Get Process ID of current konsole window / tab child="$(get_ppid "$$")" + QT_BINDIR="$(qtpaths --binaries-dir)" && PATH+=":$QT_BINDIR" + IFS=$'\n' read -d "" -ra konsole_instances \ <<< "$(qdbus | awk '/org.kde.konsole/ {print $1}')" From ce39f1bdbd4c75c1afa60c05e0a8b354ab66678c Mon Sep 17 00:00:00 2001 From: Kid Date: Mon, 23 Dec 2019 10:39:42 +0800 Subject: [PATCH 0864/1133] Update neofetch --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index f660f2991..077fac5e1 100755 --- a/neofetch +++ b/neofetch @@ -3742,8 +3742,8 @@ END ;; "Plasma"*) - image="${XDG_CONFIG_HOME}/plasma-org.kde.plasma.desktop-appletsrc" - image="$(awk -F '=' '$1 == "Image" { print $2 }' "$image")" + image="${XDG_CONFIG_HOME}/plasmarc" + image="$(awk -F '=' '$1 == "usersWallpapers" { print $2 }' "$image")" ;; *) From 9b8a38bc0e8094679090eefe18767b5327b2fcb4 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Sun, 22 Dec 2019 23:26:26 -0500 Subject: [PATCH 0865/1133] Update neofetch --- neofetch | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index cac3540d3..be07dbfce 100755 --- a/neofetch +++ b/neofetch @@ -4652,7 +4652,35 @@ IMAGE BACKEND: ASCII: --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro's ascii art to print - + + NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, + Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, + XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, + BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, + BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, + Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, + Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, + DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, + Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, + FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, + gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, + Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, + Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, + LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, + Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, + Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, + NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, + OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, + Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, + PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, + Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, + Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, + SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, + Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, + openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, + Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, + Windows7, Xubuntu, and Zorin have ascii logos + NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. NOTE: Use '{distro name}_old' to use the old logos. @@ -7295,7 +7323,7 @@ ${c5} `._.-._.' EOF ;; - "mac" | "Darwin") + "mac"* | "Darwin") set_colors 2 3 1 1 5 4 read -rd '' ascii_data <<'EOF' ${c1} 'c. @@ -9123,7 +9151,7 @@ ${c1} `- ` EOF ;; - "openSUSE Tumbleweed"*) + "openSUSE Tumbleweed"* | "openSUSE_Tumbleweed"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' ${c2} ...... From bd30e19ad895b29a778dff77ff6d711a30487f91 Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Sun, 22 Dec 2019 23:42:18 -0500 Subject: [PATCH 0866/1133] Update neofetch --- neofetch | 44 ++++++++++++++++++++++++++++++++++++++------ 1 file changed, 38 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index be07dbfce..77e08be5c 100755 --- a/neofetch +++ b/neofetch @@ -727,13 +727,45 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# -# NOTE: Arch and Ubuntu have 'old' logo variants. -# Change this to 'arch_old' or 'ubuntu_old' to use the old logos. +# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, +# Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, +# XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, +# BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, +# BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, +# Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, +# Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, +# DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, +# Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, +# FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, +# gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +# Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, +# Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, +# LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, +# Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, +# Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, +# NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, +# OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, +# Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, +# PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, +# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, +# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +# SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, +# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, +# openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, +# Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, +# Windows7, Xubuntu, and Zorin have ascii logos +# NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. +# Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. -# Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME' or 'Ubuntu-Budgie' to use the flavors. -# NOTE: Arch, Crux and Gentoo have a smaller logo variant. -# Change this to 'arch_small', 'crux_small' or 'gentoo_small' to use the small logos. +# Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, +# Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. +# NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, +# CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, +# Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, +# Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, +# Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, +# postmarketOS, and Void have a smaller logo variant. +# Use '{distro name}_small' to use the small variants. ascii_distro="auto" # Ascii Colors From 6fb1a22dfe820423268b303dd85e5e531bf9b3ed Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:03:13 -0500 Subject: [PATCH 0867/1133] Update neofetch --- neofetch | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 77e08be5c..089320ca5 100755 --- a/neofetch +++ b/neofetch @@ -753,7 +753,7 @@ image_source="auto" # Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, # openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, # Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, -# Windows7, Xubuntu, and Zorin have ascii logos +# Windows7, Xubuntu, Zorin, and IRIX have ascii logos # NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. @@ -4711,7 +4711,7 @@ ASCII: Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, - Windows7, Xubuntu, and Zorin have ascii logos + Windows7, Xubuntu, Zorin, and IRIX have ascii logos NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. @@ -9606,7 +9606,30 @@ sddddddy ydddddds `-/osyhddddhyso/-` EOF ;; - + "IRIX"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c1} ./ohmNd/ +dNmho/- + `:+ydNMMMMMMMM.-MMMMMMMMMdyo:. + `hMMMMMMNhs/sMMM-:MMM+/shNMMMMMMh` + -NMMMMMmo-` /MMM-/MMM- `-omMMMMMN. + `.`-+hNMMMMMNhyMMM-/MMMshmMMMMMmy+...` ++mMNds:-:sdNMMMMMMMyyMMMMMMMNdo:.:sdMMm+ +dMMMMMMmy+.-/ymNMMMMMMMMNmy/-.+hmMMMMMMd +oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ +.MMMM-/ymMMMMMmNMMy..hMMNmMMMMMmy/-MMMM. + hMMM/ `/dMMMMMMMN////NMMMMMMMd/. /MMMh + /MMMdhmMMMmyyMMMMMMMMMMMMhymMMMmhdMMM: + `mMMMMNho//sdMMMMM//NMMMMms//ohNMMMMd + `/so/:+ymMMMNMMMM` mMMMMMMMmh+::+o/` + `yNMMNho-yMMMM` NMMMm.+hNMMNh` + -MMMMd: oMMMM. NMMMh :hMMMM- + -yNMMMmooMMMM- NMMMyomMMMNy- + .omMMMMMMMM-`NMMMMMMMmo. + `:hMMMMMM. NMMMMMh/` + .odNm+ /dNms. +EOF + ;; "Zorin"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' From 53b02a16d6fd559d6c8bb938d6e299841c73996d Mon Sep 17 00:00:00 2001 From: bgkillas <55570525+bgkillas@users.noreply.github.com> Date: Mon, 23 Dec 2019 00:24:04 -0500 Subject: [PATCH 0868/1133] Add files via upload --- neofetch.1 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/neofetch.1 b/neofetch.1 index bd9533238..f2a95e0d2 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -278,6 +278,34 @@ Colors to print the ascii art .TP \fB\-\-ascii_distro\fR distro Which Distro's ascii art to print +.TP +NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, +Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, +XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, +BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, +BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, +Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, +Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, +DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, +Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, +FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, +gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, +Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, +LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, +Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, +Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, +NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, +OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, +Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, +PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, +Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, +Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, +Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, +openSUSE, SwagArch, Tails, Trisquel, Ubuntu\-Budgie, Ubuntu\-GNOME, +Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, Void, Obarun, windows10, +Windows7, Xubuntu, Zorin, and IRIX have ascii logos .IP NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. .IP From d8a3ae5fed32e9d26db32490004873e446497310 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 23 Dec 2019 23:24:44 +0000 Subject: [PATCH 0869/1133] wallpaper: Fix #1379 --- neofetch | 67 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 34 insertions(+), 33 deletions(-) diff --git a/neofetch b/neofetch index 9d636c04a..606a1b602 100755 --- a/neofetch +++ b/neofetch @@ -727,15 +727,15 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, -# Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, +# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, +# Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, # XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, # BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, # BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, # Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, # DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, -# Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, +# Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, # gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, # Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, @@ -745,14 +745,14 @@ image_source="auto" # Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, # NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, # OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, -# Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, +# Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, # PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, # Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, -# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, +# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, # openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, -# Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, +# Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, # Windows7, Xubuntu, Zorin, and IRIX have ascii logos # NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. @@ -3779,8 +3779,9 @@ END ;; "Plasma"*) - image="${XDG_CONFIG_HOME}/plasmarc" - image="$(awk -F '=' '$1 == "usersWallpapers" { print $2 }' "$image")" + image=$XDG_CONFIG_HOME/plasma-org.kde.plasma.desktop-appletsrc + image=$(awk -F '=' '$1 == "Image" { print $2 }' "$image") + image=${image##file://} ;; *) @@ -4689,16 +4690,16 @@ IMAGE BACKEND: ASCII: --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro's ascii art to print - - NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, - Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, + + NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, + Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, - Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, + Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, @@ -4708,16 +4709,16 @@ ASCII: Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, - Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, + Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, - Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, + Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, - Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, + Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos - + NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. NOTE: Use '{distro name}_old' to use the old logos. @@ -5847,23 +5848,23 @@ EOF "Carbs"*) set_colors 4 5 4 4 4 4 read -rd '' ascii_data <<'EOF' -${c2} .......... - ..,;:ccccccc:;'.. - ..,clllc:;;;;;:cllc,. - .,cllc,... ..';;'. - .;lol;.. .. - .,lol;. - .coo:. - .'lol,. - .,lol,. - .,lol,. - 'col;. - .:ooc'. - .'col:. - .'cllc'.. .''. - ..:lolc,'.......',cll,. - ..;cllllccccclllc;'. - ...',;;;;;;,,... +${c2} .......... + ..,;:ccccccc:;'.. + ..,clllc:;;;;;:cllc,. + .,cllc,... ..';;'. + .;lol;.. .. + .,lol;. + .coo:. + .'lol,. + .,lol,. + .,lol,. + 'col;. + .:ooc'. + .'col:. + .'cllc'.. .''. + ..:lolc,'.......',cll,. + ..;cllllccccclllc;'. + ...',;;;;;;,,... ..... EOF ;; From eb48e77595d7be31dd7fe9dc0a8eb5c5a4a4c75a Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 24 Dec 2019 16:23:17 +0100 Subject: [PATCH 0870/1133] ascii: Add openSUSE Leap logo --- neofetch | 40 ++++++++++++++++++++++++++++++++-------- neofetch.1 | 9 +++++---- 2 files changed, 37 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 606a1b602..f73a18091 100755 --- a/neofetch +++ b/neofetch @@ -750,10 +750,11 @@ image_source="auto" # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, # Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, -# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, -# openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, -# Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, -# Windows7, Xubuntu, Zorin, and IRIX have ascii logos +# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, +# openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, +# Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, +# Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX +# have ascii logos # NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. @@ -4714,10 +4715,11 @@ ASCII: Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, - Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, - openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, - Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, - Windows7, Xubuntu, Zorin, and IRIX have ascii logos + Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, + openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, + Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, + Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX + have ascii logos NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. @@ -9189,6 +9191,28 @@ ${c1} `- ` EOF ;; + "openSUSE Leap"* | "openSUSE_Leap"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c2} `-++:` + ./oooooo/- + `:oooooooooooo:. + -+oooooooooooooooo+-` + ./oooooooooooooooooooooo/- + :oooooooooooooooooooooooooo: + ` `-+oooooooooooooooooooo/- ` + `:oo/- .:ooooooooooooooo+:` `-+oo/. +`/oooooo:. -/oooooooooo/. ./oooooo/. + `:+ooooo+-` `:+oooo+- `:oooooo+:` + .:oooooo/. .::` -+oooooo/. + -/oooooo:. ./oooooo+- + `:+ooooo+-:+oooooo:` + ./oooooooooo/. + -/oooo+:` + `:/. +EOF + ;; + "openSUSE Tumbleweed"* | "openSUSE_Tumbleweed"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index f2a95e0d2..0737c78b1 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -302,10 +302,11 @@ PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, -Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Tumbleweed, -openSUSE, SwagArch, Tails, Trisquel, Ubuntu\-Budgie, Ubuntu\-GNOME, -Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, Void, Obarun, windows10, -Windows7, Xubuntu, Zorin, and IRIX have ascii logos +Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, +openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, +Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, +Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX +have ascii logos .IP NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. .IP From 684d4e881a8cc2b3f962b50e4b00cc9ae97de7f1 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 25 Dec 2019 17:42:37 +0100 Subject: [PATCH 0871/1133] Remove redundant trim --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index f73a18091..a7984a583 100755 --- a/neofetch +++ b/neofetch @@ -3782,7 +3782,6 @@ END "Plasma"*) image=$XDG_CONFIG_HOME/plasma-org.kde.plasma.desktop-appletsrc image=$(awk -F '=' '$1 == "Image" { print $2 }' "$image") - image=${image##file://} ;; *) From 408d3ae5eaa1d4fe3b1e2f455379ef00fb4433cd Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 25 Dec 2019 17:43:12 +0100 Subject: [PATCH 0872/1133] song: Fix Exaile --- neofetch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index a7984a583..1144c33e7 100755 --- a/neofetch +++ b/neofetch @@ -2672,9 +2672,12 @@ get_song() { "exaile"*) # NOTE: Exaile >= 4.0.0 will support mpris2. - song="$(dbus-send --print-reply --dest=org.exaile.Exaile /org/exaile/Exaile \ - org.exaile.Exaile.Query | - awk -F':|,' '{if ($6 && $8 && $4) printf $6 "\n" $8 "\n" $4}')" + song="$(dbus-send --print-reply --dest=org.exaile.Exaile \ + /org/exaile/Exaile org.exaile.Exaile.Query | + awk -F ':' '{sub(",[^,]*$", "", $3); t=$3; + sub(",[^,]*$", "", $4); a=$4; + sub(",[^,]*$", "", $5); b=$5} + END {print a "\n" b "\n" t}')" ;; "muine"*) From 4a414135aee2db521deed3a09ffa1421ebffa74c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 28 Dec 2019 22:53:10 +0000 Subject: [PATCH 0873/1133] disk: clean up --- neofetch | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/neofetch b/neofetch index 606a1b602..50a308078 100755 --- a/neofetch +++ b/neofetch @@ -3325,17 +3325,17 @@ END } get_disk() { - type -p df &>/dev/null ||\ + type -p df &>/dev/null || { err "Disk requires 'df' to function. Install 'df' to get disk info."; return; } - df_version="$(df --version 2>&1)" + df_version=$(df --version 2>&1) case $df_version in - *"IMitv"*) df_flags=(-P -g) ;; # AIX - *"befhikm"*) df_flags=(-P -k) ;; # IRIX - *"hiklnP"*) df_flags=(-h) ;; # OpenBSD + *IMitv*) df_flags=(-P -g) ;; # AIX + *befhikm*) df_flags=(-P -k) ;; # IRIX + *hiklnP*) df_flags=(-h) ;; # OpenBSD - *"Tracker"*) # Haiku + *Tracker*) # Haiku err "Your version of df cannot be used due to the non-standard flags" return ;; @@ -3349,7 +3349,7 @@ get_disk() { unset "disks[0]" # Stop here if 'df' fails to print disk info. - [[ -z "${disks[*]}" ]] && { + [[ ${disks[*]} ]] || { err "Disk: df failed to print the disks, make sure the disk_show array is set properly." return } @@ -3357,10 +3357,10 @@ get_disk() { for disk in "${disks[@]}"; do # Create a second array and make each element split at whitespace this time. IFS=" " read -ra disk_info <<< "$disk" - disk_perc="${disk_info[4]/\%}" + disk_perc=${disk_info[4]/\%} case $df_version in - *"befhikm"*) + *befhikm*) disk="$((disk_info[2]/1024/1024))G / $((disk_info[1]/1024/1024))G (${disk_perc}%)" ;; @@ -3369,35 +3369,33 @@ get_disk() { ;; esac - # Subtitle. case $disk_subtitle in - "name") - disk_sub="${disk_info[0]}" + name) + disk_sub=${disk_info[0]} ;; - "dir") - disk_sub="${disk_info[5]/*\/}" - disk_sub="${disk_sub:-${disk_info[5]}}" + dir) + disk_sub=${disk_info[5]/*\/} + disk_sub=${disk_sub:-${disk_info[5]}} ;; *) - disk_sub="${disk_info[5]}" + disk_sub=${disk_info[5]} ;; esac - # Bar. case $disk_display in - "bar") disk="$(bar "$disk_perc" "100")" ;; - "infobar") disk+=" $(bar "$disk_perc" "100")" ;; - "barinfo") disk="$(bar "$disk_perc" "100")${info_color} $disk" ;; - "perc") disk="${disk_perc}% $(bar "$disk_perc" "100")" ;; + bar) disk="$(bar "$disk_perc" "100")" ;; + infobar) disk+=" $(bar "$disk_perc" "100")" ;; + barinfo) disk="$(bar "$disk_perc" "100")${info_color} $disk" ;; + perc) disk="${disk_perc}% $(bar "$disk_perc" "100")" ;; esac # Append '(disk mount point)' to the subtitle. - if [[ -z "$subtitle" ]]; then - prin "${disk_sub}" "$disk" + if [[ "$subtitle" ]]; then + prin "$subtitle ($disk_sub)" "$disk" else - prin "${subtitle} (${disk_sub})" "$disk" + prin "$disk_sub" "$disk" fi done } From f9ddc9f949ebb9830a6233214cd3775ebb471f3d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 28 Dec 2019 22:54:38 +0000 Subject: [PATCH 0874/1133] model: Remove ASUS OEM string --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 7c3f0c568..cf93a3655 100755 --- a/neofetch +++ b/neofetch @@ -1249,6 +1249,7 @@ get_model() { model=${model//Not Specified} model=${model//Type1ProductConfigId} model=${model//INVALID} + model=${model//All Series} model=${model//�} case $model in From 5c7ad91bdfba1caa7e8004fb5895e6ba75d10ef3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 28 Dec 2019 22:58:06 +0000 Subject: [PATCH 0875/1133] docs: update --- .github/ISSUE_TEMPLATE.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index e51b6bbda..d1120c08a 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -2,6 +2,8 @@ If you're suggesting a new feature then just a description will suffice. +- [ ] Does this issue still occur in the master branch? (**Required if issue**) + #### Neofetch version From 541322beead948569a6a4013a99106929bb6e838 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 29 Dec 2019 11:00:13 +0100 Subject: [PATCH 0876/1133] song: print empty tags correctly --- neofetch | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/neofetch b/neofetch index cf93a3655..f3d098e03 100755 --- a/neofetch +++ b/neofetch @@ -2596,16 +2596,14 @@ get_song() { org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' \ string:'Metadata' |\ awk -F '"' 'BEGIN {RS=" entry"}; /"xesam:artist"/ {a = $4} /"xesam:album"/ {b = $4} - /"xesam:title"/ {t = $4} END {print a "\n" b "\n" t}' + /"xesam:title"/ {t = $4} END {print a " \n" b " \n" t}' )" } case ${player/*\/} in - "mpd"*|"mopidy"*) song="$(mpc -f '%artist%\n%album%\n%title%' current "${mpc_args[@]}")" ;; - "mocp"*) song="$(mocp -Q '%artist\n%album\n%song')" ;; - "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist%\\n%album%\\n%title%')" ;; - "xmms2d"*) song="$(xmms2 current -f "\${artist}"$'\n'"\${album}"$'\n'"\${title}")" ;; - "qmmp"*) song="$(qmmp --nowplaying '%p\\n%a\\n%t')" ;; + "mocp"*) song="$(mocp -Q '%artist \n%album \n%song')" ;; + "deadbeef"*) song="$(deadbeef --nowplaying-tf '%artist% \\n%album% \\n%title%')" ;; + "qmmp"*) song="$(qmmp --nowplaying '%p \n%a \n%t')" ;; "gnome-music"*) get_song_dbus "GnomeMusic" ;; "lollypop"*) get_song_dbus "Lollypop" ;; "clementine"*) get_song_dbus "clementine" ;; @@ -2632,6 +2630,14 @@ get_song() { "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; "io.elementary.music"*) get_song_dbus "Music" ;; + "mpd"* | "mopidy"*) + song="$(mpc -f '%artist% \n%album% \n%title%' current "${mpc_args[@]}")" + ;; + + "xmms2d"*) + song="$(xmms2 current -f "\${artist}"$' \n'"\${album}"$' \n'"\${title}")" + ;; + "cmus"*) # NOTE: cmus >= 2.8.0 supports mpris2 song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; @@ -2644,7 +2650,7 @@ get_song() { /tag title/ { $1=$2=""; sub(" ", ""); t=$0 } - END { print a "\n" b "\n" t }')" + END { print a " \n" b " \n" t }')" ;; "spotify"*) @@ -2668,7 +2674,7 @@ get_song() { "banshee"*) song="$(banshee --query-artist --query-album --query-title |\ awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} - END {print a "\n" b "\n"t}')" + END {print a " \n" b " \n"t}')" ;; "exaile"*) @@ -2678,31 +2684,31 @@ get_song() { awk -F ':' '{sub(",[^,]*$", "", $3); t=$3; sub(",[^,]*$", "", $4); a=$4; sub(",[^,]*$", "", $5); b=$5} - END {print a "\n" b "\n" t}')" + END {print a " \n" b " \n" t}')" ;; "muine"*) song="$(dbus-send --print-reply --dest=org.gnome.Muine /org/gnome/Muine/Player \ org.gnome.Muine.Player.GetCurrentSong | awk -F':' '/^artist/ {a=$2} /^album/ {b=$2} /^title/ {t=$2} - END {print a "\n" b "\n" t}')" + END {print a " \n" b " \n" t}')" ;; "quodlibet"*) song="$(dbus-send --print-reply --dest=net.sacredchao.QuodLibet \ /net/sacredchao/QuodLibet net.sacredchao.QuodLibet.CurrentSong |\ awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4} - /"title"/ {t=$4} END {print a "\n" b "\n" t}')" + /"title"/ {t=$4} END {print a " \n" b " \n" t}')" ;; "pogo"*) song="$(dbus-send --print-reply --dest=org.mpris.pogo /Player \ org.freedesktop.MediaPlayer.GetMetadata | awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4} - /"title"/ {t=$4} END {print a "\n" b "\n" t}')" + /"title"/ {t=$4} END {print a " \n" b " \n" t}')" ;; - *) mpc &>/dev/null && song="$(mpc -f '%artist%\n%album%\n%title%' current)" || return ;; + *) mpc &>/dev/null && song="$(mpc -f '%artist% \n%album% \n%title%' current)" || return ;; esac IFS=$'\n' read -d "" -r artist album title <<< "${song//'\n'/$'\n'}" From 92246e7b7fca9fc76d04f21e5a0809e996144b54 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 29 Dec 2019 11:02:30 +0100 Subject: [PATCH 0877/1133] song: simplify cmus --- neofetch | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index f3d098e03..68fb8c4d8 100755 --- a/neofetch +++ b/neofetch @@ -2640,17 +2640,10 @@ get_song() { "cmus"*) # NOTE: cmus >= 2.8.0 supports mpris2 - song="$(cmus-remote -Q | awk 'BEGIN { ORS=" "}; - /tag artist/ { - $1=$2=""; sub(" ", ""); a=$0 - } - /tag album / { - $1=$2=""; sub(" ", ""); b=$0 - } - /tag title/ { - $1=$2=""; sub(" ", ""); t=$0 - } - END { print a " \n" b " \n" t }')" + song="$(cmus-remote -Q | awk '/tag artist/ {$1=$2=""; a=$0} + /tag album / {$1=$2=""; b=$0} + /tag title/ {$1=$2=""; t=$0} + END {print a " \n" b " \n" t}')" ;; "spotify"*) From 03152764aaf4293ab349e59460bc0f5e49c0bfd8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 29 Dec 2019 23:46:29 +0000 Subject: [PATCH 0878/1133] cols: Fix issues --- neofetch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index cf93a3655..a5cef780c 100755 --- a/neofetch +++ b/neofetch @@ -1975,8 +1975,8 @@ get_cpu() { # Select the right temperature file. for temp_dir in /sys/class/hwmon/*; do - [[ "$(< "${temp_dir}/name")" =~ (coretemp|fam15h_power|k10temp) ]] && \ - { temp_dir="${temp_dir}/temp1_input"; break; } + [[ "$(< "$temp_dir/name")" =~ (coretemp|fam15h_power|k10temp) ]] && + { temp_dir=$temp_dir/temp1_input; break; } done # Get CPU speed. @@ -3598,12 +3598,13 @@ get_cols() { printf -v block_spaces "%${block_height}s" # Convert the spaces into rows of blocks. - [[ "$blocks" ]] && cols+="${block_spaces// /${blocks}${reset}nl}" - [[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}${reset}nl}" + [[ "$blocks" ]] && cols+="${block_spaces// /${blocks}nl}" + [[ "$blocks2" ]] && cols+="${block_spaces// /${blocks2}nl}" # Add newlines to the string. - cols="${cols%%'nl'}" - cols="${cols//nl/\\n\\e[${text_padding}C${zws}}" + cols=${cols%%nl} + cols=${cols//nl/ +[${text_padding}C${zws}} # Add block height to info height. ((info_height+=block_range[1]>7?block_height+3:block_height+2)) From 74914899d835eb82ec42084c1e2f25fd353a5fa2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 3 Jan 2020 08:57:33 +0200 Subject: [PATCH 0879/1133] wm_theme: clean up --- neofetch | 200 +++++++++++++++++++++++++++---------------------------- 1 file changed, 100 insertions(+), 100 deletions(-) diff --git a/neofetch b/neofetch index 614616389..f6896323a 100755 --- a/neofetch +++ b/neofetch @@ -1254,7 +1254,7 @@ get_model() { case $model in "Standard PC"*) model="KVM/QEMU (${model})" ;; - "OpenBSD"*) model="vmm ($model)" ;; + OpenBSD*) model="vmm ($model)" ;; esac } @@ -1637,17 +1637,17 @@ get_de() { if [[ $de_version == on && $de ]]; then case $de in - "Plasma"*) de_ver=$(plasmashell --version) ;; - "MATE"*) de_ver=$(mate-session --version) ;; - "Xfce"*) de_ver=$(xfce4-session --version) ;; - "GNOME"*) de_ver=$(gnome-shell --version) ;; - "Cinnamon"*) de_ver=$(cinnamon --version) ;; - "Deepin"*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; - "Budgie"*) de_ver=$(budgie-desktop --version) ;; - "LXQt"*) de_ver=$(lxqt-session --version) ;; - "Lumina"*) de_ver=$(lumina-desktop --version 2>&1) ;; - "Trinity"*) de_ver=$(tde-config --version) ;; - "Unity"*) de_ver=$(unity --version) ;; + Plasma*) de_ver=$(plasmashell --version) ;; + MATE*) de_ver=$(mate-session --version) ;; + Xfce*) de_ver=$(xfce4-session --version) ;; + GNOME*) de_ver=$(gnome-shell --version) ;; + Cinnamon*) de_ver=$(cinnamon --version) ;; + Deepin*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; + Budgie*) de_ver=$(budgie-desktop --version) ;; + LXQt*) de_ver=$(lxqt-session --version) ;; + Lumina*) de_ver=$(lumina-desktop --version 2>&1) ;; + Trinity*) de_ver=$(tde-config --version) ;; + Unity*) de_ver=$(unity --version) ;; esac de_ver=${de_ver/*TDE:} @@ -1784,164 +1784,164 @@ get_wm_theme() { ((de_run != 1)) && get_de case $wm in - "E16") - wm_theme="$(awk -F "= " '/theme.name/ {print $2}' "${HOME}/.e16/e_config--0.0.cfg")" + E16) + wm_theme=$(awk -F "= " '/theme.name/ {print $2}' "${HOME}/.e16/e_config--0.0.cfg") ;; - "Sawfish") - wm_theme="$(awk -F '\\(quote|\\)' '/default-frame-style/ {print $(NF-4)}' \ - "${HOME}/.sawfish/custom")" + Sawfish) + wm_theme=$(awk -F '\\(quote|\\)' '/default-frame-style/ {print $(NF-4)}' \ + "$HOME/.sawfish/custom") ;; - "Cinnamon" | "Muffin" | "Mutter (Muffin)") - detheme="$(gsettings get org.cinnamon.theme name)" - wm_theme="$(gsettings get org.cinnamon.desktop.wm.preferences theme)" - wm_theme="$detheme (${wm_theme})" + Cinnamon|Muffin|"Mutter (Muffin)") + detheme=$(gsettings get org.cinnamon.theme name) + wm_theme=$(gsettings get org.cinnamon.desktop.wm.preferences theme) + wm_theme="$detheme ($wm_theme)" ;; - "Compiz" | "Mutter" | "Gala") + Compiz|Mutter|Gala) if type -p gsettings >/dev/null; then - wm_theme="$(gsettings get org.gnome.shell.extensions.user-theme name)" + wm_theme=$(gsettings get org.gnome.shell.extensions.user-theme name) - [[ -z "${wm_theme//\'}" ]] && \ - wm_theme="$(gsettings get org.gnome.desktop.wm.preferences theme)" + [[ ${wm_theme//\'} ]] || \ + wm_theme=$(gsettings get org.gnome.desktop.wm.preferences theme) elif type -p gconftool-2 >/dev/null; then - wm_theme="$(gconftool-2 -g /apps/metacity/general/theme)" + wm_theme=$(gconftool-2 -g /apps/metacity/general/theme) fi ;; - "Metacity"*) - if [[ "$de" == "Deepin" ]]; then - wm_theme="$(gsettings get com.deepin.wrap.gnome.desktop.wm.preferences theme)" + Metacity*) + if [[ $de == Deepin ]]; then + wm_theme=$(gsettings get com.deepin.wrap.gnome.desktop.wm.preferences theme) - elif [[ "$de" == "MATE" ]]; then - wm_theme="$(gsettings get org.mate.Marco.general theme)" + elif [[ $de == MATE ]]; then + wm_theme=$(gsettings get org.mate.Marco.general theme) else - wm_theme="$(gconftool-2 -g /apps/metacity/general/theme)" + wm_theme=$(gconftool-2 -g /apps/metacity/general/theme) fi ;; - "E17" | "Enlightenment") + E17|Enlightenment) if type -p eet >/dev/null; then - wm_theme="$(eet -d "${HOME}/.e/e/config/standard/e.cfg" config |\ - awk '/value \"file\" string.*.edj/ {print $4}')" - wm_theme="${wm_theme##*/}" - wm_theme="${wm_theme%.*}" + wm_theme=$(eet -d "$HOME/.e/e/config/standard/e.cfg" config |\ + awk '/value \"file\" string.*.edj/ {print $4}') + wm_theme=${wm_theme##*/} + wm_theme=${wm_theme%.*} fi ;; - "Fluxbox") - [[ -f "${HOME}/.fluxbox/init" ]] && \ - wm_theme="$(awk -F "/" '/styleFile/ {print $NF}' "${HOME}/.fluxbox/init")" + Fluxbox) + [[ -f $HOME/.fluxbox/init ]] && + wm_theme=$(awk -F "/" '/styleFile/ {print $NF}' "$HOME/.fluxbox/init") ;; - "IceWM"*) - [[ -f "${HOME}/.icewm/theme" ]] && \ - wm_theme="$(awk -F "[\",/]" '!/#/ {print $2}' "${HOME}/.icewm/theme")" + IceWM*) + [[ -f $HOME/.icewm/theme ]] && + wm_theme=$(awk -F "[\",/]" '!/#/ {print $2}' "$HOME/.icewm/theme") ;; - "Openbox") + Openbox) case $de in - "LXDE"*) ob_file="lxde-rc" ;; - "LXQt"*) ob_file="lxqt-rc" ;; - *) ob_file="rc" ;; + LXDE*) ob_file=lxde-rc ;; + LXQt*) ob_file=lxqt-rc ;; + *) ob_file=rc ;; esac - ob_file="${XDG_CONFIG_HOME}/openbox/${ob_file}.xml" + ob_file=$XDG_CONFIG_HOME/openbox/$ob_file.xml - [[ -f "$ob_file" ]] && \ - wm_theme="$(awk '// {while (getline n) {if (match(n, //)) - {l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file")" + [[ -f $ob_file ]] && + wm_theme=$(awk '// {while (getline n) {if (match(n, //)) + {l=n; exit}}} END {split(l, a, "[<>]"); print a[3]}' "$ob_file") ;; - "PekWM") - [[ -f "${HOME}/.pekwm/config" ]] && \ - wm_theme="$(awk -F "/" '/Theme/{gsub(/\"/,""); print $NF}' "${HOME}/.pekwm/config")" + PekWM) + [[ -f $HOME/.pekwm/config ]] && + wm_theme=$(awk -F "/" '/Theme/{gsub(/\"/,""); print $NF}' "$HOME/.pekwm/config") ;; - "Xfwm4") - [[ -f "${HOME}/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml" ]] && \ - wm_theme="$(xfconf-query -c xfwm4 -p /general/theme)" + Xfwm4) + [[ -f $HOME/.config/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml ]] && + wm_theme=$(xfconf-query -c xfwm4 -p /general/theme) ;; - "KWin"*) + KWin*) kde_config_dir - kwinrc="${kde_config_dir}/kwinrc" - kdebugrc="${kde_config_dir}/kdebugrc" + kwinrc=$kde_config_dir/kwinrc + kdebugrc=$kde_config_dir/kdebugrc - if [[ -f "$kwinrc" ]]; then - wm_theme="$(awk '/theme=/ { + if [[ -f $kwinrc ]]; then + wm_theme=$(awk '/theme=/ { gsub(/theme=.*qml_|theme=.*svg__/,"",$0); print $0; exit - }' "$kwinrc")" + }' "$kwinrc") - [[ -z "$wm_theme" ]] && \ - wm_theme="$(awk '/library=org.kde/ { + [[ "$wm_theme" ]] || + wm_theme=$(awk '/library=org.kde/ { gsub(/library=org.kde./,"",$0); print $0; exit - }' "$kwinrc")" + }' "$kwinrc") - [[ -z "$wm_theme" ]] && \ - wm_theme="$(awk '/PluginLib=kwin3_/ { + [[ $wm_theme ]] || + wm_theme=$(awk '/PluginLib=kwin3_/ { gsub(/PluginLib=kwin3_/,"",$0); print $0; exit - }' "$kwinrc")" + }' "$kwinrc") - elif [[ -f "$kdebugrc" ]]; then - wm_theme="$(awk '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$kdebugrc")" + elif [[ -f $kdebugrc ]]; then + wm_theme=$(awk '/(decoration)/ {gsub(/\[/,"",$1); print $1; exit}' "$kdebugrc") fi - wm_theme="${wm_theme/theme=}" + wm_theme=${wm_theme/theme=} ;; "Quartz Compositor") - global_preferences="${HOME}/Library/Preferences/.GlobalPreferences.plist" - wm_theme="$(PlistBuddy -c "Print AppleInterfaceStyle" "$global_preferences")" - wm_theme_color="$(PlistBuddy -c "Print AppleAccentColor" "$global_preferences")" + global_preferences=$HOME/Library/Preferences/.GlobalPreferences.plist + wm_theme=$(PlistBuddy -c "Print AppleInterfaceStyle" "$global_preferences") + wm_theme_color=$(PlistBuddy -c "Print AppleAccentColor" "$global_preferences") - [[ -z "$wm_theme" ]] && \ - wm_theme="Light" + [[ "$wm_theme" ]] || + wm_theme=Light case $wm_theme_color in - "-1") wm_theme_color="Graphite" ;; - "0") wm_theme_color="Red" ;; - "1") wm_theme_color="Orange" ;; - "2") wm_theme_color="Yellow" ;; - "3") wm_theme_color="Green" ;; - "5") wm_theme_color="Purple" ;; - "6") wm_theme_color="Pink" ;; - *) wm_theme_color="Blue" ;; + -1) wm_theme_color=Graphite ;; + 0) wm_theme_color=Red ;; + 1) wm_theme_color=Orange ;; + 2) wm_theme_color=Yellow ;; + 3) wm_theme_color=Green ;; + 5) wm_theme_color=Purple ;; + 6) wm_theme_color=Pink ;; + *) wm_theme_color=Blue ;; esac - wm_theme="${wm_theme_color} ($wm_theme)" + wm_theme="$wm_theme_color ($wm_theme)" ;; - *"Explorer") - path="/proc/registry/HKEY_CURRENT_USER/Software/Microsoft" - path+="/Windows/CurrentVersion/Themes/CurrentTheme" + *Explorer) + path=/proc/registry/HKEY_CURRENT_USER/Software/Microsoft + path+=/Windows/CurrentVersion/Themes/CurrentTheme - wm_theme="$(head -n1 "$path")" - wm_theme="${wm_theme##*\\}" - wm_theme="${wm_theme%.*}" + wm_theme=$(head -n1 "$path") + wm_theme=${wm_theme##*\\} + wm_theme=${wm_theme%.*} ;; - "Blackbox" | "bbLean"*) - path="$(wmic process get ExecutablePath | grep -F "blackbox")" - path="${path//\\/\/}" + Blackbox|bbLean*) + path=$(wmic process get ExecutablePath | grep -F "blackbox") + path=${path//\\/\/} - wm_theme="$(grep '^session\.styleFile:' "${path/\.exe/.rc}")" - wm_theme="${wm_theme/session\.styleFile: }" - wm_theme="${wm_theme##*\\}" - wm_theme="${wm_theme%.*}" + wm_theme=$(grep '^session\.styleFile:' "${path/\.exe/.rc}") + wm_theme=${wm_theme/session\.styleFile: } + wm_theme=${wm_theme##*\\} + wm_theme=${wm_theme%.*} ;; esac - wm_theme="$(trim_quotes "$wm_theme")" + wm_theme=$(trim_quotes "$wm_theme") } get_cpu() { From 39d7188f4a6a6109a0c12bb98b94fc5c799f19d4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 01:00:16 +0200 Subject: [PATCH 0880/1133] disk: Added --disk_subtitle=none. Closes #1386 --- neofetch | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index f6896323a..9fa16841a 100755 --- a/neofetch +++ b/neofetch @@ -419,7 +419,7 @@ disk_show=('/') # What to append to the Disk subtitle. # # Default: 'mount' -# Values: 'mount', 'name', 'dir' +# Values: 'mount', 'name', 'dir', 'none' # Flag: --disk_subtitle # # Example: @@ -433,6 +433,10 @@ disk_show=('/') # dir: 'Disk (/): 74G / 118G (66%)' # 'Disk (Local Disk): 74G / 118G (66%)' # 'Disk (Videos): 74G / 118G (66%)' +# +# none: 'Disk: 74G / 118G (66%)' +# 'Disk: 74G / 118G (66%)' +# 'Disk: 74G / 118G (66%)' disk_subtitle="mount" @@ -3383,6 +3387,8 @@ get_disk() { disk_sub=${disk_sub:-${disk_info[5]}} ;; + none) ;; + *) disk_sub=${disk_info[5]} ;; @@ -3397,7 +3403,7 @@ get_disk() { # Append '(disk mount point)' to the subtitle. if [[ "$subtitle" ]]; then - prin "$subtitle ($disk_sub)" "$disk" + prin "$subtitle${disk_sub:+ ($disk_sub)}" "$disk" else prin "$disk_sub" "$disk" fi @@ -4615,7 +4621,7 @@ INFO: NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') --disk_subtitle type What information to append to the Disk subtitle. - Takes: name, mount, dir + Takes: name, mount, dir, none 'name' shows the disk's name (sda1, sda2, etc) @@ -4623,6 +4629,8 @@ INFO: 'dir' shows the basename of the disks's path. (/, Local Disk, etc) + 'none' shows only 'Disk' or the configured title. + --ip_host url URL to query for public IP --ip_timeout int Public IP timeout (in seconds). --song_format format Print the song data in a specific format (see config file). From b699d75a9e7ae55a101daa000bb9b99d60f0cd14 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 01:04:39 +0200 Subject: [PATCH 0881/1133] neofetch: Fix Chrome OS detection. Closes #1384 --- neofetch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 9fa16841a..fcaf9311c 100755 --- a/neofetch +++ b/neofetch @@ -736,7 +736,7 @@ image_source="auto" # XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, # BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, # BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, -# Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, +# Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, # Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, # DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, # Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, @@ -996,7 +996,7 @@ get_distro() { # While the file is a series of variables they can't be sourced # by the shell since the values aren't quoted. elif [[ -f /etc/lsb-release && $(< /etc/lsb-release) == *CHROMEOS* ]]; then - distro=$(awk -F '=' '/NAME|VERSION/ {printf $2 " "}' /etc/lsb-release) + distro='Chrome OS' elif type -p guix >/dev/null; then case $distro_shorthand in @@ -1033,11 +1033,12 @@ get_distro() { esac elif [[ $(< /proc/version) == *chrome-bot* || -f /dev/cros_ec ]]; then - case $distro_shorthand in - on) distro+=" [Chrome OS]" ;; - tiny) distro="Chrome OS" ;; - *) distro+=" on Chrome OS" ;; - esac + [[ $distro != *Chrome* ]] && + case $distro_shorthand in + on) distro+=" [Chrome OS]" ;; + tiny) distro="Chrome OS" ;; + *) distro+=" on Chrome OS" ;; + esac fi distro=$(trim_quotes "$distro") From f5263176dd5c0d2a1621e34de560e024dd9307d5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 01:18:15 +0200 Subject: [PATCH 0882/1133] neofetch: Added --disk_percent. Closes #1378 --- neofetch | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index fcaf9311c..0b7411303 100755 --- a/neofetch +++ b/neofetch @@ -439,6 +439,18 @@ disk_show=('/') # 'Disk: 74G / 118G (66%)' disk_subtitle="mount" +# Disk percent. +# Show/Hide disk percent. +# +# Default: 'on' +# Values: 'on', 'off' +# Flag: --disk_percent +# +# Example: +# on: 'Disk (/): 74G / 118G (66%)' +# off: 'Disk (/): 74G / 118G' +disk_percent="on" + # Song @@ -3368,13 +3380,18 @@ get_disk() { IFS=" " read -ra disk_info <<< "$disk" disk_perc=${disk_info[4]/\%} + case $disk_percent in + off) disk_perc= + esac + case $df_version in *befhikm*) - disk="$((disk_info[2]/1024/1024))G / $((disk_info[1]/1024/1024))G (${disk_perc}%)" + disk="$((disk_info[2]/1024/1024))G / $((disk_info[1]/1024/1024))G" + disk+="${disk_perc:+ ($disk_perc%)}" ;; *) - disk="${disk_info[2]/i} / ${disk_info[1]/i} (${disk_perc}%)" + disk="${disk_info[2]/i} / ${disk_info[1]/i}${disk_perc:+ ($disk_perc%)}" ;; esac @@ -4632,6 +4649,8 @@ INFO: 'none' shows only 'Disk' or the configured title. + --disk_percent on/off Hide/Show disk percent. + --ip_host url URL to query for public IP --ip_timeout int Public IP timeout (in seconds). --song_format format Print the song data in a specific format (see config file). @@ -4835,6 +4854,7 @@ get_args() { ;; "--disk_subtitle") disk_subtitle="$2" ;; + "--disk_percent") disk_percent="$2" ;; "--disk_show") unset disk_show for arg in "$@"; do From 6ae64c5990bdf4fe545d51fd45bade637628f105 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 01:20:01 +0200 Subject: [PATCH 0883/1133] neofetch: Fix resolution issue. Closes #1347 --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 0b7411303..cc17c58b8 100755 --- a/neofetch +++ b/neofetch @@ -2809,6 +2809,8 @@ get_resolution() { resolution="$(xrandr --nograb --current |\ awk -F 'connected |\\+|\\(' \ '/ connected/ && $2 {printf $2 ", "}')" + + resolution="${resolution/primary, }" resolution="${resolution/primary }" ;; esac From 7fdaed2f946c4e22a03389477f4a41761cace46e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 01:47:14 +0200 Subject: [PATCH 0884/1133] packages: Count nix-default. Closes #1317 --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index cc17c58b8..d2937d701 100755 --- a/neofetch +++ b/neofetch @@ -1459,8 +1459,9 @@ get_packages() { } has nix-store && { - manager=nix-system && tot nix-store -q --requisites "/run/current-system/sw" - manager=nix-user && tot nix-store -q --requisites "$HOME/.nix-profile" + manager=nix-system && tot nix-store -q --requisites /run/current-system/sw + manager=nix-user && tot nix-store -q --requisites ~/.nix-profile + manager=nix-default && tot nix-store -q --requisites /nix/var/nix/profiles/default } # pkginfo is also the name of a python package manager which is painfully slow. From 0636706ecf3e709bc7a2ed5fc225207ec2516a6a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 10:44:33 +0200 Subject: [PATCH 0885/1133] neofetch: Fix CPU temp on some systems --- neofetch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index d2937d701..728137725 100755 --- a/neofetch +++ b/neofetch @@ -1993,8 +1993,11 @@ get_cpu() { # Select the right temperature file. for temp_dir in /sys/class/hwmon/*; do - [[ "$(< "$temp_dir/name")" =~ (coretemp|fam15h_power|k10temp) ]] && - { temp_dir=$temp_dir/temp1_input; break; } + [[ "$(< "${temp_dir}/name")" =~ (coretemp|fam15h_power|k10temp) ]] && { + temp_dirs=("$temp_dir"/temp*_input) + temp_dir=${temp_dirs[0]} + break + } done # Get CPU speed. From c323470f2fbe21fe3b7528a542da5749d27f6e72 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 10:49:47 +0200 Subject: [PATCH 0886/1133] neofetch: Add support for resolution in Wayland and TTY. Closes #1304 and #1301 --- neofetch | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 728137725..4a6288fb6 100755 --- a/neofetch +++ b/neofetch @@ -2801,7 +2801,7 @@ get_resolution() { ;; *) - if type -p xrandr >/dev/null; then + if type -p xrandr >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then case $refresh_rate in "on") resolution="$(xrandr --nograb --current |\ @@ -2820,13 +2820,20 @@ get_resolution() { esac resolution="${resolution//\*}" - elif type -p xwininfo >/dev/null; then + elif type -p xwininfo >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then read -r w h \ <<< "$(xwininfo -root | awk -F':' '/Width|Height/ {printf $2}')" resolution="${w}x${h}" - elif type -p xdpyinfo >/dev/null; then + elif type -p xdpyinfo >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then resolution="$(xdpyinfo | awk '/dimensions:/ {printf $2}')" + + elif [[ -d /sys/class/drm ]]; then + for dev in /sys/class/drm/*/modes; do + read -r resolution _ < "$dev" + + [[ $resolution ]] && break + done fi ;; esac From 155fe13d9a533ed8962fe89caf50c18853ef36c5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 10:56:38 +0200 Subject: [PATCH 0887/1133] docs: update --- neofetch | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index d190389b5..d59ee15ba 100755 --- a/neofetch +++ b/neofetch @@ -3357,11 +3357,7 @@ END ;; conemu-*) - local ce_arg_list - local ce_arg_idx - local ce_conf - - # Could have used `eval set -- "$ConEmuArgs"` instead for arg parsing + # Could have used `eval set -- "$ConEmuArgs"` instead for arg parsing. readarray -t ce_arg_list < <(xargs -n1 printf "%s\n" <<< "${ConEmuArgs-}") for ce_arg_idx in "${!ce_arg_list[@]}"; do @@ -3386,7 +3382,7 @@ END } done - # Null-terminated contents in /proc/registry files triggers a Bash warning + # Null-terminated contents in /proc/registry files triggers a Bash warning. [[ "$term_font" ]] || read -r term_font < \ /proc/registry/HKEY_CURRENT_USER/Software/ConEmu/.Vanilla/FontName ;; From 1588155964c38cca2b568e9d37add13842fdbe26 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 17:54:24 +0200 Subject: [PATCH 0888/1133] resolution: Multi monitor support for Windows. Closes #1297 --- neofetch | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index d59ee15ba..b4e94ebf5 100755 --- a/neofetch +++ b/neofetch @@ -2783,15 +2783,17 @@ get_resolution() { ;; "Windows") - local width="" - width="$(wmic path Win32_VideoController get CurrentHorizontalResolution)" - width="${width//CurrentHorizontalResolution/}" + maparray -t sw < <(wmic path Win32_VideoController get CurrentHorizontalResolution) + maparray -t sh < <(wmic path Win32_VideoController get CurrentVerticalResolution) - local height="" - height="$(wmic path Win32_VideoController get CurrentVerticalResolution)" - height="${height//CurrentVerticalResolution/}" + sw=("${sw[@]//CurrentHorizontalResolution}") + sh=("${sh[@]//CurrentHorizontalResolution}") - [[ "$(trim "$width")" ]] && resolution="${width//[[:space:]]}x${height//[[:space:]]}" + for ((mn = 0; mn < ${#sw[@]}; mn++)) { + resolution+=${sw[mn]//[[:space:]]}x${sh[mn]//[[:space:]]}, + } + + resolution=${resolution%,} ;; "Haiku") From 3dd3f7f8e7c5df1c2cfa4ded1683a0a396873967 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 18:48:52 +0200 Subject: [PATCH 0889/1133] neofetch: Fix windows resolution. Closes #1297 --- neofetch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index b4e94ebf5..0ed2a32ce 100755 --- a/neofetch +++ b/neofetch @@ -2783,8 +2783,11 @@ get_resolution() { ;; "Windows") - maparray -t sw < <(wmic path Win32_VideoController get CurrentHorizontalResolution) - maparray -t sh < <(wmic path Win32_VideoController get CurrentVerticalResolution) + IFS=$'\n' read -d "" -ra sw \ + < <(wmic path Win32_VideoController get CurrentHorizontalResolution) + + IFS=$'\n' read -d "" -ra sh \ + < <(wmic path Win32_VideoController get CurrentVerticalResolution) sw=("${sw[@]//CurrentHorizontalResolution}") sh=("${sh[@]//CurrentHorizontalResolution}") From c11f1499895fde14b6c9f47ac9d58ece92f59e63 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 19:04:14 +0200 Subject: [PATCH 0890/1133] neofetch: Fix windows issue. Closes #1297 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 0ed2a32ce..9b5704fb9 100755 --- a/neofetch +++ b/neofetch @@ -2784,10 +2784,10 @@ get_resolution() { "Windows") IFS=$'\n' read -d "" -ra sw \ - < <(wmic path Win32_VideoController get CurrentHorizontalResolution) + <<< "$(wmic path Win32_VideoController get CurrentHorizontalResolution)" IFS=$'\n' read -d "" -ra sh \ - < <(wmic path Win32_VideoController get CurrentVerticalResolution) + <<< "$(wmic path Win32_VideoController get CurrentVerticalResolution)" sw=("${sw[@]//CurrentHorizontalResolution}") sh=("${sh[@]//CurrentHorizontalResolution}") From 492af341b882c9835776875a3826556e869101da Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 19:11:17 +0200 Subject: [PATCH 0891/1133] neofetch: Fix windows issue. Closes #1297 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 9b5704fb9..df9371f20 100755 --- a/neofetch +++ b/neofetch @@ -2789,8 +2789,8 @@ get_resolution() { IFS=$'\n' read -d "" -ra sh \ <<< "$(wmic path Win32_VideoController get CurrentVerticalResolution)" - sw=("${sw[@]//CurrentHorizontalResolution}") - sh=("${sh[@]//CurrentHorizontalResolution}") + sw=("${sw[@]//*CurrentHorizontalResolution*}") + sh=("${sh[@]//*CurrentVerticalResolution*}") for ((mn = 0; mn < ${#sw[@]}; mn++)) { resolution+=${sw[mn]//[[:space:]]}x${sh[mn]//[[:space:]]}, From bf0eef3f0703d096a975c45d04b5988a674d937e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 19:17:23 +0200 Subject: [PATCH 0892/1133] neofetch: Fix windows issue. Closes #1297 --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index df9371f20..39045f896 100755 --- a/neofetch +++ b/neofetch @@ -2793,7 +2793,8 @@ get_resolution() { sh=("${sh[@]//*CurrentVerticalResolution*}") for ((mn = 0; mn < ${#sw[@]}; mn++)) { - resolution+=${sw[mn]//[[:space:]]}x${sh[mn]//[[:space:]]}, + [[ ${sw[mn]//[[:space:]]} && ${sh[mn]//[[:space:]]} ]] && + resolution+=${sw[mn]//[[:space:]]}x${sh[mn]//[[:space:]]}, } resolution=${resolution%,} From 8f03e7082f523513be2e2fc58129ac14b63a97de Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 23 Jan 2020 19:30:51 +0200 Subject: [PATCH 0893/1133] neofetch: Fix windows issue. Closes #1297 --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 39045f896..dd8e5e073 100755 --- a/neofetch +++ b/neofetch @@ -2789,12 +2789,12 @@ get_resolution() { IFS=$'\n' read -d "" -ra sh \ <<< "$(wmic path Win32_VideoController get CurrentVerticalResolution)" - sw=("${sw[@]//*CurrentHorizontalResolution*}") - sh=("${sh[@]//*CurrentVerticalResolution*}") + sw=("${sw[@]//CurrentHorizontalResolution}") + sh=("${sh[@]//CurrentVerticalResolution}") for ((mn = 0; mn < ${#sw[@]}; mn++)) { [[ ${sw[mn]//[[:space:]]} && ${sh[mn]//[[:space:]]} ]] && - resolution+=${sw[mn]//[[:space:]]}x${sh[mn]//[[:space:]]}, + resolution+="${sw[mn]//[[:space:]]}x${sh[mn]//[[:space:]]}, " } resolution=${resolution%,} From 74be40b5c653eeee59a389a2d63aafd21d95d1e7 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 21 Jan 2020 21:44:41 +0100 Subject: [PATCH 0894/1133] os: Add EndeavourOS --- neofetch | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index dd8e5e073..238078c59 100755 --- a/neofetch +++ b/neofetch @@ -751,7 +751,7 @@ image_source="auto" # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, # Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, # DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, -# Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, +# EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, # gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, # Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, @@ -4779,7 +4779,7 @@ ASCII: Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, - Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, + EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, @@ -6543,6 +6543,27 @@ eee eeeeeeeeee eeeeee eee EOF ;; + "EndeavourOS"*) + set_colors 1 5 4 + read -rd '' ascii_data <<'EOF' +${c1} ./${c2}o${c3}. +${c1} ./${c2}sssso${c3}- +${c1} `:${c2}osssssss+${c3}- +${c1} `:+${c2}sssssssssso${c3}/. +${c1} `-/o${c2}ssssssssssssso${c3}/. +${c1} `-/+${c2}sssssssssssssssso${c3}+:` +${c1} `-:/+${c2}sssssssssssssssssso${c3}+/. +${c1} `.://o${c2}sssssssssssssssssssso${c3}++- +${c1} .://+${c2}ssssssssssssssssssssssso${c3}++: +${c1} .:///o${c2}ssssssssssssssssssssssssso${c3}++: +${c1} `:////${c2}ssssssssssssssssssssssssssso${c3}+++. +${c1}`-////+${c2}ssssssssssssssssssssssssssso${c3}++++- +${c1} `..-+${c2}oosssssssssssssssssssssssso${c3}+++++/` + ./++++++++++++++++++++++++++++++/:. + `:::::::::::::::::::::::::------`` +EOF + ;; + "Endless"*) set_colors 1 7 read -rd '' ascii_data <<'EOF' From 6b84f0e4deadce1acdb8acd2d300a19aee89dcb9 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 23 Jan 2020 21:46:20 +0100 Subject: [PATCH 0895/1133] Update man page --- neofetch.1 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 0737c78b1..0cb480516 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11. -.TH NEOFETCH "1" "December 2019" "Neofetch 6.1.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.12. +.TH NEOFETCH "1" "January 2020" "Neofetch 6.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -130,13 +130,18 @@ NOTE: Multiple values can be given. (\fB\-\-disk_show\fR '/' '/dev/sdc1') .TP \fB\-\-disk_subtitle\fR type What information to append to the Disk subtitle. -Takes: name, mount, dir +Takes: name, mount, dir, none .IP \&'name' shows the disk's name (sda1, sda2, etc) .IP \&'mount' shows the disk's mount point (/, \fI\,/mnt/Local\/\fP Disk, etc) .IP \&'dir' shows the basename of the disks's path. (/, Local Disk, etc) +.IP +\&'none' shows only 'Disk' or the configured title. +.TP +\fB\-\-disk_percent\fR on/off +Hide/Show disk percent. .TP \fB\-\-ip_host\fR url URL to query for public IP @@ -287,7 +292,7 @@ BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, -Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, +EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, From eaa4b35ee41c0ea6c1847ef4b0ea164e06197e25 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 28 Jan 2020 12:24:22 +0200 Subject: [PATCH 0896/1133] neofetch: Added --title_fqdn. Closes #1397 --- neofetch | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index dd8e5e073..3556936ec 100755 --- a/neofetch +++ b/neofetch @@ -85,6 +85,16 @@ print_info() { info cols } +# Title + + +# Hide/Show Fully qualified domain name. +# +# Default: 'off' +# Values: 'on', 'off' +# Flag: --title_fqdn +title_fqdn="off" + # Kernel @@ -1277,7 +1287,12 @@ get_model() { get_title() { user=${USER:-$(id -un || printf %s "${HOME/*\/}")} - hostname=${HOSTNAME:-$(hostname)} + + case $title_fqdn in + on) hostname=$(hostname -f) ;; + *) hostname=${HOSTNAME:-$(hostname)} ;; + esac + title=${title_color}${bold}${user}${at_color}@${title_color}${bold}${hostname} length=$((${#user} + ${#hostname} + 1)) } @@ -4634,6 +4649,7 @@ INFO: NOTE: You can supply multiple args. eg. 'neofetch --disable cpu gpu' + --title_fqdn on/off Hide/Show Fully Qualified Domain Name in title. --package_managers on/off Hide/Show Package Manager names . (on, tiny, off) --os_arch on/off Hide/Show OS architecture. --speed_type type Change the type of cpu speed to display. @@ -4873,6 +4889,7 @@ get_args() { while [[ "$1" ]]; do case $1 in # Info + "--title_fqdn") title_fqdn="$2" ;; "--package_managers") package_managers="$2" ;; "--os_arch") os_arch="$2" ;; "--cpu_cores") cpu_cores="$2" ;; From 388ba9c0a273b21e032cd250661245c769bfad3a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 1 Feb 2020 16:25:14 +0200 Subject: [PATCH 0897/1133] neofetch: Fix window size issue in gnome terminal --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 5528338d4..3b1112c1c 100755 --- a/neofetch +++ b/neofetch @@ -3975,14 +3975,14 @@ get_window_size() { if type -p xdo &>/dev/null; then current_window="$(xdo id)" + elif type -p xprop &>/dev/null; then + current_window="$(xprop -root _NET_ACTIVE_WINDOW)" + current_window="${current_window##* }" + elif type -p xdpyinfo &>/dev/null; then current_window="$(xdpyinfo | grep -F "focus:")" current_window="${current_window/*window }" current_window="${current_window/,*}" - - elif type -p xprop &>/dev/null; then - current_window="$(xprop -root _NET_ACTIVE_WINDOW)" - current_window="${current_window##* }" fi # If the ID was found get the window size. From e0e0033fc842766ba099e38f7e8e9edc07d1b132 Mon Sep 17 00:00:00 2001 From: Daniel Gurney Date: Sun, 2 Feb 2020 17:19:49 +0200 Subject: [PATCH 0898/1133] Add patterns for AMD CPUs with numeric core counts --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 3b1112c1c..4a318f099 100755 --- a/neofetch +++ b/neofetch @@ -2191,6 +2191,8 @@ get_cpu() { cpu="${cpu//Quad-Core}" cpu="${cpu//Six-Core}" cpu="${cpu//Eight-Core}" + cpu="${cpu//[1-9][0-9]-Core}" + cpu="${cpu//[0-9]-Core}" cpu="${cpu//, * Compute Cores}" cpu="${cpu//Core / }" cpu="${cpu//(\"AuthenticAMD\"*)}" From d2ff375b2e1edef633f8c863f547e1b55762debf Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 2 Feb 2020 17:57:24 +0200 Subject: [PATCH 0899/1133] docs: update --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 3b1112c1c..de408239b 100755 --- a/neofetch +++ b/neofetch @@ -3943,6 +3943,9 @@ get_window_size() { # user input so we have to use read to store the out # -put as a variable. # The 1 second timeout is required for older bash + # + # False positive. + # shellcheck disable=2141 case ${BASH_VERSINFO[0]} in 4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;; *) IFS=';t' read -d t -t 1 -sra term_size ;; From f6fde7cc2456ad9150b6db857b42dda925f01d35 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 4 Feb 2020 12:45:36 +0100 Subject: [PATCH 0900/1133] docs: update --- LICENSE.md | 2 +- neofetch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index 6867a5b23..a4f19eb89 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2016-2019 Dylan Araps +Copyright (c) 2015-2020 Dylan Araps Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/neofetch b/neofetch index c351f556c..5efd0b178 100755 --- a/neofetch +++ b/neofetch @@ -8,7 +8,7 @@ # # The MIT License (MIT) # -# Copyright (c) 2015-2019 Dylan Araps +# Copyright (c) 2015-2020 Dylan Araps # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal From ab7c6cac7dd544fd5c2422bdccd0153f018e60b8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 5 Feb 2020 00:15:22 +0200 Subject: [PATCH 0901/1133] neofetch: Appimage support. Closes #1403 --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index c351f556c..ce5c5ea7e 100755 --- a/neofetch +++ b/neofetch @@ -1502,6 +1502,10 @@ get_packages() { # Snap hangs if the command is run without the daemon running. # Only run snap if the daemon is also running. has snap && ps -e | grep -qFm 1 snapd >/dev/null && tot snap list && ((packages-=1)) + + # This is the only standard location for appimages. + # See: https://github.com/AppImage/AppImageKit/wiki + manager=appimage && has appimaged && dir ~/.local/bin/*.appimage ;; "Mac OS X"|MINIX) From 652c4ec8821fa7ce0d86f5dc0294b2ebbd0fe6b6 Mon Sep 17 00:00:00 2001 From: Law Zava Date: Thu, 6 Feb 2020 19:22:16 +0100 Subject: [PATCH 0902/1133] Regolith linux support --- neofetch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/neofetch b/neofetch index 59cfa1b3b..ecf7594d3 100755 --- a/neofetch +++ b/neofetch @@ -965,6 +965,12 @@ get_distro() { distro="Proxmox VE ${distro%/*}" esac + elif [[ $DESKTOP_SESSION == regolith ]]; then + case $distro_shorthand in + on|tiny) distro="Regolith";; + *) distro="Regolith ($(lsb_release -sic))" + esac + elif type -p lsb_release >/dev/null; then case $distro_shorthand in on) lsb_flags=-si ;; @@ -8867,6 +8873,31 @@ d/hhhhhhhhhhhh${c3}`-/osyso+-`${c1}hhhhhhhhhhhh.h EOF ;; + "Regolith"*) + set_colors 1 + read -rd '' ascii_data <<'EOF' +${c1} + ``....``` + `.:/++++++/::-.` + -/+++++++:.` + -++++++++:` + `/++++++++- + `/++++++++. -/+/ + /++++++++/ `` .:+++:. + -+++++++++/ ./++++:+++/-` + :+++++++++/ `+++++++/-` + :++++++++++` .-/+++++++` + `:++++++++++/``.-/++++:-:::-` ` + `:+++++++++++++++++/:.` ./` +:++/-:+++++++++/:-.. -/+. ++++++++++/::-...:/+++/-..````..-/+++. +`......``.::/+++++++++++++++++++++/. + -/+++++++++++++++++++++/. + .:/+++++++++++++++/-` + `.-:://////:-. +EOF + ;; + "Rosa"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From eabdbcdb2bf2713e660a2e3f6c6289385d94e154 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 6 Feb 2020 20:51:53 +0200 Subject: [PATCH 0903/1133] de: Temporary support for Regolith. --- neofetch | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 59cfa1b3b..3fbf60ef4 100755 --- a/neofetch +++ b/neofetch @@ -1629,7 +1629,11 @@ get_de() { *) ((wm_run != 1)) && get_wm - if [[ $XDG_CURRENT_DESKTOP ]]; then + # Temporary!! + if [[ $DESKTOP_SESSION == regolith ]]; then + de=Regolith + + elif [[ $XDG_CURRENT_DESKTOP ]]; then de=${XDG_CURRENT_DESKTOP/X\-} de=${de/Budgie:GNOME/Budgie} de=${de/:Unity7:ubuntu} From e9e70aeebd26d7ce077eb0db6a2c1b5658e4eacc Mon Sep 17 00:00:00 2001 From: Law Zava Date: Thu, 6 Feb 2020 20:02:57 +0100 Subject: [PATCH 0904/1133] regolith --- neofetch | 6 ------ 1 file changed, 6 deletions(-) diff --git a/neofetch b/neofetch index ecf7594d3..69164c2bc 100755 --- a/neofetch +++ b/neofetch @@ -965,12 +965,6 @@ get_distro() { distro="Proxmox VE ${distro%/*}" esac - elif [[ $DESKTOP_SESSION == regolith ]]; then - case $distro_shorthand in - on|tiny) distro="Regolith";; - *) distro="Regolith ($(lsb_release -sic))" - esac - elif type -p lsb_release >/dev/null; then case $distro_shorthand in on) lsb_flags=-si ;; From 88723ac00f2ca7aca9fa52d373124a28e703fd20 Mon Sep 17 00:00:00 2001 From: Law Zava Date: Thu, 6 Feb 2020 20:29:17 +0100 Subject: [PATCH 0905/1133] handle regolith as DE --- neofetch | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index bd2690510..eea06e8a8 100755 --- a/neofetch +++ b/neofetch @@ -973,6 +973,15 @@ get_distro() { esac distro=$(lsb_release "$lsb_flags") + # Temporary support for Regolith Linux + if [[ $DESKTOP_SESSION == "regolith" ]]; then + case $distro_shorthand in + on) distro+="-REGOLITH" ;; + tiny) distro+="-REGOLITH" ;; + *) distro=$(lsb_release -si)"-REGOLITH "$(lsb_release -sr) ;; + esac + fi + elif [[ -f /etc/os-release || \ -f /usr/lib/os-release || \ -f /etc/openwrt_release || \ @@ -1629,7 +1638,7 @@ get_de() { *) ((wm_run != 1)) && get_wm - # Temporary!! + # Temporary support for Regolith Linux if [[ $DESKTOP_SESSION == regolith ]]; then de=Regolith @@ -8871,7 +8880,7 @@ d/hhhhhhhhhhhh${c3}`-/osyso+-`${c1}hhhhhhhhhhhh.h EOF ;; - "Regolith"*) + "Ubuntu-REGOLITH"*) set_colors 1 read -rd '' ascii_data <<'EOF' ${c1} From a1d001dd2fa3518f89fff968b604616f9bd3c8ba Mon Sep 17 00:00:00 2001 From: Law Zava Date: Thu, 6 Feb 2020 20:59:46 +0100 Subject: [PATCH 0906/1133] remove regolith from distro discovery --- neofetch | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/neofetch b/neofetch index eea06e8a8..6bf0a596b 100755 --- a/neofetch +++ b/neofetch @@ -973,15 +973,6 @@ get_distro() { esac distro=$(lsb_release "$lsb_flags") - # Temporary support for Regolith Linux - if [[ $DESKTOP_SESSION == "regolith" ]]; then - case $distro_shorthand in - on) distro+="-REGOLITH" ;; - tiny) distro+="-REGOLITH" ;; - *) distro=$(lsb_release -si)"-REGOLITH "$(lsb_release -sr) ;; - esac - fi - elif [[ -f /etc/os-release || \ -f /usr/lib/os-release || \ -f /etc/openwrt_release || \ @@ -8880,7 +8871,7 @@ d/hhhhhhhhhhhh${c3}`-/osyso+-`${c1}hhhhhhhhhhhh.h EOF ;; - "Ubuntu-REGOLITH"*) + "Regolith"*) set_colors 1 read -rd '' ascii_data <<'EOF' ${c1} From 83a92ca5c20e262c254c0d6084a29d408024c2ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ren=C3=A9=20Rebe?= Date: Fri, 7 Feb 2020 19:36:21 +0100 Subject: [PATCH 0907/1133] initial t2 support --- neofetch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/neofetch b/neofetch index 6bf0a596b..cb69f57b2 100755 --- a/neofetch +++ b/neofetch @@ -997,6 +997,12 @@ get_distro() { *) distro="GoboLinux $(< /etc/GoboLinuxVersion)" esac + elif [[ -f /etc/SDE-VERSION ]]; then + distro="$(< /etc/SDE-VERSION)" + case $distro_shorthand in + on|tiny) distro="${distro% *}" ;; + esac + elif type -p crux >/dev/null; then distro=$(crux) case $distro_shorthand in @@ -1446,6 +1452,7 @@ get_packages() { has sorcery && tot gaze installed has alps && tot alps showinstalled has butch && tot butch list + has mine && tot mine -q # Counting files/dirs. # Variables need to be unquoted here. Only Bedrock Linux is affected. @@ -9369,6 +9376,19 @@ ${c2} `-++:` EOF ;; + "t2"*) + set_colors 7 4 + read -rd '' ascii_data <<'EOF' +${c2} +TTTTTTTTTT + tt ${c1}222${c2} + tt ${c1}2 2${c2} + tt ${c1}2${c2} + tt ${c1}2${c2} + tt ${c1}22222${c2} +EOF + ;; + "openSUSE Tumbleweed"* | "openSUSE_Tumbleweed"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' From 1c319f22bd4751327bcba860ebee978b14ef085a Mon Sep 17 00:00:00 2001 From: Gamegenorator Date: Sat, 8 Feb 2020 17:04:06 -0800 Subject: [PATCH 0908/1133] Updated Linux Mint Ascii Logo --- neofetch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/neofetch b/neofetch index cb69f57b2..489eb78a2 100755 --- a/neofetch +++ b/neofetch @@ -7740,6 +7740,31 @@ EOF "Linux Mint"* | "LinuxMint"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' +${c2} ...-:::::-... +${c2} .-MMMMMMMMMMMMMMM-. + .-MMMM${c1}`..-:::::::-..`${c2}MMMM-. + .:MMMM${c1}.:MMMMMMMMMMMMMMM:.${c2}MMMM:. + -MMM${c1}-M---MMMMMMMMMMMMMMMMMMM.${c2}MMM- + `:MMM${c1}:MM` :MMMM:....::-...-MMMM:${c2}MMM:` + :MMM${c1}:MMM` :MM:` `` `` `:MMM:${c2}MMM: +.MMM${c1}.MMMM` :MM. -MM. .MM- `MMMM.${c2}MMM. +:MMM${c1}:MMMM` :MM. -MM- .MM: `MMMM-${c2}MMM: +:MMM${c1}:MMMM` :MM. -MM- .MM: `MMMM:${c2}MMM: +:MMM${c1}:MMMM` :MM. -MM- .MM: `MMMM-${c2}MMM: +.MMM${c1}.MMMM` :MM:--:MM:--:MM: `MMMM.${c2}MMM. + :MMM${c1}:MMM- `-MMMMMMMMMMMM-` -MMM-${c2}MMM: + :MMM${c1}:MMM:` `:MMM:${c2}MMM: + .MMM${c1}.MMMM:--------------:MMMM.${c2}MMM. + '-MMMM${c1}.-MMMMMMMMMMMMMMM-.${c2}MMMM-' + '.-MMMM${c1}``--:::::--``${c2}MMMM-.' +${c2} '-MMMMMMMMMMMMM-' +${c2} ``-:::::-`` +EOF + ;; + + "Linux Mint_old") + set_colors 2 7 + read -rd '' ascii_data <<'EOF' ${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. MMm----::-://////////////oymNMd+` MMd ${c2}/++ ${c1}-sNMd: From 0593302797dced17d325500afaf55c3274dc0672 Mon Sep 17 00:00:00 2001 From: Gamegenorator Date: Sat, 8 Feb 2020 22:04:33 -0800 Subject: [PATCH 0909/1133] Updated archive tags --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 489eb78a2..7e4aac424 100755 --- a/neofetch +++ b/neofetch @@ -7762,7 +7762,7 @@ ${c2} ``-:::::-`` EOF ;; - "Linux Mint_old") + "Linux Mint Old"* | "LinuxMintOld"* | "mint_old"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' ${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. From 9459ca32db64daaa664817edd4dbb740b4c70076 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 9 Feb 2020 08:11:02 +0200 Subject: [PATCH 0910/1133] docs: update --- neofetch | 81 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 41 insertions(+), 40 deletions(-) diff --git a/neofetch b/neofetch index 7e4aac424..104cd59eb 100755 --- a/neofetch +++ b/neofetch @@ -7737,12 +7737,34 @@ ${c1} ___________ EOF ;; - "Linux Mint"* | "LinuxMint"*) + "Linux Mint Old"* | "LinuxMintOld"* | "mint_old"*) + set_colors 2 7 + read -rd '' ascii_data <<'EOF' +${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. +MMm----::-://////////////oymNMd+` +MMd ${c2}/++ ${c1}-sNMd: +MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: +ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm + NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM + NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM + NMm ${c2}dMM` ..` ... ydm. ${c1}dMM + hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM + -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM + -dMNs-${c2}``-::::-------.`` ${c1}dMM + `/dMNmy+/:-------------:/yMMM + ./ydNMMMMMMMMMMMMMMMMMMMMM + .MMMMMMMMMMMMMMMMMMM +EOF + ;; + + "Linux Mint"* | "LinuxMint"* | "mint"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c2} ...-:::::-... +${c2} ...-:::::-... ${c2} .-MMMMMMMMMMMMMMM-. - .-MMMM${c1}`..-:::::::-..`${c2}MMMM-. + .-MMMM${c1}`..-:::::::-..`${c2}MMMM-. .:MMMM${c1}.:MMMMMMMMMMMMMMM:.${c2}MMMM:. -MMM${c1}-M---MMMMMMMMMMMMMMMMMMM.${c2}MMM- `:MMM${c1}:MM` :MMMM:....::-...-MMMM:${c2}MMM:` @@ -7762,27 +7784,6 @@ ${c2} ``-:::::-`` EOF ;; - "Linux Mint Old"* | "LinuxMintOld"* | "mint_old"*) - set_colors 2 7 - read -rd '' ascii_data <<'EOF' -${c1}MMMMMMMMMMMMMMMMMMMMMMMMMmds+. -MMm----::-://////////////oymNMd+` -MMd ${c2}/++ ${c1}-sNMd: -MMNso/` ${c2}dMM `.::-. .-::.` ${c1}.hMN: -ddddMMh ${c2}dMM :hNMNMNhNMNMNh: ${c1}`NMm - NMm ${c2}dMM .NMN/-+MMM+-/NMN` ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM -MMm `MMM dMM. ${c1}dMM - NMm ${c2}dMM .mmd `mmm yMM. ${c1}dMM - NMm ${c2}dMM` ..` ... ydm. ${c1}dMM - hMM- ${c2}+MMd/-------...-:sdds ${c1}dMM - -NMm- ${c2}:hNMNNNmdddddddddy/` ${c1}dMM - -dMNs-${c2}``-::::-------.`` ${c1}dMM - `/dMNmy+/:-------------:/yMMM - ./ydNMMMMMMMMMMMMMMMMMMMMM - .MMMMMMMMMMMMMMMMMMM -EOF - ;; "mx_small"*) set_colors 4 6 7 @@ -8907,24 +8908,24 @@ EOF set_colors 1 read -rd '' ascii_data <<'EOF' ${c1} - ``....``` - `.:/++++++/::-.` - -/+++++++:.` - -++++++++:` - `/++++++++- + ``....``` + `.:/++++++/::-.` + -/+++++++:.` + -++++++++:` + `/++++++++- `/++++++++. -/+/ /++++++++/ `` .:+++:. - -+++++++++/ ./++++:+++/-` - :+++++++++/ `+++++++/-` - :++++++++++` .-/+++++++` - `:++++++++++/``.-/++++:-:::-` ` - `:+++++++++++++++++/:.` ./` -:++/-:+++++++++/:-.. -/+. -+++++++++/::-...:/+++/-..````..-/+++. -`......``.::/+++++++++++++++++++++/. - -/+++++++++++++++++++++/. - .:/+++++++++++++++/-` - `.-:://////:-. + -+++++++++/ ./++++:+++/-` + :+++++++++/ `+++++++/-` + :++++++++++` .-/+++++++` + `:++++++++++/``.-/++++:-:::-` ` + `:+++++++++++++++++/:.` ./` +:++/-:+++++++++/:-.. -/+. ++++++++++/::-...:/+++/-..````..-/+++. +`......``.::/+++++++++++++++++++++/. + -/+++++++++++++++++++++/. + .:/+++++++++++++++/-` + `.-:://////:-. EOF ;; From 29714e1875dd622e5ea445fe4b4fe9c86ca5c766 Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Wed, 12 Feb 2020 12:23:15 -0500 Subject: [PATCH 0911/1133] Minor fixes for machine model, wm, and memory on FreeMiNT --- neofetch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 59cfa1b3b..bd8264dfb 100755 --- a/neofetch +++ b/neofetch @@ -1261,6 +1261,7 @@ get_model() { FreeMiNT) model=$(sysctl -n hw.model) + model=${model/ (_MCH *)} ;; esac @@ -1799,11 +1800,11 @@ get_wm() { freemint_wm=(/proc/*) case ${freemint_wm[*]} in - *xaaes*) wm=XaAES ;; - *myaes*) wm=MyAES ;; - *naes*) wm=N.AES ;; - geneva) wm=Geneva ;; - *) wm="Atari AES" ;; + *xaaes* | *xaloader*) wm=XaAES ;; + *myaes*) wm=MyAES ;; + *naes*) wm=N.AES ;; + geneva) wm=Geneva ;; + *) wm="Atari AES" ;; esac ;; esac @@ -2560,7 +2561,7 @@ get_memory() { "FreeMiNT") mem="$(awk -F ':|kB' '/MemTotal:|MemFree:/ {printf $2, " "}' /kern/meminfo)" mem_free="${mem/* }" - mem_total="${mem/ *}" + mem_total="${mem/$mem_free}" mem_used="$((mem_total - mem_free))" mem_total="$((mem_total / 1024))" mem_used="$((mem_used / 1024))" From bb8831831e885c5d581e29a5b07bb9a089a8960e Mon Sep 17 00:00:00 2001 From: Jeffrey Armstrong Date: Thu, 13 Feb 2020 07:15:43 -0500 Subject: [PATCH 0912/1133] Removal of special cases for FreeMiNT color settings. Added blocking of X11 queries on FreeMiNT. --- neofetch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index bd8264dfb..dfa53ff8c 100755 --- a/neofetch +++ b/neofetch @@ -2828,6 +2828,10 @@ get_resolution() { [[ "$refresh_rate" == "off" ]] && resolution="${resolution/ @*}" ;; + "FreeMiNT") + # Need to block X11 queries + ;; + *) if type -p xrandr >/dev/null && [[ $DISPLAY && -z $WAYLAND_DISPLAY ]]; then case $refresh_rate in @@ -3712,10 +3716,6 @@ get_cols() { unset -v blocks blocks2 cols - # TosWin2 on FreeMiNT is terrible at this, - # so we'll reset colors arbitrarily. - [[ "$term" == "TosWin2" ]] && printf '\e[30;47m' - # Tell info() that we printed manually. prin=1 } @@ -6766,8 +6766,7 @@ EOF ;; "FreeMiNT"*) - # Don't explicitly set colors since - # TosWin2 doesn't reset well. + set_colors 7 read -rd '' ascii_data <<'EOF' ${c1} ## ## ######### From 3d803834c1b51f19146d06092573e79dbb2acc1e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 19 Feb 2020 11:43:01 +0200 Subject: [PATCH 0913/1133] neofetch: Fix GPU driver error. Closes #1411 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 104cd59eb..90b8132b1 100755 --- a/neofetch +++ b/neofetch @@ -3657,7 +3657,7 @@ get_gpu_driver() { case $os in "Linux") gpu_driver="$(lspci -nnk | awk -F ': ' \ - '/Display|3D|VGA/{nr[NR+2]}; NR in nr {printf $2 ", "}')" + '/Display|3D|VGA/{nr[NR+2]}; NR in nr {printf $2 ", "; exit}')" gpu_driver="${gpu_driver%, }" if [[ "$gpu_driver" == *"nvidia"* ]]; then From ede5c1ee291ab3d0065362a488e06c00251371b2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 4 Mar 2020 21:52:42 +0200 Subject: [PATCH 0914/1133] neofetch: Drop kitty win size func. Related to #1418 --- neofetch | 3 --- 1 file changed, 3 deletions(-) diff --git a/neofetch b/neofetch index 4bd60be36..ab064fda2 100755 --- a/neofetch +++ b/neofetch @@ -3980,9 +3980,6 @@ get_window_size() { term_width="${term_size[2]}" fi - [[ "$image_backend" == "kitty" ]] && - IFS=x read -r term_width term_height <<< "$(kitty +kitten icat --print-window-size)" - # Get terminal width/height. if (( "${term_width:-0}" < 50 )) && [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then if type -p xdotool &>/dev/null; then From f372d7162898cc8240b8eb9f54e97f0378aa503a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 6 Mar 2020 21:49:26 +0200 Subject: [PATCH 0915/1133] neofetch: Fix yash shell. Closes #1421 --- neofetch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/neofetch b/neofetch index ab064fda2..f514ad363 100755 --- a/neofetch +++ b/neofetch @@ -1594,6 +1594,13 @@ get_shell() { shell+=$("$SHELL" -c "printf %s \$tcsh") ;; + yash) + shell+=$("$SHELL" --version 2>&1) + shell=${shell/ $shell_name} + shell=${shell/ Yet another shell } + shell=${shell/ Copyright*} + ;; + *) shell+=$("$SHELL" --version 2>&1) shell=${shell/ $shell_name} From fb9d4d259c6f9ae8a0605b8acbb4e0cb32411d10 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 6 Mar 2020 21:51:30 +0200 Subject: [PATCH 0916/1133] neofetch: Fix yash shell. Closes #1421 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index f514ad363..150a615b8 100755 --- a/neofetch +++ b/neofetch @@ -1597,8 +1597,8 @@ get_shell() { yash) shell+=$("$SHELL" --version 2>&1) shell=${shell/ $shell_name} - shell=${shell/ Yet another shell } - shell=${shell/ Copyright*} + shell=${shell/ Yet another shell} + shell=${shell/Copyright*} ;; *) From ba92ae75a3ed0c801a0db7ad9705c3c15b3bc867 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 8 Mar 2020 12:06:22 +0200 Subject: [PATCH 0917/1133] docs: update --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 150a615b8..1bcb1a109 100755 --- a/neofetch +++ b/neofetch @@ -28,7 +28,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -version=6.1.0 +version=7.0.0 bash_version=${BASH_VERSION/.*} sys_locale=${LANG:-C} From bafbb7178b7aac38904b62a38ca62afede7977a4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 8 Mar 2020 12:21:10 +0200 Subject: [PATCH 0918/1133] docs: update --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index 0cb480516..8acb29214 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.12. -.TH NEOFETCH "1" "January 2020" "Neofetch 6.1.0" "User Commands" +.TH NEOFETCH "1" "January 2020" "Neofetch 7.0.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From 87827df455558bd99ca40f443d49a9f7026040f8 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 8 Mar 2020 12:23:36 +0200 Subject: [PATCH 0919/1133] docs: update --- CHANGELOG.md | 3056 -------------------------------------------------- 1 file changed, 3056 deletions(-) delete mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 5053fbd79..000000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,3056 +0,0 @@ -# Changelog - -All notable changes to this project will be documented in this file. - -The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) -and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). - - -## [6.1.0] - 2019-31-08 - -logo - -**Contributors**: - -**Charlène**, **Michael Straube**, @14mRh4X0r, @Crestwave, @GrantM11235, @Mark-Peppermint, @Michal-Szczepaniak, @Renzix, @SibrenVasse, @asantam, @chrissxYT, @chrisweeksnz, @dawidd6, @edward-p, @feren, @fjallarefur, @hpjansson, @iandrewt, @infinitewarp, @jkhsjdhjs, @konimex, @lebensterben, @lightful, @mitchweaver, @ognarb, @protonesso, @rxhanson, @spacelike, @vaygr, @weslly, @xPMo, @zyg812 - - -**OS**: - -- Added support for [KISS Linux](https://getkiss.org). -- Added support for [Bonsai Linux](bonsai-linux.org). @mitchweaver -- Added support for [Radix Linux](http://www.radixsystems.com/software.php). -- os: Fix HAIKU issues - -**ASCII**: - -- ascii: Fixed bug causing ascii files to not work. -- postmarketOS: Replace ASCII logo. @GrantM11235 -- postmarketOS: Add small ASCII logo. @GrantM11235 -- Fix big Puffy ascii logo. **Charlène** -- ASCII: Updated Artix ASCII with new logo. @konimex -- Add ascii art for Clear Linux. @chrisweeksnz -- new logo for Ataraxia Linux. @protonesso -- ASCII: Add fedora_small. @zyg812 -- Added a case for displaying the Ubuntu logo for i3buntu. @chrissxYT -- New Peppermint Logo. @Mark-Peppermint -- ascii: Fix void. -- update Red Hat with new 2019 logo. @infinitewarp -- ascii: Add back old redhat logo (--ascii_distro redhat_old). -- ASCII: Added Feren OS. @konimex -- Linux: Update ASCII for Sailfish OS. @konimex -- Linux: Fix ASCII for Sailfish OS. @Michal-Szczepaniak -- Small tweak to the colours used for the Feren OS Logo. @feren - -**Images**: - -- general: fix image sizing in VTE terminals. -- general: Fix issue with URxvt and no internal border. -- display_image: Allow Chafa backend to stretch image to desired size. @hpjansson - -**Terminal**: - -- term_font [kitty]: Fix bug with empty config. -- term_font: fix issue with konsole font detection. **Michael Straube** -- Robuster kitty font parsing. @SibrenVasse -- term_font: Fix crash when parsing Xresources. -- kitty font parsing where font name has whitespaces. @lebensterben -- term: Fix wrapper scripts in NixOS. Thanks Tdeo. - -**Memory**: - -- Memory [AIX]: Detect memory based on pages (like Solaris) for more accuracy. @konimex - -**CPU**: - -- CPU [Linux/ARM]: Use Hardware field directly. @konimex - -**GPU**: - -- Properly work with multiple GPUs. @lebensterben -- Fix GPU parsing. - -**Packages**: - -- packages: Specify Haiku's pkgman. @Crestwave -- packages: Show IRIX package manager name. -- Use guix directly to report package count instead of counting directories. @spacelike -- Packages [Guix/Nix]: Use if for detecting system and user packages. @konimex -- packages: Fix DragonFlyBSD. Thanks pornguy. -- Set nullglob for package counting. @14mRh4X0r -- packages: Check brew on Linux. @dawidd6 - -**Theme**: - -- WM Theme: update for Mojave. @iandrewt -- Handle ${GTK2_RC_FILES} with multiple values. @edward-p -- use "$GTK2_RC_FILES". @edward-p - -**Song**: - -- song: add strawberry player. **Michael Straube** -- song: Added support for plasma-browser-integration. -- song: add gogglesmm. **Michael Straube** -- song: add xnoise. **Michael Straube** - -**Uptime**: - -- support uptime from Android 9+. @lightful - -**IP**: - -- Retrieve public IP info via drill. @vaygr - -**WM**: - -- WM: Add support for yabai on macOS. @weslly -- WM: Add support for Rectangle on macOS. @rxhanson -- Removed subshell from ps grep for macOS wm. @rxhanson - -**Shell**: - -- support other versions of ksh. @mitchweaver - -**Misc**: - -- Make neofetch compatible with `libedit`. -- general: Added `--no_config` to disable config file creation. -- Made variables local in get_cols function. @asantam -- Fixed option documentation. @xPMo -- Fixed gnome shell mutter issues. -- cache_uname: improve reading from 'SystemVersion.plist' on macOS and iOS. @jkhsjdhjs -- add device information for latest ios devices. @jkhsjdhjs -- include Fusion/Bionic in iDevice processor names. @jkhsjdhjs -- give precedence to "Hardware" entry in /proc/cpuinfo. @lightful -- config: Show 15 color blocks by default. -- underline: Fix bugs with incorrect lengths. -- Moved guix check below /etc/os-release check. @Renzix -- simple mode: Hide stderr by default. -- Linux: Move /etc/os-release directly below lsb_release. @konimex -- The K Desktop Environment was renamed to Plasma. @ognarb -- Rename GuixSD to Guix System. @fjallarefur - - -## [6.0.0] - 2019-01-08 - -logo - -This release fixes a wide range of bugs and adds some neat new features. -Scroll down to "highlights" to see the bigger changes from this release. -A big thank you to @konimex, @iandrewt and the contributors below who -kept development going during my absence. - -Expect a minor bug fix release sometime this week as I'm sure new bugs -will come up. I've done extensive testing but things always slip through. - -**Contributors** - -[**@konimex**](https://github.com/konimex), [**@iandrewt**](https://github.com/iandrewt), [**@arisinfenix**](https://github.com/arisinfenix), [**@xPMo**](https://github.com/xPMo), [**@nero**](https://github.com/nero), [**@alyssais**](https://github.com/alyssais), -[**@plgruener**](https://github.com/plgruener), [**@StarryTony**](https://github.com/StarryTony), [**@julianaito**](https://github.com/julianaito), [**@HolyStephano**](https://github.com/HolyStephano), -[**@nikitenich**](https://github.com/nikitenich), [**@Appadeia**](https://github.com/Appadeia), [**@marlonn**](https://github.com/marlonn), [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle), [**@Phuurl**](https://github.com/Phuurl), [**@erikdubois**](https://github.com/erikdubois) - - -**Breaking Changes** - -- **Config**: Removed `get_line_break()`. - - Alternative: `prin '\n'` - - Rationale: fix a bug that's been lingering for a couple of years now. - -**OS** - -- Added support for Bedrock Linux. [**@paradigm**](https://github.com/paradigm) -- Added support for Namib GNU/Linux. [**@arisinfenix**](https://github.com/arisinfenix) -- Added support for Reborn OS. [**@iandrewt**](https://github.com/iandrewt) -- Added support for OpenMandriva Lx. [**@konimex**](https://github.com/konimex) -- Added support for Star. [**@arisinfenix**](https://github.com/arisinfenix) -- Added support for BlueLight OS. -- Added support for Huayra Linux. -- Added support for Pentoo. - -**Highlights** - -[ASCII] Added support for command output. You can now use whatever -terminal commands you like as the ASCII art. - -```sh -# Use fortune and cowsay as ascii art. -neofetch --ascii "$(fortune|cowsay -W 30)" - -# use figlet as ascii art. -neofetch --ascii "$(figlet -w 30 hello world)" -``` - -scrot - -Added a new "simple" mode. You can now use neofetch for scripting -by getting it to output individual info functions in plain text. - -```sh -# Example: -neofetch uptime --uptime_shorthand tiny -> uptime: 32m - -# Example: -neofetch uptime disk wm memory -> uptime: 33 mins -> disk (/): 212G / 235G (96%) -> wm: Openbox -> memory: 1215MiB / 7881MiB - -# This can be used in bars and scripts like so: -memory="$(neofetch memory)"; memory="${memory##*: }" - -# For multiple outputs at once (each line of info in an array): -# Much faster than running neofetch multiple times. -IFS=$'\n' read -d "" -ra info < <(neofetch memory uptime wm) -info=("${info[@]##*: }") -``` - -Added new image backend [chafa](https://hpjansson.org/chafa/) (`--chafa`) -which displays images in the terminal using unicode characters. - -```sh -neofetch --chafa ~/Pictures/meow.jpg -``` - -scrot - - -**Info** - -- **Color Blocks**: Fixed issue where disabling blocks caused an extra newline to appear. -- **Color Blocks**: Color blocks now have their padding built in. No more need for `get_line_break()`. -- **Song**: Added snippet to display music player. - - `[[ $player ]] && prin "Music Player" "$player"` - - NOTE: Must have `info "Song" song` enabled. -- **Song**: Added support for Netease Cloud. -- **Song**: Fixed issues in various players. [**@arisinfenix**](https://github.com/arisinfenix) [**@xPMo**](https://github.com/xPMo) -- **Song**: Fixed issues with non-English tags. -- **Song**: Fixed issues with broken newlines. -- **Song**: Fixed issues with Deadbeef. -- **Song**: Fixed issues with `qmmp`. -- **Song**: Removed `gpmdp-remote` support (unmaintained/no longer works). -- **Shell**: Fixed output for mksh [**@nero**](https://github.com/nero) -- **Packages**: Added support for `scoop`. [**@Phuurl**](https://github.com/Phuurl) -- **Packages**: Added support for `puyo`. [**@Appadeia**](https://github.com/Appadeia) -- **Packages**: Added support for `spm`. [**@Appadeia**](https://github.com/author=Appadeia) -- **Packages** [macOS]: Added detection of Nix [**@alyssais**](https://github.com/alyssais) -- **Packages**: Fixed packages from pkginfo (pkgutils) not appearing in CRUX/Janus Linux. -- **Terminal Font**: Added support for Yakuake [**@plgruener**](https://github.com/plgruener) -- **Terminal Font** [Kitty]: Use `kitty --debug-config` to get font information. -- **Memory** [Solaris]: Updated memory detection to use pages. [**@konimex**](https://github.com/konimex) -- **Memory**: Added option to show memory percentage (`--memory_percent`). -- **Model** [OpenBSD]: Added vmm (OpenBSD hypervisor) support [**@julianaito**](https://github.com/julianaito) -- **Model** [macOS]: Added VirtualSMC as a new FakeSMC alternative for Hackintosh. [**@nikitenich**](https://github.com/nikitenich) -- **WM**: Added detection for FVWM. [**@julianaito**](https://github.com/julianaito) -- **WM** [OpenBSD]: Added a new `ps_flags` to correctly detect non-EWMH WMs. [**@julianaito**](https://github.com/julianaito) -- **Disk** [OpenBSD]: Added a separate disk array creation using `awk` since one cannot directly use `/dev/...` unless being root or in the `operator` group. [**@julianaito**](https://github.com/julianaito) -- **Battery** [OpenBSD]: Improve charge `%` and add status. **Charlène** -- **GPU** [AMD]: Remove unnecessary check. -- **Public IP**: Added configurable timeout to requests. -- **Resolution**: If resolution is not found, don't print anything. - -**ASCII** - -- Fixed issues with various ASCII arts (namely the `_small` ones). -- Added support for command output. - - `neofetch --ascii "$(fortune|cowsay -W 30)"` - - `neofetch --ascii "$(figlet -w 30 hello world)"` -- Added small ArcoLinux logo. [**@erikdubois**](https://github.com/erikdubois) -- Added new Lubuntu logo. [**@marlonn**](https://github.com/marlonn) -- Fixed a bug where ASCII logo changes the terminal foreground color. [**@plgruener**](https://github.com/plgruener) -- Fixed a bug when files named `auto` or `ascii` exist. -- Do not parse file as ASCII if the source is an image file. - -**Image** - -- Added new image backend [chafa](https://hpjansson.org/chafa/) (`--chafa`). -- **w3m**: Fixed issues with URxvt and internal borders. -- **w3m**: Fixed issues with URxvt and cursor position. -- **w3m**: Fixed issue with `bash 3`. -- **macOS**: Unset IFS to get window size. [**@StarryTony**](https://github.com/StarryTony) -- **Kitty**: Use `kitty +kitten icat` instead of the deprecated `kitty icat`. [**@HolyStephano**](https://github.com/HolyStephano) -- **Kitty**: Update docs. [**@Snuggle**](https://github.com/dylanaraps/neofetch/commits?author=Snuggle) -- Thumbnails are high quality again. -- Cached thumbnails are now stored with PATH to prevent collision issues. - -## [5.0.0] - 2018-06-18 - -logo - -A lot of the script has been rewritten and all lint errors have been resolved. There's probably a few bugs so the version number has been bumped to `5.0`. Expect a minor release in the coming days to fix any bugs that come up. Thanks to everyone who contributed to this release. - -**Contributors** - -- [**@arisinfenix**](https://github.com/arisinfenix) -- [**@iandrewt**](https://github.com/iandrewt) -- [**@konimex**](https://github.com/konimex) -- [**@MindTooth**](https://github.com/MindTooth) - -**Operating System** - -- Added support for Condres OS. [**@arisinfenix**](https://github.com/arisinfenix) -- Added support for RedCore Linux. [**@arisinfenix**](https://github.com/arisinfenix) -- Added support for Regata OS. [**@arisinfenix**](https://github.com/arisinfenix) -- Added support for ClearOS. [**@arisinfenix**](https://github.com/arisinfenix) -- Added support for PureOS. -- Added support for Kibojoe Linux. -- Added support for SharkLinux. -- Added support for Linux Lite. -- Added support for macOS 10.14 Mojave. [**@iandrewt**](https://github.com/iandrewt) - -**General** - -- **output**: Added `--json` to output the info in `json`. -- **cursor**: Fixed prompt location issues after Neofetch is run. -- **macOS**: Fixed neofetch launching XQuartz. -- **misc**: Removed `uppercase()`. -- **misc**: Removed all instances of `export`. -- **misc**: Removed all deprecated options and functions. -- **info**: Removed `get_install_date()`. - -**Ascii** - -- Fixed a bug causing Windows 7 ASCII art to not display. -- Simplified ASCII art handling. -- Updated Funtoo ASCII art. - -**Image** - -- Improved performance of image handling. -- Removed `catimg` support (*It didn’t allow us to specify height so we - couldn’t accurately place the cursor*). -- Fixed `tycat`, `sixel` and `kitty icat` image sizes. -- Simplified `w3m-img` code. - -**Screenshot** - -See: https://github.com/dylanaraps/neofetch/issues/1001 - -- Removed screenshot functionality. -- Removed screenshot upload functionality. - -**Info** - -- **cpu**: Remove extra call to `uname`. -- **cpu**: Simplify core calculation. -- **disk**: Clean up. -- **font**: Fix iTerm2 checking for 2 extra profiles that don't exist. [**@iandrewt**](https://github.com/iandrewt") -- **gpu**: Fixed ATI/AMD branding issue. -- **gpu**: Removed `glxinfo` usage (*too slow*). -- **packages**: Added support for `flatpak`. [**@konimex**](https://github.com/konimex) -- **packages**: Added support for `snap`. [**@konimex**](https://github.com/konimex) -- **packages**: Added used package managers to output (`Packages: 900 - (pacman, snap)`). -- **packages**: Fixed issues with `pacman` 5.1. -- **packages**: Fixed issues with `dpkg`. -- **packages**: Removed `find` usage. -- **packages**: Removed `ls` usage. -- **packages**: Removed `wc -l` usage. -- **song**: Added support for `gmusicbrowser`. [**@arisinfenix**](https://github.com/arisinfenix) -- **song**: Added support for `SMPlayer`. [**@arisinfenix**](https://github.com/arisinfenix) -- **song**: Added support for `Dragon Player`. [**@arisinfenix**](https://github.com/arisinfenix) -- **song**: Fixed song detection on macOS. -- **song**: Fixed song output on systems using `C` locale. -- **song**: Added `mpc_args` to send additional arguments to `mpc`. -- **term\_font**: Clean up of config file handling. -- **resolution**: Added support for `xwininfo`. - -## [4.0.2] - 2018-05-19 - -### This fixes default config issues on Android, AIX, HP-UX and possibly others. - -- [config] Fixed `/dev/stdin` error. -- [config] Added `--print_config` to display the default config file. -- [macOS] Fixed xquartz issue. - -## [4.0.1] - 2018-05-18 - -### Note: This release is only required for those running `bash <3.3`. - -- [config] Fixed issue with default config in bash3. -- [packages] Simplified code. -- [term] Fixed macOS issue. -- [term] Fixed `tmux` issue. - - -## [4.0.0] - 2018-05-17 - -

logo

- -This release bumps the version number up to `4.0.0` as it contains major -changes to how Neofetch is packaged and installed. - -The entirety of Neofetch is now contained within a single executable. -Everything has been in-lined. Installing Neofetch is now as easy as -downloading the script and running it. - -Those using distributions with an outdated Neofetch version in their repos -can now easily install the latest version themselves. - -Thanks to those who contributed this time around and thanks to those who -discussed proposed changes in the bug tracker and Discord. I appreciate -it. :+1: - - -## Discord - -Neofetch now has a Discord server. Come and join the discussion! - - - - -## Contributors - - -- [**@aidanharris**](https://github.com/aidanharris) -- [**@DanySpin97**](https://github.com/DanySpin97) -- [**@SolitudeSF**](https://github.com/SolitudeSF) -- [**@Kayant**](https://github.com/Kayant) -- [**@robertwolter**](https://github.com/robertwolter) -- [**@TsundereBug**](https://github.com/TsundereBug) -- [**@dawidd6**](https://github.com/dawidd6) -- [**@mstraube**](https://github.com/mstraube) -- [**@iandrewt**](https://github.com/iandrewt) -- [**@MindTooth**](https://github.com/MindTooth) - - -## Operating System - -- Added support for ArcoLinux. - - -## General - -- Neofetch is now a single executable. -- Simplified `--version` output. -- Fixed theme issues by setting `GIO_EXTRA_MODULES`. - - -## Images - -- Added `wal`/`pywal` support to get the current wallpaper. -- Added `kitty` image backend. [**@SolitudeSF**](https://github.com/SolitudeSF) -- Added `setroot` wallpaper support. [**@SolitudeSF**](https://github.com/SolitudeSF) - - -## Ascii - -- Updated Android ascii art to better work on non-unicode terminals. [**@TsundereBug**](https://github.com/TsundereBug) - - -## Info - -**Song** - -- Added support for VLC. [**@mstraube**](https://github.com/mstraube) -- Added support for Sayonara. [**@mstraube**](https://github.com/mstraube) -- Added album data to song output. [**@mstraube**](https://github.com/mstraube), [**@iandrewt**](https://github.com/iandrewt) -- Added `song_format` to change the display format of the data. - - Default: `%artist% - %album% - %title%`. - -**Title** - -- Fixed unexpected backslash being inserted on some systems. - -**CPU** - -- Added temperature support for Zen processors. [**@Kayant**](https://github.com/Kayant) - -**GPU** - -- Fixed duplicate Intel GPUs. - -**Terminal Font** - -- Added support for `st`. [**@aidanharris**](https://github.com/aidanharris) -- Added support for `qterminal`. [**@mstraube**](https://github.com/mstraube) -- Fixed `kitty` font bug. [**@MindTooth**](https://github.com/MindTooth) - -**Packages** - -- Fixed package count in Exherbo. [**@DanySpin97**](https://github.com/DanySpin97) - -**Desktop Environment** - -- Fixed Unity output in Ubuntu 18.04. [**@dawidd6**](https://github.com/dawidd6) - -**Window Manager** - -- Added support for detecting `dwm`. - - -## [3.4.0] - 2018-04-05 - -This release adds support for a large number of Linux distros as well as support for the latest macOS and iOS devices. This release also contains a large number of bug fixes and some minor features. - -I'm pretty sure that this release is the largest in terms of number of contributors. Thanks to everyone who contributed this release! - -## Contributors - -- [**@yslgirl**](https://github.com/yslgirl) -- [**@iandrewt**](https://github.com/iandrewt) -- [**@chrisweeksnz**](https://github.com/chrisweeksnz) -- [**@dawidd6**](https://github.com/dawidd6) -- [**@MitchWeaver**](https://github.com/MitchWeaver) -- [**@StarryTony**](https://github.com/StarryTony) -- [**@rage311**](https://github.com/rage311) -- [**@matoro**](https://github.com/matoro) -- [**@szfcbr**](https://github.com/szfcbr) -- [**@ArmstrongJ**](https://github.com/ArmstrongJ) -- [**@robertwolter**](https://github.com/robertwolter) -- [**@JadeMatrix**](https://github.com/JadeMatrix) -- [**@MindTooth**](https://github.com/MindTooth) -- [**@aidanharris**](https://github.com/aidanharris) -- [**@khoacao96**](https://github.com/khoacao96) - - -## OS - -- Added support for ArchMerge. -- Added support for MagpieOS. -- Added support for PostMarketOS. -- Added support for Hyperbola GNU/Linux-libre [**@mstraube**](https://github.com/mstraube) -- Added support for macOS High Sierra. [**@yslgirl**](https://github.com/yslgirl) -- Added support for Container Linux by CoreOS. [**@chrisweeksnz**](https://github.com/chrisweeksnz) -- Added support for 2017 iOS devices. [**@iandrewt**](https://github.com/iandrewt) -- Added support for LEDE. [**@dawidd6**](https://github.com/dawidd6) -- Added support for Pop!\_OS. [**@jliles**](https://github.com/jliles) -- Added support for Lunar Linux. -- Added support for 32-bit IRIX. [**@szfcbr**](https://github.com/szfcbr) -- Added support for FreeMINT. [**@ArmstrongJ**](https://github.com/ArmstrongJ) -- Added support for Anarchy Linux. [**@robertwolter**](https://github.com/robertwolter) -- Added support for Calculate Linux. [**@robertwolter**](https://github.com/robertwolter) -- Added support for NuTyX. [**@robertwolter**](https://github.com/robertwolter) -- Added support for openSUSE Tumbleweed. [**@robertwolter**](http://github.com/robertwolter) -- Fixed detection bug with Gentoo. -- Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6) -- Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6) -- Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6) -- Fixed detection bug with Windows Subsystem for Linux and Crouton when an OS without lsb_release is installed. -- Fixed ChromeOS detection. - - -## General - -- Added more info to verbose mode for debugging. -- Fixed bug in prompt location calculation. -- Fixed prompt bug in OpenBSD. -- Fixed broken AppleScript blocks. [**@JadeMatrix**](https://github.com/JadeMatrix) -- Fixed function not working in bash 3. [**@JadeMatrix**](https://github.com/JadeMatrix) -- Swapped sequences from `\033` to `\e`. -- Fixed Pacman name conflict with the game. [**@MitchWeaver**](https://github.com/MitchWeaver) -- Removed the last `echo` in the script. -- Fixed typo. [**@khoacao96**](https://github.com/khoacao96) - - -## Ascii - -- Added color updates for Kubuntu logo. **Maulik Mistry** -- Added new DragonflyBSD logo. [**@MitchWeaver**](https://github.com/MitchWeaver) - - -## Images - -- [MacOS/iTerm2] Fixed thumbnail not appearing. [**@StarryTony**](https://github.com/StarryTony) -- Fixed bug with getting wallpaper from feh. -- Added `pixterm` backend. -- Don't force resolution in `catimg`. - -## Info - -**Desktop Environment** - -- Added GNOME version. -- Added support for TDE. - -**Window Manager** - -- Added support for most (*if not all*) current Wayland compositors/window manager's. -- Added support for some non-EWMH window managers. -- [macOS] Fixed `chunkwm` being detected as `Kwm`. [**@iandrewt**](https://github.com/iandrewt) - -**Window Manager Theme** - -- Fixed `sawfish` detection. -- [macOS] Now detects Light/Dark theme. [**@JadeMatrix**](https://github.com/JadeMatrix) - -**Install Date** - -- [macOS] Fixed Install Date. [**@iandrewt**](https://github.com/iandrewt) - -**Theme** - -- Fixed KDE font issue. [**@mstraube**](https://github.com/mstraube) - -**CPU** - -- [linux] Detect the correct temperature file to use. -- [windows] Removed `$temp` usage as it's an envar. -- [OpenBSD] Fixed CPU temperature that fails to appear in some systems. [**@rage311**](https://github.com/rage311) - -**GPU** - -- [linux] Added driver version to NVIDIA output. -- [linux] Added driver version to Intel output. -- [macOS] Added NVIDIA support. [**@iandrewt**](https://github.com/iandrewt) - -**Memory** - -- [OpenBSD] Fixed memory usage values. [**@rage311**](https://github.com/rage311) - -**Package Manager** - -- Added detection for Sabotage Linux's `butch` [**@MitchWeaver**](https://github.com/MitchWeaver) -- Changed `pacman` detection to fix issues in other distros. [**@MitchWeaver**](https://github.com/MitchWeaver) - -**Resolution** - -- [macOS] Fixed errors on non-retina screens. [**@iandrewt**](https://github.com/iandrewt) - -**Song** - -- Added option to manually specify the player to use. -- Added support for Elisa. [**@mstraube**](https://github.com/mstraube) -- macOS detection is now more reliable. [**@JadeMatrix**](https://github.com/JadeMatrix) - -**Model** - -- Remove more unneeded outputs. [**@konimex**](https://github.com/konimex) - -**Disk** - -- Update Haiku's detection. [**@dawidd6**](https://github.com/dawidd6) - -**Battery** - -- Fixed Windows detection. [**@matoro**](https://github.com/matoro) - -**Shell** - -- Added support for `tcsh`. [**@szfcbr**](https://github.com/szfcbr) - -**Terminal Font** - -- Added more paths for Alacritty. -- Added font support for Kitty. [**@MindTooth**](https://github.com/MindTooth) -- Fixed Kitty `font_size` regex. [**@aidanharris**](https://github.com/aidanharris) -- Added support for `XTerm.vt11.facename`. [**@aidanharris**](https://github.com/aidanharris) - - -## [3.3.0] - 2017-09-14 - -Thanks to everyone who contributed this release, I appreciate ya! - -## Contributors - -- **[@konimex](https://github.com/konimex)** -- **[@mstraube](https://github.com/mstraube)** -- **[@dominiklohmann](https://github.com/dominiklohmann)** -- **[@ybden](https://github.com/ybden)** -- **[@lexruee](https://github.com/lexruee)** -- **[@AMDmi3](https://github.com/AMDmi3)** -- **[@deadda7a](https://github.com/deadda7a)** -- **[@winneon](https://github.com/winneon)** -- **[@DamnWidget](https://github.com/DamnWidget)** - - -## General - -- Config file now has a `.conf` suffix. -- Neofetch now assumes target directories (config file and ASCII directory) at install time, this fixes problems with systems such as NixOS. -- `stdout` mode is now reimplemented. - - This mode prints the information in plain text. - - You can use it with `--stdout`. - - Example: https://gist.github.com/dylanaraps/151c205322cf3acae62661b76464a3f7 -- Fixed prompt location if color blocks are disabled. -- Make makefile more portable. **[@AMDmi3](https://github.com/AMDmi3)** - - -## Operating System - -- Added support for AryaLinux. **[@mstraube](https://github.com/mstraube)** -- Added support for Amazon Linux AMI. -- Added support for Artix Linux. **[@DamnWidget](https://github.com/DamnWidget)** -- Added support for Endless OS. -- Added support for Sabotage Linux. -- Added support for Siduction. **[@lexruee](https://github.com/lexruee)** -- Added support for Source Mage. -- Added support for Parsix GNU/Linux. **[@mstraube](https://github.com/mstraube)** -- Added support for Nurunner. **[@mstraube](https://github.com/mstraube)** -- Fixed Raspbian being detected as ChromeOS. - - -## Images - -- [w3m] Fixed w3m-img not found on NixOS. -- Added support for using all image types as input. - - Neofetch now supports `svg`, `tiff` etc. - - -## ASCII - -- Added small Debian. -- Added small FreeBSD. -- Added small macOS. -- Added small NixOS. - - -## Info - -**GPU Driver** - -- [Linux] Added a new info function (*off by default*) to display the GPU Driver currently in use. -- Add `info "GPU Driver" gpu_driver` to your config to use it. - -**CPU** - -- [Linux] Fixed inaccurate output on ARM SoC devices. -- [Linux] Fixed CPU speed not appearing on PowerPC systems. -- [NetBSD] Added support for CPU temperature. (NOTE: This only supports newer Intel processors) -- Fixed inaccurate speed output in systems with CPU speed less than 1 GHz. -- Deprecated `cpu_shorthand` in favor of `cpu_brand`. - -**GPU** - -- [Linux] Filter out duplicate entries. - -**Model** - -- Added support for QEMU/KVM. -- Renamed subtitle to `Host:`. - -**Uptime** - -- [AIX/IRIX] Fixed Neofetch crashing when calculating uptime. - -**Terminal** - -- [SSH] Fixed infinite loop if neofetch is run on non-interactive shells. - -**Terminal Font** - -- Added support for LXTerminal. **[@mstraube](https://github.com/mstraube)** -- Added support for GNUStep Terminal. **[@mstraube](https://github.com/mstraube)** -- Fixed Xfce4-terminal font output when system-wide font is used. **[@mstraube](https://github.com/mstraube)** -- Fixed MATE-Terminal issue. **[@mstraube](https://github.com/mstraube)** -- Fixed URxvt font detection failing if `.` is used. **[@winneon](https://github.com/winneon)** - -**Theme** - -- [Qt/KDE] Fixed inaccurate theme naming. **[@mstraube](https://github.com/mstraube)** -- [Qt/KDE] GTK theme is now shows as well. - -**Window Manager** - -- [macOS] Added support for `chunkwm`. **[@dominiklohmann](https://github.com/dominiklohmann)** -- Fix incorrect output when using WindowMaker. **[@mstraube](https://github.com/mstraube)** - -**Song** - -- Added support for Pogo. **[@mstraube](https://github.com/mstraube)** -- Fixed bug with players not being found. - -**Battery** - -- Added battery support for Thinkpads and other devices that use the `CMB` naming for batteries. **[@deadda7a](https://github.com/deadda7a)** - - -## Images - -- Fixed division by 0 error in XTerm. - -## Screenshot - -- Use `maim` over `scrot`. **[@ybden](https://github.com/ybden)** -- Fixed `scrot_cmd` arguments not being used. **[@winneon](https://github.com/winneon)** - - -## [3.2.0] - 2017-06-21 - -This release was long overdue and I apologise for the delay. I've been busy with study among other things. This update is smaller than usual but fixes some important bugs. - - -Thanks once again to everyone that contributed! - - -## Contributors - -- **[@MatthewCox](https://github.com/MatthewCox)** -- **[@dawidd6](https://github.com/dawidd6)** -- **[@erikdubois](https://github.com/erikdubois)** -- **[@konimex](https://github.com/konimex)** -- **[@mstraube](https://github.com/mstraube)** -- **[@Artoriuz](https://github.com/Artoriuz)** -- **[@WilsonRU](https://github.com/WilsonRU)** -- **[@Takeya-Yuki](https://github.com/Takeya-Yuki)** -- **[@iandrewt](https://github.com/iandrewt)** -- **[@LER0ever](https://github.com/LER0ever)** - - -## Operating System - -- Added support for IRIX. -- Added support for Arch XFerience. **[@mstraube](https://github.com/mstraube)** -- Added support for CloverOS. -- Added support for Maui. **[@mstraube](https://github.com/mstraube)** -- Added support for KS Linux. **[@Takeya-Yuki](https://github.com/Takeya-Yuki)** - - -## General - -- Minimum required BASH version is now 3.2. - - (Neofetch has always used 3.2+ features, I've just made it obvious now in the documentation.) -- Fixed config file not being created on first install. - - -## Images - -- [w3m] Added `--loop` flag which makes Neofetch draw the image once per second. - - This is a workaround to the images disappearing on resize and workspace switch. - - Use Ctrl+C to exit. -- [w3m] Fixed w3m-img not found on FreeBSD 12. **[@Artoriuz](https://github.com/Artoriuz)** - - -## Ascii - -- Added Ubuntu-MATE ascii art. -- Fixed ArchLabs ascii art. **[@erikdubois](https://github.com/erikdubois)** -- Updated GoboLinux ascii art. **[@WilsonRU](https://github.com/WilsonRU)** -- Fixed `--ascii_distro windows10` not working. - - -## Info - -**Distro** - -- [Solaris, AIX, Haiku] The machine architecture will now be shown properly instead of machine ID. - -**Terminal Emulator** - -- Added support for Neovim terminal emulator. **[@LER0ever](https://github.com/LER0ever)** -- Added font support for mate-terminal. **[@mstraube](https://github.com/mstraube)** -- [Termite] Fix font mismatch. **[@MatthewCox](https://github.com/MatthewCox)** -- Use `$SSH_TTY` for terminal detection if machine is connected via SSH. -- Break from loop if PPID can't be accessed/not found. - -**GPU** - -- [Linux] Fixed GPU sort. - -**Song** - -- Do not detect ibus\* or indicator\* as player. **[@dawidd6](https://github.com/dawidd6)** - -**Model** - -- Specify when running on a Hackintosh. **[@LER0ever](https://github.com/LER0ever)** - - -**Memory** - -- [FreeBSD]: Fix inaccurate free memory calculation. - - -## [3.1.0] - 2017-04-25 - -Hi, It's been quite a while since the last release. I've been extremely busy with university and I finally found some time to flag a new release. (I've been meaning to do this for a few weeks now) - -Though I haven't worked on Neofetch as much as I'd have liked, most of the changes this time round come from some familiar faces as well as some new contributors! Thanks to everyone for contributing, I appreciate it. - - -## Contributors - -- **[@konimex](https://github.com/konimex)** -- **[@mstraube](https://github.com/mstraube)** -- **[@jorgegonzalez](https://github.com/jorgegonzalez)** -- **[@ikeydoherty](https://github.com/ikeydoherty)** -- **[@eliezio](https://github.com/eliezio)** -- **[@nilesr](https://github.com/nilesr)** -- **[@dritter](https://github.com/dritter)** -- **[@HebaruSan](https://github.com/HebaruSan)** -- **[@LER0ever](https://github.com/LER0ever)** -- **[@obrevenge](https://github.com/obrevenge)** -- **[@ajjames31](https://github.com/ajjames31)** -- Eliezio Oliveira - - -## Operating System - -- Added Chrome OS Crouton support. **[@LER0ever](https://github.com/LER0ever)** -- Added support for SliTaz. **[@nilesr](https://github.com/nilesr)** -- Added support for Nitrux. **[@mstraube](https://github.com/mstraube)** -- Added support for DesaOS. -- Added support for MinGW. -- Added support for OBRevenge. **[@obrevenge](https://github.com/obrevenge)** -- Added support for ArchLabs. **[@obrevenge](https://github.com/obrevenge)** - - -## Screenshot - -The screenshot feature no longer requires any configuration before working. We no longer hardcode `${HOME}/Pictures/neofetch` as the screenshot location. Here's how the `-s` and `-su` flags now function: - -- `neofetch -s` will save a file in the current directory named: `neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png` -- `neofetch -s test.png` will save a file in the current directory called `test.png` -- `neofetch -s ~/` will save a file in `~` called `neofetch-$(date +%F-%I-%M-%S-${RANDOM}).png` -- `neofetch -s ~/test.png` will save a file in `~` called `test.png`. - - -## ASCII - -- Arch ASCII art now uses lighter colors. -- Fixed Ubuntu-Studio ASCII setting. **[@@HebaruSan](https://github.com/HebaruSan)** -- Updated Parabola logo. **[@mstraube](https://github.com/mstraube)** -- Updated Raspbian ASCII art. - - -## Images - -- Added `libsixel` backend. -- Added `termpix` backend. -- Only use a zero width space in the `w3m` backend. -- Fixed bug causing terminal size to not be found. -- [iTerm2] Fixed images not appearing inside `tmux`. - - -## Info - -**Locale** - -- Added a new function to display system locale. (Disabled by default) - -**CPU** - -- Added option to show decimals in CPU speed. - -**Terminal Font** - -- Added \*experimental\* font detection for iTerm2. **[@dritter](https://github.com/dritter)** - -**Window Manager** - -- [MacOS] Added support for Kwm. **[@jorgegonzalez](https://github.com/jorgegonzalez)** -- [MacOS] Added support for Spectacle. **[@jorgegonzalez](https://github.com/jorgegonzalez)** -- [MacOS] Added support for Amethyst. **[@jorgegonzalez](https://github.com/jorgegonzalez)** - -**Battery** - -- Added battery support for Bay Trail devices. **[@mstraube](https://github.com/mstraube)** - -**Disk** - -- Added new option to only show dir name in subtitle. - -**Song** - -- Added support for Deepin Music. **[@mstraube](https://github.com/mstraube)** -- Added support for Tomahawk. **[@mstraube](https://github.com/mstraube)** -- Fixed Audacious song output when `dbus-send` fails. **[@mstraube](https://github.com/mstraube)** - -**Local IP** - -- [Linux] Fixed UID showing instead of Local IP on several versions/configs of iproute2. - -**Packages** - -- [eopkg] Use a faster detection method. **[@ikeydoherty](https://github.com/ikeydoherty)** - -**Resolution** - -- [macOS] Fixed `screenresolution` not appearing at all on newer versions. **[@eliezio](https://github.com/eliezio)** -- [Linux] Show decimals. - -**GPU** - -- [Linux] Hide duplicate GPU lines (Only display 1). - - -## [3.0.1] - 2017-01-30 - -This minor release fixes all of the bugs that were found in the 3.0 release. - -Thanks for all of the bug reports and contributions. :) - -## Contributors -- **[@SomaUlte](https://github.com/SomaUlte)** -- **[@jorgegonzalez](https://github.com/jorgegonzalez)** -- **[@dawidd6](https://github.com/dawidd6)** -- **[@mstraube](https://github.com/mstraube)** -- **[@YellowApple](https://github.com/YellowApple)** -- **[@siiptuo](https://github.com/siiptuo)** -- **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** -- **[@konimex](https://github.com/konimex)** - -## Operating System -- Added support for ArchBox Linux. - -## General -- Fixed output if subtitles are disabled and `prin` is used in an info function. -- Fixed underlines not working when used with `prin`. -- Fixed HAIKU install path. **[@YellowApple](https://github.com/YellowApple)** - -## Config -- Fixed default config not found. -- Don't set locale in config file. - -## Info - -**Memory**
-- Changed memory label to `MiB` on OS that output memory in Mebibytes. - -**Shell**
-- Fixed a crash when the user has `bash 3` installed. - -**Packages**
-- Added support for Chromebrew. - -**GPU**
-- [Linux] Display detailed information about Intel GPUs. **[@SomaUlte](https://github.com/SomaUlte)** - -**Color Blocks**
-- Fixed issue with `color_blocks="off"` adding an extra newline to the output. - -**Song**
-- Don't print `$song` if it's empty and `song_shorthand` is on. **[@mstraube](https://github.com/mstraube)** -- Fixed `mpd` detection when `mpd` is on a different host. **[@dawidd6](https://github.com/dawidd6)** -- Use `get_song_dbus` for Audacious. **[@mstraube](https://github.com/mstraube)** - -**Terminal Font**
-- [Alacritty] Fixed font detection. **[@siiptuo](https://github.com/siiptuo)** - -## Images -- [iTerm2] Fixed issue with line-breaks printing spaces over the image. **[@jorgegonzalez](https://github.com/jorgegonzalez)** -- Fixed issue with images not working in Terminology. -- Fixed issue when `image_source` was set to `wall`. -- [w3m-img] Fixed issues with `w3m-img` and `tmux`. - -## Ascii -- [Windows 10] Fixed `ascii_distro` not working. -- Fixed a bug where the backend is `ascii` but the image_source is an image file. -- Fixed custom ascii files not working. -- Removed extra backslashes from OpenBSD ascii art. **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** - -## Scrot -- Added message to let users know that a screenshot was taken. - - -## [3.0] - 2017-01-23 - -This is another large release containing over `550` commits from 7 contributors. Due to the size and large amount of changes made this release expect at least one minor release to fix any bugs that come up. - -The version number has been bumped to `3.0` due to the large amount of breaking changes introduced this update. I've added backwards compatibility for all of the new changes but there may still be some breakage. I highly recommend starting with a new config to avoid any issues that may arise. - -Neofetch now supports displaying images using `catimg`, `libcaca` and `jp2a`. See this wiki page for screenshots. https://github.com/dylanaraps/neofetch/wiki/Image-Backends - -Thanks to everyone who contributed this release, there were a lot of new faces this time around. :) - -## Contributors -- **[@konimex](https://github.com/konimex)** -- **[@iandrewt](https://github.com/iandrewt)** -- **[@jorgegonzalez](https://github.com/jorgegonzalez)** -- **[@z33ky](https://github.com/z33ky)** -- **[@mstraube](https://github.com/mstraube)** -- **[@gavinhungry](https://github.com/gavinhungry)** - -## IRC - -Neofetch now has an IRC channel at `#neofetch` on Freenode. If you have any questions, issues or ideas feel free to join the IRC channel and I'll be happy to assist you. I know that we've already got the Gitter chat but hopefully this makes things easier for those without a GitHub account. :) - -[![Freenode](https://img.shields.io/badge/%23neofetch-%20on%20Freenode-brightgreen.svg)](http://irc.lc/freenode/neofetch) - -## Collaborators - -I have given collaborator access to both **[@konimex](https://github.com/konimex)** and **[@iandrewt](https://github.com/iandrewt)**. In short this allows them to push directly to the master branch of the repo, manage the issue tracker and also merge pull requests. They've been a huge help the past year so this made sense to me. - -## OS -- Added support for AIX. -- Added support for AntiX. -- Added support for GNU/kFreeBSD. -- Added support for Gentoo FreeBSD. -- Added support for GrombyangOS. -- Added support for Joyent SmartOS. -- Added support for Mer. -- Added support for MINIX. -- Added support for MX. -- Added support for Open Source Media Center (OSMC). -- Added support for SalentOS. -- Added support for TrueOS. -- Added support for Windows (MSYS2). - -## General -- The default config file is now installed to `/etc/neofetch/config` and acts as a system-wide config file for Neofetch. Editing this file will make the changes available to all users on the system. Those packaging Neofetch **without** using the Makefile will need to make changes to support this. -- The Makefile was rewritten to remove GNU-isms. -- Removed executable permission from config files. BASH can source them even if they're un-executable. -- Travis now runs [shellcheck](https://github.com/koalaman/shellcheck) on every commit and pull request. - - We've had to exclude around 10 lint errors, see this wiki page for why we did this: - - https://github.com/dylanaraps/neofetch/wiki/Shellcheck-Exclusions -- Neofetch now supports relative path values when specifying the location to images, ascii files and config files. - - For example, `neofetch --w3m Pictures/Wallpapers/10.jpg` and `neofetch --w3m 10.jpg` now work. -- Optimize usage of `get_de()`, `get_wm()` and `get_term(). - - We were calling these multiple times, we now only run them once and check to see if they were run previously. -- Optimize info caching, only check for cache files in functions that use caching. -- The manpage is now generated using `help2man`. `help2man` parses the output of `--help` and `--version` to create a manpage. This ensures that our manpage stays 1:1 with the script documentation. We actually found a lot of outdated info in the old manpage thanks to this. - - A new flag was added called `--gen-man` which generates a neofetch manpage in your current directory. -- Delete most of `info()` and instead call `prin()`. - - This removes a lot of duplicate code between `info()` and `prin()`. -- Remove `printf` subshells and instead use `printf -v` to declare the variables. -- Fixed artifacts when using line-breaks in TTYs. -- All errors are now sent to `stderr`. -- Renamed `XFCE` --> `Xfce`. **[@gavinhungry](https://github.com/gavinhungry)** -- Cleanup `main()`. -- Renamed `old_flags()` --> `old_options()`. - -## Info - -**Shell**
-- [Fish] Fixed memory leak caused by Fish. -- Added support for `xonsh`. -- Fixed version output on `ksh`. -- Rewrote the function to remove duplicate code. - -**Uptime**
-- Moved duplicate code to a function. -- Changed `$uptime_shorthand` to `on` by default. - -**Desktop Environment**
-- Fixed issues where MATE wouldn't be detected properly. -- Added fallback to `$DESKTOP_SESSION`, `$MATE_DESKTOP_SESSION_ID` and `$GNOME_DESKTOP_SESSION_ID`. -- Hide Desktop Environment if it matches Window Manager. - -**CPU**
-- [Linux] Don't simplify `cpufreq` speed option names for no reason. -- [Linux] Fixed issues with CPU name detection for architectures other than x86/amd64/ARM. -- [NetBSD] Remove case statement in favor of 1 line test. -- Simplify check for low CPU speeds. -- Expanded `cpu_temp` to take the values `C` and `F`. This means you can now display the CPU temperature as Fahrenheit. - -**CPU Usage**
-- Added Haiku cores command. -- Updated Linux and macOS commands to the match the commands in the `get_cpu()` function. - -**GPU**
-- [Linux] Each GPU is now printed on a separate line. -- [Linux] Added `--gpu_type` / `$gpu_type` which lets you display `all`, `dedicated` or `integrated` GPUs. - -**Memory**
-- [Solaris] Fixed inaccurate used memory size. - -**Resolution**
-- [Windows] Declare variables locally to fix conflicts in other functions. - -**~~Birthday~~ Install Date**
-- Renamed `get_birthday()` -- > `get_install_date()` -- Removed all `date` command usage from `get_install_date()`. -- Added a new function called `convert_time()` which takes the time stamped `ls` output and converts it to a pretty format. The function only uses bash so its much faster than calling `date`. This makes things simple and keeps the output consistent across all Operating Systems. Example: `2016-12-06 16:58:58.000000000` --> `Tue 06 Dec 2016 4:58 PM` -- Added an option so users can choose between using 24-hour and 12-hour time format -- `get_install_date()` will detect which `ls` program is being used instead of hardcoding them per OS. - -**Disk**
-- Rewrote function from scratch. - - The function is `40` lines smaller than before and works on all [1] versions of `df` we tested on [2]. -- Added the option/flag `disk_show` which allows you to specify which disks, mount points or directories to show the disk info of. (One per line) -- Added the option/flag `disk_subtitle` which allows you to specify how we label each disk. (Mount point or Disk name) -- Removed all percentage calculation since `df` already provides us with the percentage. -- Warn the user if `df` isn't installed. -- Fixed broken output if `df` wasn't installed but the function was enabled. - -[1] The function doesn't work on Haiku since their `df` is wildly non-standard. (The output format and flags are 100% different from all of the other `df` versions floating around.) - -[2] Tested on `GNU`, `Busybox`, `BSD`, `Solaris` and `macOS` `df` versions. - -**Theme**
-- [KDE] Don't display GTK Themes if KDE is detected. -- [KDE] If `kde[0-9]-config` isn't found, try and look for `$HOME/.kde`. - -**Window Manager Theme**
-- Fixed WM Theme not detected on MATE. **[@mstraube](https://github.com/mstraube)** -- Fixed WM Theme detection on KDE. **[@mstraube](https://github.com/mstraube)** - -**Song**
-- Added support for xmms2. **[@z33ky](https://github.com/z33ky)** -- Added support for Exaile music player. **[@mstraube](https://github.com/mstraube)** -- Added support for JuK .**[@mstraube](https://github.com/mstraube)** -- Added support for Bluemindo. **[@mstraube](https://github.com/mstraube)** -- Added support for Guayadeque Player. **[@mstraube](https://github.com/mstraube)** -- Added support for Yarock. **[@mstraube](https://github.com/mstraube)** -- Added support for Qmmp. **[@mstraube](https://github.com/mstraube)** -- Added support for QuodLibet. **[@mstraube](https://github.com/mstraube)** -- Added support for Mopidy. **[@d3rrial](https://github.com/d3rrial)** -- [cmus] Simplify block and fix `artistsort` bug. -- Removed `state` detection. -- Removed duplicate `dbus-send` commands. **[@mstraube](https://github.com/mstraube)** -- Hide output if no song is playing. -- Enforce order `artist - title` in `get_song_dbus()`. **[@mstraube](https://github.com/mstraube)** - -**Terminal Font**
-- Added support for Alacritty. -- Added support for Konsole. **[@mstraube](https://github.com/mstraube)** -- Added support for Sakura Terminal. **[@mstraube](https://github.com/mstraube)** -- Added support for Pantheon Terminal. **[@mstraube](https://github.com/mstraube)** -- Added support for deepin-terminal. **[@mstraube](https://github.com/mstraube)** -- [Termite] Fixed incorrect font chosen. **[@mstraube](https://github.com/mstraube)** -- [Termite] Also look at default config. **[@mstraube](https://github.com/mstraube)** - -**Battery**
-- [MacOS] Fixed issue where battery always appears as charging. **[@jorgegonzalez](https://github.com/jorgegonzalez)** - -**Local IP**
-- [BSD and Solaris] Merged the detection to Linux. -- [Windows] Support multiple interfaces. - -**Color Blocks**
-- Use `start++` instead of adding it manually after case. **[@konimex](https://github.com/konimex)** -- Fixed bug where color blocks wouldn't respect width in TTYs. -- Cursor positioning now takes `$block_height` into account. -- Fixed all artifacts in virtual consoles. -- Merged `$start` and `$end` into an array called `block_range`. - - This makes the config option match the command-line flag `--block_range`. - -## Images -- [iTerm2] Fixed blank images. -- Fixed bug where image mode would attempt to run in a TTY. -- All of the image/ascii backend handling was rewritten. Backend and Image/File/Directory selection is universal now and should make usage easier. - - Added `catimg` backend. - - Added `caca` backend. - - Added `jp2a` backend. - - `--image` has been replaced with `--backend`. - - `--backend` takes `ascii`, `caca`, `catimg`, `jp2a`, `iterm2`, `off`, `tycat`, `w3m`. - - Shortcut flags were added for easy picking of backends. - - Each flag can take a file, image or directory as an argument. - - For example: `neofetch --w3m /path/to/img.jpg` `neofetch --ascii /path/to/file` - - `--w3m` - - `--iterm2` - - `--tycat` - - `--ascii` - - `--off` - - `--catimg` - - `--caca` - - `--jp2a` - - All image and ascii file selection has been replaced with the universal `--source`. - - The value of `--source` can be any of the following: - - `auto`, `ascii`, `wallpaper`, `/path/to/img`, `/path/to/ascii`, `/path/to/dir/`. -- Fixed bugs with image shuffle mode. - -## Wallpaper -- Decode URI filenames. - -## Ascii -- Simplified ascii file handling. - - Removed a call to `tr` for those using `bash 3`. - - Fixed distro detection issues. - - Removed the assumption that `first word in distro --> ascii file name` -- Added Ubuntu-Studio. **[@konimex](https://github.com/konimex)** -- Fixed bug causing macOS ascii art to be used on other Operating Systems. -- Display warning about 'ascii' being the new default mode. -- Removed `ascii_logo_size` in favor of `ascii_distro='{arch,crux,gentoo}_small'`. -- [PCBSD] Use TrueOS ascii art. -- Added Void Linux (small) and Alpine Linux (small). - -## Screenshot -- Use arrays for `$scrot_program` - -## Args -- Fixed bug where `neofetch --config` sourced the user config twice. -- Cleaned up config arg handling. - - -## [2.0.2] - 2016-12-07 - -This minor release fixes some issues related to new features added in 2.0. These issues weren't picked up in the time between 2.0 and 2.1 and another minor release is needed due to the Packages issue being rather important. - -These issues were fixed by reverting the GPU caching and Packages optimizations. These issues occurred because not enough testing was done before these were implemented in master. In the future I'll take more care with testing these larger changes before they hit the master branch and I apologize for there being yet another release in one week. - -I also want to apologize to those packaging Neofetch for this unexpected release. - -## Info - -**Packages**
-- Fixed issue where package output was off by one. - -**GPU**
-- Fixed bug with `--gpu_brand` not working. - -**Theme**
-- [Cinnamon] Fixed incorrect information. - - -## [2.0.1] - 2016-12-06 - -This release of Neofetch fixes some important bugs that were found after 2.0 was release. This includes: Detection issues on CentOS and Linux Mint systems, Incorrect Memory usage on BSD, Linux GPU detection issues and more. - -This release also includes a rewrite of the screenshot functions. You no longer have to set the program to use in your config. Neofetch now automatically finds and uses whatever screenshot tool is available on your machine. - -See the screenshot section below for more info. - -The `get_packages()` function was optimized. Neofetch's packages function works by detecting which package managers are installed on your system and then using a sum of those as the packages output. - -Previously the function would call `wc -l` for every package manager, instead we now call `wc -l` only once at the end of the function. - -Thanks for reporting these bugs and also suggesting these features. Don't be shy, report any bugs, annoyances or etc with Neofetch and I'll happily help you out. - -Thanks to **[@konimex](https://github.com/konimex)** for all of his contributions this release. :) - -## Contributors -- **[@konimex](https://github.com/konimex)** - -## General -- Use `$kernel_name` instead of `$distro` in some functions. **[@konimex](https://github.com/konimex)** - -## Info - -**Distro**
-- Added support for Apricity OS. -- Added support for GoboLinux. **[@konimex](https://github.com/konimex)** -- Added support for SwagArch. -- Added support for AOSC OS. -- Added support for Parrot Security. -- Fixed bug that caused Linux Mint systems to be identified as Ubuntu. -- Fixed bug that caused CentOS systems to not be detected. - -**Memory**
-- [BSD] Fixed high memory output. - -**GPU**
-- [Linux] Fixed bug where sound card was detected as GPU. - -**Packages**
-- Only call `wc -l` once at the end of the function instead of calling it once per package manager. - -**Desktop Environment**
-- Show Cinnamon version. - -## Image -- Changed default image mode to `ascii`. - - See: [Images in the terminal](https://github.com/dylanaraps/neofetch/wiki/Images-in-the-terminal#enabling-image-mode) - -## Wallpaper -- Rewrote wallpaper function. -- Prioritize DE wallpaper setters before falling back to `feh`/`nitrogen`. -- Added support for XFCE's wallpaper setter. -- Added support for Solaris and GNU Hurd. **[@konimex](https://github.com/konimex)** - -## Ascii - -![ubuntu](https://u.teknik.io/zILeY.png) -
Old Ubuntu Logo vs New Ubuntu Logo -- Updated Ubuntu logo to the latest version. - - You can use the old logo by launching neofetch with `--ascii_distro ubuntu_old` or by changing `$ascii_distro` to `ubuntu_old` in your config file. -- `--ascii_colors` no longer changes text colors. -- Added ascii art for Ubuntu-Budgie. - - You can use the ascii art by launching Neofetch with `--ascii_distro ubuntu-budgie` or by changing `$ascii_distro` to `ubuntu-budgie` in your config file. -- Fixed bug causing RFRemix to use the incorrect ascii art. - -## Screenshots - -Neofetch will now automatically find and use whatever screenshot tool is available on your system. The screenshot tool is no longer hardcoded and you don't have to edit your config file to specify what program to use. - -On Haiku and macOS, Neofetch will use the built-in tools to take screenshots. On systems with an X server Neofetch will look for and use the following programs: `scrot`, `maim`, `import (imagemagick)`, `imlib2_grab` and `gnome-screenshot`. - -The config option `scrot_cmd` and the commandline flag `--scrot_cmd` are still there for those who want to use custom flags, programs or scripts to take screenshots. -- Automatically use whatever screenshot tool is available. -- Added screenshot support to macOS -- Added screenshot support to Haiku - -## Screenshot Upload -- [teknik.io] Fixed images not uploading with the right filetype. -- Changed default image upload host to `teknik.io`. - - teknik doesn't compress images whereas imgur does. - - You can change this back to imgur by using `--image_host imgur` or by editing your config file. - - -## [2.0] - 2016-12-02 - -This is the biggest release of Neofetch in a long time. 97 files were changed with 2700~ additions to 2900~ deletions. Although the changelog isn't as interesting this time majority of the script has been rewritten, restructered and cleaned up. Every function and variable name follows a proper naming scheme and a large number of bugs were fixed. - -Since this version of Neofetch differs so much from the previous versions expect a 2.0.1 release a few days later to fix any bugs that are found after release. - -The ascii file handling was rewritten, ascii art is now stored/read as plain text! All `eval` usage was removed from Neofetch, vim fold markers/comments are no longer enforced and we now run on GNU Hurd, Haiku and more. - -When I was rewriting parts of the script I thought to myself; Neofetch is using the bash shebang and does depend on bash so why not take full advantage of the features bash has to offer? All tests were changed from `[` to `[[`, arithmetic tests now use `(())` and C style for loops are used where possible. - -All of the config file documentation was rewritten and multiple wiki pages were created to hopefully make using/configuring Neofetch easier than ever before. You can see the wiki here: [Neofetch Wiki](https://github.com/dylanaraps/neofetch/wiki) - -Some of the config options/arguments were renamed/changed and Neofetch will warn you on run if you're using deprecated options (`neofetch -v`). For this release Neofetch **will** include backwards compatibility with the old config file but I'd like to remove this stuff in ~~2.1~~ 3.0. I recommend using this release with a fresh config file so that you can make use of the new documentation. - -I say this every release; This changelog is incomplete, for a full list of changes take a look through the commit history. Neofetch now has an unspoken commit style so reading the commit history won't hurt as much as it used to. - -Thanks to all of the contributors this time around, you guys are a big help and I really appreciate your work towards making Neofetch better and better each release. :) - -## Contributors -- **[@konimex](https://github.com/konimex)** -- **[@TonCherAmi](https://github.com/TonCherAmi)** -- **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** -- **[@iandrewt](https://github.com/iandrewt)** -- **[@iwamatsu](https://github.com/iwamatsu)** -- **[@Brottweiler](https://github.com/Brottweiler)** - -## Packages -- Neofetch is now in Debian's official repos. -- Neofetch is now in Ubuntu's official repos. - -## General -- All functions/variables now follow the same naming scheme. `example_func_name` -- Call `uname` once and cache the output instead of calling `uname` 4-5 times. -- Cleaned up and rewrote large chunks of the script. -- Convert math tests to correct syntax. -- Fixed `--disable` and capitalized arguments. -- Fixed issue where `bold=off` wouldn't work. -- Fixed issue where info wasn't detected properly but the subtitle was still displayed. -- Fixed issue where using `--disable func func` broke other args. -- Removed all traces of `eval` from Neofetch. -- Removed all vim fold markers and stopped enforcing folding for vim users. - - See [#431](https://github.com/dylanaraps/neofetch/pull/431) -- Rewrote all of config file documentation. -- Swap all tests from `[` to `[[`. - -## Operating System -- Added support for ChaletOS. -- Added support for DracOS. -- Added support for GNU Hurd. **[@konimex](https://github.com/konimex)** -- Added support for Haiku. **[@konimex](https://github.com/konimex)** -- Added support for Korora. **[@konimex](https://github.com/konimex)** -- Added support for Netrunner. **[@konimex](https://github.com/konimex)** -- Added support for Pardus. -- Added support for iPhone 7 and 7 Plus. - -## Ascii -- Ascii art is no longer read as a script and is now read as plain text. - - See this wiki page about the new ascii art format. - - https://github.com/dylanaraps/neofetch/wiki/Custom-Ascii-art-file-format -- Neofetch now displays your OS's ascii logo if your distro's logo isn't found. **[@konimex](https://github.com/konimex)** - - Example: [Linux] Tux is displayed if there's no distro ascii. -- `neofetch --ascii_distro x` now sets the mode to ascii for you. You no longer have to use a combination of `--ascii` and `--ascii_distro`. -- [Arch Linux] Changed default ascii colors. -- [Bunsenlabs] Changed default ascii colors. -- Fixed issue with Solarized and certain ascii art. -- Remove all duplicates from `get_distro_colors()`. -- Remove execution permission flag from ascii art files. **[@iwamatsu](https://github.com/iwamatsu)** -- Rename `colors()` to `get_distro_colors()`. -- Rename `setcolors()` to `set_colors()`. -- Update Netrunner ascii art. -- Added old arch ascii logo. **[@Brottweiler](https://github.com/Brottweiler)** - - Useable by using `--ascii_distro arch_old` or by editing the config. - -## Images -- Fixed images not appearing in st. -- Added `to_ascii()` and `to_off()`. - - These functions are used when falling back to different image modes. -- Renamed `check_old_flags()` to `old_flags()` to match `old_functions()`. -- Split `get_image()` into `get_term_size()`, `get_image_size()`, `get_image_program()` and `make_thumbnail()`. -- Use `$XDG_CACHE_HOME` as the thumbnail dir if available. - -## Wallpaper -- Added support for Cinnamon. - -## Bars -- Rename all `progress_` variables to `bar_` to match the function name. - -## Info - -**Distro**
-- [Linux] Source `/etc/*-release` files instead of having a dozen separate `awk` commands. - - We source `/etc/os-release` before falling back to `/etc/*-release`. -- Remove lsb_release detection. - - This change was made since lsb_release prints innacurate results on some distros. -- Added fallback when distro isn't found. **[@konimex](https://github.com/konimex)** - - Example: `Linux (Unknown)` - -**Packages**
-- [Solus] If `pisi` is unavailable, use `eopkg`. -- Added package detection for Lunar Linux. **[@konimex](https://github.com/konimex)** -- Added package detection for TinyCore. **[@konimex](https://github.com/konimex)** -- Remove `/usr/games` from `$PATH` to fix issues with pacman game. - -**GPU**
-- GPU is now cached till reboot. -- [Linux] Prefer dedicated GPU over integrated GPU. - -**Terminal**
-- Added support for HyperTerm. **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** - -**Terminal Font**
-- Added support for HyperTerm. **[@JorgeGonzalez](https://github.com/JorgeGonzalez)** - -**CPU**
-- [BSD] Added cpu_temp support. **[@konimex](https://github.com/konimex)** - -**CPU Usage**
-- [iOS] Fixed CPU usage. - -**Shell**
-- [bash] Simplify bash version. - -**Song**
-- Added support for Clementine. **[@konimex](https://github.com/konimex)** -- Added support for GNOME Music. **[@konimex](https://github.com/konimex)** -- Added support for Lollypop. **[@konimex](https://github.com/konimex)** -- Added support for Pragha. **[@konimex](https://github.com/konimex)** - -**Public IP**
-- Cache the output of the command. **[@konimex](https://github.com/konimex)** -- [dig] Fixed connection timed out with public_ip. **[@iandrewt](https://github.com/iandrewt)** - -**Resolution**
-- [MacOS] If refresh rate is empty don't append Hz. - - -## [1.9.1] - 2016-11-04 - -This is a small release which fixes various issues found in 1.9. - -Note: Those packaging neofetch can ignore the new file: `config/travis` - -## Contributors -- **[@konimex](https://github.com/konimex)** -- **[@fornwall](https://github.com/fornwall)** -- **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** - -## Packages -- Neofetch is now in Termux`s repos. - -## General -- [Cursor Position] Fix cursor position in URxvt when using terminal padding. -- [Termux] Fix default ascii location. **[@konimex](https://github.com/konimex)** -- [Termux] Fix default config location. **[@fornwall](https://github.com/fornwall)** -- If a function fails to detect info, let the user know in verbose mode. (`-v`) -- Removed `--test` in favor of a separate config file. Travis.ci now uses `neofetch --config travis` instead of a hacked together arg. - -## Operating System -- Added support for BlankOn Linux. - -## Images -- Fix division by 0 error. - -## Ascii -- [Tails] Update ascii art. -- [OpenBSD] Made ascii art thinner - -## Info - -**Prin**
-- Fix color breakage. -- Fix bold not working. - -**Terminal**
-- Fix whitespace error. - -**Terminal Font**
-- [Termite] Fix incorrect Termite font chosen. -- [Termite] Simplify `awk` command. -- [xfce4-terminal] Simplify `awk` command. - -**Theme**
-- [Budgie] Fix incorrect GTK Theme/Icons - -**Window Manager Theme**
-- [Budgie (Mutter)] Don't print WM Theme. - -**Memory**
-- [OpenBSD] Fixed used memory usage. **[@Head-on-a-Stick](https://github.com/Head-on-a-Stick)** - - -## [1.9] - 2016-11-01 - -This change log won't cover everything that's changed. Have a look through the commit -history for more info. - -There were a lot of major changes made to how things work in this release so I'm expecting -bugs/things not working for people. Expect a 1.9.X release. - -I'm also looking for neofetch screenshots for the Readme, see this issue: [#405](https://github.com/dylanaraps/neofetch/issues/405) - -Thanks to everyone below who contributed, it's nice to see some new faces too. :) - -## Contributors -- **[@konimex](https://github.com/konimex)** -- **[@iandrewt](https://github.com/iandrewt)** -- **[@coypoop](https://github.com/coypoop)** -- **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** -- **[@koreacomputercenter](https://github.com/koreacomputercenter)** - -## General -- Added new function called `checkoldflags` which informs users about deprecated config options. -- Change all `OS X` references to `macOS`. **[@iandrewt](https://github.com/iandrewt)** -- Fix corrupted text when long lines are cut-off. -- Don't dynamically place prompt in `image=off` mode. -- Cursor Position: Fix issues when using URxvt+Padding - -## Operating System - -![android](https://u.teknik.io/4XdJy.png) -- Added support for Android. - - Dependencies: - - Required: `bash` and `busybox` - - Note: I recommend installing `termux` from the Play Store or F-Droid. Termux provides you with a fully - working Linux environment, doesn't require root acess and includes all dependencies. - - Note2: Neofetch will be packaged in `termux` thanks to **[@konimex](https://github.com/konimex)** - - PR [#351](https://github.com/termux/termux-packages/pull/531) -- Added support for Bitrig. **[@konimex](https://github.com/konimex)** -- Added support for Sparky Linux. -- Added support for Porteus. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** -- Added support for Red Star OS. **[@koreacomputercenter](https://github.com/koreacomputercenter)** - -## Packages -- Neofetch is now in Gentoo's official repos. - -## Images - -**Fixed rendering issues in URxvt when using an XFT font.** - -![scrot](https://i.sli.mg/6qp9Cg.png) - -This was first thought to be an issue between URxvt and W3m-img and I apologize for immediately closing bug reports and dismissing comments about this. - -I spent yesterday trying to fix this issue and found out that launching neofetch with `--bold off` -reduced the rendering problems. I did more digging and found out that removing all text formatting fixes the issue entirely. I later found out that adding a single unformatted character before the formatted text fixed the issue while keeping the formatting the same. - -I opened up this PR https://github.com/dylanaraps/neofetch/pull/358 which added options to enable a border between the image and the text to fix the issue. **[@konimex](https://github.com/konimex)** later commented informing me that we could just use a `zero-width space` to fix the issue and that we didn't need a new function/args/ugly border. doh - -The final fix was as simple as adding a zero-width space before the info, here's the commit. - -https://github.com/dylanaraps/neofetch/commit/3e9c3d648cb4c6f0d5fe5f0b96f9e29429af39d9 - -**Removed hard dependency on `\033[14t`** - -Neofetch no longer requires a terminal emulator that supports `\033[14t` this means that neofetch now works in Konsole. Instead of using the escape sequence users now have three options for getting the terminal size in pixels. -- `xdotool` -- `xwininfo` + `xprop` -- `xwininfo` + `xdpyinfo` - -Neofetch will detect whatever combination you have insalled and use these programs. - -Note: `\033[14t` is still supported, if images already work for you then you don't have to install anything else. -- [w3m-img] Draw the image twice to fix rendering issues in Konsole. -- [w3m-img] Fix cursor position when using `yoffset`. -- [w3m-img] Add `-bg` support with the new option `--bg_color`. - - `neofetch --bg_color blue` will make the background behind the image blue. - - Note: The background color is only visible behind transparent parts of the image. -- If the terminal width is found as `0`, fallback to ascii mode. - -## Ascii -- Bold ascii art by default. -- Fixed incorrect prompt location when using `ascii_logo_size small`. -- Fixed incorrect colors used on light terminals. -- Update Void Linux ascii art. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** -- Update Solus ascii art. - -## Info - -**Distro**
-- Expanded `distro_shorthand` to macOS, BSD and Solaris. **[@konimex](https://github.com/konimex)** -- Removed `osx_buildversion` and `osx_codename` in favour of `distro_shorthand`. **[@konimex](https://github.com/konimex)** - -**Desktop Environment**
-- [Windows] Added support for showing DE. - - Windows 8 and above: `Modern UI/Metro` - - Windows 7 and below: `Aero` - -**Window Manager**
-- [Windows] Added support for custom WMs/Shells. - - Neofetch now detects `blackbox`, `bugn`, `Windawesome`, `emerge` and `litestep`. - -**Window Manager Theme**
-- [Windows] Added support for Blackbox themes. - -**CPU**
-- Added `cpu_speed` which lets you hide/show the speed in the output. -- Expanded `cpu_cores` option by adding two new values, `logical` and `physical`. - - `logical`: Show all virtual cores (hyperthreaded). - - `physical`: Only show physical cores. -- [Linux] Added support for showing CPU temperature. - - Added new option called `cpu_temp`. - - Note: This is disabled by default and can be enabled by changing the value of `cpu_temp` in your config to `on`. -- [macOS] Print physical cores instead of hyper-threaded cores. **[@iandrewt](https://github.com/iandrewt)** -- [iOS] Rewrite CPU function. - -**GPU** -- [iOS] Rewrite GPU function. -- [Linux] Rewrite GPU function. - - Neofetch also caches the info until reboot. - -**Uptime**
-- Rewrote uptime function to use seconds since boot instead of the `uptime` command. - - Every OS/Distro now has the pretty `uptime -p` output! -- Remove `up` from output. - -**Resolution**
-- [macOS] Add @2x label for retina resolutions. **[@iandrewt](https://github.com/iandrewt)** - -**Memory**
-- [Linux] Correctly calculate used memory. - - The output should now match `conky`, `htop` and etc. - - Source: https://github.com/KittyKatt/screenFetch/issues/386#issuecomment-249312716 -- [NetBSD] Fix memory output for sizes over 4GB. **[@coypoop](https://github.com/coypoop)** - -**Shell**
-- Hide shell path by default. -- Show shell version by default. - -**Battery**
-- [Linux] Rewrote and simplified battery function. -- Removed `battery_shorthand` -- Removed `battery_num` - -**Theme Font**
-- [XFCE] Fixed incorrect font output. - -**Color Blocks**
-- Fixed `block_width` not working. -- Fixed `% s` appearing in color blocks when neofetch is run from `tty` -- Fixed `block_width` being off by one. A value of `2` made the blocks `3` wide instead of `2` wide. - -**Terminal and Terminal Font**
-- [Linux] Use `/proc/$PPID/comm` instead of parsing `ps`. -- Uppercase first letter of `termfont` output. -- Don't print broken output of busybox's `ps`. -- Remove path from output. - -**Song**
-- [macOS] Fix iTunes automatically opening. **[@iandrewt](https://github.com/iandrewt)** -- Added support for Audacious. **[@ncmprhnsbl](https://github.com/ncmprhnsbl)** -- Rewrote song function, it's now much faster/cleaner. - - -## [1.8.1] - 2016-10-04 - -This release fixes various bugs found in 1.8. - -**General**
-- Fixed issues with single args (`-s` `-su`) being treated as values for other args. - -## Info - -**GPU**
-- Added `gpu_brand` to enable/disable showing GPU brand in output. (AMD/NVIDIA/Intel) - -**DE**
-- Added Cinnamon version number to output. - -**WM Theme**
-- Fix GNOME showing wrong WM Theme. - -**Battery**
-- Fixed battery not appearing when set to `all`. - -**Terminal Font**
-- [Termite] Ignore lines starting with `;`. - -**Progress Bars**
-- Fixed progress bars displaying incorrectly in image mode. - -## Screenshot -- Added support for uploading screenshots to Imgur and Teknik. - - Adds two new identical flags `--upload` and `-su`. -- Changed default screenshot name so that it works on Windows. - -## Images - -**General**
-- Added a tiny delay before running w3m-img which suprisingly fixed all flickering issues in VTE based terminals. See [#349](https://github.com/dylanaraps/neofetch/pull/349) - -**Wallpaper**
-- Fix wallpapers with spaces in the filename from not showing up. - -## Ascii -- Added logo mode which only displays the ascii art. - - Adds two new identical flags `--logo` and `-L`. - - -## [1.8] - 2016-10-02 - -This version of neofetch is vastly different from the previous versions and this -changelog won't cover everything that's changed. Have a look through the commit -history for more info. - -There were a lot of major changes to how things work in this release so I'm expecting -bugs/things not working for people. Depending on what comes up we my release a few 1.8.X -versions. - -This changelog is a bit of a mess this time around and I apologize but it should at least -get the message across. - -Android support didn't make it into this release as it requires testing on more devices. -If you've got a device running android and would like to help test out the branch, check -out the open PR here: [#322](https://github.com/dylanaraps/neofetch/pull/322) - -This release also saw a lot more contributors which makes me really happy. Thanks to those -below for helping out. :) - -### Contributors -- **[@hashhar](https://github.com/hashhar)** -- **[@williamkray](https://github.com/williamkray)** -- **[@dar-irl](https://github.com/dar-irl)** -- **[@gabe565](https://github.com/gabe565)** -- **[@maddcoder](https://github.com/maddcoder)** -- **[@iandrewt](https://github.com/iandrewt)** -- **[@aranega](https://github.com/aranega)** -- **[@vendion](https://github.com/vendion)** -- **[@konimex](https://github.com/konimex)** -- **[@undrskr](https://github.com/undrskr)** - -### General -- Added `--version` to print the neofetch version. -- Fix issue when title and background were both color `7`. -- Fix issue with incorrect text color when `barinfo` is set. -- Fixed various Travis.ci bugs. -- Fix lint errors. -- Moved all whitespace trimming to a dedicated function. - - Neofetch will no longer have any whitespace issues in the output. - - See [trim()](https://github.com/dylanaraps/neofetch/commit/d3c87cdaacf1ea9fbf245146c910dc53b49dba08#diff-e863270127ca6116fd30e708cdc582fcR2789) -- Quote all variable/command substitutions. -- Removed `line_wrap` as having it set to `on` broke the output. -- Removed `stdout` mode since it's been broken for a while now and I don't see the - point in fixing it. -- Removed in-script config in favor of sourcing the default user config. -- Remove all instances of `! -z` since they're pointless. -- Remove all `bc` usage by simplifying math. -- Suppress `getconfig` and `getscriptdir` errors. -- Suppress `xprop` errors since it's now an optional dependency. -- The prompt is now dynamically set in image mode instead of being anchored to the
- bottom of the window. See [#279](https://github.com/dylanaraps/neofetch/pull/279) and [#299](https://github.com/dylanaraps/neofetch/pull/299) for examples. -- The title at the top is now much more colorful. -- Moved commands near the bottom of the script to a new function called `main`. -- Use `read -s` instead of `stty -echo` and `stty +echo`. -- Use faster `$(())` syntax for index variables. -- `-v` now shows where the config files were sourced from. -- Cleanup -- Neofetch no longer clears the screen when run in ascii or image=off modes. - - You can use the old behavior by aliasing `clear && neofetch` to `neofetch`. - -### OS -- Added support for Windows 10 Linux subsystem. **[@konimex](https://github.com/konimex)** -- Added support for GuixSD. **[@konimex](https://github.com/konimex)** -- Added support for Devuan Linux. -- Added support for GalliumOS. -- Added support for Openwrt. -- Added support for PacBSD. **[@vendion](https://github.com/vendion)** -- Added support for Rosa. -- Added support for Solaris (Oracle / OpenIndiana). **[@konimex](https://github.com/konimex)** -- Added support for macOS Sierra. **[@iandrewt](https://github.com/iandrewt)** -- Fixed various iOS related issues. - -### Packages -- Added Cydia package for iOS. - - See https://github.com/dylanaraps/neofetch#ios-1 - -### Info - -**Terminal and Terminal Font**
- -![img](https://ipfs.pics/ipfs/QmR39ScLi56Yt73pA3YWri9ayatN6mpwSTEmM8RVdeRsB1) -- Added `term` function to display current terminal emulator. [1] -- Added `termfont` function to display current terminal font. [2] - -[1] Both of these functions are enabled by default. -[2] See this wiki page for more info about the functions: [Link](https://github.com/dylanaraps/neofetch/wiki/Terminal-and-Terminal-Font-detection) - -**Model**
-- Added `model` a new function which displays your device's product vendor/name. - -![Mode](https://ipfs.pics/ipfs/Qmcy2o5xZCELxroNLHAhY96ZsrwBFR86NGDCu5e2UPVn4b) - -**Distro**
-- Added `distro_shorthand` **[@konimex](https://github.com/konimex)** - -**Title**
-- Added additional fallback which gets the current username from `$HOME`. - -**Color Blocks**
-- Added `--block_height` / `$block_height` to change the number of lines high each
- block will be. - -![Big Blocks](https://ipfs.pics/ipfs/QmZpR8ukZNfGXkhXjTwAy3eWVRCeHdrurhgAdV5CSiTVvR) - -**Resolution**
-- [Windows] Fix resolution on Windows 10. **[@dar-irl](https://github.com/dar-irl)** -- [Mac OS X] Hide refresh rate if `0`. **[@iandrewt](https://github.com/iandrewt)** -- Fixed `xrandr` output on systems not using gawk. -- [Linux / BSD] Shortened refresh rate output. - -**Shell**
-- Show `fish` shell version. **[@maddcoder](https://github.com/maddcoder)** - -**Song**
-- Added support for Deadbeef. **[@konimex](https://github.com/konimex)** -- Added support for Amarok. **[@konimex](https://github.com/konimex)** -- Added support for Banshee. **[@konimex](https://github.com/konimex)** -- Added support for Rhythmbox. **[@konimex](https://github.com/konimex)** -- [Cmus] Prevent `tag artistsort` from showing up in song title. **[@williamkray](https://github.com/williamkray)** -- [Cmus] Fix order of music tags. **[@iandrewt](https://github.com/iandrewt)** -- [Cmus] The function now works on both OS X and Linux. -- [iTunes] Fix song not displaying. **[@iandrewt](https://github.com/iandrewt)** - -**CPU**
-- Simplify CPU Core command. - -**CPU Usage**
-- Fixed broken CPU usage output on BSD and Windows. -- Fixed misleading output on Linux / Mac OS X. -- Moved CPU Usage to its own dedicated function. - -### Image - -![terminology](https://ipfs.pics/ipfs/QmbVEUREBg4hMG22WrQ2bkt2sZZzyTEP5EEXmHRw7MHD6A) -- Added image support for terminology with `tycat`. **[@aranega](https://github.com/aranega)** [1] -- Fixed issues with lines getting drawn through images. See [#296](https://github.com/dylanaraps/neofetch/pull/296) -- Added `--crop_mode none` / `crop_mode=none` to disable cropping the images. -- Added `--size none` / `size=none` to disable resizing / cropping the images. -- Removed `image_position` -- `--image off` now behaves like the other image modes. - -[1] `tycat` is a terminology builtin that works similarly to w3m-img. Those using terminology
-now have working image support. - -##### Shuffle mode -- Fixed directory going out of bounds causing a fallback to ascii mode. **[@gabe565](https://github.com/gabe565)** -- Simplified shuffle function. -- Path no longer requires a `/` at the end. **[@aranega](https://github.com/aranega)** - -### Ascii -- Add `ascii_bold` which allows you to bold the ascii art. -- Added `--ascii_distro mac` as a shorter way of using the OS X ascii. -- Added missing `$ascii_distro` config option. -- Better `Ubuntu-GNOME` ascii art. **[@hashhar](https://github.com/hashhar)** -- Custom ascii files (`--ascii path/to/ascii_file`) now follow the same format as the - distro ascii files. See this wiki page that explains the syntax. [Link](https://github.com/dylanaraps/neofetch/wiki/Custom-Ascii-art-file-format) -- Fix a color issue with Debian's ascii logo. -- Fix an error with an unescaped char in Windows' ascii art. -- Use a pure bash solution to getting ascii size. -- Updated Solus ascii art to match new logo. **[@undrskr](https://github.com/undrskr)** - - -## [1.7] - 2016-05-14 - -Hello, sorry this release took so long. I've been extremely busy with uni and -haven't had as much time to work on neofetch. - -As always, check the `Following HEAD` wiki page for all breaking changes -this release. - -I'm also looking for some new Readme screenshots, see this github issue: **https://github.com/dylanaraps/neofetch/issues/245** - -### Contributers - -Thanks to the following people for contributing this release. -- **[@dawidd6](https://github.com/dawidd6)** -- **[@tudurom](https://github.com/tudurom)** -- **[@iandrewt](https://github.com/iandrewt)** - -### General -- Made it easier to get verbose logs. -- Added issue template for github. -- New repo for Crux. **[@tudurom](https://github.com/tudurom)** -- Added release badge to readme. **[@dawidd6](https://github.com/dawidd6)** -- Updated man page and usage with newest flags. -- Font is now enabled by default to match Screenfetch's default config. -- Fixed `bold` option not working. - -### OS / Distro Support -- Added support for Kogaion Linux. -- Added support for Apple iOS. **[@iandrewt](https://github.com/iandrewt)** - - Neofetch should now work on your iPhone, iPod and iPad. -- Added support for DragonflyBSD. -- Added support for PCBSD. - -![iOS screenshot](https://ipfs.pics/ipfs/QmYmPhwpFrxwySW2phdxH1TyQ6tCgCnxtYtbEEe3RY5TwZ) - -### Error Messages - -Neofetch now supports displaying error messages and saving a verbose log for -troubleshooting. - -![log](https://ipfs.pics/ipfs/QmeTWGKozY79zcxbrgXueyTRfQcTUe7ZmDqLv4ASgJB4G4) -- Added `-v` to print error messages to stdout. -- Added `-vv` to print a verbose log to stdout. [1] - -[1] Use `neofetch -vv 2> file` to save a verbose log for bug reporting. - -### Info -- Rewrote most BSD info functions, they're now much smaller and work on more - BSD distros. - -**prin** -- Format changes to fix issues with colons in string. This change also makes - `prin` use the same args as `info`. - -``` sh -# OLD Format -prin "Subtitle: Text goes here" - -# NEW Format -prin "Subtitle" "Text goes here" -``` - -**Title** -- Made title faster by using `$HOSTNAME` when available. - -**Underline** -- Fixed bug with `--underline on/off` not working. -- Underlining is no longer hardcoded to title length meaning you can now - underline any part of the output and the length will match. -- `$underline` was renamed to `$underline_enabled`. - -``` sh -# OLD Variable -underline="on" - -# NEW Variable -underline_enabled="on" -``` - -**Distro** -- Fix arch issues with ARM cpus. -- We now use `uname -m` to get the arch instead of hardcoding `x86`. -- Moved distro detection to a function called `getdistro`. -- Fixed issue with `ascii_distro` not working. - -**CPU** -- Fixed issues when cpu speed was < 1Ghz -- Cleanup of CPU function. -- Don't print `Dual-Core` or `Quad-Core` in CPU output. - -**GPU** -- [Linux] More GPU substitutions for AMD cards. -- Added BSD support using `glxinfo`. - -**Memory** -- [Linux / Windows] Use `memavail` if available for a more accurate output. - -**Packages** -- Package count now works when the user has multiple package managers installed. - For example, if the user has both `dpkg` and `pacman` installed the function will - add up the packages from both package managers to get a grand total. (`dpkg pkgs` + `pacman pkgs`) - -**Uptime** -- Fixed various issues with OS X and BSD. - -**Desktop Environment** -- [ Linux ] Fallback to using `xprop` if `$XDG_CURRENT_DESKTOP` is empty. -- Use `$de` instead of `$XDG_CURRENT_DESKTOP` for wallpaper and theme detection. -- Fixed xprop bug with DE detection when X wasn't running. -- Don't assume that user is using MATE if marco wm is detected. - -**Window Manager Theme** -- Fixed bug when `$de` was unset. - -**Color Blocks** -- Fixed bug when the blocks wrap a line causing a large white strip to appear. - -### Ascii -- Added KDE neon ascii art. -- Added small OpenBSD ascii art. - - Credit goes to ufetch. -- Reduced the size of NetBSD's ascii art. -- [Windows 8/8.1] Use modern windows ascii art. - -### Colors -- Fixed bug with `--colors` not working with all 256 terminal colors. -- `--colors 7` now uses the color white. [1] -- `--colors fg` now uses the foreground color. [1] - -[1] Neofetch tried to be smart before by assuming that the foreground color -would be white or black. This caused issues for those setting the foreground -color to red or etc. This change adds a new value for `--colors` and `colors=()` -called `fg` which will set the color to your foreground color. - -### Progress Bars -- The default progress bar look was changed to `[=====-----]` instead of `━━━━━━━━━━` - fix issues with older systems. -- You can now enable/disable a border around the progress bars with `progress_border`. - -``` sh -# $progress_border on -[=====-----] - -# $progress_border off -=====----- -``` -- You can now individually set the progress bar characters by using - `progress_char_elapsed` and `progress_char_total`. This means that you can - have a seperate character for the elapsed and total portions of the bar. - -``` sh -# Examples with $progress_border on - -# Elapsed: = -# Total: - -[=====-----] - -# Elapsed: . -# Total: " " -[..... ] - -# Elapsed: / -# Total: " " -[///// ] -``` - - -## [1.6] - 2016-04-01 - -# Neofetch 1.6 - -Another ~~week~~ another release of Neofetch. - -This release focused on cleanup, bug fixes and optimization. Neofetch -is now much much faster than last release and more bug free than ever -before! - -This release surprisingly didn't break much at all, see the latest entry in -the wiki page `Following HEAD`. - -https://github.com/dylanaraps/neofetch/wiki/Following-HEAD - -![scrot](https://ipfs.pics/ipfs/QmTD6cRmYfLdrvvyLfGdUfBDCzE5uYNsRpLUx7vLUFkYxM) - -### Contributors - -Thanks to the following people for contributing this release. -- **[@iandrewt](https://github.com/iandrewt)** -- **[@dawidd6](https://github.com/dawidd6)** -- **[@onodera-punpun](https://github.com/onodera-punpun)** -- **[@onespaceman](https://github.com/onespaceman)** -- **[@firstEncounter](https://github.com/firstEncounter)** -- **[@konimex](https://github.com/konimex)** - -### General -- Added Travis CI support. -- Added `--test` which is meant for testing and prints all functions. -- Cleanup of Distro, Uptime, Memory and CPU functions. -- We now use a more reliable white-space trimming substitution for CPU/GPU etc. -- Use `stty` instead of `read -s` to fix an issue with escape sequences
- appearing in the output. -- Line wrap is now disabled by default. -- Implement base support for caching specific info. This will eventually
- allow us to speed up the script by caching info that won't change for a
- long period of time like the CPU/GPU. [1] -- Fixed a locale issue when `LC_ALL` is unset on the user's system. -- Change all usage of `$HOME/.config` to `$XDG_CONFIG_HOME` with a fallback to `$HOME/.config`. - -[1] You can clear the cache with `--clean`. - -### Colors - -![vs](https://ipfs.pics/ipfs/QmNVw4zm78tgBGdhDJ1FZ1aktpEtVapVtNWWMMKh5aitrZ) - -

Neofetch 1.5 vs Neofetch 1.6

- -

Neofetch now works with bright color schemes and uses the foreground color instead of hard-coding white.

- -
-- Fixed buggy colors in older versions of *BSD, OS X and Linux. -- The default text colors now work on bright color schemes. We no longer force
- the color white, it's now based on your foreground color. -- Progress bars are now by default colored based on your distro's logo colors. -- Color blocks now work in older systems and in Travis CI. - -### Packages -- Neofetch is now is Void Linux's official repos. **[@konimex](https://github.com/konimex)** - -### Info -- Functions now no longer print `Unknown` when they fail, they now don't appear at all. - -**Window Manager Theme**
-- Added new `WM Theme` function to print window manager themes. - -**OS**
-- [ CRUX ] Also print the CRUX version. **[@onodera-punpun](https://github.com/onodera-punpun)** -- [ Fedora ] Fixed a weird detection bug. - -**CPU**
-- [ Windows ] Don't print CPU cores if detection fails. -- [ BSD ] Fixed extremely long output. -- Fixed broken CPU speed when source is `/proc/cpuinfo`. - -**GPU**
-- Don't show GPU output on unsupported OS. -- `Nvidia` is now displayed as `NVIDIA`. **[@firstEncounter](https://github.com/firstEncounter)** -- Intel GPUs now all appear as `Intel Integrated Graphics`. to avoid naming issues. -- [ OS X ] We now cache the GPU value. - -**Battery**
-- Show charging state in battery output. **[@dawidd6](https://github.com/dawidd6)** and **[@iandrewt](https://github.com/iandrewt)** -- [ Windows / OpenBSD ] Fix blank battery output when battery isn't found. - -**Resolution**
-- [ Windows ] Don't print resolution if detection fails. -- [ Linux / OSX / BSD ] Print refresh rate next to resolutions. -- [ Linux ] Multi monitor support using `xorg-xrandr`. -- [ Linux ] Refresh rate support using `xorg-xrandr`. -- [ OSX ] Added support for using `screenresolution` to print the output.
- This is much faster than the default method. - -**Packages**
-- Listing homebrew packages is now super fast. **[@iandrewt](https://github.com/iandrewt)** - -**Public IP**
-- Made public IP function faster by using `dig` if available. **[@iandrewt](https://github.com/iandrewt)** -- Each source now has a timeout to avoid a hang. -- If the IP detection fails we try another method. - -**Theme**
-- Use `$GTK2_RC_FILES` if the envar is set. **[@onespaceman](https://github.com/onespaceman)** - -**Desktop Environment**
-- Added OS X detection. - -**Song**
-- [ MPD ] Fixed function when mpd is running on another PC and not your own. -- Song now displays `Not Playing` instead of `Unknown` when no music player is found. -- Added support for Google Play Music Desktop Player (adds optional dependency of [`gpmdp-bash`](https://github.com/iandrewt/gpmdp-bash)) **[@iandrewt](https://github.com/iandrewt)** - -**Disk**
-- Added new display option `perc` to display just the percentage with the progress bar. -- [ FreeBSD ] Fixed disk usage not working. - -**Memory**
-- [ OpenBSD ] Fixed completely broken memory output on OpenBSD. -- [ Linux ] Rewrote memory function so that it works on old kernel versions. - -**Uptime**
-- [ OSX / BSD ] Performance improvements. **[@iandrewt](https://github.com/iandrewt)** -- [ OpenBSD ] Fixed duplicate `up` in output. - -**Birthday**
-- Fix stray `+` sign in output. - -### Image -- Remove `shuffledir` in favor of '--image path/to/dir/' -- Use `printf` instead of `shuf` to pick a random image. -- [ OS X ] Fixed issues with wallpaper detection. -- [ OS X ] Wallpaper detection now works on a per desktop basis. -- Removed `image_backend` and instead use iterm2 mode only when iterm2 is detected. - -### Ascii -- Added ascii art for Qubes OS. -- Added ascii art for Travis CI. -- Revamped Alpine Linux's ascii art. -- Fixed missing ascii colors for Puppy Linux. -- [ OSX ] Fixed incorrect text colors. -- Sped up ascii function by dropping `wc` usage. - -### Scrot -- Fixed scrot function not using user defined options. - - -## [1.5] - 2016-03-17 - -# Neofetch 1.5 - -![Xubuntu](https://ipfs.pics/ipfs/QmWPvwW3nQoKVffHSZUu57MwCpQDZoMVTHQVwwCom2ChqM) - -### Contributers - -Thanks to the following people for helping me to improve neofetch. -- **[@iandrewt](https://github.com/iandrewt)** -- **[@konimex](https://github.com/konimex)** -- **[@CousinMachu](https://github.com/CousinMachu)** - -### General -- Remove all `echo` usage inside the script. -- More cleanup and misc bug fixes. - -### Packages -- Neofetch is now packaged for `Fedora` and `Fedora` based distros. **[@konimex](https://github.com/konimex)**. -- Added installation instructions for RHEL and CentOS. **[@konimex](https://github.com/konimex)**. -- Added stable package to the AUR. **[neofetch](https://aur.archlinux.org/packages/neofetch/)** - -### Progress Bars - -This has finally been merged to master, a big thanks to **[@iandrewt](https://github.com/iandrewt)** for helping -me finish up with this PR. - -![bars](https://ipfs.pics/ipfs/Qmbj8S7pi4CVw12XTawtRwRpLvkiZ9cxRxCUPMLQ1Nhhkb) -- Added progress bar support to CPU, Memory, Disk, Battery. -- Added `progress_char` which allows you to change the character used when drawing the bars. -- Added `progress_length` which allows you to set the max length in spaces of the bars. -- Added `progress_elapsed_color` which sets the elapsed color. -- Added `progress_total_color` which sets the total color. -- Added `--progress_colors` which takes two color values: `elapsed`, `total`. -- Added `cpu_display`, `memory_display`, `disk_display` and `battery_display` which allow you
- to customize where or if the progress bar will appear. - - Takes these values: `info`, `bar`, `infobar`, `barinfo` - -### OS -- Added support for `SteamOS`. - -### Images -- Using `xoffset` now also moves the text over. -- Changed default gap size to `2`. -- Fixed an issue with Nitrogen and multi monitor wallpaper setups. **[@CousinMachu](https://github.com/CousinMachu)** - -### Ascii -- Kaos: Update ascii logo to the new logo. -- Added ascii logos for `Kubuntu`, `Lubuntu`, `Xubuntu` and `ubuntu-gnome`. - - You can enable them with `--ascii_distro kubuntu`, `--ascii_distro lubuntu` and etc. - -### Info - -**OS**
-- [ OSX ] Fix buildversion displaying regardless of on/off. **[@iandrewt](https://github.com/iandrewt)** -- [ OSX ] Added `osx_codename` (on by default) which prints the OSX codename. **[@iandrewt](https://github.com/iandrewt)** - -**Disk Usage**
-- Only display usage of local disks. -- Fixed disk usage progress bars when the used value was larger than the total. **[@iandrewt](https://github.com/iandrewt)** - -**Theme**
-- Added `/usr/share` as another theme directory to fix an issue with no theme being found. **[@iandrewt](https://github.com/iandrewt)** - -**CPU**
-- Added `cpu_shorthand` to shorten the output of CPU. **[@iandrewt](https://github.com/iandrewt)** - - Takes these values: `name`, `speed`, `tiny`, `on`, `off` -- Added the ability to print the CPU Usage by using `cpu_display="info"` or `--cpu_display off/on info`. -- Added `cpu_cores` to enable/disable showing the number of CPU cores in the output. **[@iandrewt](https://github.com/iandrewt)** - -**GPU**
-- Added new `tiny` option to `gpu_shorthand` to further shorten the GPU output. **[@iandrewt](https://github.com/iandrewt)** - -**Memory**
-- Fix hang on older systems. - -**Desktop Environment**
-- Fixed bug where `i3` would show up as both a DE and a WM. - -**Birthday**
-- Fixed the birthday function on OS X, it apparently wasn't working from the start. **[@iandrewt](https://github.com/iandrewt)** - -**Song**
-- [ OSX ] Added Spotify support to song. **[@iandrewt](https://github.com/iandrewt)** -- [ OSX ] Added Itunes support to song. **[@iandrewt](https://github.com/iandrewt)** -- Fix bug with `song_shorthand` and songs with more than one occurence of `-`. - -**Battery**
-- Fixed a naming error when multiple batteries are displayed. **[@iandrewt](https://github.com/iandrewt)** - -### Stdout Mode -- Fixed issues with functions that use `prin`. - - -## [1.4] - 2016-03-09 - -Lots of bugs were fixed and a lot of code was cleaned up, this changelog just lists -the major changes made to neofetch. For a full list, checkout the git commit history. - -Thanks to everyone for contributing, I appreciate it! -- Renamed `fetch` to `neofetch`. Thanks for voting. -- Neofetch now has a man page. (man neofetch) Thanks **[@konimex](https://github.com/konimex)** -- Added support for `Alpine Linux`. -- Fix issue with color blocks ending up on the same line as the prompt. - -### Packages -- Added Debian/Ubuntu package. Thanks **[@dawidd6](https://github.com/dawidd6)** -- Added Homebrew package for OS X. Thanks **[@iandrewt](https://github.com/iandrewt)** - -### Info -- Reimplement `color` function. - -**Battery**
-- Added support for NetBSD - -**Song**
-- [Linux] Added support for Spotify. - -**Birthday**
-- Added `--birthday_format` and `$birthday_format` to change the date format of the
- birthday function. The flag uses the `date` cmd's format options so see `man date`
- for a list. - -**Packages**
-- Fix 0 package count in Slackware. Thanks **[@h3xx](https://github.com/h3xx)** - -**GPU**
-- Added more GPU substitutions. - -Example: - -``` sh -neofetch --birthday_format "%D" -neofetch --birthday_format "%a %d %b %Y %l:%M %p" -neofetch --birthday_format "%c" -``` - -**Theme**
-- Fix incorrect theme detection on Cinnamon. - -### Ascii -- Added small ascii logo variants for Arch, Crux and Gentoo. [1] -- Added new flag/option `ascii_logo_size` that takes the values `normal` and `small`. -- Optimized all ascii art fixing all leading whitespace issues. - -[1] The small ascii art was taken from [ufetch](https://github.com/jschx/ufetch). - -Example of small ascii logo: - -![CRUX](https://ipfs.pics/ipfs/QmSpadVHtBPRBUJEiiztqkXqfhE2fuGS5t8bzsbxWUYaXA) - -### Stdout -- Don't create config file when using `--stdout`. -- Simplified stdout function. -- Reimplent `--stdout_separator` and `$stdout_separator` which allow you to change
- the separator between the info. - -Example: - -``` sh -# Display memory, battery and disk in a single line separated by " | " -# This output can then be used in lemonbar etc. -neofetch --stdout memory battery disk --stdout_separator " | " -``` - - -## [1.3] - 2016-02-26 - -# Fetch 1.3 - -Hey guys, - -This update brought some breaking changes, see this wiki page for what you'll -need to update in your config file. - -https://github.com/dylanaraps/fetch/wiki/Following-HEAD - -We're in the middle of renaming 'fetch' to something else as there are -already other programs using the name and we don't appear in any searches. - -You can help out by voting in our poll here: - -http://strawpoll.me/6894425 -- Fetch now supports **bash 3.0+**. -- More cleanup -- The text is now by default colored according to your distro's logo. -- Removed `$*_color` variables/flags in favour of a general `$colors` - variable/flag. See my writeup here: **https://github.com/dylanaraps/fetch/pull/96** - -### Image -- You no longer need to set the font_width value, your font size - is now calculated by fetch automatically. -- Image sizing now takes terminal height into account. -- `--size` now also takes a percentage as a value, for example. - -``` sh -# Image takes up 70% of the terminal size. -fetch --size 70% - -# Size the image in pixels. -fetch --size 200px -``` - -### Packages -- Fetch now has a `crux` port. Thanks **[@ix](https://github.com/ix)**. - -### OS -- Added support for `BunsenLabs`. -- Added support for `SailfishOS`. (Untested) - -### Info -- Don't display Theme, Icons, Font or Window Manager if X isn't running. -- Added function to show currently logged in users. - -**Window Manager** -- Add support for Wayland window managers. (Hardcoded) - -**Song** -- Added `song_shorthand` which prints the Artist/Title on seperate lines. - -**Theme** -- Windows Visual Style is now a part of `getstyle`. -- Disabled theme output on OS X to fix a `gsetttings` related crash. -- Uppercase the first letter of the theme. - -**Resolution** -- Added Windows support. -- Enabled by default but only displays info if the dependency is found. - -**Battery** -- Added FreeBSD and OpenBSD support. Thanks **[@tudurom](https://github.com/tudurom)**. - -**GPU** -- Added more substitutions/ - -### Stdout - -Printing to stdout in a plaintext format for use in scripts is now -much faster and cleaner. -- Removed `--stdout_separator` (Separator is now 2 spaces) -- Removed `--stdout_subtitles` -- Removed `--stdout_title` - - -## [1.2] - 2016-02-17 - -# Fetch 1.2 - -This new release comes with a few config breaking changes, see this wiki page -for info on how you can workaround the issues. - -https://github.com/dylanaraps/fetch/wiki/Following-HEAD -- Fetch now has a **gitter** chatroom. [![Gitter](https://badges.gitter.im/dylanaraps/fetch.svg)](https://gitter.im/dylanaraps/fetch?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) -- Fixed text padding when the user didn't have the locale `en_US.UTF8` installed. -- Cleaned up parts of the script. - -### OS - -We now support almost all the Linux distros Screenfetch supports excluding -the distros that have been discontinued. - -Added support for these distros: -- `Puppy Linux` -- `Kali Linux` -- `openSUSE` -- `Raspbian` -- `Mageia` -- `PCLinuxOS` -- `Zorin OS` -- `Tails` -- `BLAG` -- `Void Linux` -- `Trisquel` -- `Solus` -- `Peppermint` -- `NixOS` -- `Chakra` -- `Mandriva` -- `gNewSense` -- `LMDE` -- `KaOS` -- `Sabayon` -- `Frugalware` -- `Chapeau` -- `Slackware` -- `Scientific Linux` -- `Exherbo` -- `Chrome OS` -- `Chromium OS` - -### Makefile -- Fixed makefile on OS X El Captain. -- `$PREFIX` is now also used when installing ascii art and the default config - -### Wallpaper -- Fetch now supports using `MATE` desktop's wallpapers. -- Fetch now fallsback to ascii mode if the found wallpaper is an xml file. This - fixes issues where the wallpaper set by gsettings is an xml file. - -### Info - -**Desktop Environment**: -- Added support for showing the user's DE. - -**Window Manager**: -- `xprop` is now a required dependency. See **[#79](https://github.com/dylanaraps/fetch/pull/79)**. -- Renamed 'windowmanager' to 'wm' - -**IP Address**: -- Added function to get your local IP -- Added function to get your public IP [1] -- Added `--ip_host` and `$public_ip_host` which allow you to change the website we - ping for the public IP. - -[1] Public IP requires an internet connection as we ping a website. - -**Packages**: -- Check for packages based on which package manager is installed instead of - using a hardcoded list of distros. - -**Theme**: -- Added support for getting DE theme. -- Added support for getting KDE theme. -- Renamed `getgtk` to `getstyle`. -- Dropped the `gtk` from these printinfo functions `gtktheme`, `gtkicons` - and `gtkfont`. Theme output will be blank until you make these changes: - -``` sh -# Old Naming -info "GTK Theme" gtktheme -info "Icons" gtkicons -info "Font" gtkfont - -# New Naming -info "Theme" theme -info "Icons" icons -info "Font" font -``` - -**GPU**: -- `gpu_shorthand` is now enabled by default. -- We now favor showing the dedicated GPU over the integrated one. - -**Song**: -- Added support for `MOC`. -- We now check to see if the player is running before printing anything. -- We now check playback state and show it if relevent. - -**Uptime**: -- [Linux] Fixed uptime when it's under 1 minute. - -### Ascii Art -- `--ascii_distro` now also enables ascii mode. -- Fix missing ascii art when fetch is installed in /usr/local -- Update Deepin's ascii art to their new logo - - -## [1.1] - 2016-02-06 - -# Fetch 1.1 changelog - -Over the past 10~ days over **190** more commits have been pushed to master and the -script has had some big changes. Thanks to everyone who has contributed, you've been -a big help. - -![screenfetch mode](http://i.imgur.com/nW3HiNP.png) -New screenfetch mode -- If `w3m` or `imagemagick` aren't installed we gracefully fallback to ascii mode. -- Automatically find the `w3m-img` path and fallback to ascii mode if not found. [1] -- Fix padding escape codes on BSD systems. -- Swap escape codes from `\e` to `\033` for consistency. -- We only move the cursor to the bottom of the terminal in w3m/iterm2 rendering modes. -- Cursor position is now dynamic in ascii mode based on the height of the ascii and info text. -- If images and ascii are off, don't clear the terminal -- The script now exits correctly instead of always exiting with status code `1` -- If the script exits for any reason, unhide the cursor. -- Removed duplicate blocks inside `getcpu` and `getmemory`. -- Removed `--colors` as it was apparently broken from day 1. -- Usage has been reformatted so that every flag has a value. - -[1] Setting `$w3m_img_path` will make the script look there first. - -### Image -- Added support for displaying ascii art inside of text files. -- Added "screenfetch mode" which will display your distro's ascii art next to the info. [1] -- Added `--ascii_distro` to choose which distro's ascii logo to display. -- Added `--ascii_colors` and `$ascii_colors` which allow you to change the colors of the ascii art - and distro logos. [2] -- Added `--size` and `$image_size` to set the image size in pixels. -- Rename `--shuffledir` and `$shuffledir` to `shuffle_dir`. -- Rename `--imgtempdir` and `$imgtempdir` to `thumbnail_dir` -- Removed `--split_size` and `$split_size` as they were weird and confusing to use. -- Default thumbnail directory is now `$HOME/.cache/thumbnails/fetch`. Thanks @tudurom -- If `--image` and `--ascii` are left empty we fallback to ascii distro mode. - -Example usage of ascii from file: - -``` sh -fetch --ascii "path/to/ascii" --ascii_color 2 - -``` - -[1] **[How do I enable screenfetch mode?](http://github.com/dylanaraps/fetch#how-do-i-enable-screenfetch-mode)** -[2] `ascii_colors` takes a range of colors which allows you to color every aspect of -distro and OS ascii art. For custom art the script will color the entirety of it using -the first value of `ascii_colors`. If `ascii_colors` is left empty, color will be disabled. - -### Config file -- Fetch now has a config file that you can share with people and keep between - script versions! [1] -- Added `--config` and `$config_file` to specify a custom config location. -- Added `--config off`, `--config none` and `$config` to enable / disable config files - at launch or in script. - -[1] https://github.com/dylanaraps/fetch#using-the-config-file - -### Makefile -- Fetch now has a make file due to the increasing number of files, - this allows the script to be easily installed and uninstalled on - systems it isn't packaged for yet! [1] - -[1] The script will still work just fine on its own, you'll just be missing -the distro ascii art and the automatic config creation. - -### Packages -- Fetch now has a Gentoo/Funtoo e-build courtesy of **@z1lt0id** - -### Stdout -- Added `stdout` mode which allows you to fetch info in a plain text format that works - with lemonbar and in your scripts. You can use it by launching fetch with `--stdout` to print all - functions enabled in your `printinfo` function. You can selectively print functions by passing - arguments to `--stdout` like so: - -``` sh -# Print the output of all info functions enabled in printinfo -fetch --stdout - -# Print the output of memory -fetch --stdout memory - -# Print the output of memory and disk -fetch --stdout disk - -# Print the output of all functions excluding x -fetch --stdout --disable kernel packages gtktheme - -``` -- Added `--stdout_separator` and `$stdout_separator` which takes a string and adds it - as a separator between the output. -- Added `--stdout_title` and `$stdout_title` which allow you to toggle the `title@hostname` - from appearing in the output. -- Added `--stdout_subtitles` which allow you to toggle the `Info:` titles from appearing in - the output. - -``` sh -# Hiding subtitles -fetch --stdout --stdout_subtitles off - -# Custom separator -fetch --stdout disk gpu --stdout_separator " | " - -``` - -**NOTE:** `stdout_subtitles` and `stdout_title` only work when `--stdout` is used on its own -without any args. - -### Info -- You can now display info without a subtitle. eg. `info memory` -- Added `--disable` which allows you to stop an info line from appearing at launch. -- Added `--underline` and `$underline` which allow you to toggle visibility of the - underline at launch and in your config. - -``` sh -# Stop cpu, gpu, disk and shell functions from being called -fetch --disable cpu gpu disk shell -``` - -**Kernel:** Added `--kernel_shorthand` and `$kernel_shorthand` to print less or more kernel info -**Window Manager:** Added support for `$XINITRC` -**GTK:** Fix incorrect GTK3 theme being displayed -**CPU:** `cpu_shorthand`: New substitutions -**GPU:** `[Linux]` Count the number of identical GPUs. eg. `Nvidia Geforce GTX 970 x 2` -**Memory:** `[Mac OS X]` Added wired memory to memory usage. - -**Distro:** -- Added support for showing OS architecture. eg `Arch Linux x86_64`, `Windows 7 Ultimate 64-bit` [1] -- Mac OS X: Added support for showing Max OS X build version. [2] -- Windows: Distro now displays Windows edition. eg. `Windows 7 Ultimate` - -[1] You can toggle this using `--os_arch` and `$os_arch`. -[2] You can toggle it using `--osx_buildversion` and `$osx_buildversion`. - -**Shell:** -- Added `--shell_version` and `$shell_version` to hide/show your shell's version. -- Added `--shell_path` and `$shell_path` to hide/show the path to your shell - -**Birthday:** -- Added `birthday` which prints the age of your OS install. -- Added `--birthday_shorthand` and `$birthday_shorthand` to shorten/lengthen - the output of birthday. -- Added `--birthday_time` and `$birthday_time` to show/hide the time in the output. - -**Battery:** -- Added `battery` which prints the battery usage percentage for each battery - in your system. -- Linux: Added `battery_num` which allows you to choose which battery to display, - it also takes the value `all` which will print all batteries line by line. -- Linux: Added `battery_shorthand` which when set to `on` prints each battery on the - same line like so: - -``` sh -# battery_shorthand="on" -Battery: 10%, 5%, 67% - -# battery_shorthand="off" -Battery0: 10% -Battery1: 5% -Battery2: 67% - -# If there's only a single battery in the system -# we ommit the numbered title. -Battery: 10% -``` -- **NOTE:** This currently doesn't support BSD systems as we have no one to help us test - - See **[Issue #46](https://github.com/dylanaraps/fetch/issues/46)** - - -## [1.0] - 2016-01-27 - -# Fetch 1.0 - -There have been over **260** commits to master since I last made a release -and the script is at a point now where I can say that it's feature complete -so I'm releasing 1.0. The script now supports many more OS/distros and has -had lots of bug fixes, changes and features added. - -I'm probably missing a bunch of stuff from this changelog so if i've -forgotten anything, let me know! - -I'm also slowly adding pages to the wiki so check it out! - -# Here's what's new: -- Added full support for **Windows**, **BSD** and **Mac OS X**. -- Fetch is now MIT licensed -- Dropped the `.sh` from the filename and title. -- Dropped support for `mksh` so we can support some `bash` only features. -- Cleanup of everything -- Added `--prompt_height` and `$prompt_height` to fix the script going
- offscreen due to multi-line shell prompts. This option should be set to
- your prompt height in lines. -- The script now supports bash **4.0**. It turns out that we only
- supported bash **4.3** -- Restore cursor and clear screen on ctrl+c. -- Swap `tput` cmds for `ansi escape sequences` where possible. -- Added folds to make the script easier to navigate in *vim. -- Added `-F` to grep where possible for a speedup where possible. -- Fix whitespace issues with different distros. -- Remove uneeded `$` symbols. -- Remove double negative tests. -- Added note about needing `procps` or `procps-ng` for uptime support. -- Fix syntax errors in script and readme. -- All vars now use `on/off` instead of `1/0`. -- Quote things that should be quoted. - -**Linux:** -- Fix issues with `Elementary OS` and `CentOS`. - -**Mac OS X:** -- Added support for other package managers. -- Fix issue with multiple resolutions in `getresolution` - -**Windows:** -- Added `getvisualstyle` function to get the current Windows theme. -- Added `choclatey` support to package count. - -**BSD:** -- Fix tput commands not working on BSD - -## Info: - -As of commit 9daacdd the info array at the top of the script has changed -to a regular function. The benefits of this are pretty cool, you can now -use any bash syntax to customize what gets displayed. You could have an -if statment and only print window manager and gtk themes if X is running -or only show current song if there's one playing. - -You can see some examples and read more about it here: - -https://github.com/dylanaraps/fetch/wiki/Customizing-Info - -
- -**All:** -- All functions return `Unknown` or `None` instead of printing nothing.
- -**Title:** -- You can now color the `@` symbol in the title using `--at_color`,
- `$at_color` and `--colors x x x x x x`. - -**OS:** -- We now check `lsb_release` before looking inside of files, this fixes
- detection for some *buntu based distros. -- We now exit if the OS type wasn't detected. - -**Window Manager:** -- `wmctrl` is now used by default if found. - -**Uptime:** -- Added `--uptime_shorthand` and `$uptime_shorthand` to make the output
- of `uptime` smaller and prettier. -- Added new `--uptime_shorthand` and `$uptime_shorthand` value
- called `tiny`. This makes the output even tinier. eg. `1d 10h 32m` - -**GTK:** -- Added functions to get GTK Theme, Icons and Font -- Added `--gtk{2,3}` and `$gtk{2,3}` to enable/disable gtk2 or gtk3 from
- being displayed. -- Added `--gtk_shorthand` and `$gtk_shorthand` to make the output of
- `gtk*` smaller and prettier. - -**Packages:** -- Remove package version and color from `Pacman` output -- All distros are now wildcarded so that version numbers from
- `lsb_release` are ignored. - -**CPU:** -- Added more cpu speed types to `--speed_type` and `$speed_type`. -- Use `cpufreq` when available instead of hardcoding it for specific distros. - -**GPU:** - -See **[issue #21](https://github.com/dylanaraps/fetch/issues/21)** -- Added function to get the current Graphics Card. -- Added support for VirtualBox GPU. -- Added `--gpu_shorthand` and `$gpu_shorthand` to make the output of `gpu`
- smaller and prettier. - -**Disk:** - -See **[issue #27](https://github.com/dylanaraps/fetch/issues/27)** -- Added function to get current/total disk usage. - -**Song:** -- Added `cmus` support. - -## Images: -- Added support for **iTerm2's** image rendering. -- Added `--image_backend` and `$image_backend` to change which program
- is used to render the images. -- The image is now displayed **before** the text, this fixes image
- rendering issues with **vte** based terminal emulators. -- Added `$w3m_img_path` to set the location of `w3mimgdisplay`. -- Unified all image options, the new var `$image` takes these
- values: `wall`, `shuffle`, `path/to/img.png`, `off`. -- Added `shuffle` to image modes. The script can now pick a random
- image from a specified folder to display. You can pick the shuffle
- directory with `--shuffle_dir` and `$shuffle_dir` -- Fixed images getting cut off at the top. -- Added image size to filename which allowed us to remove a _really_
- slow check. - -**Wallpaper:** -- Added `nitrogen` and `gsettings` support. -- Added wallpaper support to `Mac OS X` and `Windows`. -- Fix hang when wallpaper isn't found. -- We now check to see that `feh` set the wallpaper. -- Fixed wallpapers with spaces in the filename. -- `wall` is now the default image source. - -## Screenshot: - -The script can now take a screenshot on script finish. You can use -the flags `--scrot` or `-s` to take a screenshot. - -`--scrot` and `-s` can also take a path/filename so you can choose -where and what to name the file at launch. - -If left empty `--scrot` and `-s` will use `$scrot_dir` and -`$scrot_name` when saving the screenshot. - -By default the script uses `scrot` as the screenshot program. -You can use the launch flag `--scrot_cmd` or the option `$srot_cmd` -to set the program to use to take the screenshot. - -## Wiki: - -Added `Customizing Info` page which has info/examples about -the new printinfo function. - -https://github.com/dylanaraps/fetch/wiki/Customizing-Info - -Added `Customization` which lists all options and their values. - -https://github.com/dylanaraps/fetch/wiki/Customization - - -## [0.2.1] - 2016-01-04 - -Here's what's new: -- Mac OS X support (It's done now) -- Resolution Detection (Off by default) -- Song info is now off by default. -- You can now display the image on the right with: - - `--image_position left/right` -- Fixed bug with multiple colons -- Fixed underlines not being drawn the full width. -- Functions now fallback to "Unknown" instead of printing nothing. -- `getos` now gets os type and `getdistro` gets the distro. - - This makes it even easier to add other os types. - -Here's what I'm working on: -- Finishing OpenBSD support -- Cygwin support - -Enjoy - - -## [0.2] - 2016-01-03 - -I finished my rewrite! - -## Here's what's new: -- The script is now way faster. -- You can now pick what gets displayed and where using an array - at the top of the script. This also allows you to: - - underline anything - - print custom info - - print a custom title - - add linebreaks -- Mac OS X support and a base that allows us to add other OS later. -- You can now specify split size. -- Fixed issue with 2 line prompts -- Fixed image not displaying in vte based terminals -- Move all config options to the top of the script -- Moved almost everything to a function. -- Removed wmctrl dependency -- Made variable names more consistent -- Added shell substitution for cpu output. This means - that the cpu output won't include: (tm) (r) "Processor" "CPU" -- Optimized all get\* functions -- Use variable substitution where possible as it's faster than sed/awk -- Moved crop and smart_crop to crop_mode -- Removed --size and --padding in favor of --split_size - -## Here's what I'm currently working on: -- Window support (I'm almost done) -- Option to swap the image and text around -- Imagemagick optimizations -- Cleanup of info array handling -- More info outputs. Now that it's easy to customize what's printed and - everything is a function we can add optional support for pretty much anything. - - Resolution - - GTK themes - - Terminal Font - - GPU - - IP - - etc - -## Issues: -- Uptime doesn't work in OS X yet. -- If the customizable info includes a third colon then it breaks. - -I'd love to hear your thoughts. - - -## 0.1 - 2015-12-31 - -Changelog: -- Added flag to disable bold text `--nobold` -- Added flag to disable text wrapping `--nowrap` -- Moved to using only printf instead of a mix of echo/printf -- The script now aligns the cursor to the bottom of the - terminal instead of using a hardcoded amount of newlines -- Image size and padding is now dynamic, the only difference on the user - side is that instead of setting a long line of spaces as - padding, you set your font width. This means that you set the - var once and the script will just work at any window size. -- You can disable dynamic images and go back to the old - behaviour with by using the `--size` or the in config var. - $img_auto -- Manual padding now takes a count, so `--padding 10` will pad - the text 10 spaces. -- tput is now a dependency because we need (tput cols/lines/cup) - for the dynamic images and it allows us to support more terminals. -- Color block width can now be changed with the flag `--blockwidth`. - It takes a count like `--padding` so `--blockwidth 10` will make - the color blocks 10 spaces wide. - -Let me know if you're having issues. - - -[Unreleased]: https://github.com/dylanaraps/neofetch/compare/5.0.0...HEAD -[5.0.0]: https://github.com/dylanaraps/neofetch/compare/4.0.2...5.0.0 -[4.0.2]: https://github.com/dylanaraps/neofetch/compare/4.0.1...4.0.2 -[4.0.1]: https://github.com/dylanaraps/neofetch/compare/4.0.0...4.0.1 -[4.0.0]: https://github.com/dylanaraps/neofetch/compare/3.4.0...4.0.0 -[3.4.0]: https://github.com/dylanaraps/neofetch/compare/3.3.0...3.4.0 -[3.3.0]: https://github.com/dylanaraps/neofetch/compare/3.2.0...3.3.0 -[3.2.0]: https://github.com/dylanaraps/neofetch/compare/3.1.0...3.2.0 -[3.1.0]: https://github.com/dylanaraps/neofetch/compare/3.0.1...3.1.0 -[3.0.1]: https://github.com/dylanaraps/neofetch/compare/3.0...3.0.1 -[3.0]: https://github.com/dylanaraps/neofetch/compare/2.0.2...3.0 -[2.0.2]: https://github.com/dylanaraps/neofetch/compare/2.0.1...2.0.2 -[2.0.1]: https://github.com/dylanaraps/neofetch/compare/2.0...2.0.1 -[2.0]: https://github.com/dylanaraps/neofetch/compare/1.9.1...2.0 -[1.9.1]: https://github.com/dylanaraps/neofetch/compare/1.9...1.9.1 -[1.9]: https://github.com/dylanaraps/neofetch/compare/1.8.1...1.9 -[1.8.1]: https://github.com/dylanaraps/neofetch/compare/1.8...1.8.1 -[1.8]: https://github.com/dylanaraps/neofetch/compare/1.7...1.8 -[1.7]: https://github.com/dylanaraps/neofetch/compare/1.6...1.7 -[1.6]: https://github.com/dylanaraps/neofetch/compare/1.5...1.6 -[1.5]: https://github.com/dylanaraps/neofetch/compare/1.4...1.5 -[1.4]: https://github.com/dylanaraps/neofetch/compare/1.3...1.4 -[1.3]: https://github.com/dylanaraps/neofetch/compare/1.2...1.3 -[1.2]: https://github.com/dylanaraps/neofetch/compare/1.1...1.2 -[1.1]: https://github.com/dylanaraps/neofetch/compare/1.0...1.1 -[1.0]: https://github.com/dylanaraps/neofetch/compare/0.2.1...1.0 -[0.2.1]: https://github.com/dylanaraps/neofetch/compare/0.2...0.2.1 -[0.2]: https://github.com/dylanaraps/neofetch/compare/0.1...0.2 From e960c5168654211a8429e8089ba160e3cc89dc37 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 8 Mar 2020 16:13:19 +0200 Subject: [PATCH 0920/1133] neofetch: Fix uptime seconds on Linux. Closes #1422 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 1bcb1a109..614d51e7e 100755 --- a/neofetch +++ b/neofetch @@ -1396,7 +1396,7 @@ get_uptime() { uptime=${d:+$d, }${h:+$h, }$m uptime=${uptime%', '} - uptime=${uptime:-$seconds secs} + uptime=${uptime:-$s secs} # Make the output of uptime smaller. case $uptime_shorthand in From e09146142f9abdf0ecf0badc4e3c3a5e3c51c23a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 8 Mar 2020 17:42:00 +0200 Subject: [PATCH 0921/1133] neofetch: Prefer lsb-release --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 614d51e7e..0a25c0b1c 100755 --- a/neofetch +++ b/neofetch @@ -979,8 +979,8 @@ get_distro() { -f /etc/lsb-release ]]; then # Source the os-release file - for file in /usr/lib/os-release /etc/os-release \ - /etc/openwrt_release /etc/lsb-release; do + for file in /etc/lsb-release /usr/lib/os-release \ + /etc/os-release /etc/openwrt_release; do source "$file" && break done From 5241b24bf4e8c21ba5a4eaf3464102d8316b2b76 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 9 Mar 2020 10:58:31 +0200 Subject: [PATCH 0922/1133] neofetch: Enable DE version by default --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 0a25c0b1c..88ce69651 100755 --- a/neofetch +++ b/neofetch @@ -398,10 +398,10 @@ public_ip_timeout=2 # Show Desktop Environment version # -# Default: 'off' +# Default: 'on' # Values: 'on', 'off' # Flag: --de_version -de_version="off" +de_version="on" # Disk From 07a9bcdd3cfb6e9642744a7a280e0a2a54dccf44 Mon Sep 17 00:00:00 2001 From: Mitch Weaver Date: Thu, 12 Mar 2020 03:39:35 -0500 Subject: [PATCH 0923/1133] detect whether using -current on OpenBSD change name to please shellhcheck sorry shellcheck... --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index 88ce69651..ce9b3478d 100755 --- a/neofetch +++ b/neofetch @@ -1032,6 +1032,11 @@ get_distro() { *) distro="Guix System $(guix system -V | awk 'NR==1{printf $5}')" esac + # Display whether using '-current' or '-release' on OpenBSD. + elif [[ $kernel_name = OpenBSD ]] ; then + read -ra kernel_info <<< "$(sysctl -n kern.version)" + distro=${kernel_info[*]:0:2} + else for release_file in /etc/*-release; do distro+=$(< "$release_file") From b9ca399ff6d3b938d779bbda9fe739d9b02042b6 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 29 Mar 2020 14:04:30 +0200 Subject: [PATCH 0924/1133] os: Add OpenStage Linux --- neofetch | 27 +++++++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index ce9b3478d..c9b687828 100755 --- a/neofetch +++ b/neofetch @@ -769,7 +769,7 @@ image_source="auto" # LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, # Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, # Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -# NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, +# NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, OpenStage, # OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, # Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, # PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, @@ -4833,7 +4833,7 @@ ASCII: LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, - NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, + NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, @@ -8174,6 +8174,29 @@ ${c1} `````` EOF ;; + "OpenStage"*) + set_colors 2 + read -rd '' ascii_data <<'EOF' +${c1} /(/ + .(((((((, + /(((((((((/ + .(((((/,/(((((, + *(((((* ,(((((/ + (((((* .*/(( + *((((/ (//(/* + /((((* ((((((((((, + . /((((* (((((((((((((. + ((. *((((/ ,(((((((( + ,(((/ (((((/ ** ,((((((* + /(((((. .(((((/ //(((* *(((((/ + .(((((, ((/ .(((((/. .(((((, + /((((* ,(((((((/ ,((((( + /(((((((((((((((((((/. /(((((((((/ + /(((((((((((((((((, /(((((((((((/ + */(((((//*. */((/(/(/* +EOF + ;; + "OpenWrt"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From d9389a1f5188504fa26e1e182cd3b1e91bb7d168 Mon Sep 17 00:00:00 2001 From: Mark Barbone Date: Mon, 30 Mar 2020 04:26:13 -0400 Subject: [PATCH 0925/1133] Change order GTK3 settings.ini files are read --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index c9b687828..5359f8113 100755 --- a/neofetch +++ b/neofetch @@ -2984,11 +2984,11 @@ get_style() { elif type -p gsettings >/dev/null; then gtk3_theme="$(gsettings get org.gnome.desktop.interface "$gsettings")" - elif [[ -f "/usr/share/gtk-3.0/settings.ini" ]]; then - gtk3_theme="$(grep "^[^#]*$name" /usr/share/gtk-3.0/settings.ini)" - elif [[ -f "/etc/gtk-3.0/settings.ini" ]]; then gtk3_theme="$(grep "^[^#]*$name" /etc/gtk-3.0/settings.ini)" + + elif [[ -f "/usr/share/gtk-3.0/settings.ini" ]]; then + gtk3_theme="$(grep "^[^#]*$name" /usr/share/gtk-3.0/settings.ini)" fi gtk3_theme="${gtk3_theme/${name}*=}" From 16cf4fd4c6b16a08a341014fc2196b57bd7859d0 Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Wed, 1 Apr 2020 20:21:26 -0500 Subject: [PATCH 0926/1133] neofetch/aosc: split AOSC OS and AOSC OS/Retro --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 5359f8113..e4cd3c88d 100755 --- a/neofetch +++ b/neofetch @@ -753,8 +753,8 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, -# Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, +# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", +# "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, # XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, # BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, # BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, @@ -4817,8 +4817,8 @@ ASCII: --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro's ascii art to print - NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, - Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, + NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", + "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, From f2baf51fc18c2995e80895eb0abeec15dd494108 Mon Sep 17 00:00:00 2001 From: Mingcong Bai Date: Wed, 1 Apr 2020 20:21:55 -0500 Subject: [PATCH 0927/1133] neofetch: add AOSC OS/Retro logo --- neofetch | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e4cd3c88d..128c9b026 100755 --- a/neofetch +++ b/neofetch @@ -5393,7 +5393,31 @@ ${c1} EOF ;; - "AOSC"*) + "AOSC OS/Retro"*) + set_colors 4 7 1 3 + read -rd '' ascii_data <<'EOF' +${c2} ......... + ................... + .....................${c1}################${c2} + .............. ....${c1}################${c2} +.............. ...${c1}################${c2} +............. ..${c1}****************${c2} +............ . .${c1}****************${c2} +........... ... ${c1}................${c2} +.......... ..... ${c1}...............${c2} +......... ....... ... + .${c3}...... ${c2}. + ${c3}..... .....${c2}.... ${c4}........... + ${c3}.... ......${c2}. ${c4}........... + ${c3}... ....... ${c4}........... + ${c3}................ ${c4}*********** + ${c3}................ ${c4}########### + ${c3}**************** + ${c3}################ +EOF + ;; + + "AOSC OS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c2} .:+syhhhhys+:. From a24fa712dd9ea7d44eecf72adccdc1ba3040bbf0 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 10 Apr 2020 21:09:07 +0200 Subject: [PATCH 0928/1133] os: Add openmamba --- neofetch | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 5359f8113..24801a4de 100755 --- a/neofetch +++ b/neofetch @@ -769,8 +769,8 @@ image_source="auto" # LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, # Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, # Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -# NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, OpenStage, -# OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, +# NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, +# OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, # Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, # PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, @@ -4833,8 +4833,8 @@ ASCII: LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, - NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, OpenStage, - OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, + NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, + OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, @@ -8145,6 +8145,32 @@ h+` `.-:+oyyyo/-` EOF ;; + "openmamba"*) + set_colors 7 2 + read -rd '' ascii_data <<'EOF' +${c1} ````` + .-/+ooooooooo+/:-` + ./ooooooooooooooooooo+:. + -+oooooooooooooooooooooooo+- + .+ooooooooo+/:---::/+ooooooooo+. + :oooooooo/-` `-/oo${c2}s´${c1}oooo.${c2}s´${c1} + :ooooooo/` `${c2}sNds${c1}ooo${c2}sNds${c1} + -ooooooo- ${c2}:dmy${c1}ooo${c2}:dmy${c1} + +oooooo: :oooooo- +.ooooooo .://:` +:oooooo+ ./+o+:` +-ooooooo` `oooooo+ +`ooooooo: /oooooo+ + -ooooooo: :ooooooo. + :ooooooo+. .+ooooooo: + :oooooooo+-` `-+oooooooo: + .+ooooooooo+/::::://oooooooooo+. + -+oooooooooooooooooooooooo+- + .:ooooooooooooooooooo+:. + `-:/ooooooooo+/:.` + `````` +EOF + ;; "OpenMandriva"*) set_colors 4 From d7b37b4c450a23103dc8f929d03468558b67f4e6 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 10 Apr 2020 21:20:44 +0200 Subject: [PATCH 0929/1133] docs: update --- neofetch.1 | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 8acb29214..45cd4d6ab 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.12. -.TH NEOFETCH "1" "January 2020" "Neofetch 7.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. +.TH NEOFETCH "1" "April 2020" "Neofetch 7.0.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -40,6 +40,9 @@ For example: 'info "Memory" memory' would be '\-\-disable memory' .IP NOTE: You can supply multiple args. eg. 'neofetch \fB\-\-disable\fR cpu gpu' .TP +\fB\-\-title_fqdn\fR on/off +Hide/Show Fully Qualified Domain Name in title. +.TP \fB\-\-package_managers\fR on/off Hide/Show Package Manager names . (on, tiny, off) .TP @@ -300,8 +303,8 @@ Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -NuTyX, OBRevenge, OpenBSD, OpenIndiana, OpenMandriva, -OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, +NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, +OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, From 23c445d05f9359877d0cdc3e18615723214e8257 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 15 Apr 2020 15:21:53 +0300 Subject: [PATCH 0930/1133] neofetch: Drop . outside of iOS for oil shell --- neofetch | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/neofetch b/neofetch index 4ccf4ae98..fbe07c65a 100755 --- a/neofetch +++ b/neofetch @@ -903,24 +903,24 @@ get_os() { # $kernel_name is set in a function called cache_uname and is # just the output of "uname -s". case $kernel_name in - Darwin): "$darwin_name" ;; - SunOS): Solaris ;; - Haiku): Haiku ;; - MINIX): MINIX ;; - AIX): AIX ;; - IRIX*): IRIX ;; - FreeMiNT): FreeMiNT ;; + Darwin) os=$darwin_name ;; + SunOS) os=Solaris ;; + Haiku) os=Haiku ;; + MINIX) os=MINIX ;; + AIX) os=AIX ;; + IRIX*) os=IRIX ;; + FreeMiNT) os=FreeMiNT ;; Linux|GNU*) - : Linux + os=Linux ;; *BSD|DragonFly|Bitrig) - : BSD + os=BSD ;; CYGWIN*|MSYS*|MINGW*) - : Windows + os=Windows ;; *) @@ -929,8 +929,6 @@ get_os() { exit 1 ;; esac - - os=$_ } get_distro() { @@ -1425,7 +1423,7 @@ get_packages() { # dir: Count files or dirs in a glob. # pac: If packages > 0, log package manager name. # tot: Count lines in command output. - has() { type -p "$1" >/dev/null && manager=$_; } + has() { type -p "$1" >/dev/null && manager=$1; } dir() { ((packages+=$#)); pac "$#"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")";((packages+=${#pkgs[@]}));pac "${#pkgs[@]}";} From e1af688b36ef3fdae795c5280971fa1eafd6d356 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 15 Apr 2020 15:25:20 +0300 Subject: [PATCH 0931/1133] neofetch: Fix incorrect variable name --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index fbe07c65a..5cbfdd4dc 100755 --- a/neofetch +++ b/neofetch @@ -1727,7 +1727,7 @@ get_wm() { # If function was run, stop here. ((wm_run == 1)) && return - case $uname in + case $kernel_name in *OpenBSD*) ps_flags=(x -c) ;; *) ps_flags=(-e) ;; esac From 12f8cb9189b23dcf50609e00a4b1c13a380d2bed Mon Sep 17 00:00:00 2001 From: ignapk Date: Tue, 14 Apr 2020 20:17:58 +0200 Subject: [PATCH 0932/1133] os: Add GNOME OS --- neofetch | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 5cbfdd4dc..eb55fd563 100755 --- a/neofetch +++ b/neofetch @@ -763,7 +763,7 @@ image_source="auto" # DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, -# gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +# gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, # Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, # Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, # LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, @@ -4825,7 +4825,7 @@ ASCII: DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, - gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, + gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, @@ -6980,6 +6980,33 @@ ollllllh +llllllllllll+ hllllllo EOF ;; + "GNOME"*) + set_colors 4 + read -rd '' ascii_data <<'EOF' +${c1} ,@@@@@@@@, + @@@@@@ @@@@@@@@@@@@ + ,@@. @@@@@@@ *@@@@@@@@@@@@ + @@@@@% @@@@@@( @@@@@@@@@@@& + @@@@@@ @@@@* @@@@@@@@@# +@@@@* @@@@, *@@@@@% +@@@@@. + @@@@# @@@@@@@@@@@@@@@@ + ,@@@@@@@@@@@@@@@@@@@@@@@, + ,@@@@@@@@@@@@@@@@@@@@@@@@@@& + .@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@( + @@@@@@@@@@@@@@@@@@@@% + @@@@@@@@@@@@@@@@ + @@@@@@@@@@@@* @@@@@@@@/ + &@@@@@@@@@@ @@@@@@@@@* + @@@@@@@@@@@, @@@@@@@@@* + ,@@@@@@@@@@@@@@@@@@@@& + &@@@@@@@@@@@@@@ + ... +EOF + ;; + "GNU") set_colors fg 7 read -rd '' ascii_data <<'EOF' From fbe6666aa438da76f804876c2dedaca44e91a735 Mon Sep 17 00:00:00 2001 From: ignapk Date: Tue, 14 Apr 2020 20:18:18 +0200 Subject: [PATCH 0933/1133] Update man page --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index 45cd4d6ab..1b45673d0 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -297,7 +297,7 @@ Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, -gNewSense, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +gNewSense, GNOMEOS, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, From ff6d59ef0c790648973708fe595ae64a9bb7eb0d Mon Sep 17 00:00:00 2001 From: Crestwave Date: Thu, 16 Apr 2020 08:01:16 +0800 Subject: [PATCH 0934/1133] neofetch: add support for OSH --- neofetch | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 5cbfdd4dc..4c12b86c1 100755 --- a/neofetch +++ b/neofetch @@ -30,7 +30,14 @@ version=7.0.0 -bash_version=${BASH_VERSION/.*} +if [[ "$BASH_VERSION" ]]; then + bash_version=${BASH_VERSION/.*} +else + BASH_VERSION=$(bash -c "printf %s \"\$BASH_VERSION\"") + bash_version=5 + shopt -s eval_unsafe_arith +fi + sys_locale=${LANG:-C} XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-${HOME}/.config} PATH=$PATH:/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec @@ -1593,6 +1600,10 @@ get_shell() { shell=${shell/version} ;; + osh) + shell+=$("$SHELL" -c "printf %s \"\$OIL_VERSION\"") + ;; + tcsh) shell+=$("$SHELL" -c "printf %s \$tcsh") ;; @@ -2338,7 +2349,7 @@ get_gpu() { { unset -v gpu; continue; } case $gpu in - *"advanced"*) + *"Advanced"*) brand="${gpu/*AMD*ATI*/AMD ATI}" brand="${brand:-${gpu/*AMD*/AMD}}" brand="${brand:-${gpu/*ATI*/ATi}}" @@ -2352,13 +2363,13 @@ get_gpu() { gpu="$brand $gpu" ;; - *"nvidia"*) + *"NVIDIA"*) gpu="${gpu/*\[}" gpu="${gpu/\]*}" gpu="NVIDIA $gpu" ;; - *"intel"*) + *"Intel"*) gpu="${gpu/*Intel/Intel}" gpu="${gpu/\(R\)}" gpu="${gpu/Corporation}" @@ -2369,7 +2380,7 @@ get_gpu() { [[ -z "$(trim "$gpu")" ]] && gpu="Intel Integrated Graphics" ;; - *"virtualbox"*) + *"VirtualBox"*) gpu="VirtualBox Graphics Adapter" ;; @@ -4261,7 +4272,11 @@ info() { [[ "$prin" ]] && return # Update the variable. - output="$(trim "${!2:-${!1}}")" + if [[ "$2" ]]; then + output="$(trim "${!2}")" + else + output="$(trim "${!1}")" + fi if [[ "$2" && "${output// }" ]]; then prin "$1" "$output" From c2fcf35ab1a103065c0804b0bd9874f5052932eb Mon Sep 17 00:00:00 2001 From: Crestwave Date: Thu, 16 Apr 2020 09:52:25 +0800 Subject: [PATCH 0935/1133] neofetch: only fork for {BASH,OIL}_VERSION when necessary --- neofetch | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 4c12b86c1..234a79073 100755 --- a/neofetch +++ b/neofetch @@ -33,7 +33,6 @@ version=7.0.0 if [[ "$BASH_VERSION" ]]; then bash_version=${BASH_VERSION/.*} else - BASH_VERSION=$(bash -c "printf %s \"\$BASH_VERSION\"") bash_version=5 shopt -s eval_unsafe_arith fi @@ -1590,7 +1589,11 @@ get_shell() { [[ $shell_version != on ]] && return case ${shell_name:=${SHELL##*/}} in - bash) shell+=${BASH_VERSION/-*} ;; + bash) + [[ $BASH_VERSION ]] || + BASH_VERSION=$("$SHELL" -c "printf %s \"\$BASH_VERSION\"") + shell+=${BASH_VERSION/-*} + ;; sh|ash|dash) ;; @@ -1601,7 +1604,11 @@ get_shell() { ;; osh) - shell+=$("$SHELL" -c "printf %s \"\$OIL_VERSION\"") + if [[ $OIL_VERSION ]]; then + shell+=$OIL_VERSION + else + shell+=$("$SHELL" -c "printf %s \"\$OIL_VERSION\"") + fi ;; tcsh) From 8e56495da8fa3557de47be60facddc670a41947a Mon Sep 17 00:00:00 2001 From: Crestwave Date: Thu, 16 Apr 2020 09:57:39 +0800 Subject: [PATCH 0936/1133] neofetch: remove unnecessary(?) parameter expansion and BASH_VERSINFO --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 234a79073..9d92964ef 100755 --- a/neofetch +++ b/neofetch @@ -30,8 +30,8 @@ version=7.0.0 -if [[ "$BASH_VERSION" ]]; then - bash_version=${BASH_VERSION/.*} +if [[ "${BASH_VERSINFO[0]}" ]]; then + bash_version=${BASH_VERSINFO[0]} else bash_version=5 shopt -s eval_unsafe_arith @@ -3992,7 +3992,7 @@ get_window_size() { # # False positive. # shellcheck disable=2141 - case ${BASH_VERSINFO[0]} in + case $bash_version in 4|5) IFS=';t' read -d t -t 0.05 -sra term_size ;; *) IFS=';t' read -d t -t 1 -sra term_size ;; esac @@ -4240,7 +4240,7 @@ display_image() { # Add a tiny delay to fix issues with images not # appearing in specific terminal emulators. - ((BASH_VERSINFO[0]>3)) && sleep 0.05 + ((bash_version>3)) && sleep 0.05 printf '%b\n%s;\n%s\n' "0;1;$xoffset;$yoffset;$width;$height;;;;;$image" 3 4 |\ "${w3m_img_path:-false}" -bg "$background_color" &>/dev/null ;; From 2943116dd552783f51303d5d08ab92b95f9ef806 Mon Sep 17 00:00:00 2001 From: Crestwave Date: Thu, 16 Apr 2020 14:47:13 +0800 Subject: [PATCH 0937/1133] neofetch: clean up --- neofetch | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 9d92964ef..5b3362d1f 100755 --- a/neofetch +++ b/neofetch @@ -30,13 +30,8 @@ version=7.0.0 -if [[ "${BASH_VERSINFO[0]}" ]]; then - bash_version=${BASH_VERSINFO[0]} -else - bash_version=5 - shopt -s eval_unsafe_arith -fi - +bash_version=${BASH_VERSINFO[0]:-5} +shopt -s eval_unsafe_arith &>/dev/null sys_locale=${LANG:-C} XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-${HOME}/.config} PATH=$PATH:/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec From b441c57aeac0359ad9fe9fa4c35fe2020a317466 Mon Sep 17 00:00:00 2001 From: Crestwave Date: Thu, 16 Apr 2020 14:56:45 +0800 Subject: [PATCH 0938/1133] neofetch: add comments --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index 5b3362d1f..fcd2d219b 100755 --- a/neofetch +++ b/neofetch @@ -30,6 +30,8 @@ version=7.0.0 +# Fallback to a value of '5' for shells which support bash +# but do not set the 'BASH_' shell variables (osh). bash_version=${BASH_VERSINFO[0]:-5} shopt -s eval_unsafe_arith &>/dev/null sys_locale=${LANG:-C} From d0d6d208b0cc4b0000d3045108d56b8af7ad16bb Mon Sep 17 00:00:00 2001 From: Crestwave Date: Thu, 16 Apr 2020 15:00:12 +0800 Subject: [PATCH 0939/1133] neofetch: clean up --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index fcd2d219b..050eb60d1 100755 --- a/neofetch +++ b/neofetch @@ -34,6 +34,7 @@ version=7.0.0 # but do not set the 'BASH_' shell variables (osh). bash_version=${BASH_VERSINFO[0]:-5} shopt -s eval_unsafe_arith &>/dev/null + sys_locale=${LANG:-C} XDG_CONFIG_HOME=${XDG_CONFIG_HOME:-${HOME}/.config} PATH=$PATH:/usr/xpg4/bin:/usr/sbin:/sbin:/usr/etc:/usr/libexec @@ -1589,6 +1590,7 @@ get_shell() { bash) [[ $BASH_VERSION ]] || BASH_VERSION=$("$SHELL" -c "printf %s \"\$BASH_VERSION\"") + shell+=${BASH_VERSION/-*} ;; From ff5600a3ec4832ea3a31e705e1c6d83dc1a75dd8 Mon Sep 17 00:00:00 2001 From: Morgaux <34286986+Morgaux@users.noreply.github.com> Date: Fri, 17 Apr 2020 05:21:01 +1200 Subject: [PATCH 0940/1133] Correct spelling --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index e2412109a..a1d5ef192 100755 --- a/neofetch +++ b/neofetch @@ -1689,7 +1689,7 @@ get_de() { # When a window manager is started from a display manager # the desktop variables are sometimes also set to the # window manager name. This checks to see if WM == DE - # and dicards the DE value. + # and discards the DE value. [[ $de == "$wm" ]] && { unset -v de; return; } ;; esac @@ -5200,7 +5200,7 @@ get_simple() { } old_functions() { - # Removed functions for backwards compatability. + # Removed functions for backwards compatibility. get_line_break() { :; } } From 2eae510bd9b6efd05725738a281b083f50624788 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 19 Apr 2020 12:01:41 +0300 Subject: [PATCH 0941/1133] docs: update --- .travis.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index f313c14a7..60c4a7303 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,13 +9,6 @@ before_install: - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install screenresolution; fi -install: - # Install a custom version of shellcheck instead of Travis CI's default - - scversion="latest" # or "v0.4.7", or "latest" - - wget "https://storage.googleapis.com/shellcheck/shellcheck-${scversion}.linux.x86_64.tar.xz" - - tar --xz -xvf "shellcheck-${scversion}.linux.x86_64.tar.xz" - - shellcheck() { "shellcheck-${scversion}/shellcheck" "$@"; } - script: - time ./neofetch --travis -v - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then shellcheck -e SC2244 -e SC2243 neofetch; fi From a61724f6b28b6285a003e403c184b5a5a2e155c9 Mon Sep 17 00:00:00 2001 From: Hayao0819 Date: Sun, 19 Apr 2020 21:02:20 +0900 Subject: [PATCH 0942/1133] Added support for Alter Linux and Serene Linux (#1447) * neofetch : Added alterlinux logo. * os: Added SereneLinux * Added Serene Linux and Alter Linux to the description * Added Serene Linux and Alter Linux to help message * Added Serene Linux and Alter Linux to man --- neofetch | 70 +++++++++++++++++++++++++++++++++++++++++++++++------- neofetch.1 | 8 +++---- 2 files changed, 65 insertions(+), 13 deletions(-) diff --git a/neofetch b/neofetch index a1d5ef192..98a017b50 100755 --- a/neofetch +++ b/neofetch @@ -757,7 +757,7 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", +# NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, "AOSC OS", # "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, # XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, # BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, @@ -778,9 +778,9 @@ image_source="auto" # Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, # PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, -# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, -# SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, -# Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, +# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +# SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, +# Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, # Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, # Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX @@ -4836,9 +4836,9 @@ ASCII: --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro's ascii art to print - NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", - "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, - XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, + NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, + "AOSC OS", "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, + ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, @@ -4858,8 +4858,8 @@ ASCII: PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, - SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, - Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, + SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, + Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX @@ -5273,6 +5273,32 @@ hdddyo+ohddyosdddddddddho+oydddy++ohdddh EOF ;; + "Alter"*) + set_colors 6 6 + read -rd '' ascii_data <<'EOF' +${c1} %, + ^WWWw + 'wwwwww + !wwwwwwww + #`wwwwwwwww + @wwwwwwwwwwww + wwwwwwwwwwwwwww + wwwwwwwwwwwwwwwww + wwwwwwwwwwwwwwwwwww + wwwwwwwwwwwwwwwwwwww, + w~1i.wwwwwwwwwwwwwwwww, + 3~:~1lli.wwwwwwwwwwwwwwww. + :~~:~?ttttzwwwwwwwwwwwwwwww + #<~:~~~~?llllltO-.wwwwwwwwwww + #~:~~:~:~~?ltlltlttO-.wwwwwwwww + @~:~~:~:~:~~(zttlltltlOda.wwwwwww + @~:~~: ~:~~:~:(zltlltlO a,wwwwww + 8~~:~~:~~~~:~~~~_1ltltu ,www + 5~~:~~:~~:~~:~~:~~~_1ltq N,, + g~:~~:~~~:~~:~~:~:~~~~1q N, +EOF + ;; + "Amazon"*) set_colors 3 7 read -rd '' ascii_data <<'EOF' @@ -9221,6 +9247,32 @@ yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy EOF ;; + "Serene"*) + set_colors 6 6 + read -rd '' ascii_data <<'EOF' +${c1} __---''''''---__ + . . + : : + - _______----_- + s __----''' __---- + __h_ _-' _-' h + '-._''--.._ ; _-' y + : ''-._ '-._/ _-' : + y ':_ _--'' y + m .--'' '-._.;' m + m : : m + y '.._ '-__ y + : '--._ '''----___ : + y '--._ ''-- _ y + h '--._ : h + s __'; vs + - __..--'' - + :_..--'' : + . _ . + `''---______---''-`` +EOF + ;; + "SharkLinux"*) set_colors 4 7 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index 1b45673d0..22d21105d 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -287,8 +287,8 @@ Colors to print the ascii art \fB\-\-ascii_distro\fR distro Which Distro's ascii art to print .TP -NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, AOSC, -Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, +NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, +AOSC, Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, @@ -309,8 +309,8 @@ Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, -SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, -Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, +SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, +Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX From c85509f838eeb107a48190d982c9886714787a22 Mon Sep 17 00:00:00 2001 From: Shantanu Joshi Date: Fri, 24 Apr 2020 22:06:33 +0530 Subject: [PATCH 0943/1133] WM: Add support for xmonad (#1451) * WM: add xmonad * Fix shellcheck warning --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 98a017b50..c386112ef 100755 --- a/neofetch +++ b/neofetch @@ -1798,7 +1798,8 @@ get_wm() { -e "[d]wm" \ -e "[2]bwm" \ -e "[m]onsterwm" \ - -e "[t]inywm") + -e "[t]inywm" \ + -e "[x]monad") else case $os in @@ -4837,7 +4838,7 @@ ASCII: --ascii_distro distro Which Distro's ascii art to print NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, - "AOSC OS", "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, + \"AOSC OS\", \"AOSC OS/Retro\", Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, From a1f80c3a613692c9e727e8cef67d729e2f335e82 Mon Sep 17 00:00:00 2001 From: Erick Cafferata Date: Fri, 1 May 2020 14:25:05 -0500 Subject: [PATCH 0944/1133] distro: speed up guix lookup (#1452) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c386112ef..37d829001 100755 --- a/neofetch +++ b/neofetch @@ -1031,7 +1031,7 @@ get_distro() { elif type -p guix >/dev/null; then case $distro_shorthand in on|tiny) distro="Guix System" ;; - *) distro="Guix System $(guix system -V | awk 'NR==1{printf $5}')" + *) distro="Guix System $(guix -V | awk 'NR==1{printf $4}')" esac # Display whether using '-current' or '-release' on OpenBSD. From 1c2b5ff624cbe655c141b4be7a747c35637bc87c Mon Sep 17 00:00:00 2001 From: Noah Cain Date: Sun, 3 May 2020 12:48:38 -0700 Subject: [PATCH 0945/1133] Update neofetch (#1454) --- neofetch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/neofetch b/neofetch index 37d829001..f2577883d 100755 --- a/neofetch +++ b/neofetch @@ -6424,6 +6424,30 @@ o/${c2}--...::-:/::/:-......-::::::-/-...-${c1}:/o `.-://++++++//:-.` EOF ;; + + "dahlia"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} + .#. + *%@@@%* + .,,,,,(&@@@@@@@&/,,,,,. + ,#@@@@@@@@@@@@@@@@@@@@@#. + ,#@@@@@@@&#///#&@@@@@@@#. + ,/%&@@@@@%/, .,(%@@@@@&#/. + *#&@@@@@@#,. .*#@@@@@@&#, + .&@@@@@@@@@( .(@@@@@@@@@&&. +#@@@@@@@@@@( )@@@@@@@@@@@# + °@@@@@@@@@@( .(@@@@@@@@@@@° + *%@@@@@@@(. ,#@@@@@@@%* + ,(&@@@@@@%*. ./%@@@@@@%(, + ,#@@@@@@@&(***(&@@@@@@@#. + ,#@@@@@@@@@@@@@@@@@@@@@#. + ,*****#&@@@@@@@&(*****, + ,/%@@@%/. + ,#, +EOF + ;; "debian_small") set_colors 1 7 3 From 51e0237f86d98f991d954c6433a7c2b2bd2a18fb Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 3 May 2020 22:53:20 +0300 Subject: [PATCH 0946/1133] neofetch: Fix CI --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index a1d5ef192..1453723ad 100755 --- a/neofetch +++ b/neofetch @@ -758,9 +758,9 @@ image_source="auto" # Values: 'auto', 'distro_name' # Flag: --ascii_distro # NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", -# "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, -# XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, -# BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, +# "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, +# ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, +# Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, # BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, # Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, From 58e90e8f299ba9120171019c186a7c01cc618460 Mon Sep 17 00:00:00 2001 From: aosync Date: Sun, 10 May 2020 12:58:11 +0200 Subject: [PATCH 0947/1133] es shell support (no shell version) (#1456) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 0646d669e..64b45c96d 100755 --- a/neofetch +++ b/neofetch @@ -1594,7 +1594,7 @@ get_shell() { shell+=${BASH_VERSION/-*} ;; - sh|ash|dash) ;; + sh|ash|dash|es) ;; *ksh) shell+=$("$SHELL" -c "printf %s \"\$KSH_VERSION\"") From 564ee212f3507df6a5f9f680fb4ccea4b8c1b7d7 Mon Sep 17 00:00:00 2001 From: ulkuderner Date: Sun, 10 May 2020 13:58:26 +0300 Subject: [PATCH 0948/1133] Added SambaBOX logo (#1455) Added SamBOX logo to os logos. --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 64b45c96d..7c7c860e8 100755 --- a/neofetch +++ b/neofetch @@ -10181,6 +10181,31 @@ ${c3}#######${c2}#${c1}#####${c2}#${c3}####### ${c3} #####${c2}#######${c3}##### EOF ;; + "Profelis SambaBOX"* | "SambaBOX"*) + set_colors 3 6 + read -rd '' ascii_data <<'EOF' +${c1} + # + *////##### + /////////#########( + .((((((///// ,####(#((((( + /#######(((* (#(((((((((. +//((#(#(#, ((##( ,((((((// +////// #(##########( ////// +////// ((#(#(#(#(##########(///////// +/////( (((((((#########(##((((((///// +/(((#( ((((/ +####(# ((### +#########(((/////////(((((((((, (#(#( +########( /////////(((((((* ##### +####///, *////((( ((((((( +./////////// .//((((((((( + ///////////, *(/////((((* + ,/(((((((((##########/. + .((((((####### + ((##* +EOF + ;; "SunOS") set_colors 3 7 @@ -10220,6 +10245,7 @@ oMMMMmMMMMNds:.+MMMmmMMN/.-odNMMMMmMMMM+ .odNm+ /dNms. EOF ;; + esac ;; esac From 027c80ce4fc6cf1a2a5203fc3463510b1139cede Mon Sep 17 00:00:00 2001 From: Georgy Komarov Date: Fri, 15 May 2020 21:27:35 +0300 Subject: [PATCH 0949/1133] Add OS Elbrus support (#1459) --- neofetch | 38 ++++++++++++++++++++++++++++++++++---- neofetch.1 | 4 ++-- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 7c7c860e8..412eea0dc 100755 --- a/neofetch +++ b/neofetch @@ -774,8 +774,8 @@ image_source="auto" # Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, # Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, # NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, -# OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, -# Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, +# OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, +# Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, # PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, # Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, @@ -958,6 +958,12 @@ get_distro() { *) distro="Siduction ($(lsb_release -sic))" esac + elif [[ -f /etc/mcst_version ]]; then + case $distro_shorthand in + on|tiny) distro="OS Elbrus" ;; + *) distro="OS Elbrus $(< /etc/mcst_version)" + esac + elif type -p pveversion >/dev/null; then case $distro_shorthand in on|tiny) distro="Proxmox VE" ;; @@ -2387,6 +2393,10 @@ get_gpu() { [[ -z "$(trim "$gpu")" ]] && gpu="Intel Integrated Graphics" ;; + *"MCST"*) + gpu="${gpu/*MCST*MGA2*/MCST MGA2}" + ;; + *"VirtualBox"*) gpu="VirtualBox Graphics Adapter" ;; @@ -4854,8 +4864,8 @@ ASCII: Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, - OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, - Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, + OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, + Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, @@ -8403,6 +8413,26 @@ ${c1} EOF ;; + "OS Elbrus"*) + set_colors 4 7 3 + read -rd '' ascii_data <<'EOF' +${c1} ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ + ██▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀██ + ██ ██ + ██ ███████ ███████ ██ + ██ ██ ██ ██ ██ ██ + ██ ██ ██ ██ ██ ██ + ██ ██ ██ ██ ██ ██ + ██ ██ ██ ██ ██ ██ + ██ ██ ███████ ███████ + ██ ██ ██ + ██ ██▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄██ + ██ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀██ + ██ ██ + ███████████████████████████ +EOF + ;; + "PacBSD"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index 22d21105d..6c1f70eb5 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -304,8 +304,8 @@ LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, -OpenStage, OpenWrt, osmc, Oracle, PacBSD, Parabola, Pardus, Parrot, -Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, +OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, +Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, From c160c07399644533a778890ddb851ecb9d0a86a1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 22 May 2020 10:27:36 +0300 Subject: [PATCH 0950/1133] disk: Fix paths with spaces in names. Closes #1445 --- neofetch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 0646d669e..27b0e512d 100755 --- a/neofetch +++ b/neofetch @@ -3493,7 +3493,7 @@ get_disk() { for disk in "${disks[@]}"; do # Create a second array and make each element split at whitespace this time. IFS=" " read -ra disk_info <<< "$disk" - disk_perc=${disk_info[4]/\%} + disk_perc=${disk_info[-2]/\%} case $disk_percent in off) disk_perc= @@ -3501,29 +3501,29 @@ get_disk() { case $df_version in *befhikm*) - disk="$((disk_info[2]/1024/1024))G / $((disk_info[1]/1024/1024))G" + disk="$((disk_info[-4]/1024/1024))G / $((disk_info[-5]/1024/1024))G" disk+="${disk_perc:+ ($disk_perc%)}" ;; *) - disk="${disk_info[2]/i} / ${disk_info[1]/i}${disk_perc:+ ($disk_perc%)}" + disk="${disk_info[-4]/i} / ${disk_info[-5]/i}${disk_perc:+ ($disk_perc%)}" ;; esac case $disk_subtitle in name) - disk_sub=${disk_info[0]} + disk_sub=${disk_info[@]::${#disk_info[@]}-5} ;; dir) - disk_sub=${disk_info[5]/*\/} - disk_sub=${disk_sub:-${disk_info[5]}} + disk_sub=${disk_info[-1]/*\/} + disk_sub=${disk_sub:-${disk_info[-1]}} ;; none) ;; *) - disk_sub=${disk_info[5]} + disk_sub=${disk_info[-1]} ;; esac From 241ac6c1525549323a8782e619237b65bb9eede3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 22 May 2020 10:37:01 +0300 Subject: [PATCH 0951/1133] neofetch: Windows multi GPI support. Closes #1462 --- neofetch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 880a9916c..5cda684fd 100755 --- a/neofetch +++ b/neofetch @@ -2472,8 +2472,11 @@ get_gpu() { ;; "Windows") - gpu="$(wmic path Win32_VideoController get caption)" - gpu="${gpu//Caption}" + while read -r line; do + prin "${subtitle:+${subtitle}${gpu_name}}" "$(trim "$line")" + done < <(wmic path Win32_VideoController get caption) + + gpu=${gpu//Caption} ;; "Haiku") From 488ceb764b0c61008eb3218b8cf746cdc01ee4f9 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 29 May 2020 16:06:50 +0200 Subject: [PATCH 0952/1133] Add Venom Linux (#1468) * os: Add Venom Linux * docs: update * Make shellcheck happy * Fix long lines (travis) --- neofetch | 78 ++++++++++++++++++++++++++++++++++-------------------- neofetch.1 | 12 ++++----- 2 files changed, 55 insertions(+), 35 deletions(-) diff --git a/neofetch b/neofetch index 5cda684fd..9a341cb07 100755 --- a/neofetch +++ b/neofetch @@ -783,7 +783,7 @@ image_source="auto" # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, # Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, -# Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX +# Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX # have ascii logos # NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. @@ -1480,6 +1480,7 @@ get_packages() { has eopkg && dir ${br_prefix}/var/lib/eopkg/package/* has crew && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist has pkgtool && dir ${br_prefix}/var/log/packages/* + has scratch && dir ${br_prefix}/var/lib/scratchpkg/index/*/.pkginfo has kagami && dir ${br_prefix}/var/lib/kagami/pkgs/* has cave && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ ${br_prefix}/var/db/paludis/repositories/installed/data/*/ @@ -3525,7 +3526,7 @@ get_disk() { case $disk_subtitle in name) - disk_sub=${disk_info[@]::${#disk_info[@]}-5} + disk_sub=${disk_info[*]::${#disk_info[@]}-5} ;; dir) @@ -4851,33 +4852,31 @@ ASCII: --ascii_distro distro Which Distro's ascii art to print NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, - \"AOSC OS\", \"AOSC OS/Retro\", Apricity, ArcoLinux, ArchBox, ARCHlabs, - ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, - BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, - BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, - Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, - Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, - DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, - EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, - FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, - gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, - Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, - Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, - LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, - Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, - Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, - NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, - OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, - Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, - PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, - Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, - Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, - SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, - Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, - openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, - Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, - Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX - have ascii logos + \"AOSC OS\", \"AOSC OS/Retro\", Apricity, ArcoLinux, ArchBox, + ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, + Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, + BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, + Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, + Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, + DracOS, DragonFly, Drauger, Elementary, EndeavourOS, Endless, + EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, + Funtoo, GalliumOS, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, + Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, + KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LFS, + Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, + Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, + NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, + OpenBSD, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, + osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, + TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, + Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, + Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, + Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, + Siduction, Slackware, SliTaz, SmartOS, Solus, Source_Mage, Sparky, + Star, SteamOS, SunOS, openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, + SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, + Ubuntu-Studio, Ubuntu, Venom, Void, Obarun, windows10, Windows7, + Xubuntu, Zorin, and IRIX have ascii logos NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. @@ -9941,6 +9940,27 @@ oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso EOF ;; + "Venom"*) + set_colors 8 4 + read -rd '' ascii_data <<'EOF' +${c1} ::::::: ::::::: + mMMMMMMm dMMMMMMm + /MMMMMMMo +MMMMMMM/ + yMMMMMMN mMMMMMMy + NMMMMMMs oMMMMMMm + +MMMMMMN: NMMMMMM+ + hMMMMMMy sMMMMMMy + :NMMMMMM::NMMMMMN: + oMMMMMMyyMMMMMM+ + dMMMMMMMMMMMMh + /MMMMMMMMMMMN: + sMMMMMMMMMMo + mMMMMMMMMd + +MMMMMMMN: + :::::: +EOF + ;; + "void_small") set_colors 2 8 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index 6c1f70eb5..159d83361 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.13. -.TH NEOFETCH "1" "April 2020" "Neofetch 7.0.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.15. +.TH NEOFETCH "1" "May 2020" "Neofetch 7.0.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -288,8 +288,8 @@ Colors to print the ascii art Which Distro's ascii art to print .TP NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, -AOSC, Apricity, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, -XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, +"AOSC OS", "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, +ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, @@ -297,7 +297,7 @@ Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, -gNewSense, GNOMEOS, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, @@ -313,7 +313,7 @@ SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, -Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX +Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos .IP NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. From d14dc2d54fa8408d846503a03773aafa7d9384fa Mon Sep 17 00:00:00 2001 From: Halo-Michael <45062120+Halo-Michael@users.noreply.github.com> Date: Sat, 6 Jun 2020 18:56:23 +0800 Subject: [PATCH 0953/1133] Add more device support (#1473) * Update * Update * Update --- neofetch | 99 +++++++++++++++++++++++++++----------------------------- 1 file changed, 47 insertions(+), 52 deletions(-) diff --git a/neofetch b/neofetch index 9a341cb07..443547226 100755 --- a/neofetch +++ b/neofetch @@ -1206,26 +1206,29 @@ get_model() { "iPhone OS") case $kernel_machine in - iPad1,1): "iPad" ;; - iPad2,[1-4]): "iPad 2" ;; - iPad3,[1-3]): "iPad 3" ;; - iPad3,[4-6]): "iPad 4" ;; - iPad6,1[12]): "iPad 5" ;; - iPad7,[5-6]): "iPad 6" ;; - iPad4,[1-3]): "iPad Air" ;; - iPad5,[3-4]): "iPad Air 2" ;; - iPad11,[3-4]): "iPad Air 3" ;; - iPad6,[7-8]): "iPad Pro (12.9 Inch)" ;; - iPad6,[3-4]): "iPad Pro (9.7 Inch)" ;; - iPad7,[1-2]): "iPad Pro 2 (12.9 Inch)" ;; - iPad7,[3-4]): "iPad Pro (10.5 Inch)" ;; - iPad8,[1-4]): "iPad Pro (11 Inch)" ;; - iPad8,[5-8]): "iPad Pro 3 (12.9 Inch)" ;; - iPad2,[5-7]): "iPad mini" ;; - iPad4,[4-6]): "iPad mini 2" ;; - iPad4,[7-9]): "iPad mini 3" ;; - iPad5,[1-2]): "iPad mini 4" ;; - iPad11,[1-2]): "iPad mini 5" ;; + iPad1,1): "iPad" ;; + iPad2,[1-4]): "iPad 2" ;; + iPad3,[1-3]): "iPad 3" ;; + iPad3,[4-6]): "iPad 4" ;; + iPad6,1[12]): "iPad 5" ;; + iPad7,[5-6]): "iPad 6" ;; + iPad7,1[12]): "iPad 7" ;; + iPad4,[1-3]): "iPad Air" ;; + iPad5,[3-4]): "iPad Air 2" ;; + iPad11,[3-4]): "iPad Air 3" ;; + iPad6,[7-8]): "iPad Pro (12.9 Inch)" ;; + iPad6,[3-4]): "iPad Pro (9.7 Inch)" ;; + iPad7,[1-2]): "iPad Pro 2 (12.9 Inch)" ;; + iPad7,[3-4]): "iPad Pro (10.5 Inch)" ;; + iPad8,[1-4]): "iPad Pro (11 Inch)" ;; + iPad8,[5-8]): "iPad Pro 3 (12.9 Inch)" ;; + iPad8,9 | iPad8,10): "iPad Pro 4 (11 Inch)" ;; + iPad8,1[1-2]): "iPad Pro 4 (12.9 Inch)" ;; + iPad2,[5-7]): "iPad mini" ;; + iPad4,[4-6]): "iPad mini 2" ;; + iPad4,[7-9]): "iPad mini 3" ;; + iPad5,[1-2]): "iPad mini 4" ;; + iPad11,[1-2]): "iPad mini 5" ;; iPhone1,1): "iPhone" ;; iPhone1,2): "iPhone 3G" ;; @@ -1248,6 +1251,10 @@ get_model() { iPhone11,2): "iPhone XS" ;; iPhone11,[46]): "iPhone XS Max" ;; iPhone11,8): "iPhone XR" ;; + iPhone12,1): "iPhone 11" ;; + iPhone12,3): "iPhone 11 Pro" ;; + iPhone12,5): "iPhone 11 Pro Max" ;; + iPhone12,8): "iPhone SE 2020" ;; iPod1,1): "iPod touch" ;; ipod2,1): "iPod touch 2G" ;; @@ -2110,12 +2117,12 @@ get_cpu() { "iPhone6,"[1-2]): "Apple A7 (2) @ 1.3GHz" ;; "iPhone7,"[1-2]): "Apple A8 (2) @ 1.4GHz" ;; "iPhone8,"[1-4] | "iPad6,1"[12]): "Apple A9 (2) @ 1.85GHz" ;; - "iPhone9,"[1-4] | "iPad7,"[5-6]): "Apple A10 Fusion (4) @ 2.34GHz" ;; - "iPhone10,"[1-6]): "Apple A11 Bionic (6) @ 2.39GHz" ;; - - "iPhone11,"[2468] | "iPad11,"[1-4]) - : "Apple A12 Bionic (6) @ 2.49GHz" + "iPhone9,"[1-4] | "iPad7,"[5-6] | "iPad7,1"[1-2]): + "Apple A10 Fusion (4) @ 2.34GHz" ;; + "iPhone10,"[1-6]): "Apple A11 Bionic (6) @ 2.39GHz" ;; + "iPhone11,"[2468] | "iPad11,"[1-4]): "Apple A12 Bionic (6) @ 2.49GHz" ;; + "iPhone12,"[1358]): "Apple A13 Bionic (6) @ 2.65GHz" ;; "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; "iPod3,1"): "Samsung S5L8922 (1) @ 600MHz" ;; @@ -2132,6 +2139,7 @@ get_cpu() { "iPad6,"[7-8]): "Apple A9X (2) @ 2.26GHz" ;; "iPad7,"[1-4]): "Apple A10X Fusion (6) @ 2.39GHz" ;; "iPad8,"[1-8]): "Apple A12X Bionic (8) @ 2.49GHz" ;; + "iPad8,9" | "iPad8,1"[0-2]): "Apple A12Z Bionic (8) @ 2.49GHz" ;; esac cpu="$_" ;; @@ -2433,38 +2441,25 @@ get_gpu() { "iPhone OS") case $kernel_machine in - "iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;; - "iPhone5,"[1-4]): "PowerVR SGX543MP3" ;; - "iPhone11,"[2468]): "G11P" ;; + "iPhone1,"[1-2]): "PowerVR MBX Lite 3D" ;; + "iPhone2,1" | "iPhone3,"[1-3] | "iPod3,1" | "iPod4,1" | "iPad1,1"): + "PowerVR SGX535" + ;; + "iPhone4,1" | "iPad2,"[1-7] | "iPod5,1"): "PowerVR SGX543MP2" ;; + "iPhone5,"[1-4]): "PowerVR SGX543MP3" ;; + "iPhone6,"[1-2] | "iPad4,"[1-9]): "PowerVR G6430" ;; + "iPhone7,"[1-2] | "iPod7,1" | "iPad5,"[1-2]): "PowerVR GX6450" ;; + "iPhone8,"[1-4] | "iPad6,1"[12]): "PowerVR GT7600" ;; + "iPhone9,"[1-4] | "iPad7,"[5-6]): "PowerVR GT7600 Plus" ;; + "iPhone10,"[1-6]): "Apple Designed GPU (A11)" ;; + "iPhone11,"[2468]): "Apple Designed GPU (A12)" ;; + "iPhone12,"[1358]): "Apple Designed GPU (A13)" ;; + "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; "iPad5,"[3-4]): "PowerVR GXA6850" ;; "iPad6,"[3-8]): "PowerVR 7XT" ;; - "iPhone2,1" | "iPhone3,"[1-3] | "iPod3,1" | "iPod4,1" | "iPad1,1") - : "PowerVR SGX535" - ;; - - "iPhone4,1" | "iPad2,"[1-7] | "iPod5,1") - : "PowerVR SGX543MP2" - ;; - - "iPhone6,"[1-2] | "iPad4,"[1-9]) - : "PowerVR G6430" - ;; - - "iPhone7,"[1-2] | "iPod7,1" | "iPad5,"[1-2]) - : "PowerVR GX6450" - ;; - - "iPhone8,"[1-4] | "iPad6,1"[12]) - : "PowerVR GT7600" - ;; - - "iPhone9,"[1-4] | "iPad7,"[5-6]) - : "PowerVR GT7600 Plus" - ;; - "iPod1,1" | "iPod2,1") : "PowerVR MBX Lite" ;; From 298d75665a6b91453b3967fd83639f61e32c4f26 Mon Sep 17 00:00:00 2001 From: Cyril Raffatelli Date: Sun, 7 Jun 2020 15:31:39 +0200 Subject: [PATCH 0954/1133] Add playerctl support (#1475) --- neofetch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neofetch b/neofetch index 443547226..3a878b5f4 100755 --- a/neofetch +++ b/neofetch @@ -501,6 +501,7 @@ disk_percent="on" # mpd # muine # netease-cloud-music +# playerctl # pogo # pragha # qmmp @@ -2656,6 +2657,7 @@ get_song() { "muine" "netease-cloud-music" "plasma-browser-integration" + "playerctl" "pogo" "pragha" "qmmp" @@ -2791,6 +2793,10 @@ get_song() { awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4} /"title"/ {t=$4} END {print a " \n" b " \n" t}')" ;; + + "playerctl"*) + song="$(playerctl metadata --format '{{ artist }} \n{{ album }} \n{{ title }}')" + ;; *) mpc &>/dev/null && song="$(mpc -f '%artist% \n%album% \n%title%' current)" || return ;; esac From c8e08cd76e59aa759bda815f61a149955b61466a Mon Sep 17 00:00:00 2001 From: wilssonmartee <47995524+wilssonmartee@users.noreply.github.com> Date: Tue, 9 Jun 2020 03:05:59 -0400 Subject: [PATCH 0955/1133] Added Hash Linux Ascii (#1477) More info: https://hashproject.org --- neofetch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/neofetch b/neofetch index 3a878b5f4..f9adc6a2b 100755 --- a/neofetch +++ b/neofetch @@ -5249,6 +5249,28 @@ h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y EOF ;; + "Hash"*) + set_colors 123 + read -rd '' ascii_data <<'EOF' +${c1} + + + ###### + + ### ###### ### + ##### ###### ##### + ###### ###### ###### + +####### '"###### '"######## +####### ###### ######## +####### ###### ######## + + ###### '"###### '"###### + ##### ###### ##### + ### ###### ### + ~ ###### ~ + +EOF + ;; + "alpine_small") set_colors 4 7 read -rd '' ascii_data <<'EOF' From 7b710257c993a491827e5eb15910778fbee4b04c Mon Sep 17 00:00:00 2001 From: sgse Date: Fri, 12 Jun 2020 22:19:29 +0000 Subject: [PATCH 0956/1133] add garuda linux (#1479) * add garuda linux * fix garuda linux Co-authored-by: SGSm --- neofetch | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index f9adc6a2b..d8ae4c783 100755 --- a/neofetch +++ b/neofetch @@ -767,7 +767,7 @@ image_source="auto" # Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, # DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, -# FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, +# FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, # Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, # Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, @@ -4861,7 +4861,7 @@ ASCII: Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, - Funtoo, GalliumOS, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, + Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, @@ -7004,7 +7004,34 @@ yyyo+:-..............................-// o/:-...................................: EOF ;; - + + "Garuda"*) + set_colors 7 7 + read -rd '' ascii_data <<'EOF' +${c1} __,,,,,,,_ + _╓╗╣╫╠╠╠╠╠╠╠╠╠╠╠╠╠╕╗╗┐_ + ╥╢╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╥, + ╗╠╠╠╠╠╠╠╝╜╜╜╜╝╢╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠┐ + ╣╠╠╠╠╠╠╠╠╢╣╢╗╕ , `"╘╠╠╠╠╠╠╠╠╠╠╠╠╠╠╔╥_ + ╒╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╕╙╥╥╜ `"╜╠╬╠╠╠╠╠╠╠╠╠╠╠╥, + ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗╥╥╥╥╗╗╬╠╠╠╠╠╠╠╝╙╠╠╣╠╠╠╠╢┐ + ╣╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╥╬╣╠╠╠╠╠╠╠╠╗ + ╒╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗ + ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠ + ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╬ ```"╜╝╢╠╠╡ + ╒╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╣, ╘╠╪ + ╞╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╢┐ ╜ + `╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗ + ,╬╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠"╕ + ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗ + ╝^╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╝╣╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╡ + ╔╜`╞┘╢╛╜ ╡╢╠"╚╠╠╜╝┌╞╞"╢╠╠╠╠╠╠╠╠╠╠╣╩╢╪ + ╜╒" `╜ ` ╜╙╕ └╣╠╠╠╠╕ ╞╙╖ + ╠╠╠ + ╜ +EOF + ;; + "gentoo_small") set_colors 5 7 read -rd '' ascii_data <<'EOF' From 5b8eea997491fb382f5af6a30284d8a16a1cdac5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 13 Jun 2020 01:23:26 +0300 Subject: [PATCH 0957/1133] docs: update --- neofetch | 58 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/neofetch b/neofetch index d8ae4c783..7d496504e 100755 --- a/neofetch +++ b/neofetch @@ -775,17 +775,17 @@ image_source="auto" # Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, # Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, # NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, -# OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, -# Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, -# PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, -# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, -# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, -# SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, -# Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, -# openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, -# Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, -# Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX -# have ascii logos +# OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, +# Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, +# Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, +# Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, +# Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, +# Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, +# SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, +# openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, +# Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, +# Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, +# and IRIX have ascii logos # NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. @@ -2793,7 +2793,7 @@ get_song() { awk -F'"' 'BEGIN {RS=" entry"}; /"artist"/ {a=$4} /"album"/ {b=$4} /"title"/ {t=$4} END {print a " \n" b " \n" t}')" ;; - + "playerctl"*) song="$(playerctl metadata --format '{{ artist }} \n{{ album }} \n{{ title }}')" ;; @@ -5252,22 +5252,22 @@ EOF "Hash"*) set_colors 123 read -rd '' ascii_data <<'EOF' -${c1} - - + ###### + - ### ###### ### - ##### ###### ##### - ###### ###### ###### - +${c1} + + + ###### + + ### ###### ### + ##### ###### ##### + ###### ###### ###### + ####### '"###### '"######## ####### ###### ######## ####### ###### ######## - - ###### '"###### '"###### - ##### ###### ##### - ### ###### ### - ~ ###### ~ - + + ###### '"###### '"###### + ##### ###### ##### + ### ###### ### + ~ ###### ~ + EOF ;; @@ -7004,12 +7004,12 @@ yyyo+:-..............................-// o/:-...................................: EOF ;; - + "Garuda"*) set_colors 7 7 read -rd '' ascii_data <<'EOF' ${c1} __,,,,,,,_ - _╓╗╣╫╠╠╠╠╠╠╠╠╠╠╠╠╠╕╗╗┐_ + _╓╗╣╫╠╠╠╠╠╠╠╠╠╠╠╠╠╕╗╗┐_ ╥╢╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╥, ╗╠╠╠╠╠╠╠╝╜╜╜╜╝╢╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠┐ ╣╠╠╠╠╠╠╠╠╢╣╢╗╕ , `"╘╠╠╠╠╠╠╠╠╠╠╠╠╠╠╔╥_ @@ -7028,10 +7028,10 @@ ${c1} __,,,,,,,_ ╔╜`╞┘╢╛╜ ╡╢╠"╚╠╠╜╝┌╞╞"╢╠╠╠╠╠╠╠╠╠╠╣╩╢╪ ╜╒" `╜ ` ╜╙╕ └╣╠╠╠╠╕ ╞╙╖ ╠╠╠ - ╜ + ╜ EOF ;; - + "gentoo_small") set_colors 5 7 read -rd '' ascii_data <<'EOF' From 726d9b81337c235a03f2d26d11746190a0e7b50d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 28 Jun 2020 01:08:39 +0300 Subject: [PATCH 0958/1133] wm: Added support for x11fs --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 7d496504e..dd29a954a 100755 --- a/neofetch +++ b/neofetch @@ -1814,6 +1814,7 @@ get_wm() { -e "[2]bwm" \ -e "[m]onsterwm" \ -e "[t]inywm" \ + -e "[x]11fs" \ -e "[x]monad") else From 824866e14c0b3c2623481259e36e2401ed971a1f Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 28 Jun 2020 19:19:52 +0200 Subject: [PATCH 0959/1133] song: Add Tauon Music Box (#1489) * song: Add Tauon Music Box * Fix long line (travis) --- neofetch | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index dd29a954a..76572e045 100755 --- a/neofetch +++ b/neofetch @@ -511,6 +511,7 @@ disk_percent="on" # smplayer # spotify # strawberry +# tauonmb # tomahawk # vlc # xmms2d @@ -2669,6 +2670,7 @@ get_song() { "spotify" "Spotify" "strawberry" + "tauonmb" "tomahawk" "vlc" "xmms2d" @@ -2720,6 +2722,7 @@ get_song() { "strawberry"*) get_song_dbus "strawberry" ;; "gogglesmm"*) get_song_dbus "gogglesmm" ;; "xnoise"*) get_song_dbus "xnoise" ;; + "tauonmb"*) get_song_dbus "tauon" ;; "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; "io.elementary.music"*) get_song_dbus "Music" ;; @@ -4862,15 +4865,15 @@ ASCII: Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, - Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, - Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, - KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LFS, - Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, - Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, - NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, - OpenBSD, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, - osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, - TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, + Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, + GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, + KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, + LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, + Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, + Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, + OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, OpenStage, + OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, + Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, From 7805b2c4cb3c9015bcf4be7167f1ec8ab70fe540 Mon Sep 17 00:00:00 2001 From: "Ybenel (R2dr0dn)" <44820142+r2dr0dn@users.noreply.github.com> Date: Tue, 30 Jun 2020 18:34:15 +0100 Subject: [PATCH 0960/1133] Added DarkOs Logo (#1491) Co-authored-by: r2dr0dn --- neofetch | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 76572e045..156c66004 100755 --- a/neofetch +++ b/neofetch @@ -766,7 +766,7 @@ image_source="auto" # BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, # Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, -# DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, +# DesaOS, Devuan, DracOS, DarkOs, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, @@ -4863,7 +4863,7 @@ ASCII: BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, - DracOS, DragonFly, Drauger, Elementary, EndeavourOS, Endless, + DracOS, DarkOs, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, @@ -6606,6 +6606,34 @@ ${c1} `-:/- `:sy: `. `/yyyyys: ./o/.` .oyyso+oo:` :+oo+//::::///:-.` `.` +EOF + ;; + + "DarkOs") + set_colors 1 6 5 3 2 + read -rd '' ascii_data <<'EOF' + +${c3}⠀⠀⠀⠀ ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⠢⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c1}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣶⠋⡆⢹⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c5}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡆⢀⣤⢛⠛⣠⣿⠀⡏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c6}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣶⣿⠟⣡⠊⣠⣾⣿⠃⣠⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c2}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣴⣯⣿⠀⠊⣤⣿⣿⣿⠃⣴⣧⣄⣀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c1}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣤⣶⣿⣿⡟⣠⣶⣿⣿⣿⢋⣤⠿⠛⠉⢁⣭⣽⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c4} ⠀⠀⠀⠀⠀⠀ ⠀⣠⠖⡭⢉⣿⣯⣿⣯⣿⣿⣿⣟⣧⠛⢉⣤⣶⣾⣿⣿⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c5}⠀⠀⠀⠀⠀⠀⠀⠀⣴⣫⠓⢱⣯⣿⢿⠋⠛⢛⠟⠯⠶⢟⣿⣯⣿⣿⣿⣿⣿⣿⣦⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c2}⠀⠀⠀⠀⠀⠀⢀⡮⢁⣴⣿⣿⣿⠖⣠⠐⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠉⠉⠛⠛⠛⢿⣶⣄⠀⠀⠀⠀⠀⠀⠀ +${c3}⠀⠀⠀⠀⢀⣤⣷⣿⣿⠿⢛⣭⠒⠉⠀⠀⠀⣀⣀⣄⣤⣤⣴⣶⣶⣶⣿⣿⣿⣿⣿⠿⠋⠁⠀⠀⠀⠀⠀⠀⠀⠀ +${c1}⠀⢀⣶⠏⠟⠝⠉⢀⣤⣿⣿⣶⣾⣿⣿⣿⣿⣿⣿⣟⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣧⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c6}⢴⣯⣤⣶⣿⣿⣿⣿⣿⡿⣿⣯⠉⠉⠉⠉⠀⠀⠀⠈⣿⡀⣟⣿⣿⢿⣿⣿⣿⣿⣿⣦⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c5}⠀⠀⠀⠉⠛⣿⣧⠀⣆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠃⣿⣿⣯⣿⣦⡀⠀⠉⠻⣿⣦⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c3}⠀⠀⠀⠀⠀⠀⠉⢿⣮⣦⠀⠀⠀⠀⠀⠀⠀⠀⠀⣼⣿⠀⣯⠉⠉⠛⢿⣿⣷⣄⠀⠈⢻⣆⠀⠀⠀⠀⠀⠀⠀⠀ +${c2}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠢⠀⠀⠀⠀⠀⠀⠀⢀⢡⠃⣾⣿⣿⣦⠀⠀⠀⠙⢿⣿⣤⠀⠙⣄⠀⠀⠀⠀⠀⠀⠀ +${c6}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⢋⡟⢠⣿⣿⣿⠋⢿⣄⠀⠀⠀⠈⡄⠙⣶⣈⡄⠀⠀⠀⠀⠀⠀ +${c1}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠐⠚⢲⣿⠀⣾⣿⣿⠁⠀⠀⠉⢷⡀⠀⠀⣇⠀⠀⠈⠻⡀⠀⠀⠀⠀⠀ +${c4}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢢⣀⣿⡏⠀⣿⡿⠀⠀⠀⠀⠀⠀⠙⣦⠀⢧⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c3}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⠿⣧⣾⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⣮⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +${c5}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠙⠛⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ + EOF ;; From e00afa6b92cc9cdbbaa729b79d9da54c40c91791 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 4 Jul 2020 17:11:24 +0200 Subject: [PATCH 0961/1133] song: Add olivia player (#1495) --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 156c66004..19c12648f 100755 --- a/neofetch +++ b/neofetch @@ -501,6 +501,7 @@ disk_percent="on" # mpd # muine # netease-cloud-music +# olivia # playerctl # pogo # pragha @@ -2658,6 +2659,7 @@ get_song() { "mpd" "muine" "netease-cloud-music" + "olivia" "plasma-browser-integration" "playerctl" "pogo" @@ -2723,6 +2725,7 @@ get_song() { "gogglesmm"*) get_song_dbus "gogglesmm" ;; "xnoise"*) get_song_dbus "xnoise" ;; "tauonmb"*) get_song_dbus "tauon" ;; + "olivia"*) get_song_dbus "olivia" ;; "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; "io.elementary.music"*) get_song_dbus "Music" ;; From 0343552f49dd2fa9925329f026c71840ce093c96 Mon Sep 17 00:00:00 2001 From: Hyd3r1 <60399586+Hyd3r1@users.noreply.github.com> Date: Mon, 6 Jul 2020 15:36:39 +0200 Subject: [PATCH 0962/1133] Add ITC distro logo (#1496) * Add ITC distro logo * update logo to smaller --- neofetch | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/neofetch b/neofetch index 19c12648f..11d8a552c 100755 --- a/neofetch +++ b/neofetch @@ -6637,6 +6637,23 @@ ${c4}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢢⣀⣿⡏⠀⣿⡿⠀⠀⠀ ${c3}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⠿⣧⣾⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⣮⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ ${c5}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠙⠛⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ +EOF + ;; + + "Itc") + set_colors 1 + read -rd '' ascii_data <<'EOF' +${c1}....................-==============+... +${c1}....................-==============:... +${c1}...:===========-....-==============:... +${c1}...-===========:....-==============-... +${c1}....*==========+........-::********-... +${c1}....*===========+.:*====**==*+-.-...... +${c1}....:============*+-..--:+**====*---... +${c1}......::--........................::... +${c1}..+-:+-.+::*:+::+:-++::++-.:-.*.:++:++. +${c1}..:-:-++++:-::--:+::-::.:++-++:++--:-:. ⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ EOF ;; From f4a83d604fa96a1e91f25c075cbb4b8f509ec43c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 Jul 2020 23:53:51 +0300 Subject: [PATCH 0963/1133] neofetch: Fix trailing whitespace --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 11d8a552c..15d17325b 100755 --- a/neofetch +++ b/neofetch @@ -6639,7 +6639,7 @@ ${c5}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠙⠛⠀⠀⠀⠀ EOF ;; - + "Itc") set_colors 1 read -rd '' ascii_data <<'EOF' From 0e448167c02f28603425c6913a33439d5d3a5e05 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 Jul 2020 23:54:25 +0300 Subject: [PATCH 0964/1133] resolution: Fix output when monitor is turned off. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 15d17325b..f9ac23060 100755 --- a/neofetch +++ b/neofetch @@ -2905,7 +2905,7 @@ get_resolution() { "off") resolution="$(xrandr --nograb --current |\ awk -F 'connected |\\+|\\(' \ - '/ connected/ && $2 {printf $2 ", "}')" + '/ connected.*[0-9]+x[0-9]+\+/ && $2 {printf $2 ", "}')" resolution="${resolution/primary, }" resolution="${resolution/primary }" From 77a34f884d487721533949033ad9c98fc21ce9fb Mon Sep 17 00:00:00 2001 From: SeungheonOh Date: Tue, 7 Jul 2020 11:26:23 -0500 Subject: [PATCH 0965/1133] Adding pot terminal image backend (#1482) --- neofetch | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index f9ac23060..479f9b5b2 100755 --- a/neofetch +++ b/neofetch @@ -732,7 +732,7 @@ disk_display="off" # # Default: 'ascii' # Values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'off', -# 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' +# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' # Flag: --backend image_backend="ascii" @@ -3792,7 +3792,7 @@ image_backend() { "off") image_backend="off" ;; "caca" | "chafa" | "jp2a" | "iterm2" | "termpix" |\ - "tycat" | "w3m" | "sixel" | "pixterm" | "kitty") + "tycat" | "w3m" | "sixel" | "pixterm" | "kitty" | "pot") get_image_source [[ ! -f "$image" ]] && { @@ -3817,7 +3817,7 @@ image_backend() { *) err "Image: Unknown image backend specified '$image_backend'." err "Image: Valid backends are: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'kitty', - 'off', 'sixel', 'pixterm', 'termpix', 'tycat', 'w3m')" + 'off', 'sixel', 'pot', 'pixterm', 'termpix', 'tycat', 'w3m')" err "Image: Falling back to ascii mode." print_ascii ;; @@ -4219,6 +4219,13 @@ display_image() { "$image" ;; + "pot") + pot \ + "$image" \ + --size="$((width / font_width))x$((height / font_height))" \ + --loader=std + ;; + "pixterm") pixterm \ -tc "$((width / font_width))" \ @@ -4845,6 +4852,7 @@ IMAGE BACKEND: --iterm2 source Shortcut to use 'iterm2' backend. --jp2a source Shortcut to use 'jp2a' backend. --kitty source Shortcut to use 'kitty' backend. + --pot source Shortcut to use 'pot' backend. --pixterm source Shortcut to use 'pixterm' backend. --sixel source Shortcut to use 'sixel' backend. --termpix source Shortcut to use 'termpix' backend. @@ -5062,7 +5070,7 @@ get_args() { # Image backend "--backend") image_backend="$2" ;; "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pixterm" |\ + "--ascii" | "--caca" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" | "--pixterm" |\ "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") image_backend="${1/--}" case $2 in From 59335d35818d07e32f485fc4bbee378039aba972 Mon Sep 17 00:00:00 2001 From: SeungheonOh Date: Tue, 7 Jul 2020 11:47:51 -0500 Subject: [PATCH 0966/1133] pot argument fix (#1498) * pot argument fix * removing '\' --- neofetch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 479f9b5b2..42476d7d6 100755 --- a/neofetch +++ b/neofetch @@ -4222,8 +4222,7 @@ display_image() { "pot") pot \ "$image" \ - --size="$((width / font_width))x$((height / font_height))" \ - --loader=std + --size="$((width / font_width))x$((height / font_height))" ;; "pixterm") From af2c02ceb63f3013f8227ba4476670a91784cb27 Mon Sep 17 00:00:00 2001 From: Hyd3r1 <60399586+Hyd3r1@users.noreply.github.com> Date: Wed, 8 Jul 2020 01:23:53 +0200 Subject: [PATCH 0967/1133] Repair ITC distro show (#1499) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 42476d7d6..a5b682802 100755 --- a/neofetch +++ b/neofetch @@ -6647,7 +6647,7 @@ ${c5}⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠙⠛⠀⠀⠀⠀ EOF ;; - "Itc") + "Itc"*) set_colors 1 read -rd '' ascii_data <<'EOF' ${c1}....................-==============+... From f954cbab30c92d0fb009d7f77e5275b7da6c297d Mon Sep 17 00:00:00 2001 From: Steve Kang Date: Sun, 12 Jul 2020 19:12:22 +0900 Subject: [PATCH 0968/1133] Add latest macOS support and fix issue (#1487) Support for both "Mac OS X" and "macOS" Support for macOS 10.16(11.0), Big Sur Resolve issue #1486 --- neofetch | 62 +++++++++++++++++++++++++++++--------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/neofetch b/neofetch index a5b682802..738b7a7d3 100755 --- a/neofetch +++ b/neofetch @@ -1089,7 +1089,7 @@ get_distro() { distro=${distro/NAME=} ;; - "Mac OS X") + "Mac OS X"|"macOS") case $osx_version in 10.4*) codename="Mac OS X Tiger" ;; 10.5*) codename="Mac OS X Leopard" ;; @@ -1103,6 +1103,8 @@ get_distro() { 10.13*) codename="macOS High Sierra" ;; 10.14*) codename="macOS Mojave" ;; 10.15*) codename="macOS Catalina" ;; + 10.16*) codename="macOS Big Sur" ;; + 11.0*) codename="macOS Big Sur" ;; *) codename=macOS ;; esac @@ -1115,7 +1117,7 @@ get_distro() { case $osx_version in 10.[4-7]*) distro=${distro/${codename}/Mac OS X} ;; 10.[8-9]*|10.1[0-1]*) distro=${distro/${codename}/OS X} ;; - 10.1[2-4]*) distro=${distro/${codename}/macOS} ;; + 10.1[2-6]*|11.0*) distro=${distro/${codename}/macOS} ;; esac distro=${distro/ ${osx_build}} ;; @@ -1199,7 +1201,7 @@ get_model() { fi ;; - "Mac OS X") + "Mac OS X"|"macOS") if [[ $(kextstat | grep -F -e "FakeSMC" -e "VirtualSMC") != "" ]]; then model="Hackintosh (SMBIOS: $(sysctl -n hw.model))" else @@ -1371,7 +1373,7 @@ get_uptime() { fi ;; - "Mac OS X"|"iPhone OS"|BSD|FreeMiNT) + "Mac OS X"|"macOS"|"iPhone OS"|BSD|FreeMiNT) boot=$(sysctl -n kern.boottime) boot=${boot/\{ sec = } boot=${boot/,*} @@ -1540,7 +1542,7 @@ get_packages() { manager=appimage && has appimaged && dir ~/.local/bin/*.appimage ;; - "Mac OS X"|MINIX) + "Mac OS X"|"macOS"|MINIX) has port && tot port installed && ((packages-=1)) has brew && dir /usr/local/Cellar/* has pkgin && tot pkgin list @@ -1656,7 +1658,7 @@ get_de() { ((de_run == 1)) && return case $os in - "Mac OS X") de=Aqua ;; + "Mac OS X"|"macOS") de=Aqua ;; Windows) case $distro in @@ -1796,7 +1798,7 @@ get_wm() { -e westford \ -e weston) - elif [[ $DISPLAY && $os != "Mac OS X" && $os != FreeMiNT ]]; then + elif [[ $DISPLAY && $os != "Mac OS X" && $os != "macOS" && $os != FreeMiNT ]]; then type -p xprop &>/dev/null && { id=$(xprop -root -notype _NET_SUPPORTING_WM_CHECK) id=${id##* } @@ -1821,7 +1823,7 @@ get_wm() { else case $os in - "Mac OS X") + "Mac OS X"|"macOS") ps_line=$(ps -e | grep -o \ -e "[S]pectacle" \ -e "[A]methyst" \ @@ -2101,7 +2103,7 @@ get_cpu() { esac ;; - "Mac OS X") + "Mac OS X"|"macOS") cpu="$(sysctl -n machdep.cpu.brand_string)" # Get CPU cores. @@ -2281,8 +2283,8 @@ get_cpu() { # Add CPU cores to the output. [[ "$cpu_cores" != "off" && "$cores" ]] && \ case $os in - "Mac OS X") cpu="${cpu/@/(${cores}) @}" ;; - *) cpu="$cpu ($cores)" ;; + "Mac OS X"|"macOS") cpu="${cpu/@/(${cores}) @}" ;; + *) cpu="$cpu ($cores)" ;; esac # Add CPU speed to the output. @@ -2321,14 +2323,14 @@ get_cpu_usage() { # Get CPU cores if unset. if [[ "$cpu_cores" != "logical" ]]; then case $os in - "Linux" | "MINIX") cores="$(grep -c "^processor" /proc/cpuinfo)" ;; - "Mac OS X") cores="$(sysctl -n hw.logicalcpu_max)" ;; - "BSD") cores="$(sysctl -n hw.ncpu)" ;; - "Solaris") cores="$(kstat -m cpu_info | grep -c -F "chip_id")" ;; - "Haiku") cores="$(sysinfo -cpu | grep -c -F 'CPU #')" ;; - "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; - "IRIX") cores="$(sysconf NPROC_ONLN)" ;; - "FreeMiNT") cores="$(sysctl -n hw.ncpu)" ;; + "Linux" | "MINIX") cores="$(grep -c "^processor" /proc/cpuinfo)" ;; + "Mac OS X"|"macOS") cores="$(sysctl -n hw.logicalcpu_max)" ;; + "BSD") cores="$(sysctl -n hw.ncpu)" ;; + "Solaris") cores="$(kstat -m cpu_info | grep -c -F "chip_id")" ;; + "Haiku") cores="$(sysinfo -cpu | grep -c -F 'CPU #')" ;; + "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; + "IRIX") cores="$(sysconf NPROC_ONLN)" ;; + "FreeMiNT") cores="$(sysctl -n hw.ncpu)" ;; "AIX") cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" @@ -2429,7 +2431,7 @@ get_gpu() { return ;; - "Mac OS X") + "Mac OS X"|"macOS") if [[ -f "${cache_dir}/neofetch/gpu" ]]; then source "${cache_dir}/neofetch/gpu" @@ -2526,7 +2528,7 @@ get_memory() { mem_total="$((mem_total / 1024))" ;; - "Mac OS X" | "iPhone OS") + "Mac OS X" | "macOS" | "iPhone OS") mem_total="$(($(sysctl -n hw.memsize) / 1024 / 1024))" mem_wired="$(vm_stat | awk '/ wired/ { print $4 }')" mem_active="$(vm_stat | awk '/ active/ { printf $3 }')" @@ -2750,7 +2752,7 @@ get_song() { case $os in "Linux") get_song_dbus "spotify" ;; - "Mac OS X") + "Mac OS X"|"macOS") song="$(osascript -e 'tell application "Spotify" to artist of current track as¬ string & "\n" & album of current track as¬ string & "\n" & name of current track as string')" @@ -2832,7 +2834,7 @@ get_song() { get_resolution() { case $os in - "Mac OS X") + "Mac OS X"|"macOS") if type -p screenresolution >/dev/null; then resolution="$(screenresolution get 2>&1 | awk '/Display/ {printf $6 "Hz, "}')" resolution="${resolution//x??@/ @ }" @@ -2939,7 +2941,7 @@ get_style() { # Fix weird output when the function is run multiple times. unset gtk2_theme gtk3_theme theme path - if [[ "$DISPLAY" && "$os" != "Mac OS X" ]]; then + if [[ "$DISPLAY" && $os != "Mac OS X" && $os != "macOS" ]]; then # Get DE if user has disabled the function. ((de_run != 1)) && get_de @@ -3622,7 +3624,7 @@ get_battery() { esac ;; - "Mac OS X") + "Mac OS X"|"macOS") battery="$(pmset -g batt | grep -o '[0-9]*%')" state="$(pmset -g batt | awk '/;/ {print $4}')" [[ "$state" == "charging;" ]] && battery_state="charging" @@ -3662,7 +3664,7 @@ get_local_ip() { local_ip="$(ifconfig | awk '{printf $3; exit}')" ;; - "Mac OS X" | "iPhone OS") + "Mac OS X" | "macOS" | "iPhone OS") local_ip="$(ipconfig getifaddr en0)" [[ -z "$local_ip" ]] && local_ip="$(ipconfig getifaddr en1)" ;; @@ -3722,7 +3724,7 @@ get_gpu_driver() { fi ;; - "Mac OS X") + "Mac OS X"|"macOS") if [[ "$(kextstat | grep "GeForceWeb")" != "" ]]; then gpu_driver="NVIDIA Web Driver" else @@ -3889,7 +3891,7 @@ get_image_source() { get_wallpaper() { case $os in - "Mac OS X") + "Mac OS X"|"macOS") image="$(osascript </dev/null; then IFS=$'\n' read -d "" -ra win \ <<< "$(xdotool getactivewindow getwindowgeometry --shell %1)" @@ -4558,7 +4560,7 @@ cache() { get_cache_dir() { case $os in - "Mac OS X") cache_dir="/Library/Caches" ;; + "Mac OS X"|"macOS") cache_dir="/Library/Caches" ;; *) cache_dir="/tmp" ;; esac } From a4bf721014bef8cdd099a802abe07b81abee2333 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 17 Jul 2020 16:56:13 +0300 Subject: [PATCH 0969/1133] neofetch: Fix CI (long lines) --- neofetch | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 738b7a7d3..b72a55d20 100755 --- a/neofetch +++ b/neofetch @@ -3819,7 +3819,8 @@ image_backend() { *) err "Image: Unknown image backend specified '$image_backend'." err "Image: Valid backends are: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'kitty', - 'off', 'sixel', 'pot', 'pixterm', 'termpix', 'tycat', 'w3m')" + 'off', 'sixel', 'pot', 'pixterm', 'termpix', 'tycat', + 'w3m')" err "Image: Falling back to ascii mode." print_ascii ;; @@ -5071,8 +5072,8 @@ get_args() { # Image backend "--backend") image_backend="$2" ;; "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" | "--pixterm" |\ - "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + "--ascii" | "--caca" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" |\ + "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") image_backend="${1/--}" case $2 in "-"* | "") ;; From 47d8dbcec8b6edbcee4676532f61132362c0a16d Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 17 Jul 2020 21:05:58 +0200 Subject: [PATCH 0970/1133] Detect Ubuntu flavors (#1507) --- neofetch | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index b72a55d20..c51bb016f 100755 --- a/neofetch +++ b/neofetch @@ -1087,6 +1087,18 @@ get_distro() { distro=$(trim_quotes "$distro") distro=${distro/NAME=} + + # Get Ubuntu flavor. + if [[ $distro == "Ubuntu"* ]]; then + case $XDG_CONFIG_DIRS in + *"plasma"*) distro=${distro/Ubuntu/Kubuntu} ;; + *"mate"*) distro=${distro/Ubuntu/Ubuntu MATE} ;; + *"xubuntu"*) distro=${distro/Ubuntu/Xubuntu} ;; + *"Lubuntu"*) distro=${distro/Ubuntu/Lubuntu} ;; + *"budgie"*) distro=${distro/Ubuntu/Ubuntu Budgie} ;; + *"studio"*) distro=${distro/Ubuntu/Ubuntu Studio} ;; + esac + fi ;; "Mac OS X"|"macOS") @@ -9890,7 +9902,7 @@ ${c1} ▀█████████ ███████${c2}███▀ EOF ;; - "Ubuntu-Budgie"*) + "Ubuntu Budgie"* | "Ubuntu-Budgie"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c2} ./oydmMMMMMMmdyo/. @@ -9938,7 +9950,7 @@ ${c4} `soooo. .oooo` EOF ;; - "Ubuntu-MATE"*) + "Ubuntu MATE"* | "Ubuntu-MATE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' ${c1} `:+shmNNMMNNmhs+:` @@ -9988,7 +10000,7 @@ ${c3} `oo++. EOF ;; - "Ubuntu-Studio") + "Ubuntu Studio"* | "Ubuntu-Studio") set_colors 6 7 read -rd '' ascii_data <<'EOF' ${c1} ..-::::::-.` From 3c63ac1d4a69cb032f112a1586907138e69475ce Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 20 Jul 2020 07:57:30 +0200 Subject: [PATCH 0971/1133] Add Ubuntu Cinnamon (#1508) --- neofetch | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index c51bb016f..6ff4ff2fb 100755 --- a/neofetch +++ b/neofetch @@ -1091,12 +1091,13 @@ get_distro() { # Get Ubuntu flavor. if [[ $distro == "Ubuntu"* ]]; then case $XDG_CONFIG_DIRS in - *"plasma"*) distro=${distro/Ubuntu/Kubuntu} ;; - *"mate"*) distro=${distro/Ubuntu/Ubuntu MATE} ;; - *"xubuntu"*) distro=${distro/Ubuntu/Xubuntu} ;; - *"Lubuntu"*) distro=${distro/Ubuntu/Lubuntu} ;; - *"budgie"*) distro=${distro/Ubuntu/Ubuntu Budgie} ;; - *"studio"*) distro=${distro/Ubuntu/Ubuntu Studio} ;; + *"plasma"*) distro=${distro/Ubuntu/Kubuntu} ;; + *"mate"*) distro=${distro/Ubuntu/Ubuntu MATE} ;; + *"xubuntu"*) distro=${distro/Ubuntu/Xubuntu} ;; + *"Lubuntu"*) distro=${distro/Ubuntu/Lubuntu} ;; + *"budgie"*) distro=${distro/Ubuntu/Ubuntu Budgie} ;; + *"studio"*) distro=${distro/Ubuntu/Ubuntu Studio} ;; + *"cinnamon"*) distro=${distro/Ubuntu/Ubuntu Cinnamon} ;; esac fi ;; @@ -9902,6 +9903,32 @@ ${c1} ▀█████████ ███████${c2}███▀ EOF ;; + "Ubuntu Cinnamon"* | "Ubuntu-Cinnamon"*) + set_colors 1 + read -rd '' ascii_data <<'EOF' +${c1} .-:/++oooo++/:-. + `:/oooooooooooooooooo/-` + -/oooooooooooooooooooo+ooo/- + .+oooooooooooooooooo+/-`.ooooo+. + :oooooooooooo+//:://++:. .ooooooo: + /oooooooooo+o:`.----.``./+/oooooooo/ + /ooooooooo+. +ooooooooo+:``/ooooooooo/ +.ooooooooo: .+ooooooooooooo- -ooooooooo. +/oooooo/o+ .ooooooo:`+oo+ooo- :oooooooo/ +ooo+:. .o: :ooooo:` .+/. ./o+:/ooooooooo +oooo/-`.o: :ooo/` `/+. ./.:ooooooooo +/oooooo+o+``++. `:+- /oooooooo/ +.ooooooooo/`` -+:` :ooooooooo. + /ooooooooo+--+/` .+ooooooooo/ + /ooooooooooo+.` `.:++:oooooooo/ + :oooooooooooooo++++oo+-` .ooooooo: + .+ooooooooooooooooooo+:..ooooo+. + -/oooooooooooooooooooooooo/- + `-/oooooooooooooooooo/:` + .-:/++oooo++/:-. +EOF + ;; + "Ubuntu Budgie"* | "Ubuntu-Budgie"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From 96da4081006a881bb18b2879af1e8c7b449d246e Mon Sep 17 00:00:00 2001 From: Luke Yue Date: Thu, 23 Jul 2020 16:55:00 +0800 Subject: [PATCH 0972/1133] Add openEuler (#1510) Signed-off-by: Luke Yue --- neofetch | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 6ff4ff2fb..f31996d4e 100755 --- a/neofetch +++ b/neofetch @@ -776,10 +776,10 @@ image_source="auto" # LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, # Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, # Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -# NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, -# OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, -# Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, -# Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, +# NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, +# OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, +# Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, +# popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, # Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, # Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, # Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, @@ -4897,9 +4897,9 @@ ASCII: LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, - OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, OpenStage, - OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, - Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, + OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, + OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, + Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, @@ -8381,6 +8381,29 @@ ${c1} `-|.' /_. ${c4}\_| ${c1} F EOF ;; + "openEuler"*) + set_colors 4 7 1 + read -rd '' ascii_data <<'EOF' +${c1} + (##### + (((######## ##### + ((( ########## __...__ + (((((((( ####### /((((((###\ + ((((((((((( ....... \(((((####/ + (((((( ((((######### ******* + %((((((# ((######## + /////((((( ### +/////(((((((# (((& + ((((((((((((( + (((((((((((( + ((((((((( ((((((### + /((((((###### + //((((((###### + /((((((##### + *********/ +EOF + ;; + "OpenIndiana"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From b19d2b3caca6f7cb530d45d3ce9e7496e3443176 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 25 Jul 2020 08:35:21 +0300 Subject: [PATCH 0973/1133] term: Add support for Windows Terminal. Related to #1513 --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index b72a55d20..200ea0bb4 100755 --- a/neofetch +++ b/neofetch @@ -3122,6 +3122,7 @@ get_term() { # Most likely TosWin2 on FreeMiNT - quick check [[ "$TERM" == "tw52" || "$TERM" == "tw100" ]] && term="TosWin2" [[ "$SSH_CONNECTION" ]] && term="$SSH_TTY" + [[ "$WT_SESSION" ]] && term="Windows Terminal" # Check $PPID for terminal emulator. while [[ -z "$term" ]]; do From 0435dcd0cd44bb22afa9b986f15742cc05de7b20 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 26 Jul 2020 09:33:16 +0300 Subject: [PATCH 0974/1133] neofetch: Added support for --memory_unit to change memory output unit. Examples: kib '1020928KiB / 7117824KiB' mib '1042MiB / 6951MiB' gib: '0.98GiB / 6.79GiB' Precision level of GiB output is /not/ configurable at this stage in time. This may be added later. Closes #1388 --- neofetch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/neofetch b/neofetch index 4b6583c65..8537340c2 100755 --- a/neofetch +++ b/neofetch @@ -170,6 +170,18 @@ uptime_shorthand="on" # off: '1801MiB / 7881MiB' memory_percent="off" +# Change memory output unit. +# +# Default: 'mib' +# Values: 'kib', 'mib', 'gib' +# Flag: --memory_unit +# +# Example: +# kib '1020928KiB / 7117824KiB' +# mib '1042MiB / 6951MiB' +# gib: ' 0.98GiB / 6.79GiB' +memory_unit="mib" + # Packages @@ -2638,6 +2650,20 @@ get_memory() { [[ "$memory_percent" == "on" ]] && ((mem_perc=mem_used * 100 / mem_total)) + case $memory_unit in + gib) + mem_used=$(awk '{printf "%.2f", $1 / $2}' <<< "$mem_used 1024") + mem_total=$(awk '{printf "%.2f", $1 / $2}' <<< "$mem_total 1024") + mem_label=GiB + ;; + + kib) + mem_used=$((mem_used * 1024)) + mem_total=$((mem_total * 1024)) + mem_label=KiB + ;; + esac + memory="${mem_used}${mem_label:-MiB} / ${mem_total}${mem_label:-MiB} ${mem_perc:+(${mem_perc}%)}" # Bars. @@ -4817,6 +4843,7 @@ INFO: --song_format format Print the song data in a specific format (see config file). --song_shorthand on/off Print the Artist/Album/Title on separate lines. --memory_percent on/off Display memory percentage. + --memory_unit kib/mib/gib Memory output unit. --music_player player-name Manually specify a player to use. Available values are listed in the config file @@ -5009,6 +5036,7 @@ get_args() { "--song_shorthand") song_shorthand="$2" ;; "--music_player") music_player="$2" ;; "--memory_percent") memory_percent="$2" ;; + "--memory_unit") memory_unit="$2" ;; "--cpu_temp") cpu_temp="$2" [[ "$cpu_temp" == "on" ]] && cpu_temp="C" From 5413aff1dffc03ea2d1eb72bc93392b0c0034de6 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 1 Aug 2020 09:30:01 +0200 Subject: [PATCH 0975/1133] wallpaper: Add LXQt desktop (#1516) --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index 8537340c2..e4ef1c757 100755 --- a/neofetch +++ b/neofetch @@ -3986,6 +3986,11 @@ END image=$(awk -F '=' '$1 == "Image" { print $2 }' "$image") ;; + "LXQt"*) + image="$XDG_CONFIG_HOME/pcmanfm-qt/lxqt/settings.conf" + image="$(awk -F '=' '$1 == "Wallpaper" {print $2}' "$image")" + ;; + *) if type -p feh >/dev/null && [[ -f "${HOME}/.fehbg" ]]; then image="$(awk -F\' '/feh/ {printf $(NF-1)}' "${HOME}/.fehbg")" From fe921d7d173f783009e40b5f46e8ff0a74b05e31 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 1 Aug 2020 10:31:23 +0300 Subject: [PATCH 0976/1133] docs: update --- neofetch | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index 8537340c2..3d6fdb36f 100755 --- a/neofetch +++ b/neofetch @@ -4926,16 +4926,17 @@ ASCII: Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, - OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, - Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, PostMarketOS, - Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, Reborn_OS, Redstar, - Redcore, Redhat, Refracted_Devuan, Regata, Rosa, sabotage, Sabayon, - Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, - Siduction, Slackware, SliTaz, SmartOS, Solus, Source_Mage, Sparky, - Star, SteamOS, SunOS, openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, - SwagArch, Tails, Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, - Ubuntu-Studio, Ubuntu, Venom, Void, Obarun, windows10, Windows7, - Xubuntu, Zorin, and IRIX have ascii logos + OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, + Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, + Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, + Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, + Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, + Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, + SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, + openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, + Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, + Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, + and IRIX have ascii logos NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. From 60d07dee6b76769d8c487a40639fb7b5a1a7bc85 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 2 Aug 2020 21:37:41 +0300 Subject: [PATCH 0977/1133] neofetch: 7.0.0 --- neofetch | 2 +- neofetch.1 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index ff0bd3ade..1e4b56462 100755 --- a/neofetch +++ b/neofetch @@ -28,7 +28,7 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -version=7.0.0 +version=7.1.0 # Fallback to a value of '5' for shells which support bash # but do not set the 'BASH_' shell variables (osh). diff --git a/neofetch.1 b/neofetch.1 index 159d83361..21c547828 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.15. -.TH NEOFETCH "1" "May 2020" "Neofetch 7.0.0" "User Commands" +.TH NEOFETCH "1" "Aug 2020" "Neofetch 7.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS From a8c9214b994e9561fb01edfe0800963ba4e4cff2 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 3 Aug 2020 18:22:39 +0200 Subject: [PATCH 0978/1133] ascii: Update Lubuntu and Xubuntu (#1518) * ascii: Update Lubuntu * ascii: Update Xubuntu --- neofetch | 84 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/neofetch b/neofetch index 1e4b56462..9367b7fd9 100755 --- a/neofetch +++ b/neofetch @@ -7745,28 +7745,28 @@ EOF ;; "Lubuntu"*) - set_colors 4 7 1 + set_colors 27 7 1 read -rd '' ascii_data <<'EOF' -${c1} `-mddhhhhhhhhhddmss` - ./mdhhhhhhhhhhhhhhhhhhhhhh. - :mdhhhhhhhhhhhhhhhhhhhhhhhhhhhm` - :ymhhhhhhhhhhhhhhhyyyyyyhhhhhhhhhy: - `odhyyyhhhhhhhhhy+-````./syhhhhhhhho` - `hhy..:oyhhhhhhhy-`:osso/..:/++oosyyyh` - dhhs .-/syhhhhs`shhhhhhyyyyyyyyyyyyhs -:hhhy` yso/:+syhy/yhhhhhshhhhhhhhhhhhhh: -hhhhho. +hhhys++oyyyhhhhh-yhhhhhhhhhhhhhs -hhhhhhs-`/syhhhhyssyyhhhh:-yhhhhhhhhhhhhh -hhhhhhs `:/+ossyyhyyhhhhs -yhhhhhhhhhhhh -hhhhhhy/ `syyyssyyyyhhhhhh: :yhhhhhhhhhhs -:hhhhhhyo:-/osyhhhhhhhhhhho ohhhhhhhhhh: - sdhhhhhhhyyssyyhhhhhhhhhhh+ +hhhhhhhhs - `shhhhhhhhhhhhhhhhhhhhhhy+` .yhhhhhhhh` - +sdhhhhhhhhhhhhhhhhhyo/. `/yhhhhhhhd` - `:shhhhhhhhhh+---..``.:+yyhhhhhhh: - `:mdhhhhhh/.syssyyyyhhhhhhhd:` - `+smdhhh+shhhhhhhhhhhhdm` - `sNmdddhhhhhhhddm-` +${c1} `.:/ossyyyysso/:. + `.:yyyyyyyyyyyyyyyyyy:.` + .:yyyyyyyyyyyyyyyyyyyyyyyy:. + .:yyyyyyyyyyyyyyyyyyyyyyyyyyyy:. + -yyyyyyyyyyyyyy${c2}+hNMMMNh+${c1}yyyyyyyyy- + :yy${c2}mNy+${c1}yyyyyyyy${c2}+Nmso++smMdhyysoo+${c1}yy: + -yy${c2}+MMMmmy${c1}yyyyyy${c2}hh${c1}yyyyyyyyyyyyyyyyyyy- +.yyyy${c2}NMN${c1}yy${c2}shhs${c1}yyy${c2}+o${c1}yyyyyyyyyyyyyyyyyyyy. +:yyyy${c2}oNM+${c1}yyyy${c2}+sso${c1}yyyyyyy${c2}ss${c1}yyyyyyyyyyyyy: +:yyyyy${c2}+dNs${c1}yyyyyyy${c2}++${c1}yyyyy${c2}oN+${c1}yyyyyyyyyyyy: +:yyyyy${c2}oMMmhysso${c1}yyyyyyyyyy${c2}mN+${c1}yyyyyyyyyyy: +:yyyyyy${c2}hMm${c1}yyyyy${c2}+++${c1}yyyyyyy${c2}+MN${c1}yyyyyyyyyyy: +.yyyyyyy${c2}ohmy+${c1}yyyyyyyyyyyyy${c2}NMh${c1}yyyyyyyyyy. + -yyyyyyyyyy${c2}++${c1}yyyyyyyyyyyy${c2}MMh${c1}yyyyyyyyy- + :yyyyyyyyyyyyyyyyyyyyy${c2}+mMN+${c1}yyyyyyyy: + -yyyyyyyyyyyyyyyyy${c2}+sdMMd+${c1}yyyyyyyy- + .:yyyyyyyyy${c2}hmdmmNMNdy+${c1}yyyyyyyy:. + .:yyyyyyy${c2}my${c1}yyyyyyyyyyyyyyy:. + `.:yyyy${c2}s${c1}yyyyyyyyyyyyy:.` + `.:/oosyyyysso/:.` EOF ;; @@ -10281,28 +10281,28 @@ EOF ;; "Xubuntu"*) - set_colors 4 7 1 + set_colors 20 7 1 read -rd '' ascii_data <<'EOF' -${c1} `-/osyhddddhyso/-` - .+yddddddddddddddddddy+. - :yddddddddddddddddddddddddy: - -yddddddddddddddddddddhdddddddy- - odddddddddddyshdddddddh`dddd+ydddo - `yddddddhshdd- ydddddd+`ddh.:dddddy` - sddddddy /d. :dddddd-:dy`-ddddddds -:ddddddds /+ .dddddd`yy`:ddddddddd: -sdddddddd` . .-:/+ssdyodddddddddds -ddddddddy `:ohddddddddd -dddddddd. +dddddddd -sddddddy ydddddds -:dddddd+ .oddddddd: - sdddddo ./ydddddddds - `yddddd. `:ohddddddddddy` - oddddh/` `.:+shdddddddddddddo - -ydddddhyssyhdddddddddddddddddy- - :yddddddddddddddddddddddddy: - .+yddddddddddddddddddy+. - `-/osyhddddhyso/-` +${c1} `.:/ossyyyysso/:. + `.yyyyyyyyyyyyyyyyyyyy.` + `yyyyyyyyyyyyyyyyyyyyyyyyyy` + `yyyyyyyyyyyyyyyyyyyy${c2}::${c1}yyyyyyyy` + .yyyyyyyyyyy${c2}/+:${c1}yyyyyyy${c2}ds${c1}yyy${c2}+y${c1}yyyy. + yyyyyyy${c2}:o/${c1}yy${c2}dMMM+${c1}yyyyy${c2}/M+${c1}y${c2}:hM+${c1}yyyyyy + yyyyyyy${c2}+MMMy${c1}y${c2}mMMMh${c1}yyyyy${c2}yM::mM+${c1}yyyyyyyy +`yyyyyyy${c2}+MMMMysMMMd${c1}yyyyy${c2}dh:mN+${c1}yyyyyyyyy` +yyyyyyyy${c2}:NMMMMmMMMMmmdhyy+/y:${c1}yyyyyyyyyyy +yyyyyyyy${c2}+MMMMMMMMMMMMMMMMMMNho:${c1}yyyyyyyyy +yyyyyyyy${c2}mMMMMMMMMMMMMMMMMMMMMMMy${c1}yyyyyyyy +yyyyyyy${c2}+MMMMMMMMMMMMMMMMMMMMMMMM/${c1}yyyyyyy +`yyyyyy${c2}sMMMMMMMMMMMMMMMMMMMMMMmo${c1}yyyyyyy` + yyyyyy${c2}oMMMMMMMMMMMMMMMMMMMmy+${c1}yyyyyyyyy + yyyyy${c2}:mMMMMMMMMMMMMMMNho/${c1}yyyyyyyyyyy + .yyyy${c2}:yNMMMMMMMNdyo:${c1}yyyyyyyyyyyyy. + `yyyyyy${c2}:/++/::${c1}yyyyyyyyyyyyyyyyy` + `yyyyyyyyyyyyyyyyyyyyyyyyyy` + `.yyyyyyyyyyyyyyyyyyyy.` + `.:/oosyyyysso/:.` EOF ;; "IRIX"*) From bed4e9a8a117e6be20659ab05af00dab3e3ecb20 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 3 Aug 2020 21:38:38 +0200 Subject: [PATCH 0979/1133] ascii: revert colors (#1519) --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 9367b7fd9..3a7562c79 100755 --- a/neofetch +++ b/neofetch @@ -7745,7 +7745,7 @@ EOF ;; "Lubuntu"*) - set_colors 27 7 1 + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c1} `.:/ossyyyysso/:. `.:yyyyyyyyyyyyyyyyyy:.` @@ -10281,7 +10281,7 @@ EOF ;; "Xubuntu"*) - set_colors 20 7 1 + set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c1} `.:/ossyyyysso/:. `.yyyyyyyyyyyyyyyyyyyy.` From 9a82c8cac29f71323d12b379309daadc13af5d25 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 4 Aug 2020 16:27:58 +0200 Subject: [PATCH 0980/1133] Update Ubuntu Cinnamon logo (#1521) --- neofetch | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/neofetch b/neofetch index 3a7562c79..ac7f2c3e0 100755 --- a/neofetch +++ b/neofetch @@ -9962,28 +9962,28 @@ EOF ;; "Ubuntu Cinnamon"* | "Ubuntu-Cinnamon"*) - set_colors 1 + set_colors 1 7 read -rd '' ascii_data <<'EOF' -${c1} .-:/++oooo++/:-. - `:/oooooooooooooooooo/-` - -/oooooooooooooooooooo+ooo/- - .+oooooooooooooooooo+/-`.ooooo+. - :oooooooooooo+//:://++:. .ooooooo: - /oooooooooo+o:`.----.``./+/oooooooo/ - /ooooooooo+. +ooooooooo+:``/ooooooooo/ -.ooooooooo: .+ooooooooooooo- -ooooooooo. -/oooooo/o+ .ooooooo:`+oo+ooo- :oooooooo/ -ooo+:. .o: :ooooo:` .+/. ./o+:/ooooooooo -oooo/-`.o: :ooo/` `/+. ./.:ooooooooo -/oooooo+o+``++. `:+- /oooooooo/ -.ooooooooo/`` -+:` :ooooooooo. - /ooooooooo+--+/` .+ooooooooo/ - /ooooooooooo+.` `.:++:oooooooo/ - :oooooooooooooo++++oo+-` .ooooooo: - .+ooooooooooooooooooo+:..ooooo+. - -/oooooooooooooooooooooooo/- - `-/oooooooooooooooooo/:` - .-:/++oooo++/:-. +${c1} .-/+oooooooo+/-. + `:+oooooooooooooooooo+:` + -+oooooooooooooooooooooooo+- + .ooooooooooooooooooo${c2}:ohNd${c1}oooooo. + /oooooooooooo${c2}:/+oo++:/ohNd${c1}ooooooo/ + +oooooooooo${c2}:osNdhyyhdNNh+:+${c1}oooooooo+ + /ooooooooo${c2}/dN/${c1}ooooooooo${c2}/sNNo${c1}ooooooooo/ +.ooooooooo${c2}oMd:${c1}oooooooooooo${c2}:yMy${c1}ooooooooo. ++ooooo${c2}:+o/Md${c1}oooooo${c2}:sm/${c1}oo/ooo${c2}yMo${c1}oooooooo+ +ooo${c2}:sdMdosMo${c1}ooooo${c2}oNMd${c1}//${c2}dMd+${c1}o${c2}:so${c1}ooooooooo +oooo${c2}+ymdosMo${c1}ooo${c2}+mMm${c1}+/${c2}hMMMMMh+hs${c1}ooooooooo ++oooooo${c2}:${c1}:${c2}/Nm:${c1}/${c2}hMNo${c1}:y${c2}MMMMMMMMMM+${c1}oooooooo+ +.ooooooooo${c2}/NNMNy${c1}:o${c2}NMMMMMMMMMMo${c1}ooooooooo. +/oooooooooo${c2}:yh:${c1}+m${c2}MMMMMMMMMMd/${c1}ooooooooo/ + +oooooooooo${c2}+${c1}/h${c2}mMMMMMMNds//o${c1}oooooooo+ + /oooooooooooo${c2}+:////:o/ymMd${c1}ooooooo/ + .oooooooooooooooooooo${c2}/sdh${c1}oooooo. + -+oooooooooooooooooooooooo+- + `:+oooooooooooooooooo+:` + .-/+oooooooo+/-. EOF ;; From db6fa4c374bd7a3fdbfa86084824c721855b4103 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 4 Aug 2020 19:17:22 +0200 Subject: [PATCH 0981/1133] Update Ubuntu Mate logo (#1522) --- neofetch | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/neofetch b/neofetch index ac7f2c3e0..de0441fe1 100755 --- a/neofetch +++ b/neofetch @@ -10038,26 +10038,27 @@ EOF "Ubuntu MATE"* | "Ubuntu-MATE"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1} `:+shmNNMMNNmhs+:` - .odMMMMMMMMMMMMMMMMMMdo. - /dMMMMMMMMMMMMMMMmMMMMMMMMd/ - :mMMMMMMMMMMMMNNNNM/`/yNMMMMMMm: - `yMMMMMMMMMms:..-::oM: -omMMMMMy` - `dMMMMMMMMy-.odNMMMMMM: -odMMMMMMd` - hMMMMMMMm-.hMMy/....+M:`/yNm+mMMMMMMMh -/MMMMNmMN-:NMy`-yNMMMMMmNyyMN:`dMMMMMMM/ -hMMMMm -odMMh`sMMMMMMMMMMs sMN..MMMMMMMh -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -NMMMMm `/yNMMMMMMMMMMMM: MM+ mMMMMMMN -hMMMMm -odMMh sMMMMMMMMMMs oMN..MMMMMMMh -/MMMMNNMN-:NMy`-yNMMMMMNNsyMN:`dMMMMMMM/ - hMMMMMMMm-.hMMy/....+M:.+hNd+mMMMMMMMh - `dMMMMMMMMy-.odNMMMMMM: :smMMMMMMd` - yMMMMMMMMMms/..-::oM: .+dMMMMMy - :mMMMMMMMMMMMMNNNNM: :smMMMMMMm: - /dMMMMMMMMMMMMMMMdNMMMMMMMd/ - .odMMMMMMMMMMMMMMMMMMdo. - `:+shmNNMMNNmhs+:` +${c1} .:/+oossssoo+/:.` + `:+ssssssssssssssssss+:` + -+sssssssssssssss${c2}y${c1}ssssssss+- + .osssssssssssss${c2}yy${c1}ss${c2}mMmh${c1}ssssssso. + /sssssssss${c2}ydmNNNmmd${c1}s${c2}mMMMMNdy${c1}sssss/ + `+ssssssss${c2}hNNdy${c1}sssssss${c2}mMMMMNdy${c1}ssssss+` + +sssssss${c2}yNNh${c1}ss${c2}hmNNNNm${c1}s${c2}mMmh${c1}s${c2}ydy${c1}sssssss+ +-sssss${c2}y${c1}ss${c2}Nm${c1}ss${c2}hNNh${c1}ssssss${c2}y${c1}s${c2}hh${c1}ss${c2}mMy${c1}sssssss- ++ssss${c2}yMNdy${c1}ss${c2}hMd${c1}ssssssssss${c2}hMd${c1}ss${c2}NN${c1}sssssss+ +sssss${c2}yMMMMMmh${c1}sssssssssssss${c2}NM${c1}ss${c2}dMy${c1}sssssss +sssss${c2}yMMMMMmhy${c1}ssssssssssss${c2}NM${c1}ss${c2}dMy${c1}sssssss ++ssss${c2}yMNdy${c1}ss${c2}hMd${c1}ssssssssss${c2}hMd${c1}ss${c2}NN${c1}sssssss+ +-sssss${c2}y${c1}ss${c2}Nm${c1}ss${c2}hNNh${c1}ssssssss${c2}dh${c1}ss${c2}mMy${c1}sssssss- + +sssssss${c2}yNNh${c1}ss${c2}hmNNNNm${c1}s${c2}mNmh${c1}s${c2}ymy${c1}sssssss+ + +ssssssss${c2}hNNdy${c1}sssssss${c2}mMMMMmhy${c1}ssssss+ + /sssssssss${c2}ydmNNNNmd${c1}s${c2}mMMMMNdh${c1}sssss/ + .osssssssssssss${c2}yy${c1}ss${c2}mMmdy${c1}sssssso. + -+sssssssssssssss${c2}y${c1}ssssssss+- + `:+ssssssssssssssssss+:` + .:/+oossssoo+/:. + EOF ;; From 286ef32f4557ab221a079631b764573d1a8cd5e5 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 7 Aug 2020 17:17:28 +0200 Subject: [PATCH 0982/1133] Add LibreELEC logo (#1526) --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index de0441fe1..0439d1ca2 100755 --- a/neofetch +++ b/neofetch @@ -7664,6 +7664,32 @@ EOF EOF ;; + "LibreELEC"*) + set_colors 2 3 7 14 13 + read -rd '' ascii_data <<'EOF' +${c1} :+ooo/. ${c2}./ooo+: +${c1} :+ooooooo/. ${c2}./ooooooo+: +${c1} :+ooooooooooo:${c2}:ooooooooooo+: +${c1} :+ooooooooooo+- ${c2}-+ooooooooooo+: +${c1} :+ooooooooooo+- ${c3}-- ${c2}-+ooooooooooo+: +${c1}.+ooooooooooo+- ${c3}:+oo+: ${c2}-+ooooooooooo+- +${c1}-+ooooooooo+- ${c3}:+oooooo+: ${c2}-+oooooooooo- +${c1} :+ooooo+- ${c3}:+oooooooooo+: ${c2}-+oooooo: +${c1} :+o+- ${c3}:+oooooooooooooo+: ${c2}-+oo: +${c4} ./ ${c3}:oooooooooooooooooo: ${c5}/. +${c4} ./oo+: ${c3}-+oooooooooooooo+- ${c5}:+oo/. +${c4} ./oooooo+: ${c3}-+oooooooooo+- ${c5}:+oooooo/. +${c4}-oooooooooo+: ${c3}-+oooooo+- ${c5}:+oooooooooo- +${c4}.+ooooooooooo+: ${c3}-+oo+- ${c5}:+ooooooooooo+. +${c4} -+ooooooooooo+: ${c3}.. ${c5}:+ooooooooooo+- +${c4} -+ooooooooooo+: ${c5}:+ooooooooooo+- +${c4} -+oooooooooo+:${c5}:+oooooooooo+- +${c4} -+oooooo+: ${c5}:+oooooo+- +${c4} -+oo+: ${c5}:+oo+- +${c4} .. ${c5}.. +EOF + ;; + "Linux") set_colors fg 8 3 read -rd '' ascii_data <<'EOF' From e33625ba92f088403940beecedde4dc4006e4c15 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 7 Aug 2020 18:16:34 +0200 Subject: [PATCH 0983/1133] song: Switch Exaile to get_song_dbus (#1528) --- neofetch | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/neofetch b/neofetch index 0439d1ca2..129fc1948 100755 --- a/neofetch +++ b/neofetch @@ -2767,6 +2767,7 @@ get_song() { "xnoise"*) get_song_dbus "xnoise" ;; "tauonmb"*) get_song_dbus "tauon" ;; "olivia"*) get_song_dbus "olivia" ;; + "exaile"*) get_song_dbus "exaile" ;; "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; "io.elementary.music"*) get_song_dbus "Music" ;; @@ -2811,16 +2812,6 @@ get_song() { END {print a " \n" b " \n"t}')" ;; - "exaile"*) - # NOTE: Exaile >= 4.0.0 will support mpris2. - song="$(dbus-send --print-reply --dest=org.exaile.Exaile \ - /org/exaile/Exaile org.exaile.Exaile.Query | - awk -F ':' '{sub(",[^,]*$", "", $3); t=$3; - sub(",[^,]*$", "", $4); a=$4; - sub(",[^,]*$", "", $5); b=$5} - END {print a " \n" b " \n" t}')" - ;; - "muine"*) song="$(dbus-send --print-reply --dest=org.gnome.Muine /org/gnome/Muine/Player \ org.gnome.Muine.Player.GetCurrentSong | From d96ed38f25a394e214b01ab34080baa09ff3d12f Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Mon, 17 Aug 2020 20:03:35 +0200 Subject: [PATCH 0984/1133] term_font: fix alacritty (#1535) --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 129fc1948..9d634597c 100755 --- a/neofetch +++ b/neofetch @@ -3206,7 +3206,8 @@ get_term_font() { [[ -f "${confs[0]}" ]] || return - term_font="$(awk -F ':|#' '/normal:/ {getline; print}' "${confs[0]}")" + term_font="$(awk '/normal:/ {while (!/family:/ || /#/) + {if (!getline) {exit}} print; exit}' "${confs[0]}")" term_font="${term_font/*family:}" term_font="${term_font/$'\n'*}" term_font="${term_font/\#*}" From bfbefc7f6bacf3016a973e8c874b2346fae539e1 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Wed, 19 Aug 2020 08:54:41 +0200 Subject: [PATCH 0985/1133] docs: update (#1538) --- neofetch | 2 +- neofetch.1 | 63 +++++++++++++++++++++++++++++------------------------- 2 files changed, 35 insertions(+), 30 deletions(-) diff --git a/neofetch b/neofetch index 9d634597c..4a3809624 100755 --- a/neofetch +++ b/neofetch @@ -4854,7 +4854,7 @@ TEXT FORMATTING: COLOR BLOCKS: --color_blocks on/off Enable/Disable the color blocks - --col_offset auto/num Left-padding of color blocks + --col_offset auto/num Left-padding of color blocks --block_width num Width of color blocks in spaces --block_height num Height of color blocks in lines --block_range num num Range of colors to print as blocks diff --git a/neofetch.1 b/neofetch.1 index 21c547828..5cadd702a 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.15. -.TH NEOFETCH "1" "Aug 2020" "Neofetch 7.1.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. +.TH NEOFETCH "1" "August 2020" "Neofetch 7.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -161,6 +161,9 @@ Print the Artist/Album/Title on separate lines. \fB\-\-memory_percent\fR on/off Display memory percentage. .TP +\fB\-\-memory_unit\fR kib/mib/gib +Memory output unit. +.TP \fB\-\-music_player\fR player\-name Manually specify a player to use. Available values are listed in the config file @@ -259,6 +262,9 @@ Shortcut to use 'jp2a' backend. \fB\-\-kitty\fR source Shortcut to use 'kitty' backend. .TP +\fB\-\-pot\fR source +Shortcut to use 'pot' backend. +.TP \fB\-\-pixterm\fR source Shortcut to use 'pixterm' backend. .TP @@ -288,33 +294,32 @@ Colors to print the ascii art Which Distro's ascii art to print .TP NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, -"AOSC OS", "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, -ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, -BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, -BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, -Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, -Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, -DesaOS, Devuan, DracOS, DragonFly, Drauger, Elementary, -EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, -FreeMiNT, Frugalware, Funtoo, GalliumOS, Gentoo, Pentoo, -gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, -Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, -Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, -LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, -Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, -Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -NuTyX, OBRevenge, OpenBSD, OpenIndiana, openmamba, OpenMandriva, -OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, -Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, Porteus, -PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, Raspbian, -Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, -Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, -SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, -Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, -openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, -Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, Ubuntu\-Studio, Ubuntu, -Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX -have ascii logos +"AOSC OS", "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, +ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, +Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, +BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, +Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, +Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, +DracOS, DarkOs, DragonFly, Drauger, Elementary, EndeavourOS, Endless, +EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, +Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, +GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, +KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, +LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, +Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, +Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, +OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, +OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, +Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, +Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, +Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, +Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, +Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, +SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, +openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, +Trisquel, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, Ubuntu\-Studio, +Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, +and IRIX have ascii logos .IP NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. .IP From 5f8ce9bbc462c28f5976e14245e7df5a236e52fc Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 17 Sep 2020 08:27:48 +0300 Subject: [PATCH 0986/1133] packages: Add support for carbs --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 4a3809624..0df70a8a1 100755 --- a/neofetch +++ b/neofetch @@ -1489,6 +1489,7 @@ get_packages() { Linux|BSD|"iPhone OS"|Solaris) # Package Manager Programs. has kiss && tot kiss l + has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never has dpkg && tot dpkg-query -f '.\n' -W has rpm && tot rpm -qa From af4cf16bf4ec5c9ad4a93d71f715fdf14c88db6d Mon Sep 17 00:00:00 2001 From: ncmprhnsbl Date: Thu, 17 Sep 2020 21:58:37 +1000 Subject: [PATCH 0987/1133] add song= support for MellowPlayer using get_song_dbus (#1558) * add song= support for MellowPlayer using get_song_dbus * adjusted indent for mellowplayer get_song_dbus Co-authored-by: ncmprhnsb1 --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 0df70a8a1..bce4e2a95 100755 --- a/neofetch +++ b/neofetch @@ -508,6 +508,7 @@ disk_percent="on" # iTunes # juk # lollypop +# MellowPlayer # mocp # mopidy # mpd @@ -2696,6 +2697,7 @@ get_song() { "iTunes" "juk" "lollypop" + "MellowPlayer" "mocp" "mopidy" "mpd" @@ -2772,6 +2774,7 @@ get_song() { "netease-cloud-music"*) get_song_dbus "netease-cloud-music" ;; "plasma-browser-integration"*) get_song_dbus "plasma-browser-integration" ;; "io.elementary.music"*) get_song_dbus "Music" ;; + "MellowPlayer"*) get_song_dbus "MellowPlayer3" ;; "mpd"* | "mopidy"*) song="$(mpc -f '%artist% \n%album% \n%title%' current "${mpc_args[@]}")" From 8a9eacbab8653bb5f4546d51e50af3b15518caaa Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 19 Sep 2020 23:47:15 +0200 Subject: [PATCH 0988/1133] os: Add Live Raizo (#1560) --- neofetch | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/neofetch b/neofetch index bce4e2a95..3c27b00eb 100755 --- a/neofetch +++ b/neofetch @@ -8108,6 +8108,31 @@ ${c2} ``-:::::-`` EOF ;; + "Live Raizo"* | "Live_Raizo"*) + set_colors 3 + read -rd '' ascii_data <<'EOF' +${c1} `......` + -+shmNMMMMMMNmhs/. + :smMMMMMmmhyyhmmMMMMMmo- + -hMMMMd+:. `----` .:odMMMMh- + `hMMMN+. .odNMMMMMMNdo. .yMMMMs` + hMMMd. -dMMMMmdhhdNMMMNh` .mMMMh +oMMMm` :MMMNs.:sddy:-sMMMN- `NMMM+ +mMMMs dMMMo sMMMMMMd yMMMd sMMMm +----` .---` oNMMMMMh `---. .---- + .sMMy: + /MM/ + +dMMms. + hMMMMMMN + `dMMMMMMm: + .+ss+sMNysMMoomMd+ss+. + +MMMMMMN` +MM/ hMMMMMNs + sMMMMMMm-hNMMMd-hMMMMMMd + :yddh+`hMMMMMMN :yddy/` + .hMMMMd: + `..` +EOF + ;; "mx_small"*) set_colors 4 6 7 From f74746d5b94727587fccd43820396335e0d928b0 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 20 Sep 2020 18:28:17 +0200 Subject: [PATCH 0989/1133] os: Add Quibian (#1561) --- neofetch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/neofetch b/neofetch index 3c27b00eb..e8de6b069 100755 --- a/neofetch +++ b/neofetch @@ -9110,6 +9110,30 @@ ${c1} `..--..` EOF ;; + "Quibian"*) + set_colors 3 7 + read -rd '' ascii_data <<'EOF' +${c1} `.--::::::::--.` + `.-:::-..`` ``..-::-.` + .::::-` .${c2}+${c1}:`` `.-::.` + .::::.` -::::::-` `.::. + `-:::-` -:::::::::--..`` .::` + `::::- .${c2}oy${c1}:::::::---.```.: `::` + -:::: `.-:::::::::::-.``` `:: +.::::.`-:::::::::::::. `:. +-::::.::::::::::::::: -: +::::::::::::::::::::` `: +:::::::::::::::::::- `: +::::::::::::::::::: -- +.:::::::::::::::::` `:` +`::::::::::::::::: -` + .:::::::::::::::- -` + `::::::::::::::- `.` + .::::::::::::- `` + `.--:::::-. +EOF + ;; + "Radix"*) set_colors 1 2 read -rd '' ascii_data <<'EOF' From b83a48a60f2a06b87b4d6532f3e2cc1df6d0795e Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 25 Sep 2020 13:36:46 +0200 Subject: [PATCH 0990/1133] uptime: Fix shorthand off (#1564) --- neofetch | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index e8de6b069..c9a3e5cd9 100755 --- a/neofetch +++ b/neofetch @@ -1433,7 +1433,7 @@ get_uptime() { d="$((s / 60 / 60 / 24)) days" h="$((s / 60 / 60 % 24)) hours" - m="$((s / 60 % 60)) mins" + m="$((s / 60 % 60)) minutes" # Remove plural if < 2. ((${d/ *} == 1)) && d=${d/s} @@ -1447,20 +1447,24 @@ get_uptime() { uptime=${d:+$d, }${h:+$h, }$m uptime=${uptime%', '} - uptime=${uptime:-$s secs} + uptime=${uptime:-$s seconds} # Make the output of uptime smaller. case $uptime_shorthand in - on) ;; + on) + uptime=${uptime/ minutes/ mins} + uptime=${uptime/ minute/ min} + uptime=${uptime/ seconds/ secs} + ;; tiny) uptime=${uptime/ days/d} uptime=${uptime/ day/d} uptime=${uptime/ hours/h} uptime=${uptime/ hour/h} - uptime=${uptime/ mins/m} - uptime=${uptime/ min/m} - uptime=${uptime/ secs/s} + uptime=${uptime/ minutes/m} + uptime=${uptime/ minute/m} + uptime=${uptime/ seconds/s} uptime=${uptime//,} ;; esac From 6f8d365deb07accaa728ffe0850abca53f561ee5 Mon Sep 17 00:00:00 2001 From: Simon Gredal Date: Sun, 27 Sep 2020 06:39:11 +0200 Subject: [PATCH 0991/1133] Fix CPU Temp. not showing up on Raspberry Pi (#1566) Added another possible name to the regex for finding cpu temperature. This was tested on a Raspberry Pi 4 running Arch Linux ARM. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c9a3e5cd9..eaefbf235 100755 --- a/neofetch +++ b/neofetch @@ -2103,7 +2103,7 @@ get_cpu() { # Select the right temperature file. for temp_dir in /sys/class/hwmon/*; do - [[ "$(< "${temp_dir}/name")" =~ (coretemp|fam15h_power|k10temp) ]] && { + [[ "$(< "${temp_dir}/name")" =~ (cpu_thermal|coretemp|fam15h_power|k10temp) ]] && { temp_dirs=("$temp_dir"/temp*_input) temp_dir=${temp_dirs[0]} break From 1a4fdc346f0c914585a282c8e7e2ed53af3fbc67 Mon Sep 17 00:00:00 2001 From: j-james <35242550+j-james@users.noreply.github.com> Date: Tue, 29 Sep 2020 21:44:09 -0700 Subject: [PATCH 0992/1133] Images: Reimplement catimg support (#1570) Fixes broken size parameter from the last implementation --- neofetch | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index eaefbf235..7a8c22fb9 100755 --- a/neofetch +++ b/neofetch @@ -744,7 +744,7 @@ disk_display="off" # Image backend. # # Default: 'ascii' -# Values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'off', +# Values: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', 'iterm2', 'off', # 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' # Flag: --backend image_backend="ascii" @@ -881,6 +881,14 @@ crop_offset="center" # --size image_size="auto" +# Catimg block size. +# Control the resolution of catimg. +# +# Default: '2' +# Values: '1', '2' +# Flags: --catimg_size +catimg_size="2" + # Gap between image and text # # Default: '3' @@ -3833,7 +3841,7 @@ image_backend() { "ascii") print_ascii ;; "off") image_backend="off" ;; - "caca" | "chafa" | "jp2a" | "iterm2" | "termpix" |\ + "caca" | "catimg" | "chafa" | "jp2a" | "iterm2" | "termpix" |\ "tycat" | "w3m" | "sixel" | "pixterm" | "kitty" | "pot") get_image_source @@ -3858,9 +3866,9 @@ image_backend() { *) err "Image: Unknown image backend specified '$image_backend'." - err "Image: Valid backends are: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'kitty', - 'off', 'sixel', 'pot', 'pixterm', 'termpix', 'tycat', - 'w3m')" + err "Image: Valid backends are: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', 'iterm2', + 'kitty', 'off', 'sixel', 'pot', 'pixterm', 'termpix', + 'tycat', 'w3m')" err "Image: Falling back to ascii mode." print_ascii ;; @@ -4248,6 +4256,10 @@ display_image() { "$image" ;; + "catimg") + catimg -w "$((width*catimg_size / font_width))" -r "$catimg_size" "$image" + ;; + "chafa") chafa --stretch --size="$((width / font_width))x$((height / font_height))" "$image" ;; @@ -4885,8 +4897,8 @@ BARS: IMAGE BACKEND: --backend backend Which image backend to use. - Possible values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', - 'off', 'sixel', 'tycat', 'w3m', 'kitty' + Possible values: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', + 'iterm2', 'off', 'sixel', 'tycat', 'w3m', 'kitty' --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] @@ -4896,6 +4908,7 @@ IMAGE BACKEND: NEW: neofetch --ascii \"\$(fortune | cowsay -W 30)\" --caca source Shortcut to use 'caca' backend. + --catimg source Shortcut to use 'catimg' backend. --chafa source Shortcut to use 'chafa' backend. --iterm2 source Shortcut to use 'iterm2' backend. --jp2a source Shortcut to use 'jp2a' backend. @@ -4969,6 +4982,7 @@ IMAGE: in some terminals emulators when using image mode. --size 00px | --size 00% How to size the image. Possible values: auto, 00px, 00%, none + --catimg_size 1/2 Change the resolution of catimg. --crop_mode mode Which crop mode to use Takes the values: normal, fit, fill --crop_offset value Change the crop offset for normal mode. @@ -5120,8 +5134,8 @@ get_args() { # Image backend "--backend") image_backend="$2" ;; "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" |\ - "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + "--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" |\ + "--pot" | "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") image_backend="${1/--}" case $2 in "-"* | "") ;; @@ -5132,6 +5146,7 @@ get_args() { # Image options "--loop") image_loop="on" ;; "--image_size" | "--size") image_size="$2" ;; + "--catimg_size") catimg_size="$2" ;; "--crop_mode") crop_mode="$2" ;; "--crop_offset") crop_offset="$2" ;; "--xoffset") xoffset="$2" ;; From 4b5f4e33beec42db4d3278ab92c7549656dc8202 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 13:42:05 +0300 Subject: [PATCH 0993/1133] de/wm: Fix Windows 10 issues. Closes #1571, #1573 --- neofetch | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index 0df70a8a1..5ae16b32f 100755 --- a/neofetch +++ b/neofetch @@ -1688,8 +1688,17 @@ get_de() { Windows) case $distro in - "Windows 8"*|"Windows 10"*) de="Modern UI/Metro" ;; - *) de=Aero + "Windows 10"*) + de=Fluent + ;; + + "Windows 8"*) + de=Metro + ;; + + *) + de=Aero + ;; esac ;; @@ -1870,15 +1879,21 @@ get_wm() { ;; Windows) - wm=$(tasklist | grep -m 1 -o -F \ - -e bugn \ - -e Windawesome \ - -e blackbox \ - -e emerge \ - -e litestep) - - [[ $wm == blackbox ]] && wm="bbLean (Blackbox)" - wm=${wm:+$wm, }Explorer + wm=$( + tasklist | + + grep -Fom 1 \ + -e bugn \ + -e Windawesome \ + -e blackbox \ + -e emerge \ + -e litestep + ) + + [[ $wm == blackbox ]] && + wm="bbLean (Blackbox)" + + wm=${wm:+$wm, }DWM.exe ;; FreeMiNT) From 77bac34cc5f406373ab31615a67f3eeb4c2609da Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 13:53:30 +0300 Subject: [PATCH 0994/1133] general: drop cpu_usage. Always been unreliable. Never worked well. Closes #1551 --- neofetch | 44 +------------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/neofetch b/neofetch index 4f6a04a6a..9f824816d 100755 --- a/neofetch +++ b/neofetch @@ -75,7 +75,6 @@ print_info() { info "Memory" memory # info "GPU Driver" gpu_driver # Linux/macOS only - # info "CPU Usage" cpu_usage # info "Disk" disk # info "Battery" battery # info "Font" font @@ -2365,47 +2364,6 @@ get_cpu() { fi } -get_cpu_usage() { - case $os in - "Windows") - cpu_usage="$(wmic cpu get loadpercentage)" - cpu_usage="${cpu_usage/LoadPercentage}" - cpu_usage="${cpu_usage//[[:space:]]}" - ;; - - *) - # Get CPU cores if unset. - if [[ "$cpu_cores" != "logical" ]]; then - case $os in - "Linux" | "MINIX") cores="$(grep -c "^processor" /proc/cpuinfo)" ;; - "Mac OS X"|"macOS") cores="$(sysctl -n hw.logicalcpu_max)" ;; - "BSD") cores="$(sysctl -n hw.ncpu)" ;; - "Solaris") cores="$(kstat -m cpu_info | grep -c -F "chip_id")" ;; - "Haiku") cores="$(sysinfo -cpu | grep -c -F 'CPU #')" ;; - "iPhone OS") cores="${cpu/*\(}"; cores="${cores/\)*}" ;; - "IRIX") cores="$(sysconf NPROC_ONLN)" ;; - "FreeMiNT") cores="$(sysctl -n hw.ncpu)" ;; - - "AIX") - cores="$(lparstat -i | awk -F':' '/Online Virtual CPUs/ {printf $2}')" - ;; - esac - fi - - cpu_usage="$(ps aux | awk 'BEGIN {sum=0} {sum+=$3}; END {print sum}')" - cpu_usage="$((${cpu_usage/\.*} / ${cores:-1}))" - ;; - esac - - # Print the bar. - case $cpu_display in - "bar") cpu_usage="$(bar "$cpu_usage" 100)" ;; - "infobar") cpu_usage="${cpu_usage}% $(bar "$cpu_usage" 100)" ;; - "barinfo") cpu_usage="$(bar "$cpu_usage" 100)${info_color} ${cpu_usage}%" ;; - *) cpu_usage="${cpu_usage}%" ;; - esac -} - get_gpu() { case $os in "Linux") @@ -5258,7 +5216,6 @@ get_args() { info "GPU Driver" gpu_driver info "Memory" memory - info "CPU Usage" cpu_usage info "Disk" disk info "Battery" battery info "Font" font @@ -5311,6 +5268,7 @@ get_simple() { old_functions() { # Removed functions for backwards compatibility. get_line_break() { :; } + get_cpu_usage() { :; } } get_distro_ascii() { From fb572770362144915e3b47283c09f4a97ed31c3f Mon Sep 17 00:00:00 2001 From: Alan Griffiths Date: Sun, 4 Oct 2020 12:04:48 +0100 Subject: [PATCH 0995/1133] Better handling of Wayland compositors (#1539) * Better handling of Wayland compositors * Reinstate setting ps_flags, it's used elsewhere * Try another incantation * Try another incantation * Try another incantation * Use short options and a newline to reduce line-length * Rework to handle the "better way" failing on some systems and fall back to the old method (which has the virtue of working most of the time). --- neofetch | 66 +++++++++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 29 deletions(-) diff --git a/neofetch b/neofetch index 9f824816d..9752e09a6 100755 --- a/neofetch +++ b/neofetch @@ -1815,35 +1815,43 @@ get_wm() { *) ps_flags=(-e) ;; esac - if [[ $WAYLAND_DISPLAY ]]; then - wm=$(ps "${ps_flags[@]}" | grep -m 1 -o -F \ - -e arcan \ - -e asc \ - -e clayland \ - -e dwc \ - -e fireplace \ - -e gnome-shell \ - -e greenfield \ - -e grefsen \ - -e kwin \ - -e lipstick \ - -e maynard \ - -e mazecompositor \ - -e motorcar \ - -e orbital \ - -e orbment \ - -e perceptia \ - -e rustland \ - -e sway \ - -e ulubis \ - -e velox \ - -e wavy \ - -e way-cooler \ - -e wayfire \ - -e wayhouse \ - -e westeros \ - -e westford \ - -e weston) + if [[ -O "${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY:-wayland-0}" ]]; then + if tmp_pid="$(lsof -t "${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY:-wayland-0}" 2>&1)" || + tmp_pid="$(fuser "${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY:-wayland-0}" 2>&1)"; then + wm="$(ps -p "${tmp_pid}" -ho comm=)" + else + # lsof may not exist, or may need root on some systems. Similarly fuser. + # On those systems we search for a list of known window managers, this can mistakenly + # match processes for another user or session and will miss unlisted window managers. + wm=$(ps "${ps_flags[@]}" | grep -m 1 -o -F \ + -e arcan \ + -e asc \ + -e clayland \ + -e dwc \ + -e fireplace \ + -e gnome-shell \ + -e greenfield \ + -e grefsen \ + -e kwin \ + -e lipstick \ + -e maynard \ + -e mazecompositor \ + -e motorcar \ + -e orbital \ + -e orbment \ + -e perceptia \ + -e rustland \ + -e sway \ + -e ulubis \ + -e velox \ + -e wavy \ + -e way-cooler \ + -e wayfire \ + -e wayhouse \ + -e westeros \ + -e westford \ + -e weston) + fi elif [[ $DISPLAY && $os != "Mac OS X" && $os != "macOS" && $os != FreeMiNT ]]; then type -p xprop &>/dev/null && { From a6137b26dbc9c4527f5468d5804652c729f47cb6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 14:11:56 +0300 Subject: [PATCH 0996/1133] de: Display Wayland if detected. Closes #1471 --- neofetch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9f824816d..764a84151 100755 --- a/neofetch +++ b/neofetch @@ -1800,9 +1800,15 @@ get_de() { de_ver=${de_ver/* } de_ver=${de_ver//\"} - de="$de $de_ver" + de+=" $de_ver" fi + # TODO: + # - New config option + flag: --de_display_server on/off ? + # - Add display of X11, Arcan and anything else relevant. + [[ $de && $WAYLAND_DISPLAY ]] && + de+=" (Wayland)" + de_run=1 } From a4d9c557b3c7e55510bf4009537bc4963760e4d2 Mon Sep 17 00:00:00 2001 From: Julian Torreno Date: Sun, 4 Oct 2020 07:26:51 -0400 Subject: [PATCH 0997/1133] Remove extra newlines from get_cols (#1449) Co-authored-by: Julian Torreno --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index f53cd9b88..19e574fe1 100755 --- a/neofetch +++ b/neofetch @@ -3807,8 +3807,8 @@ get_cols() { ((info_height+=block_range[1]>7?block_height+3:block_height+2)) case $col_offset in - "auto") printf '\n\e[%bC%b\n\n' "$text_padding" "${zws}${cols}" ;; - *) printf '\n\e[%bC%b\n\n' "$col_offset" "${zws}${cols}" ;; + "auto") printf '\n\e[%bC%b\n' "$text_padding" "${zws}${cols}" ;; + *) printf '\n\e[%bC%b\n' "$col_offset" "${zws}${cols}" ;; esac fi From 1c468b4e3163977ff47780e8534793cd7fe8bf75 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 14:34:57 +0300 Subject: [PATCH 0998/1133] neofetch: Fix cursor placement issue --- neofetch | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 19e574fe1..e336c53c5 100755 --- a/neofetch +++ b/neofetch @@ -3804,7 +3804,7 @@ get_cols() { [${text_padding}C${zws}} # Add block height to info height. - ((info_height+=block_range[1]>7?block_height+3:block_height+2)) + ((info_height+=block_range[1]>7?block_height+2:block_height+1)) case $col_offset in "auto") printf '\n\e[%bC%b\n' "$text_padding" "${zws}${cols}" ;; @@ -3885,7 +3885,14 @@ print_ascii() { done <<< "${ascii_data//\$\{??\}}" # Fallback if file not found. - ((lines==1)) && { lines=; ascii_len=; image_source=auto; get_distro_ascii; print_ascii; return; } + ((lines==1)) && { + lines= + ascii_len= + image_source=auto + get_distro_ascii + print_ascii + return + } # Colors. ascii_data="${ascii_data//\$\{c1\}/$c1}" From 566c8096dad0c2eb8bc8bfba58ff031cd20b928e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 14:44:04 +0300 Subject: [PATCH 0999/1133] term_font: Fix st font2 issue. Closes #1446 --- neofetch | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index e336c53c5..4a900135e 100755 --- a/neofetch +++ b/neofetch @@ -3409,15 +3409,16 @@ END # like a font definition. NOTE: There is a slight limitation in this approach. # Technically "Font Name" is a valid font. As it doesn't specify any font options # though it is hard to match it correctly amongst the rest of the noise. - [[ -n "$binary" ]] && \ - term_font="$(strings "$binary" | grep -F -m 1 \ - -e "pixelsize=" \ - -e "size=" \ - -e "antialias=" \ - -e "autohint=")" + [[ -n "$binary" ]] && + term_font=$( + strings "$binary" | + + grep -m 1 "*font[^2]" + ) fi term_font="${term_font/xft:}" + term_font="${term_font#*=}" term_font="${term_font/:*}" ;; From c155bdecd1c314b5f3744d553ad049b34bd42730 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 14:50:26 +0300 Subject: [PATCH 1000/1133] wm: Fix issue with dwm. Closes #1433 --- neofetch | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/neofetch b/neofetch index 4a900135e..249ab3fd3 100755 --- a/neofetch +++ b/neofetch @@ -1860,7 +1860,19 @@ get_wm() { fi elif [[ $DISPLAY && $os != "Mac OS X" && $os != "macOS" && $os != FreeMiNT ]]; then - type -p xprop &>/dev/null && { + # non-EWMH WMs. + wm=$(ps "${ps_flags[@]}" | grep -m 1 -o \ + -e "[s]owm" \ + -e "[c]atwm" \ + -e "[f]vwm" \ + -e "[d]wm" \ + -e "[2]bwm" \ + -e "[m]onsterwm" \ + -e "[t]inywm" \ + -e "[x]11fs" \ + -e "[x]monad") + + [[ -z $wm ]] && type -p xprop &>/dev/null && { id=$(xprop -root -notype _NET_SUPPORTING_WM_CHECK) id=${id##* } wm=$(xprop -id "$id" -notype -len 100 -f _NET_WM_NAME 8t) @@ -1869,19 +1881,6 @@ get_wm() { wm=${wm/\"*} } - # Fallback for non-EWMH WMs. - [[ $wm ]] || - wm=$(ps "${ps_flags[@]}" | grep -m 1 -o \ - -e "[s]owm" \ - -e "[c]atwm" \ - -e "[f]vwm" \ - -e "[d]wm" \ - -e "[2]bwm" \ - -e "[m]onsterwm" \ - -e "[t]inywm" \ - -e "[x]11fs" \ - -e "[x]monad") - else case $os in "Mac OS X"|"macOS") From f730fc6a81b939dccdedd1a7d630b0cd40cb3810 Mon Sep 17 00:00:00 2001 From: Andrea Canepa <32621046+A-725-K@users.noreply.github.com> Date: Sun, 4 Oct 2020 13:53:30 +0200 Subject: [PATCH 1001/1133] Wrong number of packages reported for some package managers (#1556) * Wrong number of snap packages reported: fixed for snap (#1274) * Adjusted indentation and improved packages count (#1274) * Fixed spacing in empty lines --- neofetch | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/neofetch b/neofetch index 249ab3fd3..aca6d0033 100755 --- a/neofetch +++ b/neofetch @@ -1478,21 +1478,28 @@ get_uptime() { } get_packages() { + # to adjust the number of pkgs per pkg manager + pkgs_h=0 + # has: Check if package manager installed. # dir: Count files or dirs in a glob. # pac: If packages > 0, log package manager name. # tot: Count lines in command output. has() { type -p "$1" >/dev/null && manager=$1; } - dir() { ((packages+=$#)); pac "$#"; } + dir() { ((packages+=$#)); pac "$(($#-pkgs_h))"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } - tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")";((packages+=${#pkgs[@]}));pac "${#pkgs[@]}";} + tot() { + IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")"; + ((packages+=${#pkgs[@]})); + pac "$((${#pkgs[@]}-pkgs_h))"; + } # Redefine tot() for Bedrock Linux. [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]] && { tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in $(brl list); do strat -r "$s" "$@"; done)" ((packages+="${#pkgs[@]}")) - pac "${#pkgs[@]}" + pac "$((${#pkgs[@]}-pkgs_h))"; } br_prefix="/bedrock/strata/*" } @@ -1512,7 +1519,7 @@ get_packages() { has lvu && tot lvu installed has tce-status && tot tce-status -i has pkg_info && tot pkg_info - has tazpkg && tot tazpkg list && ((packages-=6)) + has tazpkg && pkgs_h=6 tot tazpkg list && ((packages-=6)) has sorcery && tot gaze installed has alps && tot alps showinstalled has butch && tot butch list @@ -1573,7 +1580,8 @@ get_packages() { # Snap hangs if the command is run without the daemon running. # Only run snap if the daemon is also running. - has snap && ps -e | grep -qFm 1 snapd >/dev/null && tot snap list && ((packages-=1)) + has snap && ps -e | grep -qFm 1 snapd >/dev/null && \ + pkgs_h=1 tot snap list && ((packages-=1)) # This is the only standard location for appimages. # See: https://github.com/AppImage/AppImageKit/wiki @@ -1581,7 +1589,7 @@ get_packages() { ;; "Mac OS X"|"macOS"|MINIX) - has port && tot port installed && ((packages-=1)) + has port && pkgs_h=1 tot port installed && ((packages-=1)) has brew && dir /usr/local/Cellar/* has pkgin && tot pkgin list @@ -1603,9 +1611,9 @@ get_packages() { esac # Scoop environment throws errors if `tot scoop list` is used - has scoop && dir ~/scoop/apps/* && ((packages-=1)) + has scoop && pkgs_h=1 dir ~/scoop/apps/* && ((packages-=1)) - # Count chocolatey packages. + # Count chocolatey packages. [[ -d /cygdrive/c/ProgramData/chocolatey/lib ]] && \ dir /cygdrive/c/ProgramData/chocolatey/lib/* ;; @@ -1613,11 +1621,11 @@ get_packages() { Haiku) has pkgman && dir /boot/system/package-links/* packages=${packages/pkgman/depot} - ;; - + ;; + IRIX) manager=swpkg - tot versions -b && ((packages-=3)) + pkgs_h=3 tot versions -b && ((packages-=3)) ;; esac From 6dca2c4037c35c71e9c676908070296087541974 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 4 Oct 2020 13:56:51 +0200 Subject: [PATCH 1002/1133] os: Add Univention (#1572) --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index aca6d0033..6c4b02b39 100755 --- a/neofetch +++ b/neofetch @@ -10242,6 +10242,32 @@ oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso EOF ;; + "Univention"*) + set_colors 1 7 + read -rd '' ascii_data <<'EOF' +${c1} ./osssssssssssssssssssssso+- + `ohhhhhhhhhhhhhhhhhhhhhhhhhhhhy: + shhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh- + `-//${c2}sssss${c1}/hhhhhhhhhhhhhh+${c2}s${c1}.hhhhhhhhh+ + .ohhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sss${c1}+hhhhhhh+ +.yhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}ssss${c1}:hhhhhh+ ++hhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sssss${c1}yhhhhh+ ++hhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sssss${c1}yhhhhh+ ++hhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sssss${c1}yhhhhh+ ++hhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sssss${c1}yhhhhh+ ++hhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sssss${c1}yhhhhh+ ++hhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sssss${c1}yhhhhh+ ++hhhhhy${c2}sssss${c1}.hhhhhhhhhhhhhh.${c2}sssss${c1}yhhhhh+ ++hhhhhy${c2}ssssss${c1}+yhhhhhhhhhhy/${c2}ssssss${c1}yhhhhh+ ++hhhhhh:${c2}sssssss${c1}:hhhhhhh+${c2}.ssssssss${c1}yhhhhy. ++hhhhhhh+`${c2}ssssssssssssssss${c1}hh${c2}sssss${c1}yhhho` ++hhhhhhhhhs+${c2}ssssssssssss${c1}+hh+${c2}sssss${c1}/:-` +-hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhho + :yhhhhhhhhhhhhhhhhhhhhhhhhhhhh+` + -+ossssssssssssssssssssss+:` +EOF + ;; + "Venom"*) set_colors 8 4 read -rd '' ascii_data <<'EOF' From 1cd67b9f9ae45ceb095ee8f022c8dab3b6620d0a Mon Sep 17 00:00:00 2001 From: RhinoCodes <51250021+RhinoCodes@users.noreply.github.com> Date: Sun, 4 Oct 2020 06:57:09 -0500 Subject: [PATCH 1003/1133] Add semcOS (#1567) --- neofetch | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/neofetch b/neofetch index 6c4b02b39..6cdff4fd6 100755 --- a/neofetch +++ b/neofetch @@ -10324,6 +10324,36 @@ ${c1} -1vvnvv. `~+++` ++|+++ ~|Invnvnvvnvvvnnv}+` -~|{*l}*|~ EOF + + ;; + + "semc"*) + set_colors 2 8 + read -rd '' ascii_data <<'EOF' +${c1} __.;=====;.__ + _.=+==++=++=+=+===;. + -=+++=+===+=+=+++++=_ + . -=:`` `--==+=++==. + _vi, ` --+=++++: + .uvnvi. _._ -==+==+. + .vvnvnI` .;==|==;. :|=||=|. +${c2} _______._______.___ ___. ______ + / | ____| \/ | / | + | (----| |__ | \ / || ,----' + \ \ | __| | |\/| || | +.----) | | |____| | | || `----. +|_______/ |_______|__| |__| \______| + +${c1} -1vvnvv. `~+++` ++|+++ + +vnvnnv, `-|=== + +vnvnvns. . :=- + -Invnvvnsi..___..=sv=. ` + +Invnvnvnnnnnnnnvvnn;. + ~|Invnvnvvnvvvnnv}+` + -~|{*l}*|~ + +EOF + ;; "Obarun"*) From 19af3abaee51460ea5ed137c09776ca7269e0a16 Mon Sep 17 00:00:00 2001 From: Aditya Shakya Date: Sun, 4 Oct 2020 17:27:24 +0530 Subject: [PATCH 1004/1133] Added Archcraft OS (#1547) --- neofetch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/neofetch b/neofetch index 6cdff4fd6..2e9700ab1 100755 --- a/neofetch +++ b/neofetch @@ -5630,6 +5630,30 @@ dhhyys+/-` EOF ;; + "Archcraft"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} -m: + :NMM+ .+ + +MMMMMo -NMy + sMMMMMMMy -MMMMh` + yMMMMMMMMMd` oMMMMd` + `dMMMMMMMMMMMm. /MMMMm- + .mMMMMMm-dMMMMMN- :NMMMN: + -NMMMMMd` yMMMMMN: .mMMMM/ + :NMMMMMy sMMMMMM+ `dMMMMo + +MMMMMMs +MMMMMMs `hMMMMy + oMMMMMMMds- :NMMMMMy sMMMMh` + yMMMMMNoydMMmo` -NMMMMMd` +MMMMd. + `dMMMMMN- `:yNNs` .mMMMMMm. /MMMMm- + .mMMMMMm. :hN/ `dMMMMMN- -NMMMN: + -NMMMMMd` -hh` `yMMMMMN: .mMMMM/ + :NMMMMMy `s` :h. oMMMMMM+ `----- + +MMMMMMo .dMm. `o. +MMMMMMo +sMMMMMM+ .mMMMN: :` :NMMMMMy +EOF + ;; + "arcolinux_small"*) set_colors 7 4 read -rd '' ascii_data <<'EOF' From 314a0bc4f6bf1801dcd015f84e5ae8d6d973144f Mon Sep 17 00:00:00 2001 From: Rising Thumb Date: Sun, 4 Oct 2020 13:00:26 +0100 Subject: [PATCH 1005/1133] =?UTF-8?q?=C3=9Cberzug=20image=20support=20(#15?= =?UTF-8?q?62)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Support for Ueberzug backend * Ueberzug cli argument * Fixed slight issues according to shellcheck * Read output suppressed * --xoffset and --yoffset support Co-authored-by: dylan --- neofetch | 32 +++++++++++++++++++++++++++----- neofetch.1 | 9 ++++++--- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index 2e9700ab1..e80541ed9 100755 --- a/neofetch +++ b/neofetch @@ -744,7 +744,8 @@ disk_display="off" # # Default: 'ascii' # Values: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', 'iterm2', 'off', -# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' +# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty', 'ueberzug' + # Flag: --backend image_backend="ascii" @@ -3837,13 +3838,14 @@ image_backend() { "off") image_backend="off" ;; "caca" | "catimg" | "chafa" | "jp2a" | "iterm2" | "termpix" |\ - "tycat" | "w3m" | "sixel" | "pixterm" | "kitty" | "pot") + "tycat" | "w3m" | "sixel" | "pixterm" | "kitty" | "pot", | "ueberzug") get_image_source [[ ! -f "$image" ]] && { to_ascii "Image: '$image_source' doesn't exist, falling back to ascii mode." return } + [[ "$image_backend" == "ueberzug" ]] && wait=true; get_window_size @@ -4258,6 +4260,24 @@ display_image() { "$image" ;; + + "ueberzug") + if [ "$wait" = true ];then + wait=false; + else + source "$(ueberzug library)" + ImageLayer 0< <( + ImageLayer::add\ + ['identifier']="neofetch"\ + ['x']="$xoffset" ['y']="$yoffset"\ + ['max_width']="$((width / font_width))"\ + ['max_height']="$((height / font_height))"\ + ['path']="$image"; + read -rs; + ) + fi + ;; + "catimg") catimg -w "$((width*catimg_size / font_width))" -r "$catimg_size" "$image" ;; @@ -4921,6 +4941,7 @@ IMAGE BACKEND: --termpix source Shortcut to use 'termpix' backend. --tycat source Shortcut to use 'tycat' backend. --w3m source Shortcut to use 'w3m' backend. + --ueberzug source Shortcut to use 'ueberzug' backend --off Shortcut to use 'off' backend (Disable ascii art). NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', @@ -5135,9 +5156,9 @@ get_args() { # Image backend "--backend") image_backend="$2" ;; - "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" |\ - "--pot" | "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty") + "--source") image_source="$2" ;; + "--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" |\ + "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty" | "--ueberzug") image_backend="${1/--}" case $2 in "-"* | "") ;; @@ -10726,6 +10747,7 @@ main() { # w3m-img: Draw the image a second time to fix # rendering issues in specific terminal emulators. [[ $image_backend == *w3m* ]] && display_image + [[ $image_backend == *ueberzug* ]] && display_image # Add neofetch info to verbose output. err "Neofetch command: $0 $*" diff --git a/neofetch.1 b/neofetch.1 index 5cadd702a..4a766043c 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -235,7 +235,7 @@ Possible values: bar, infobar, barinfo, off \fB\-\-backend\fR backend Which image backend to use. Possible values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', -\&'off', 'sixel', 'tycat', 'w3m', 'kitty' +\&'off', 'sixel', 'tycat', 'w3m', 'kitty', 'ueberzug' .TP \fB\-\-source\fR source Which image or ascii file to use. @@ -280,6 +280,9 @@ Shortcut to use 'tycat' backend. \fB\-\-w3m\fR source Shortcut to use 'w3m' backend. .TP +\fB\-\-ueberzug\fR source +Shortcut to use 'ueberzug' backend. +.TP \fB\-\-off\fR Shortcut to use 'off' backend (Disable ascii art). .IP @@ -365,11 +368,11 @@ west, center, east, southwest, south, southeast .TP \fB\-\-xoffset\fR px How close the image will be to the left edge of the -window. This only works with w3m. +window. This only works with w3m and ueberzug. .TP \fB\-\-yoffset\fR px How close the image will be to the top edge of the -window. This only works with w3m. +window. This only works with w3m and ueberzug. .TP \fB\-\-bg_color\fR color Background color to display behind transparent image. From f3991ad97024b8766a9f1531462e4e40a7aa4284 Mon Sep 17 00:00:00 2001 From: manzoor ahmed Date: Sun, 4 Oct 2020 17:03:28 +0500 Subject: [PATCH 1006/1133] add LaxerOS (#1541) --- neofetch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/neofetch b/neofetch index e80541ed9..561d94137 100755 --- a/neofetch +++ b/neofetch @@ -7723,6 +7723,34 @@ EOF \ LE \ / \ DE \ / \________\/ +EOF + ;; + + "LaxerOS"*) + set_colors 7 4 + read -rd '' ascii_data <<'EOF' +${c2} + /. + `://:- + `//////: + .////////:` + -//////////:` + -/////////////` + :///////////////. + `://////.```-//////- + `://///:` .//////- + `//////: `//////: + .//////- `://///:` + -//////- `://///:` + -//////. ://////` + ://////` -//////. + `/////:` ./////: + .-::-` .:::-` + +.:://////////////////////////////////::. +//////////////////////////////////////// +.:////////////////////////////////////:. + EOF ;; From 60d090164dc25c5d63698151feccdba7afac49d6 Mon Sep 17 00:00:00 2001 From: paperbenni Date: Sun, 4 Oct 2020 14:03:57 +0200 Subject: [PATCH 1007/1133] Update neofetch (#1537) --- neofetch | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/neofetch b/neofetch index 561d94137..04bb10d5b 100755 --- a/neofetch +++ b/neofetch @@ -5533,6 +5533,34 @@ ${c1} -o o- EOF ;; + "instantOS"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' + +${c1} + 'cx0XWWMMWNKOd:'. + .;kNMMMMMMMMMMMMMWNKd' + 'kNMMMMMMWNNNWMMMMMMMMXo. +,0MMMMMW0o;'..,:dKWMMMMMWx. +OMMMMMXl. .xNMMMMMNo +WMMMMNl .kWWMMMMO' +MMMMMX; oNWMMMMK, +NMMMMWo .OWMMMMMK, +kWMMMMNd. ,kWMMMMMMK, +'kWMMMMWXxl:;;:okNMMMMMMMMK, + .oXMMMMMMMWWWMMMMMMMMMMMMK, + 'oKWMMMMMMMMMMMMMMMMMMMK, + .;lxOKXXXXXXXXXXXXXXXO;...... + ................,d0000000kd:. + .kMMMMMMMMMW0; + .kMMMMMMMMMMMX + .xMMMMMMMMMMMW + cXMMMMMMMMMM0 + :0WMMMMMMNx, + .o0NMWNOc. +EOF + ;; + "Antergos"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' From d8e957cb0d4204d144f964941ec58fae11bbb8e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charl=C3=A8ne?= Date: Sun, 4 Oct 2020 14:05:34 +0200 Subject: [PATCH 1008/1133] Improve glxinfo call, OpenBSD sensors fix (#1494) * Use `glxinfo -B' instead of `glxinfo' It's enough to get the gpu infos and it's way faster. * OpenBSD: fix cpu sensors informations, add ksmn(4) and adt(4) --- neofetch | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 04bb10d5b..ae42adbd2 100755 --- a/neofetch +++ b/neofetch @@ -2246,8 +2246,7 @@ get_cpu() { ;; "OpenBSD"* | "Bitrig"*) deg="$(sysctl hw.sensors | \ - awk -F '=| degC' '/lm0.temp|cpu0.temp/ {print $2; exit}')" - deg="${deg/00/0}" + awk -F'=|degC' '/(ksmn|adt|lm|cpu)0.temp0/ {printf("%2.1f", $2); exit}')" ;; esac ;; @@ -2529,7 +2528,7 @@ get_gpu() { ;; *) - gpu="$(glxinfo | grep -F 'OpenGL renderer string')" + gpu="$(glxinfo -B | grep -F 'OpenGL renderer string')" gpu="${gpu/OpenGL renderer string: }" ;; esac From 6b26a4d688ae8f2e71cc95471be247d1d4ee5c04 Mon Sep 17 00:00:00 2001 From: Alex Mirrington <34053287+alexmirrington@users.noreply.github.com> Date: Sun, 4 Oct 2020 23:05:59 +1100 Subject: [PATCH 1009/1133] Update raspbian_small ascii art (#1483) * Update raspbian_small ascii art * Escape rogue backslash --- neofetch | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index ae42adbd2..57df2210a 100755 --- a/neofetch +++ b/neofetch @@ -9282,16 +9282,15 @@ EOF "Raspbian_small"*) set_colors 2 1 read -rd '' ascii_data <<'EOF' -${c1} .~~. .~~. - '. \\ ' ' / .' -${c2} .~ .~~~..~. - : .~.'~'.~. : - ~ ( ) ( ) ~ -( : '~'.~.'~' : ) - ~ .~ ( ) ~. ~ - ( : '~' : ) - '~ .~~~. ~' - '~' +${c1} .. ,. + :oo: .:oo: + 'o\\o o/o: +${c2} :: . :: . :: +:: ::: ::: :: +:' '',.'' ': + ::: :::: ::: + ':, '' ,:' + ' ~::~ ' EOF ;; From d76815d3a245bc7acbaf839e663b6c4bde87abf3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sun, 4 Oct 2020 14:06:25 +0200 Subject: [PATCH 1010/1133] Add Armbian Linux (#1417) * Add Armbian Linux * Update neofetch * Update neofetch --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index 57df2210a..196246b4d 100755 --- a/neofetch +++ b/neofetch @@ -976,6 +976,10 @@ get_distro() { *) distro="Red Star OS $(awk -F'[^0-9*]' '$0=$2' /etc/redstar-release)" esac + elif [[ -f /etc/armbian-release ]]; then + . /etc/armbian-release + distro="Armbian $DISTRIBUTION_CODENAME ($VERSION)" + elif [[ -f /etc/siduction-version ]]; then case $distro_shorthand in on|tiny) distro=Siduction ;; From 9ca24eaa0ac41b70d84c7db0ee321f7520860333 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sun, 4 Oct 2020 23:09:36 +1100 Subject: [PATCH 1011/1133] local_ip: Add interface selection (#1327) * local_ip: add interface selection local_ip: add interface selection for macOS local_ip: add interface support for Linux and others local_ip: fix quotes local_ip: fix line length local_ip: fix line length for realsies this time * local ip: change default to auto and simplify if statement * local ip: make error for invalid interface actually work on linux * local ip: remove unneeded slash * local ip: silence errors from ip and ifconfig Co-authored-by: dylan --- neofetch | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 196246b4d..633328afa 100755 --- a/neofetch +++ b/neofetch @@ -407,6 +407,13 @@ public_ip_host="http://ident.me" # Flag: --ip_timeout public_ip_timeout=2 +# Local IP interface +# +# Default: 'auto' (interface of default route) +# Values: 'auto', 'en0', 'en1' +# Flag: --ip_interface +local_ip_interface=('auto') + # Desktop Environment @@ -3702,9 +3709,25 @@ get_battery() { get_local_ip() { case $os in "Linux" | "BSD" | "Solaris" | "AIX" | "IRIX") - local_ip="$(ip route get 1 | awk -F'src' '{print $2; exit}')" - local_ip="${local_ip/uid*}" - [[ -z "$local_ip" ]] && local_ip="$(ifconfig -a | awk '/broadcast/ {print $2; exit}')" + if [[ "${local_ip_interface[0]}" == "auto" ]]; then + local_ip="$(ip route get 1 | awk -F'src' '{print $2; exit}')" + local_ip="${local_ip/uid*}" + [[ "$local_ip" ]] || local_ip="$(ifconfig -a | awk '/broadcast/ {print $2; exit}')" + else + for interface in "${local_ip_interface[@]}"; do + local_ip="$(ip addr show "$interface" 2> /dev/null | + awk '/inet / {print $2; exit}')" + local_ip="${local_ip/\/*}" + [[ "$local_ip" ]] || + local_ip="$(ifconfig "$interface" 2> /dev/null | + awk '/broadcast/ {print $2; exit}')" + if [[ -n "$local_ip" ]]; then + prin "$interface" "$local_ip" + else + err "Local IP: Could not detect local ip for $interface" + fi + done + fi ;; "MINIX") @@ -3712,8 +3735,19 @@ get_local_ip() { ;; "Mac OS X" | "macOS" | "iPhone OS") - local_ip="$(ipconfig getifaddr en0)" - [[ -z "$local_ip" ]] && local_ip="$(ipconfig getifaddr en1)" + if [[ "${local_ip_interface[0]}" == "auto" ]]; then + interface="$(route get 1 | awk -F': ' '/interface/ {printf $2; exit}')" + local_ip="$(ipconfig getifaddr "$interface")" + else + for interface in "${local_ip_interface[@]}"; do + local_ip="$(ipconfig getifaddr "$interface")" + if [[ -n "$local_ip" ]]; then + prin "$interface" "$local_ip" + else + err "Local IP: Could not detect local ip for $interface" + fi + done + fi ;; "Windows") @@ -4882,6 +4916,7 @@ INFO: --ip_host url URL to query for public IP --ip_timeout int Public IP timeout (in seconds). + --ip_interface value Interface(s) to use for local IP --song_format format Print the song data in a specific format (see config file). --song_shorthand on/off Print the Artist/Album/Title on separate lines. --memory_percent on/off Display memory percentage. @@ -5078,6 +5113,17 @@ get_args() { "--shell_version") shell_version="$2" ;; "--ip_host") public_ip_host="$2" ;; "--ip_timeout") public_ip_timeout="$2" ;; + "--ip_interface") + unset local_ip_interface + for arg in "$@"; do + case "$arg" in + "--ip_interface") ;; + "-"*) break ;; + *) local_ip_interface+=("$arg") ;; + esac + done + ;; + "--song_format") song_format="$2" ;; "--song_shorthand") song_shorthand="$2" ;; "--music_player") music_player="$2" ;; From 075eb43dd77cddcbe5f41706c9676ae29be0291f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 15:18:28 +0300 Subject: [PATCH 1012/1133] neofetch: clean up --- neofetch | 114 ++++++++++++++++++++++++++----------------------------- 1 file changed, 54 insertions(+), 60 deletions(-) diff --git a/neofetch b/neofetch index 633328afa..60ef7d941 100755 --- a/neofetch +++ b/neofetch @@ -728,8 +728,7 @@ bar_color_total="distro" # # Default: 'off' # Values: 'bar', 'infobar', 'barinfo', 'off' -# Flags: --cpu_display -# --memory_display +# Flags: --memory_display # --battery_display # --disk_display # @@ -738,7 +737,6 @@ bar_color_total="distro" # infobar: 'info [---=======]' # barinfo: '[---=======] info' # off: 'info' -cpu_display="off" memory_display="off" battery_display="off" disk_display="off" @@ -985,7 +983,7 @@ get_distro() { elif [[ -f /etc/armbian-release ]]; then . /etc/armbian-release - distro="Armbian $DISTRIBUTION_CODENAME ($VERSION)" + distro="Armbian $DISTRIBUTION_CODENAME (${VERSION:-})" elif [[ -f /etc/siduction-version ]]; then case $distro_shorthand in @@ -1500,7 +1498,7 @@ get_packages() { has() { type -p "$1" >/dev/null && manager=$1; } dir() { ((packages+=$#)); pac "$(($#-pkgs_h))"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } - tot() { + tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")"; ((packages+=${#pkgs[@]})); pac "$((${#pkgs[@]}-pkgs_h))"; @@ -1634,7 +1632,7 @@ get_packages() { has pkgman && dir /boot/system/package-links/* packages=${packages/pkgman/depot} ;; - + IRIX) manager=swpkg pkgs_h=3 tot versions -b && ((packages-=3)) @@ -4314,7 +4312,7 @@ display_image() { ) fi ;; - + "catimg") catimg -w "$((width*catimg_size / font_width))" -r "$catimg_size" "$image" ;; @@ -4946,8 +4944,6 @@ BARS: --bar_length num Length in spaces to make the bars. --bar_colors num num Colors to make the bar. Set in this order: elapsed, total - --cpu_display mode Bar mode. - Possible values: bar, infobar, barinfo, off --memory_display mode Bar mode. Possible values: bar, infobar, barinfo, off --battery_display mode Bar mode. @@ -5198,14 +5194,13 @@ get_args() { bar_color_total="$3" ;; - "--cpu_display") cpu_display="$2" ;; "--memory_display") memory_display="$2" ;; "--battery_display") battery_display="$2" ;; "--disk_display") disk_display="$2" ;; # Image backend "--backend") image_backend="$2" ;; - "--source") image_source="$2" ;; + "--source") image_source="$2" ;; "--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" |\ "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty" | "--ueberzug") image_backend="${1/--}" @@ -5336,7 +5331,6 @@ get_args() { refresh_rate="on" shell_version="on" - cpu_display="infobar" memory_display="infobar" disk_display="infobar" cpu_temp="C" @@ -5587,26 +5581,26 @@ EOF read -rd '' ascii_data <<'EOF' ${c1} - 'cx0XWWMMWNKOd:'. - .;kNMMMMMMMMMMMMMWNKd' - 'kNMMMMMMWNNNWMMMMMMMMXo. -,0MMMMMW0o;'..,:dKWMMMMMWx. -OMMMMMXl. .xNMMMMMNo -WMMMMNl .kWWMMMMO' -MMMMMX; oNWMMMMK, -NMMMMWo .OWMMMMMK, -kWMMMMNd. ,kWMMMMMMK, -'kWMMMMWXxl:;;:okNMMMMMMMMK, - .oXMMMMMMMWWWMMMMMMMMMMMMK, - 'oKWMMMMMMMMMMMMMMMMMMMK, - .;lxOKXXXXXXXXXXXXXXXO;...... - ................,d0000000kd:. + 'cx0XWWMMWNKOd:'. + .;kNMMMMMMMMMMMMMWNKd' + 'kNMMMMMMWNNNWMMMMMMMMXo. +,0MMMMMW0o;'..,:dKWMMMMMWx. +OMMMMMXl. .xNMMMMMNo +WMMMMNl .kWWMMMMO' +MMMMMX; oNWMMMMK, +NMMMMWo .OWMMMMMK, +kWMMMMNd. ,kWMMMMMMK, +'kWMMMMWXxl:;;:okNMMMMMMMMK, + .oXMMMMMMMWWWMMMMMMMMMMMMK, + 'oKWMMMMMMMMMMMMMMMMMMMK, + .;lxOKXXXXXXXXXXXXXXXO;...... + ................,d0000000kd:. .kMMMMMMMMMW0; .kMMMMMMMMMMMX .xMMMMMMMMMMMW cXMMMMMMMMMM0 :0WMMMMMMNx, - .o0NMWNOc. + .o0NMWNOc. EOF ;; @@ -5731,24 +5725,24 @@ EOF "Archcraft"*) set_colors 6 6 7 1 read -rd '' ascii_data <<'EOF' -${c1} -m: - :NMM+ .+ - +MMMMMo -NMy - sMMMMMMMy -MMMMh` - yMMMMMMMMMd` oMMMMd` - `dMMMMMMMMMMMm. /MMMMm- - .mMMMMMm-dMMMMMN- :NMMMN: - -NMMMMMd` yMMMMMN: .mMMMM/ - :NMMMMMy sMMMMMM+ `dMMMMo - +MMMMMMs +MMMMMMs `hMMMMy - oMMMMMMMds- :NMMMMMy sMMMMh` - yMMMMMNoydMMmo` -NMMMMMd` +MMMMd. - `dMMMMMN- `:yNNs` .mMMMMMm. /MMMMm- - .mMMMMMm. :hN/ `dMMMMMN- -NMMMN: +${c1} -m: + :NMM+ .+ + +MMMMMo -NMy + sMMMMMMMy -MMMMh` + yMMMMMMMMMd` oMMMMd` + `dMMMMMMMMMMMm. /MMMMm- + .mMMMMMm-dMMMMMN- :NMMMN: + -NMMMMMd` yMMMMMN: .mMMMM/ + :NMMMMMy sMMMMMM+ `dMMMMo + +MMMMMMs +MMMMMMs `hMMMMy + oMMMMMMMds- :NMMMMMy sMMMMh` + yMMMMMNoydMMmo` -NMMMMMd` +MMMMd. + `dMMMMMN- `:yNNs` .mMMMMMm. /MMMMm- + .mMMMMMm. :hN/ `dMMMMMN- -NMMMN: -NMMMMMd` -hh` `yMMMMMN: .mMMMM/ :NMMMMMy `s` :h. oMMMMMM+ `----- - +MMMMMMo .dMm. `o. +MMMMMMo -sMMMMMM+ .mMMMN: :` :NMMMMMy + +MMMMMMo .dMm. `o. +MMMMMMo +sMMMMMM+ .mMMMN: :` :NMMMMMy EOF ;; @@ -7806,24 +7800,24 @@ EOF "LaxerOS"*) set_colors 7 4 read -rd '' ascii_data <<'EOF' -${c2} +${c2} /. - `://:- - `//////: - .////////:` - -//////////:` - -/////////////` - :///////////////. - `://////.```-//////- - `://///:` .//////- - `//////: `//////: - .//////- `://///:` - -//////- `://///:` - -//////. ://////` - ://////` -//////. - `/////:` ./////: + `://:- + `//////: + .////////:` + -//////////:` + -/////////////` + :///////////////. + `://////.```-//////- + `://///:` .//////- + `//////: `//////: + .//////- `://///:` + -//////- `://///:` + -//////. ://////` + ://////` -//////. + `/////:` ./////: .-::-` .:::-` - + .:://////////////////////////////////::. //////////////////////////////////////// .:////////////////////////////////////:. @@ -10500,7 +10494,7 @@ ${c1} -1vvnvv. `~+++` ++|+++ +Invnvnvnnnnnnnnvvnn;. ~|Invnvnvvnvvvnnv}+` -~|{*l}*|~ - + EOF ;; From c511bcbcef44db3b05c885191ebd170ebaf15574 Mon Sep 17 00:00:00 2001 From: Rashil Gandhi <46838874+rashil2000@users.noreply.github.com> Date: Sun, 4 Oct 2020 19:07:50 +0530 Subject: [PATCH 1013/1133] Display charging status in Windows (#1575) --- neofetch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neofetch b/neofetch index 60ef7d941..3e93ed79d 100755 --- a/neofetch +++ b/neofetch @@ -3686,6 +3686,9 @@ get_battery() { battery="$(wmic Path Win32_Battery get EstimatedChargeRemaining)" battery="${battery/EstimatedChargeRemaining}" battery="$(trim "$battery")%" + state="$(wmic /NameSpace:'\\root\WMI' Path BatteryStatus get Charging)" + state="${state/Charging}" + [[ "$state" == *TRUE* ]] && battery_state="charging" ;; "Haiku") From 71d8914ec7a30e42e800253433eae10bc1b43869 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 18:05:18 +0300 Subject: [PATCH 1014/1133] windows: Fix gpu output --- neofetch | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 3e93ed79d..f88f5c954 100755 --- a/neofetch +++ b/neofetch @@ -2517,10 +2517,13 @@ get_gpu() { "Windows") while read -r line; do + [[ $win_gpu ]] || { + win_gpu=1 + continue + } + prin "${subtitle:+${subtitle}${gpu_name}}" "$(trim "$line")" done < <(wmic path Win32_VideoController get caption) - - gpu=${gpu//Caption} ;; "Haiku") From c93f3dabd6ab578bf055165c813ef80bc9829a57 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 18:26:26 +0300 Subject: [PATCH 1015/1133] gpu: Fix blank line in output on Windows. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f88f5c954..477a9b246 100755 --- a/neofetch +++ b/neofetch @@ -2517,7 +2517,7 @@ get_gpu() { "Windows") while read -r line; do - [[ $win_gpu ]] || { + [[ -z $win_gpu ]] || [[ -z "$line" ]] && { win_gpu=1 continue } From 7bf2ecee26adf67165a370e7510631914a5f47d2 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 18:46:04 +0300 Subject: [PATCH 1016/1133] fix ci --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 477a9b246..e5e7dbbb4 100755 --- a/neofetch +++ b/neofetch @@ -5207,8 +5207,9 @@ get_args() { # Image backend "--backend") image_backend="$2" ;; "--source") image_source="$2" ;; - "--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" | "--pot" |\ - "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty" | "--ueberzug") + "--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" |\ + "--pot" | "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty" |\ + "--ueberzug") image_backend="${1/--}" case $2 in "-"* | "") ;; From 4660ae7a53d61a90a66dc5634367a8e357bfb135 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 4 Oct 2020 19:05:03 +0300 Subject: [PATCH 1017/1133] various: fix windows issues --- neofetch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index e5e7dbbb4..ba1835989 100755 --- a/neofetch +++ b/neofetch @@ -1718,11 +1718,11 @@ get_de() { Windows) case $distro in - "Windows 10"*) + *"Windows 10"*) de=Fluent ;; - "Windows 8"*) + *"Windows 8"*) de=Metro ;; @@ -2517,12 +2517,14 @@ get_gpu() { "Windows") while read -r line; do + line=$(trim "$line") + [[ -z $win_gpu ]] || [[ -z "$line" ]] && { win_gpu=1 continue } - prin "${subtitle:+${subtitle}${gpu_name}}" "$(trim "$line")" + prin "${subtitle:+${subtitle}${gpu_name}}" "$line" done < <(wmic path Win32_VideoController get caption) ;; From 53d938c4fee11e9437bf27134d10e2fff7eaf165 Mon Sep 17 00:00:00 2001 From: Xander Hess <5012529+XanderHess@users.noreply.github.com> Date: Fri, 16 Oct 2020 07:11:28 +0100 Subject: [PATCH 1018/1133] Adding support for Pengwin (#1578) * Added recently added distros to list of included distros with ascii art. * Fixed indent in usage for ueberzug backend. * Added ascii art for Pengwin (https://github.com/WhitewaterFoundry/Pengwin) and added Pengwin to the distro lists. --- neofetch | 121 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 72 insertions(+), 49 deletions(-) diff --git a/neofetch b/neofetch index ba1835989..803376a1c 100755 --- a/neofetch +++ b/neofetch @@ -778,34 +778,34 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", -# "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, -# ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, -# Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, -# BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, -# Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, -# Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, -# DesaOS, Devuan, DracOS, DarkOs, DragonFly, Drauger, Elementary, +# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android, instantOS, +# Antergos, antiX, "AOSC OS", "AOSC OS/Retro", Apricity, ArchCraft, +# ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, +# Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, +# bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, +# Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, +# Container_Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, +# Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, -# Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, -# Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, -# LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, -# Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, -# Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -# NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, -# OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, -# Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, -# popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, -# Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, -# Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, -# Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, -# SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, -# openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, -# Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, -# Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, -# and IRIX have ascii logos +# Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, +# KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, +# Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, +# Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, +# Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, +# openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, +# osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, +# TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, +# Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, +# Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, +# sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +# SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, +# Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, +# openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, +# Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, +# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, +# windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. # NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. @@ -4983,7 +4983,7 @@ IMAGE BACKEND: --termpix source Shortcut to use 'termpix' backend. --tycat source Shortcut to use 'tycat' backend. --w3m source Shortcut to use 'w3m' backend. - --ueberzug source Shortcut to use 'ueberzug' backend + --ueberzug source Shortcut to use 'ueberzug' backend --off Shortcut to use 'off' backend (Disable ascii art). NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', @@ -4993,33 +4993,35 @@ ASCII: --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro's ascii art to print - NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, - \"AOSC OS\", \"AOSC OS/Retro\", Apricity, ArcoLinux, ArchBox, - ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, - Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, - BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, - Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, - Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, - DracOS, DarkOs, DragonFly, Drauger, Elementary, EndeavourOS, Endless, + NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android, + instantOS, Antergos, antiX, \"AOSC OS\", \"AOSC OS/Retro\", + Apricity, ArchCraft, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, + XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, + BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, + Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, + Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, + CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, + DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, - LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, - Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, - Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, - OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, - OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, - Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, - Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, - Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, - Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, - Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, - SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, - openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, - Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, - Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, - and IRIX have ascii logos + LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, + Mageia, MagpieOS, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, + Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, + NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, + openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, + OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, + PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, + Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, + Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, + sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, + SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, + Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, + t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, + Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, + Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, + windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. @@ -9042,6 +9044,27 @@ yyhh- ${c2}ymm- /dmdyosyd` ${c1}`yhh+ EOF ;; + "Pengwin"*) + set_colors 5 5 13 + read -rd '' ascii_data <<'EOF' +${c3} ...` +${c3} `-///:-` +${c3} .+${c2}ssys${c3}/ +${c3} +${c2}yyyyy${c3}o ${c2} +${c2} -yyyyyy: +${c2} `.:/+ooo+/:` -yyyyyy+ +${c2} `:oyyyyyys+:-.`syyyyyy: +${c2} .syyyyyyo-` .oyyyyyyo +${c2} `syyyyyy `-+yyyyyyy/` +${c2} /yyyyyy+ -/osyyyyyyo/. +${c2} +yyyyyy- `.-:::-.` +${c2} .yyyyyy- +${c3} :${c2}yyyyy${c3}o +${c3} .+${c2}ooo${c3}+ +${c3} `.::/:. +EOF + ;; + "Peppermint"*) set_colors 1 15 3 read -rd '' ascii_data <<'EOF' From f0b16b63ff33271cd184f5a1384be946f17de3f8 Mon Sep 17 00:00:00 2001 From: SGS Date: Fri, 16 Oct 2020 16:36:55 +0000 Subject: [PATCH 1019/1133] update garuda linux logo (#1579) Co-authored-by: SGSm --- neofetch | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/neofetch b/neofetch index 803376a1c..f159d4168 100755 --- a/neofetch +++ b/neofetch @@ -7262,28 +7262,27 @@ EOF "Garuda"*) set_colors 7 7 read -rd '' ascii_data <<'EOF' -${c1} __,,,,,,,_ - _╓╗╣╫╠╠╠╠╠╠╠╠╠╠╠╠╠╕╗╗┐_ - ╥╢╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╥, - ╗╠╠╠╠╠╠╠╝╜╜╜╜╝╢╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠┐ - ╣╠╠╠╠╠╠╠╠╢╣╢╗╕ , `"╘╠╠╠╠╠╠╠╠╠╠╠╠╠╠╔╥_ - ╒╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╕╙╥╥╜ `"╜╠╬╠╠╠╠╠╠╠╠╠╠╠╥, - ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗╥╥╥╥╗╗╬╠╠╠╠╠╠╠╝╙╠╠╣╠╠╠╠╢┐ - ╣╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╥╬╣╠╠╠╠╠╠╠╠╗ - ╒╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗ - ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠ - ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╬ ```"╜╝╢╠╠╡ - ╒╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╣, ╘╠╪ - ╞╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╢┐ ╜ - `╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗ - ,╬╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠"╕ - ╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╗ - ╝^╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╝╣╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╠╡ - ╔╜`╞┘╢╛╜ ╡╢╠"╚╠╠╜╝┌╞╞"╢╠╠╠╠╠╠╠╠╠╠╣╩╢╪ - ╜╒" `╜ ` ╜╙╕ └╣╠╠╠╠╕ ╞╙╖ - ╠╠╠ - ╜ +${c1} + .%;888:X8889888@8: + x;XxXB%8b8:b8%b88xx8: + .88Xx;; 8X8x:. + .tt8xX x8x8; + .t%xx8: Xxx.8: + .@8x8; x8xx@; + ,tSXXX° .bbbbbbbbbbbbbbbbb8x@. + .SXxx° bBBBBBBBBBBBBBBBBB:S;8. + ,888S° ;8SS + .@8@%° ;8: + <8X88/ + x%888 .@88@8@X@X8X@@X@X@8@Xx + .x8X@: bb8x8x8b8b8x8s8x88b88x; + .xxS88 .@8@;: + .x.88 .Xt@x; + .::SSX88@8b8B8B8b@@8Sxx; + .xq)9898999989989899° + EOF + ;; "gentoo_small") From 5dfce0f9c3068d4d8a49d0b7182bdace61b8f4d0 Mon Sep 17 00:00:00 2001 From: Kanashimia <56224949+kanashimia@users.noreply.github.com> Date: Mon, 2 Nov 2020 16:20:02 +0200 Subject: [PATCH 1020/1133] Update NixOS Logo (#1590) --- neofetch | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f159d4168..50de9d391 100755 --- a/neofetch +++ b/neofetch @@ -8493,7 +8493,7 @@ EOF EOF ;; - "NixOS"*) + "nixos_old"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' ${c1} ::::. ${c2}'::::: ::::' @@ -8518,6 +8518,32 @@ ${c1} .:::: :::: ${c2}'::::. EOF ;; + "NixOS"*) + set_colors 4 6 + read -rd '' ascii_data <<'EOF' +${c1} ▗██▙ ${c2}▜███▙ ▟██▖ +${c1} ▜███▙ ${c2}▜███▙ ▟███▛ +${c1} ▜███▙ ${c2}▜███▙▟███▛ +${c1} ▜███▙ ${c2}▜██████▛ +${c1} ▟█████████████████▙ ${c2}▜████▛ ${c1}▟▙ +${c1} ▟███████████████████▙ ${c2}▜███▙ ${c1}▟██▙ +${c2} ▄▄▄▄▖ ▜███▙ ${c1}▟███▛ +${c2} ▟███▛ ▜██▛ ${c1}▟███▛ +${c2} ▟███▛ ▜▛ ${c1}▟███▛ +${c2}▟███████████▛ ${c1}▟██████████▙ +${c2}▜██████████▛ ${c1}▟███████████▛ +${c2} ▟███▛ ${c1}▟▙ ▟███▛ +${c2} ▟███▛ ${c1}▟██▙ ▟███▛ +${c2} ▟███▛ ${c1}▜███▙ ▝▀▀▀▀ +${c2} ▜██▛ ${c1}▜███▙ ${c2}▜██████████████████▛ +${c2} ▜▛ ${c1}▟████▙ ${c2}▜████████████████▛ +${c1} ▟██████▙ ${c2}▜███▙ +${c1} ▟███▛▜███▙ ${c2}▜███▙ +${c1} ▟███▛ ▜███▙ ${c2}▜███▙ +${c1} ▝██▛ ▜███▙ ${c2}▜██▘ +EOF + ;; + "Nurunner"*) set_colors 4 read -rd '' ascii_data <<'EOF' From 106a53c575d6dc97ed461139c0fd22991a5528f1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 3 Nov 2020 05:38:45 +0200 Subject: [PATCH 1021/1133] neofetch: Use MemAvailable for memory on Linux if supported. Closes #1591 --- neofetch | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index ba1835989..285fa5228 100755 --- a/neofetch +++ b/neofetch @@ -2568,10 +2568,21 @@ get_memory() { "MemFree" | "Buffers" | "Cached" | "SReclaimable") mem_used="$((mem_used-=${b/kB}))" ;; + + # Available since Linux 3.14rc (34e431b0ae398fc54ea69ff85ec700722c9da773). + # If detected this will be used over the above calculation for mem_used. + "MemAvailable") + mem_avail=${b/kB} + ;; esac done < /proc/meminfo - mem_used="$((mem_used / 1024))" + if [[ $mem_avail ]]; then + mem_used=$(((mem_total - mem_avail) / 1024)) + else + mem_used="$((mem_used / 1024))" + fi + mem_total="$((mem_total / 1024))" ;; From dbe781043b6f606b484e9b8268f4200542c52fc1 Mon Sep 17 00:00:00 2001 From: Paul Delafosse Date: Tue, 3 Nov 2020 12:11:00 +0100 Subject: [PATCH 1022/1133] feat(backend): add viu image backend (#1592) * feat(backend): add viu image backend * fix: double quote typo on viu command --- neofetch | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 281a5deb3..67b779002 100755 --- a/neofetch +++ b/neofetch @@ -749,7 +749,8 @@ disk_display="off" # # Default: 'ascii' # Values: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', 'iterm2', 'off', -# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty', 'ueberzug' +# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty', 'ueberzug', +# 'viu' # Flag: --backend image_backend="ascii" @@ -3892,7 +3893,8 @@ image_backend() { "off") image_backend="off" ;; "caca" | "catimg" | "chafa" | "jp2a" | "iterm2" | "termpix" |\ - "tycat" | "w3m" | "sixel" | "pixterm" | "kitty" | "pot", | "ueberzug") + "tycat" | "w3m" | "sixel" | "pixterm" | "kitty" | "pot", | "ueberzug" |\ + "viu") get_image_source [[ ! -f "$image" ]] && { @@ -3919,7 +3921,7 @@ image_backend() { err "Image: Unknown image backend specified '$image_backend'." err "Image: Valid backends are: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', 'iterm2', 'kitty', 'off', 'sixel', 'pot', 'pixterm', 'termpix', - 'tycat', 'w3m')" + 'tycat', 'w3m', 'viu')" err "Image: Falling back to ascii mode." print_ascii ;; @@ -4398,6 +4400,12 @@ display_image() { "$image" ;; + "viu") + viu \ + -t -w "$((width / font_width))" -h "$((height / font_height))" \ + "$image" + ;; + "w3m") get_w3m_img_path zws='\xE2\x80\x8B\x20' @@ -4973,7 +4981,7 @@ BARS: IMAGE BACKEND: --backend backend Which image backend to use. Possible values: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', - 'iterm2', 'off', 'sixel', 'tycat', 'w3m', 'kitty' + 'iterm2', 'off', 'sixel', 'tycat', 'w3m', 'kitty', 'viu' --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] @@ -4995,6 +5003,7 @@ IMAGE BACKEND: --tycat source Shortcut to use 'tycat' backend. --w3m source Shortcut to use 'w3m' backend. --ueberzug source Shortcut to use 'ueberzug' backend + --viu source Shortcut to use 'viu' backend --off Shortcut to use 'off' backend (Disable ascii art). NOTE: 'source; can be any of the following: 'auto', 'ascii', 'wallpaper', '/path/to/img', @@ -5224,7 +5233,7 @@ get_args() { "--source") image_source="$2" ;; "--ascii" | "--caca" | "--catimg" | "--chafa" | "--jp2a" | "--iterm2" | "--off" |\ "--pot" | "--pixterm" | "--sixel" | "--termpix" | "--tycat" | "--w3m" | "--kitty" |\ - "--ueberzug") + "--ueberzug" | "--viu") image_backend="${1/--}" case $2 in "-"* | "") ;; From ac6f6a1ce43159a270b7b66e48a05c6ef23c7d37 Mon Sep 17 00:00:00 2001 From: sudo killall windows <51250021+RhinoCodes@users.noreply.github.com> Date: Tue, 3 Nov 2020 21:21:00 -0600 Subject: [PATCH 1023/1133] Update SEMC logo (#1593) --- neofetch | 37 ++++++++++++------------------------- 1 file changed, 12 insertions(+), 25 deletions(-) diff --git a/neofetch b/neofetch index 67b779002..552333b98 100755 --- a/neofetch +++ b/neofetch @@ -10547,31 +10547,18 @@ EOF ;; - "semc"*) - set_colors 2 8 - read -rd '' ascii_data <<'EOF' -${c1} __.;=====;.__ - _.=+==++=++=+=+===;. - -=+++=+===+=+=+++++=_ - . -=:`` `--==+=++==. - _vi, ` --+=++++: - .uvnvi. _._ -==+==+. - .vvnvnI` .;==|==;. :|=||=|. -${c2} _______._______.___ ___. ______ - / | ____| \/ | / | - | (----| |__ | \ / || ,----' - \ \ | __| | |\/| || | -.----) | | |____| | | || `----. -|_______/ |_______|__| |__| \______| - -${c1} -1vvnvv. `~+++` ++|+++ - +vnvnnv, `-|=== - +vnvnvns. . :=- - -Invnvvnsi..___..=sv=. ` - +Invnvnvnnnnnnnnvvnn;. - ~|Invnvnvvnvvvnnv}+` - -~|{*l}*|~ - + "semc"*) + set_colors 2 8 1 + read -rd '' ascii_data <<'EOF' +${c1} /\ + ______/ \ + / |()| ${c2}E M C +${c1} | (-- | | + \ \ | | +.----) | |__| +|_______/ / ${c3}"${c1} \ + ${c3}" + " EOF ;; From 56c8d7e0c81108163a3f2970940ea2287648916f Mon Sep 17 00:00:00 2001 From: Zach Dykstra Date: Wed, 4 Nov 2020 22:06:28 -0600 Subject: [PATCH 1024/1133] Support multiple displays under wayland (#1596) --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 552333b98..59e29d547 100755 --- a/neofetch +++ b/neofetch @@ -2991,9 +2991,9 @@ get_resolution() { elif [[ -d /sys/class/drm ]]; then for dev in /sys/class/drm/*/modes; do - read -r resolution _ < "$dev" + read -r single_resolution _ < "$dev" - [[ $resolution ]] && break + [[ $single_resolution ]] && resolution="${single_resolution}, ${resolution}" done fi ;; From 0c1a7996d35900f1768a46f4116791a00db53afc Mon Sep 17 00:00:00 2001 From: Quinten <58103738+HexaOneOfficial@users.noreply.github.com> Date: Tue, 10 Nov 2020 13:56:23 +0100 Subject: [PATCH 1025/1133] update man page (#1600) * Update neofetch.1 * Update neofetch.1 * Update neofetch.1 --- neofetch.1 | 59 +++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/neofetch.1 b/neofetch.1 index 4a766043c..c05e3038f 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -296,33 +296,34 @@ Colors to print the ascii art \fB\-\-ascii_distro\fR distro Which Distro's ascii art to print .TP -NOTE: AIX, Alpine, AlterLinux, Anarchy, Android, Antergos, antiX, -"AOSC OS", "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, -ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, -Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, -BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, -Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, -Container_Linux, CRUX, Cucumber, Debian, Deepin, DesaOS, Devuan, -DracOS, DarkOs, DragonFly, Drauger, Elementary, EndeavourOS, Endless, -EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, -Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, -GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, -KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, -LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, -Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, -Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, -OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, -OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, -Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, popos, -Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, -Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, -Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, -Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, -SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, -openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, -Trisquel, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, Ubuntu\-Studio, -Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, -and IRIX have ascii logos +NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android, instantOS, +Antergos, antiX, "AOSC OS", "AOSC OS/Retro", Apricity, ArchCraft, +ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, +Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, +bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, +Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, +Container_Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, +Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, +EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, +FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, +gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, +KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, +Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, +Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, +Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, +openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, +osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, +TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, +Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, +Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, +sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, +Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, +openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, +Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, +Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, +windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. .IP NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. .IP @@ -330,8 +331,8 @@ NOTE: Use '{distro name}_old' to use the old logos. .IP NOTE: Ubuntu has flavor variants. .TP -NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu\-GNOME, -Ubuntu\-Studio, Ubuntu\-Mate or Ubuntu\-Budgie to use the flavors. +Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, +Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. .TP NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, From 2a1788a11bc25744bbdae3d9844c6c1ac5ce557b Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 17 Nov 2020 11:49:46 +0200 Subject: [PATCH 1026/1133] fix macOS issue. See #1607 --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index 59e29d547..4cb397e7c 100755 --- a/neofetch +++ b/neofetch @@ -4774,6 +4774,10 @@ cache_uname() { kernel_machine="${uname[2]}" if [[ "$kernel_name" == "Darwin" ]]; then + # macOS can report incorrect versions unless this is 0. + # https://github.com/dylanaraps/neofetch/issues/1607 + export SYSTEM_VERSION_COMPAT=0 + IFS=$'\n' read -d "" -ra sw_vers <<< "$(awk -F'<|>' '/key|string/ {print $3}' \ "/System/Library/CoreServices/SystemVersion.plist")" for ((i=0;i<${#sw_vers[@]};i+=2)) { From cb6f10d8f4d924ed8f6d8ec429d6632674ce10e4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 17 Nov 2020 18:35:33 +0200 Subject: [PATCH 1027/1133] fix whitespace --- neofetch | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 4cb397e7c..37f2dbf70 100755 --- a/neofetch +++ b/neofetch @@ -7286,25 +7286,25 @@ EOF "Garuda"*) set_colors 7 7 read -rd '' ascii_data <<'EOF' -${c1} - .%;888:X8889888@8: - x;XxXB%8b8:b8%b88xx8: - .88Xx;; 8X8x:. - .tt8xX x8x8; - .t%xx8: Xxx.8: +${c1} + .%;888:X8889888@8: + x;XxXB%8b8:b8%b88xx8: + .88Xx;; 8X8x:. + .tt8xX x8x8; + .t%xx8: Xxx.8: .@8x8; x8xx@; ,tSXXX° .bbbbbbbbbbbbbbbbb8x@. .SXxx° bBBBBBBBBBBBBBBBBB:S;8. - ,888S° ;8SS - .@8@%° ;8: - <8X88/ - x%888 .@88@8@X@X8X@@X@X@8@Xx - .x8X@: bb8x8x8b8b8x8s8x88b88x; - .xxS88 .@8@;: - .x.88 .Xt@x; - .::SSX88@8b8B8B8b@@8Sxx; - .xq)9898999989989899° - + ,888S° ;8SS + .@8@%° ;8: + <8X88/ + x%888 .@88@8@X@X8X@@X@X@8@Xx + .x8X@: bb8x8x8b8b8x8s8x88b88x; + .xxS88 .@8@;: + .x.88 .Xt@x; + .::SSX88@8b8B8B8b@@8Sxx; + .xq)9898999989989899° + EOF ;; @@ -8553,7 +8553,7 @@ ${c1} ▟█████████████████▙ ${c2}▜█ ${c1} ▟███████████████████▙ ${c2}▜███▙ ${c1}▟██▙ ${c2} ▄▄▄▄▖ ▜███▙ ${c1}▟███▛ ${c2} ▟███▛ ▜██▛ ${c1}▟███▛ -${c2} ▟███▛ ▜▛ ${c1}▟███▛ +${c2} ▟███▛ ▜▛ ${c1}▟███▛ ${c2}▟███████████▛ ${c1}▟██████████▙ ${c2}▜██████████▛ ${c1}▟███████████▛ ${c2} ▟███▛ ${c1}▟▙ ▟███▛ From 2b39f58f749fa2641a4028419c6a9e20874a740c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Tue, 17 Nov 2020 18:43:32 +0200 Subject: [PATCH 1028/1133] disk: Fix bash 3.2 incompatibility. Closes #1586 --- neofetch | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index 37f2dbf70..d650a7b0d 100755 --- a/neofetch +++ b/neofetch @@ -3586,7 +3586,7 @@ get_disk() { for disk in "${disks[@]}"; do # Create a second array and make each element split at whitespace this time. IFS=" " read -ra disk_info <<< "$disk" - disk_perc=${disk_info[-2]/\%} + disk_perc=${disk_info[${#disk_info[@]} - 2]/\%} case $disk_percent in off) disk_perc= @@ -3594,29 +3594,34 @@ get_disk() { case $df_version in *befhikm*) - disk="$((disk_info[-4]/1024/1024))G / $((disk_info[-5]/1024/1024))G" - disk+="${disk_perc:+ ($disk_perc%)}" + disk=$((disk_info[${#disk_info[@]} - 4] / 1024 / 1024))G + disk+=" / " + disk+=$((disk_info[${#disk_info[@]} - 5] / 1024/ 1024))G + disk+=${disk_perc:+ ($disk_perc%)} ;; *) - disk="${disk_info[-4]/i} / ${disk_info[-5]/i}${disk_perc:+ ($disk_perc%)}" + disk=${disk_info[${#disk_info[@]} - 4]/i} + disk+=" / " + disk+=${disk_info[${#disk_info[@]} - 5]/i} + disk+=${disk_perc:+ ($disk_perc%)} ;; esac case $disk_subtitle in name) - disk_sub=${disk_info[*]::${#disk_info[@]}-5} + disk_sub=${disk_info[*]::${#disk_info[@]} - 5} ;; dir) - disk_sub=${disk_info[-1]/*\/} - disk_sub=${disk_sub:-${disk_info[-1]}} + disk_sub=${disk_info[${#disk_info[@]} - 1]/*\/} + disk_sub=${disk_sub:-${disk_info[${#disk_info[@]} - 1]}} ;; none) ;; *) - disk_sub=${disk_info[-1]} + disk_sub=${disk_info[${#disk_info[@]} - 1]} ;; esac From 494a7d8335cf0a2d815ea01b55401dbb4ae24ef9 Mon Sep 17 00:00:00 2001 From: Xaver Hellauer Date: Sat, 21 Nov 2020 17:34:34 +0100 Subject: [PATCH 1029/1133] Add support for `swupd` package manager (#1610) `swupd` is the default package manager of Clear Linux OS (they actually call their packages bundles). This patch adds support for swupd. --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index d650a7b0d..5b165dd0a 100755 --- a/neofetch +++ b/neofetch @@ -1535,6 +1535,7 @@ get_packages() { has alps && tot alps showinstalled has butch && tot butch list has mine && tot mine -q + has swupd && tot swupd bundle-list --quiet # Counting files/dirs. # Variables need to be unquoted here. Only Bedrock Linux is affected. From d76d92f6b84c806e1b12e413eee443439c206947 Mon Sep 17 00:00:00 2001 From: SGS Date: Tue, 24 Nov 2020 04:47:07 +0100 Subject: [PATCH 1030/1133] New Garuda Neofetch Logo (#1613) Co-authored-by: SGSm --- neofetch | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/neofetch b/neofetch index 5b165dd0a..2a6dd34f6 100755 --- a/neofetch +++ b/neofetch @@ -7290,26 +7290,27 @@ EOF ;; "Garuda"*) - set_colors 7 7 + set_colors 7 7 3 7 2 4 read -rd '' ascii_data <<'EOF' -${c1} - .%;888:X8889888@8: - x;XxXB%8b8:b8%b88xx8: - .88Xx;; 8X8x:. - .tt8xX x8x8; - .t%xx8: Xxx.8: - .@8x8; x8xx@; - ,tSXXX° .bbbbbbbbbbbbbbbbb8x@. - .SXxx° bBBBBBBBBBBBBBBBBB:S;8. - ,888S° ;8SS - .@8@%° ;8: - <8X88/ - x%888 .@88@8@X@X8X@@X@X@8@Xx - .x8X@: bb8x8x8b8b8x8s8x88b88x; - .xxS88 .@8@;: - .x.88 .Xt@x; - .::SSX88@8b8B8B8b@@8Sxx; - .xq)9898999989989899° + +${c3} + .%;888:8898898: + x;XxXB%89b8:b8%b88: + .8Xxd 8X:. + .8Xx; 8x:. + .tt8x ${c6}.d${c3} x88; + .@8x8; ${c6}.db:${c3} xx@; + ${c4},tSXX° .bbbbbbbbbbbbbbbbbbbB8x@; + .SXxx bBBBBBBBBBBBBBBBBBBBbSBX8; + ,888S pd! + 8X88/ q + GBB. + ${c5}x%88 d888@8@X@X@X88X@@XX@@X@8@X. + dxXd dB8b8b8B8B08bB88b998888b88x. + dxx8o .@@;. + dx88 .t@x. + d:SS@8ba89aa67a853Sxxad. + .d988999889889899dd. EOF From d4f6abf1a87d1a6906f92f80931a9f402dbd45ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20L=C3=B6nnqvist?= Date: Tue, 24 Nov 2020 17:30:55 +0200 Subject: [PATCH 1031/1133] Refactor ueberzug (#1614) The previous way ueberzug was used is now deprecated. --- neofetch | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 2a6dd34f6..b2db1711b 100755 --- a/neofetch +++ b/neofetch @@ -4327,15 +4327,14 @@ display_image() { if [ "$wait" = true ];then wait=false; else - source "$(ueberzug library)" - ImageLayer 0< <( - ImageLayer::add\ - ['identifier']="neofetch"\ - ['x']="$xoffset" ['y']="$yoffset"\ - ['max_width']="$((width / font_width))"\ - ['max_height']="$((height / font_height))"\ - ['path']="$image"; - read -rs; + ueberzug layer --parser bash 0< <( + declare -Ap ADD=(\ + [action]="add"\ + [identifier]="neofetch"\ + [x]=$xoffset [y]=$yoffset\ + [path]=$image\ + ) + read -rs ) fi ;; From df61458e7fa60e98a165520c3832b86dc3108ef0 Mon Sep 17 00:00:00 2001 From: Sekai Zhou Date: Wed, 25 Nov 2020 13:22:45 +0800 Subject: [PATCH 1032/1133] Fix font support for yakuake (#1615) Originally added in #1063, but did not actually work because it only looked for konsole processes (rather than yakuake's) when querying its session profile. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index b2db1711b..328cc1cd8 100755 --- a/neofetch +++ b/neofetch @@ -3335,7 +3335,7 @@ END QT_BINDIR="$(qtpaths --binaries-dir)" && PATH+=":$QT_BINDIR" IFS=$'\n' read -d "" -ra konsole_instances \ - <<< "$(qdbus | awk '/org.kde.konsole/ {print $1}')" + <<< "$(qdbus | awk '/org.kde.'"$term"'/ {print $1}')" for i in "${konsole_instances[@]}"; do IFS=$'\n' read -d "" -ra konsole_sessions <<< "$(qdbus "$i" | grep -F '/Sessions/')" From 2b559cb8c62088dcbe997f6bb5a27002a9c22e27 Mon Sep 17 00:00:00 2001 From: Iuri Jikidze <37273763+ijiki16@users.noreply.github.com> Date: Wed, 25 Nov 2020 01:09:10 -0800 Subject: [PATCH 1033/1133] Add Apple Music (#1611) * iTunes --> Music * add back iTunes * fix indentation * fix indentation 2 * ty vs code * fix ? --- neofetch | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/neofetch b/neofetch index 328cc1cd8..4a625fe0e 100755 --- a/neofetch +++ b/neofetch @@ -512,6 +512,7 @@ disk_percent="on" # guayadeque # io.elementary.music # iTunes +# Music # juk # lollypop # MellowPlayer @@ -2728,6 +2729,7 @@ get_song() { "guayadeque" "io.elementary.music" "iTunes" + "Music" "juk" "lollypop" "MellowPlayer" @@ -2842,6 +2844,12 @@ get_song() { string & "\n" & album of current track as¬ string & "\n" & name of current track as string')" ;; + + "music"*) + song="$(osascript -e 'tell application "Music" to artist of current track as¬ + string & "\n" & album of current track as¬ + string & "\n" & name of current track as string')" + ;; "banshee"*) song="$(banshee --query-artist --query-album --query-title |\ From 80174ea4d9b3f2e1fb35de8214b011275ed4b736 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 25 Nov 2020 14:09:31 +0200 Subject: [PATCH 1034/1133] neofetch: swap to apt for packages. Possible fix for #1616 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 4a625fe0e..7b68ffb3c 100755 --- a/neofetch +++ b/neofetch @@ -1522,7 +1522,7 @@ get_packages() { has kiss && tot kiss l has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never - has dpkg && tot dpkg-query -f '.\n' -W + has apt && tot apt list has rpm && tot rpm -qa has xbps-query && tot xbps-query -l has apk && tot apk info @@ -2844,7 +2844,7 @@ get_song() { string & "\n" & album of current track as¬ string & "\n" & name of current track as string')" ;; - + "music"*) song="$(osascript -e 'tell application "Music" to artist of current track as¬ string & "\n" & album of current track as¬ From bec3918bfdf383e4695f3308a50e1115a1064c18 Mon Sep 17 00:00:00 2001 From: Kanashimia <56224949+kanashimia@users.noreply.github.com> Date: Thu, 26 Nov 2020 07:11:09 +0200 Subject: [PATCH 1035/1133] NixOS - squash logo, add new package location. (#1617) * Decrease size of NixOS logo by one block. * Improve package counting for NixOS. --- neofetch | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 7b68ffb3c..ed7116ae1 100755 --- a/neofetch +++ b/neofetch @@ -1566,9 +1566,13 @@ get_packages() { } has nix-store && { - manager=nix-system && tot nix-store -q --requisites /run/current-system/sw - manager=nix-user && tot nix-store -q --requisites ~/.nix-profile - manager=nix-default && tot nix-store -q --requisites /nix/var/nix/profiles/default + nix-user-pkgs() { + nix-store -qR ~/.nix-profile + nix-store -qR /etc/profiles/per-user/"$USER" + } + manager=nix-system && tot nix-store -qR /run/current-system/sw + manager=nix-user && tot nix-user-pkgs + manager=nix-default && tot nix-store -qR /nix/var/nix/profiles/default } # pkginfo is also the name of a python package manager which is painfully slow. @@ -1607,8 +1611,12 @@ get_packages() { has pkgin && tot pkgin list has nix-store && { - manager=nix-system && tot nix-store -q --requisites "/run/current-system/sw" - manager=nix-user && tot nix-store -q --requisites "$HOME/.nix-profile" + nix-user-pkgs() { + nix-store -qR ~/.nix-profile + nix-store -qR /etc/profiles/per-user/"$USER" + } + manager=nix-system && tot nix-store -qR /run/current-system/sw + manager=nix-user && tot nix-store -qR nix-user-pkgs } ;; @@ -8559,7 +8567,7 @@ EOF "NixOS"*) set_colors 4 6 read -rd '' ascii_data <<'EOF' -${c1} ▗██▙ ${c2}▜███▙ ▟██▖ +${c1} ▗▄▄▄ ${c2}▗▄▄▄▄ ▄▄▄▖ ${c1} ▜███▙ ${c2}▜███▙ ▟███▛ ${c1} ▜███▙ ${c2}▜███▙▟███▛ ${c1} ▜███▙ ${c2}▜██████▛ @@ -8578,7 +8586,7 @@ ${c2} ▜▛ ${c1}▟████▙ ${c2}▜█████████ ${c1} ▟██████▙ ${c2}▜███▙ ${c1} ▟███▛▜███▙ ${c2}▜███▙ ${c1} ▟███▛ ▜███▙ ${c2}▜███▙ -${c1} ▝██▛ ▜███▙ ${c2}▜██▘ +${c1} ▝▀▀▀ ▀▀▀▀▘ ${c2}▀▀▀▘ EOF ;; From dc8a834888d9c93a007f766db8cbbbd889d69776 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 26 Nov 2020 07:15:09 +0200 Subject: [PATCH 1036/1133] neofetch: Fix naming conflict with mine. See #1616 --- neofetch | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 7b68ffb3c..051baf0e9 100755 --- a/neofetch +++ b/neofetch @@ -1535,9 +1535,12 @@ get_packages() { has sorcery && tot gaze installed has alps && tot alps showinstalled has butch && tot butch list - has mine && tot mine -q has swupd && tot swupd bundle-list --quiet + # 'mine' conflicts with minesweeper games. + [[ -f /etc/SDE-VERSION ]] && + has mine && tot mine -q + # Counting files/dirs. # Variables need to be unquoted here. Only Bedrock Linux is affected. # $br_prefix is fixed and won't change based on user input so this is safe either way. From b0a654f162f6dcaf67871c2ca6785b97bca49c05 Mon Sep 17 00:00:00 2001 From: minhtricute69 <42957778+minhtricute69@users.noreply.github.com> Date: Fri, 11 Jun 2021 11:48:39 +0700 Subject: [PATCH 1037/1133] Add HydroOS distro support (#1766) Add HydroOS distro support --- neofetch | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 62b82ea4c..59ccbb560 100755 --- a/neofetch +++ b/neofetch @@ -790,7 +790,7 @@ image_source="auto" # Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, -# gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +# gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS # Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, # KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, # Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, @@ -7591,6 +7591,20 @@ ${c2} ` `` EOF ;; + "HydroOS"*) + set_colors 1 2 3 4 5 + read -rd '' ascii_data <<'EOF' +${c1} + _ _ _ ____ _____ + | | | | | | / __ \ / ____| + | |__| |_ _ __| |_ __ ___ | | | | (___ + | __ | | | |/ _` | '__/ _ \| | | |\___ \ + | | | | |_| | (_| | | | (_) | |__| |____) | + |_| |_|\__, |\__,_|_| \___/ \____/|_____/ + __/ | + |___/ +EOF + ;; "hyperbola_small"*) set_colors 8 From 19fefa65618241846f567815739fa2f7b4078e36 Mon Sep 17 00:00:00 2001 From: minhtricute69 <42957778+minhtricute69@users.noreply.github.com> Date: Fri, 11 Jun 2021 11:48:46 +0700 Subject: [PATCH 1038/1133] Add HydroOS distro support (#1767) Add HydroOS distro support --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index c05e3038f..aa4c7c118 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -306,7 +306,7 @@ Container_Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, -gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, +gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, From 4d7ec21ad5c4ae24e634c92763eaa26ea2655b0f Mon Sep 17 00:00:00 2001 From: Philipp Wallisch Date: Fri, 11 Jun 2021 06:51:48 +0200 Subject: [PATCH 1039/1133] Rework macOS memory calculation to work on Apple Silicon (#1752) --- neofetch | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 59ccbb560..c84895068 100755 --- a/neofetch +++ b/neofetch @@ -2601,12 +2601,13 @@ get_memory() { ;; "Mac OS X" | "macOS" | "iPhone OS") + hw_pagesize="$(sysctl -n hw.pagesize)" mem_total="$(($(sysctl -n hw.memsize) / 1024 / 1024))" - mem_wired="$(vm_stat | awk '/ wired/ { print $4 }')" - mem_active="$(vm_stat | awk '/ active/ { printf $3 }')" - mem_compressed="$(vm_stat | awk '/ occupied/ { printf $5 }')" - mem_compressed="${mem_compressed:-0}" - mem_used="$(((${mem_wired//.} + ${mem_active//.} + ${mem_compressed//.}) * 4 / 1024))" + pages_app="$(($(sysctl -n vm.page_pageable_internal_count) - $(sysctl -n vm.page_purgeable_count)))" + pages_wired="$(vm_stat | awk '/ wired/ { print $4 }')" + pages_compressed="$(vm_stat | awk '/ occupied/ { printf $5 }')" + pages_compressed="${pages_compressed:-0}" + mem_used="$(((${pages_app} + ${pages_wired//.} + ${pages_compressed//.}) * hw_pagesize / 1024 / 1024))" ;; "BSD" | "MINIX") From 22b97f99c33e5e141dea9489e0393ff5723a197a Mon Sep 17 00:00:00 2001 From: jnats Date: Fri, 11 Jun 2021 05:52:52 +0100 Subject: [PATCH 1040/1133] Update neofetch (#1749) Co-authored-by: jnats --- neofetch | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index c84895068..b8c72bb38 100755 --- a/neofetch +++ b/neofetch @@ -786,8 +786,8 @@ image_source="auto" # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, # bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, -# Container_Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, -# Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, +# Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, +# DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS @@ -5049,8 +5049,8 @@ ASCII: BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, - CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, - DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, + CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, + DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, @@ -6692,6 +6692,32 @@ ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; + *"CrystalUX"*) + set_colors 13 5 + read -rd '' ascii_data <<'EOF' +${c1} mysssym +${c1} mysssym +${c1} mysssym +${c1} mysssym +${c1} mysssyd +${c1} mysssyd N +${c1} mysssyd mysym +${c1} mysssyd dysssym +${c1} mysssyd dysssym +${c1} mysssyd dysssym +${c1} mysssyd dysssym +${c1} mysssyd dysssym +${c1} mysssyd dysssym +${c1} mysym dysssym +${c1} N dysssym +${c1} dysssym +${c1} dysssym +${c1} dysssym +${c1} dysssym +${c1} dysssym +EOF + ;; + *"Cucumber"*) set_colors 2 3 read -rd '' ascii_data <<'EOF' From 87753c5057632d6b7cffd5c6097d72f61b13a123 Mon Sep 17 00:00:00 2001 From: Fritz Geib <30505127+Fr1tzBot@users.noreply.github.com> Date: Fri, 11 Jun 2021 00:53:33 -0400 Subject: [PATCH 1041/1133] fix neofetch not recognizing brew package count on M1 macs (#1747) * fix neofetch not recognizing brew package count on M1 macs * fix apt package count issue --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index b8c72bb38..8aee9f8d1 100755 --- a/neofetch +++ b/neofetch @@ -1522,7 +1522,7 @@ get_packages() { has kiss && tot kiss l has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never - has apt && tot apt list + has apt && tot apt list --installed && ((packages-=1)) has rpm && tot rpm -qa has xbps-query && tot xbps-query -l has apk && tot apk info @@ -1610,7 +1610,7 @@ get_packages() { "Mac OS X"|"macOS"|MINIX) has port && pkgs_h=1 tot port installed && ((packages-=1)) - has brew && dir /usr/local/Cellar/* + has brew && dir "$(brew --cellar)"/* has pkgin && tot pkgin list has nix-store && { From b7abdba2fdd6321cf6ac0acbbde54f857cc519d6 Mon Sep 17 00:00:00 2001 From: Luca Robbiano Date: Fri, 11 Jun 2021 06:54:26 +0200 Subject: [PATCH 1042/1133] Add Rocky Linux (#1743) * Add Rocky Linux * Add Rocky Linux ASCII Art * Add Rocky Linux into the ASCII logo list * Fix Co-authored-by: Kaleb <51819073+klebdotio@users.noreply.github.com> --- neofetch | 47 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 8aee9f8d1..0cf87a42c 100755 --- a/neofetch +++ b/neofetch @@ -800,8 +800,8 @@ image_source="auto" # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, # Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, -# Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, -# sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +# Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rocky, +# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, @@ -9705,6 +9705,49 @@ ${c1} EOF ;; + "rocky_small"*) + set_colors 2 + read -rd '' ascii_data <<'EOF' +${c1} `-/+++++++++/-.` + `-+++++++++++++++++-` +.+++++++++++++++++++++. +-+++++++++++++++++++++++. ++++++++++++++++/-/+++++++ ++++++++++++++/. ./+++++ ++++++++++++:. ./+++ ++++++++++:` `:/:` .:/ +-++++++:` .:+++++:` + .+++-` ./+++++++++:` + `-` ./+++++++++++- + -+++++++++:-.` +EOF + ;; + + "rocky"*) + set_colors 35 + read -rd '' ascii_data <<'EOF' +${c1} __wgliliiligw_, + _williiiiiiliilililw, + _%iiiiiilililiiiiiiiiiii_ + .Qliiiililiiiiiiililililiilm. + _iiiiiliiiiiililiiiiiiiiiiliil, + .lililiiilililiiiilililililiiiii, +_liiiiiiliiiiiiiliiiiiF{iiiiiilili, +jliililiiilililiiili@` ~ililiiiiiL +iiiliiiiliiiiiiili>` ~liililii +liliiiliiilililii` -9liiiil +iiiiiliiliiiiii~ "4lili +4ililiiiiilil~| -w, )4lf +-liiiiililiF' _liig, )' + )iiiliii@` _QIililig, + )iiii>` .Qliliiiililw + )<>~ .mliiiiiliiiiiil, + _gllilililiililii~ + giliiiiiiiiiiiiT` + -^~$ililili@~~' +EOF + ;; + "Rosa"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From cd6c4334db046b813e0002ff98919a30a472e52d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=2E=20Efe=20=C3=87etin?= <45270788+efectn@users.noreply.github.com> Date: Fri, 11 Jun 2021 07:55:06 +0300 Subject: [PATCH 1043/1133] Add TeArch Linux. (#1741) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add TeArch Linux. * Update neofetch Co-authored-by: Efe Çetin --- neofetch | 31 +++++++++++++++++++++++++++++-- neofetch.1 | 2 +- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 0cf87a42c..7393fbf9b 100755 --- a/neofetch +++ b/neofetch @@ -793,7 +793,7 @@ image_source="auto" # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS # Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, # KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, -# Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, +# Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, # Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, # Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, @@ -5056,7 +5056,7 @@ ASCII: GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, - Mageia, MagpieOS, Mandriva, Manjaro, Maui, Mer, Minix, LinuxMint, + Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, @@ -8231,6 +8231,33 @@ ${c1}██████████████████ ██████ EOF ;; + "TeArch"*) + set_colors 39 7 1 + read -rd '' ascii_data <<'EOF' +${c1} @@@@@@@@@@@@@@ + @@@@@@@@@ @@@@@@ + @@@@@ @@@@@ + @@ @@ + @% @@ + @ @ + @@@@@@@@@@@@@@@@@@@@@@@@ @@ + .@@@@@@@@@@@@/@@@@@@@@@@@@ + @@@@@@@@@@@@///@@@@@@@@@@@@ + @@@@@@@@@@@@@((((@@@@@@@@@@@@ + @@@@@@@@@@@#(((((((#@@@@@@@@@@@ + @@@@@@@@@@@#//////////@@@@@@@@@@& + @@@@@@@@@@////@@@@@////@@@@@@@@@@ + @@@@@@@@//////@@@@@/////@@@@@@@@@ + @@@@@@@//@@@@@@@@@@@@@@@//@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +@@ .@@@@@@@@@@@@@@@@@@@@@@@@@ @ + @@@@@@ @@@. @@@@@@@ + @@@@@@@&@@@@@@@# #@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@ +EOF + ;; + "Maui"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index aa4c7c118..8eed9bc30 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -309,7 +309,7 @@ FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS, Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, -Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, Maui, +Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, From d8b58a10b9c08deb236bd85bea0f4f0cdc6e3c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Par=C3=B3czai=20Oliv=C3=A9r?= Date: Fri, 11 Jun 2021 06:55:35 +0200 Subject: [PATCH 1044/1133] Only use DNS if public_ip_host option is empty (#1737) In config: public_ip_host="" -> uses DNS for getting public IP public_ip_host="http://example.com/ip" -> uses wget/curl for getting public IP --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 7393fbf9b..093fc030c 100755 --- a/neofetch +++ b/neofetch @@ -3807,12 +3807,12 @@ get_local_ip() { } get_public_ip() { - if type -p dig >/dev/null; then + if [[ ! -n "$public_ip_host" ]] && type -p dig >/dev/null; then public_ip="$(dig +time=1 +tries=1 +short myip.opendns.com @resolver1.opendns.com)" [[ "$public_ip" =~ ^\; ]] && unset public_ip fi - if [[ -z "$public_ip" ]] && type -p drill >/dev/null; then + if [[ ! -n "$public_ip_host" ]] && [[ -z "$public_ip" ]] && type -p drill >/dev/null; then public_ip="$(drill myip.opendns.com @resolver1.opendns.com | \ awk '/^myip\./ && $3 == "IN" {print $5}')" fi From 21c9c5f22b32faed93f5110b40537694bdf670a4 Mon Sep 17 00:00:00 2001 From: Kevin Lapointe <80723850+klpnt@users.noreply.github.com> Date: Fri, 11 Jun 2021 00:55:56 -0400 Subject: [PATCH 1045/1133] New ASCII logo for Fedora (#1736) * Added new ASCII logo for Fedora * Added new ASCII art for Fedora * Added new ASCII for Fedora --- neofetch | 31 ++++++++++++++++++++++++++++--- neofetch.1 | 2 +- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 093fc030c..0044858b6 100755 --- a/neofetch +++ b/neofetch @@ -808,7 +808,7 @@ image_source="auto" # Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, # Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, # windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. -# NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. +# NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. # Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, @@ -5072,7 +5072,7 @@ ASCII: Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. - NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. + NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. NOTE: Use '{distro name}_old' to use the old logos. @@ -7161,7 +7161,7 @@ ${c1}\\ \\${c2}__/ | EOF ;; - "Fedora"* | "RFRemix"*) + "Fedora_old"* | "RFRemix"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' ${c1} /:-------------:\\ @@ -7183,6 +7183,31 @@ ${c1} /:-------------:\\ :---------------------:// EOF ;; + + "Fedora"*) + set_colors 12 7 + read -rd '' ascii_data <<'EOF' +${c1} .',;::::;,'. + .';:cccccccccccc:;,. + .;cccccccccccccccccccccc;. + .:cccccccccccccccccccccccccc:. + .;ccccccccccccc;${c2}.:dddl:.${c1};ccccccc;. + .:ccccccccccccc;${c2}OWMKOOXMWd${c1};ccccccc:. +.:ccccccccccccc;${c2}KMMc${c1};cc;${c2}xMMc${c1};ccccccc:. +,cccccccccccccc;${c2}MMM.${c1};cc;${c2};WW:${c1};cccccccc, +:cccccccccccccc;${c2}MMM.${c1};cccccccccccccccc: +:ccccccc;${c2}oxOOOo${c1};${c2}MMM0OOk.${c1};cccccccccccc: +cccccc;${c2}0MMKxdd:${c1};${c2}MMMkddc.${c1};cccccccccccc; +ccccc;${c2}XM0'${c1};cccc;${c2}MMM.${c1};cccccccccccccccc' +ccccc;${c2}MMo${c1};ccccc;${c2}MMW.${c1};ccccccccccccccc; +ccccc;${c2}0MNc.${c1}ccc${c2}.xMMd${c1};ccccccccccccccc; +cccccc;${c2}dNMWXXXWM0:${c1};cccccccccccccc:, +cccccccc;${c2}.:odl:.${c1};cccccccccccccc:,. +:cccccccccccccccccccccccccccc:'. +.:cccccccccccccccccccccc:;,.. + '::cccccccccccccc::;,. +EOF + ;; "Feren"*) set_colors 4 7 1 diff --git a/neofetch.1 b/neofetch.1 index 8eed9bc30..39676dfb6 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -325,7 +325,7 @@ Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. .IP -NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. +NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. .IP NOTE: Use '{distro name}_old' to use the old logos. .IP From 41f75b7b484cca653e0db19b194d99a993dbf5f8 Mon Sep 17 00:00:00 2001 From: Adam Salt <75907419+whyadamsalt@users.noreply.github.com> Date: Fri, 11 Jun 2021 05:56:10 +0100 Subject: [PATCH 1046/1133] Update neofetch (#1732) --- neofetch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/neofetch b/neofetch index 0044858b6..f634e3bd0 100755 --- a/neofetch +++ b/neofetch @@ -6359,6 +6359,28 @@ ${c2} .......... ...',;;;;;;,,... ..... EOF + + + "CelOS"*) + set_colors 3 2 4 5 7 + read -rd '' ascii_data <<'EOF' + +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ +@@@# @@@ +@@ ,#%%%%%(. (@ +@# %%%%%%%%%%%%%%# @ +@# %%%%%%%%# %%%/ @ +@# #%%%%%%%%. #%%%* @ +@# %%%%%%%%%%%* (%%%%%# @ +@# #%%%% %%%%%%%%%%%, @ +@# #%%%%%%%%%%%%%%%%%, @ +@# #%%%%%%%%%%%%%* @ +@@ *##%#(, @@ +@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + + +EOF + ;; ;; "centos_small"*) From 50a8bd285d965c2c94e863f7e5e4e547c1c101db Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:02:17 +0000 Subject: [PATCH 1047/1133] packages: Use dnf cache if available. Closes #1730 --- neofetch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f634e3bd0..e0298e692 100755 --- a/neofetch +++ b/neofetch @@ -1523,7 +1523,6 @@ get_packages() { has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never has apt && tot apt list --installed && ((packages-=1)) - has rpm && tot rpm -qa has xbps-query && tot xbps-query -l has apk && tot apk info has opkg && tot opkg list-installed @@ -1537,6 +1536,13 @@ get_packages() { has butch && tot butch list has swupd && tot swupd bundle-list --quiet + # Using the dnf package cache is much faster than rpm. + if has dnf && type -p sqlite3 >/dev/null && [[ -f /var/cache/dnf/packages.db ]]; then + pac "$(sqlite3 /var/cache/dnf/packages.db "SELECT count(pkg) FROM installed")" + else + has rpm && tot rpm -qa + fi + # 'mine' conflicts with minesweeper games. [[ -f /etc/SDE-VERSION ]] && has mine && tot mine -q From 34d55b874787629fdf3936e2ad8560a44f8ac4bd Mon Sep 17 00:00:00 2001 From: MeztliRA <78863518+MeztliRA@users.noreply.github.com> Date: Fri, 11 Jun 2021 12:04:16 +0700 Subject: [PATCH 1048/1133] Fixes #1636 (#1727) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e0298e692..206dab8c1 100755 --- a/neofetch +++ b/neofetch @@ -1769,7 +1769,7 @@ get_de() { ((wm_run != 1)) && get_wm # Temporary support for Regolith Linux - if [[ $DESKTOP_SESSION == regolith ]]; then + if [[ $DESKTOP_SESSION == *regolith ]]; then de=Regolith elif [[ $XDG_CURRENT_DESKTOP ]]; then From 96d9d3c4f6504226ae0674ffb31061bf29387b25 Mon Sep 17 00:00:00 2001 From: Daniel Brooks Date: Fri, 11 Jun 2021 05:05:46 +0000 Subject: [PATCH 1049/1133] just removes any quotes from around the Alacritty font name, if any (#1708) --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 206dab8c1..005788718 100755 --- a/neofetch +++ b/neofetch @@ -3274,6 +3274,7 @@ get_term_font() { term_font="${term_font/*family:}" term_font="${term_font/$'\n'*}" term_font="${term_font/\#*}" + term_font="${term_font//\"}" ;; "Apple_Terminal") From 0dd28db34e519962517efbf1b38bc16250c7d143 Mon Sep 17 00:00:00 2001 From: Rolex <62307498+DaOfficialRolex@users.noreply.github.com> Date: Fri, 11 Jun 2021 05:07:44 +0000 Subject: [PATCH 1050/1133] Added APT/Debian Packager to package managers for MacOS and combined PR #1702 (#1762) * Added new iOS and iPadOS device information * Updated neofetch to show dpkg and correct amount of packages. * Fixed indentation. --- neofetch | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 005788718..fc511402a 100755 --- a/neofetch +++ b/neofetch @@ -1263,9 +1263,11 @@ get_model() { iPad6,1[12]): "iPad 5" ;; iPad7,[5-6]): "iPad 6" ;; iPad7,1[12]): "iPad 7" ;; + iPad11,[67]): "iPad 8" ;; iPad4,[1-3]): "iPad Air" ;; iPad5,[3-4]): "iPad Air 2" ;; iPad11,[3-4]): "iPad Air 3" ;; + iPad13,[1-2]): "iPad Air 4";; iPad6,[7-8]): "iPad Pro (12.9 Inch)" ;; iPad6,[3-4]): "iPad Pro (9.7 Inch)" ;; iPad7,[1-2]): "iPad Pro 2 (12.9 Inch)" ;; @@ -1305,6 +1307,10 @@ get_model() { iPhone12,3): "iPhone 11 Pro" ;; iPhone12,5): "iPhone 11 Pro Max" ;; iPhone12,8): "iPhone SE 2020" ;; + iPhone13,1): "iPhone 12 Mini" ;; + iPhone13,2): "iPhone 12" ;; + iPhone13,3): "iPhone 12 Pro" ;; + iPhone13,4): "iPhone 12 Pro Max" ;; iPod1,1): "iPod touch" ;; ipod2,1): "iPod touch 2G" ;; @@ -1312,6 +1318,7 @@ get_model() { ipod4,1): "iPod touch 4G" ;; ipod5,1): "iPod touch 5G" ;; ipod7,1): "iPod touch 6G" ;; + iPod9,1): "iPod touch 7G" ;; esac model=$_ @@ -1618,6 +1625,7 @@ get_packages() { has port && pkgs_h=1 tot port installed && ((packages-=1)) has brew && dir "$(brew --cellar)"/* has pkgin && tot pkgin list + has dpkg && tot dpkg-query -f '.\n' -W has nix-store && { nix-user-pkgs() { @@ -2231,8 +2239,9 @@ get_cpu() { "Apple A10 Fusion (4) @ 2.34GHz" ;; "iPhone10,"[1-6]): "Apple A11 Bionic (6) @ 2.39GHz" ;; - "iPhone11,"[2468] | "iPad11,"[1-4]): "Apple A12 Bionic (6) @ 2.49GHz" ;; + "iPhone11,"[2468] | "iPad11,"[1-4] | "iPad11,"[6-7]): "Apple A12 Bionic (6) @ 2.49GHz" ;; "iPhone12,"[1358]): "Apple A13 Bionic (6) @ 2.65GHz" ;; + "iPhone13,"[1-4] | "iPad13,"[1-2]): "Apple A14 Bionic (6) @ 3.00Ghz" ;; "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; "iPod3,1"): "Samsung S5L8922 (1) @ 600MHz" ;; @@ -2520,8 +2529,9 @@ get_gpu() { "iPhone8,"[1-4] | "iPad6,1"[12]): "PowerVR GT7600" ;; "iPhone9,"[1-4] | "iPad7,"[5-6]): "PowerVR GT7600 Plus" ;; "iPhone10,"[1-6]): "Apple Designed GPU (A11)" ;; - "iPhone11,"[2468]): "Apple Designed GPU (A12)" ;; + "iPhone11,"[2468] | "iPad11,"[67]): "Apple Designed GPU (A12)" ;; "iPhone12,"[1358]): "Apple Designed GPU (A13)" ;; + "iPhone13,"[1234] | "iPad13,"[12]): "Apple Designed GPU (A14)" ;; "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; From c0ceffb55455f00478753728135a0d447a6e5450 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:11:00 +0000 Subject: [PATCH 1051/1133] general: fix indentation --- neofetch | 61 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/neofetch b/neofetch index fc511402a..f1f970782 100755 --- a/neofetch +++ b/neofetch @@ -1263,11 +1263,11 @@ get_model() { iPad6,1[12]): "iPad 5" ;; iPad7,[5-6]): "iPad 6" ;; iPad7,1[12]): "iPad 7" ;; - iPad11,[67]): "iPad 8" ;; + iPad11,[67]): "iPad 8" ;; iPad4,[1-3]): "iPad Air" ;; iPad5,[3-4]): "iPad Air 2" ;; iPad11,[3-4]): "iPad Air 3" ;; - iPad13,[1-2]): "iPad Air 4";; + iPad13,[1-2]): "iPad Air 4";; iPad6,[7-8]): "iPad Pro (12.9 Inch)" ;; iPad6,[3-4]): "iPad Pro (9.7 Inch)" ;; iPad7,[1-2]): "iPad Pro 2 (12.9 Inch)" ;; @@ -1307,10 +1307,10 @@ get_model() { iPhone12,3): "iPhone 11 Pro" ;; iPhone12,5): "iPhone 11 Pro Max" ;; iPhone12,8): "iPhone SE 2020" ;; - iPhone13,1): "iPhone 12 Mini" ;; - iPhone13,2): "iPhone 12" ;; - iPhone13,3): "iPhone 12 Pro" ;; - iPhone13,4): "iPhone 12 Pro Max" ;; + iPhone13,1): "iPhone 12 Mini" ;; + iPhone13,2): "iPhone 12" ;; + iPhone13,3): "iPhone 12 Pro" ;; + iPhone13,4): "iPhone 12 Pro Max" ;; iPod1,1): "iPod touch" ;; ipod2,1): "iPod touch 2G" ;; @@ -1318,7 +1318,7 @@ get_model() { ipod4,1): "iPod touch 4G" ;; ipod5,1): "iPod touch 5G" ;; ipod7,1): "iPod touch 6G" ;; - iPod9,1): "iPod touch 7G" ;; + iPod9,1): "iPod touch 7G" ;; esac model=$_ @@ -1508,9 +1508,9 @@ get_packages() { dir() { ((packages+=$#)); pac "$(($#-pkgs_h))"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } tot() { - IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")"; - ((packages+=${#pkgs[@]})); - pac "$((${#pkgs[@]}-pkgs_h))"; + IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")"; + ((packages+=${#pkgs[@]})); + pac "$((${#pkgs[@]}-pkgs_h))"; } # Redefine tot() for Bedrock Linux. @@ -1518,7 +1518,7 @@ get_packages() { tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in $(brl list); do strat -r "$s" "$@"; done)" ((packages+="${#pkgs[@]}")) - pac "$((${#pkgs[@]}-pkgs_h))"; + pac "$((${#pkgs[@]}-pkgs_h))"; } br_prefix="/bedrock/strata/*" } @@ -1614,7 +1614,7 @@ get_packages() { # Snap hangs if the command is run without the daemon running. # Only run snap if the daemon is also running. has snap && ps -e | grep -qFm 1 snapd >/dev/null && \ - pkgs_h=1 tot snap list && ((packages-=1)) + pkgs_h=1 tot snap list && ((packages-=1)) # This is the only standard location for appimages. # See: https://github.com/AppImage/AppImageKit/wiki @@ -1625,7 +1625,7 @@ get_packages() { has port && pkgs_h=1 tot port installed && ((packages-=1)) has brew && dir "$(brew --cellar)"/* has pkgin && tot pkgin list - has dpkg && tot dpkg-query -f '.\n' -W + has dpkg && tot dpkg-query -f '.\n' -W has nix-store && { nix-user-pkgs() { @@ -1651,7 +1651,7 @@ get_packages() { # Scoop environment throws errors if `tot scoop list` is used has scoop && pkgs_h=1 dir ~/scoop/apps/* && ((packages-=1)) - # Count chocolatey packages. + # Count chocolatey packages. [[ -d /cygdrive/c/ProgramData/chocolatey/lib ]] && \ dir /cygdrive/c/ProgramData/chocolatey/lib/* ;; @@ -1659,7 +1659,7 @@ get_packages() { Haiku) has pkgman && dir /boot/system/package-links/* packages=${packages/pkgman/depot} - ;; + ;; IRIX) manager=swpkg @@ -2241,7 +2241,7 @@ get_cpu() { "iPhone10,"[1-6]): "Apple A11 Bionic (6) @ 2.39GHz" ;; "iPhone11,"[2468] | "iPad11,"[1-4] | "iPad11,"[6-7]): "Apple A12 Bionic (6) @ 2.49GHz" ;; "iPhone12,"[1358]): "Apple A13 Bionic (6) @ 2.65GHz" ;; - "iPhone13,"[1-4] | "iPad13,"[1-2]): "Apple A14 Bionic (6) @ 3.00Ghz" ;; + "iPhone13,"[1-4] | "iPad13,"[1-2]): "Apple A14 Bionic (6) @ 3.00Ghz" ;; "iPod2,1"): "Samsung S5L8720 (1) @ 533MHz" ;; "iPod3,1"): "Samsung S5L8922 (1) @ 600MHz" ;; @@ -2531,7 +2531,7 @@ get_gpu() { "iPhone10,"[1-6]): "Apple Designed GPU (A11)" ;; "iPhone11,"[2468] | "iPad11,"[67]): "Apple Designed GPU (A12)" ;; "iPhone12,"[1358]): "Apple Designed GPU (A13)" ;; - "iPhone13,"[1234] | "iPad13,"[12]): "Apple Designed GPU (A14)" ;; + "iPhone13,"[1234] | "iPad13,"[12]): "Apple Designed GPU (A14)" ;; "iPad3,"[1-3]): "PowerVR SGX534MP4" ;; "iPad3,"[4-6]): "PowerVR SGX554MP4" ;; @@ -5067,7 +5067,7 @@ ASCII: Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, - DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, + DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, @@ -6381,7 +6381,7 @@ EOF "CelOS"*) set_colors 3 2 4 5 7 read -rd '' ascii_data <<'EOF' - + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ @@@# @@@ @@ ,#%%%%%(. (@ @@ -6731,9 +6731,9 @@ ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; - *"CrystalUX"*) - set_colors 13 5 - read -rd '' ascii_data <<'EOF' + *"CrystalUX"*) + set_colors 13 5 + read -rd '' ascii_data <<'EOF' ${c1} mysssym ${c1} mysssym ${c1} mysssym @@ -6755,7 +6755,7 @@ ${c1} dysssym ${c1} dysssym ${c1} dysssym EOF - ;; + ;; *"Cucumber"*) set_colors 2 3 @@ -7682,7 +7682,8 @@ ${c2} ` `` EOF ;; - "HydroOS"*) + + "HydroOS"*) set_colors 1 2 3 4 5 read -rd '' ascii_data <<'EOF' ${c1} @@ -7695,7 +7696,7 @@ ${c1} __/ | |___/ EOF - ;; + ;; "hyperbola_small"*) set_colors 8 @@ -9796,9 +9797,9 @@ ${c1} EOF ;; - "rocky_small"*) - set_colors 2 - read -rd '' ascii_data <<'EOF' + "rocky_small"*) + set_colors 2 + read -rd '' ascii_data <<'EOF' ${c1} `-/+++++++++/-.` `-+++++++++++++++++-` .+++++++++++++++++++++. @@ -9812,7 +9813,7 @@ ${c1} `-/+++++++++/-.` `-` ./+++++++++++- -+++++++++:-.` EOF - ;; + ;; "rocky"*) set_colors 35 @@ -10751,7 +10752,7 @@ EOF ;; - "semc"*) + "semc"*) set_colors 2 8 1 read -rd '' ascii_data <<'EOF' ${c1} /\ From 75198506b857e408eb6e9398f59842dd3dfcf6fe Mon Sep 17 00:00:00 2001 From: Daniel Thau Date: Fri, 11 Jun 2021 01:12:37 -0400 Subject: [PATCH 1052/1133] Bedrock Linux fixes (#1675) Neofetch is Bedrock-aware by default, but ignores Bedrock and restricts itself to the local layer of the Bedrock system when run in Bedrock's "restricted" mode. Previously, neofetch checked for restricted mode by looking at the $PATH, which can fail in some workflows. Instead, check for $BEDROCK_RESTRICT, which is more robust. Neofetch previously counted Bedrock stratum aliases when counting packages for some package managers. This resulted in over-counting packages. This commit restricts neofetch to only counting actual strata, not aliases. --- neofetch | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/neofetch b/neofetch index fc511402a..42e35e900 100755 --- a/neofetch +++ b/neofetch @@ -971,7 +971,7 @@ get_distro() { case $os in Linux|BSD|MINIX) - if [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]]; then + if [[ -f /bedrock/etc/bedrock-release && -z $BEDROCK_RESTRICT ]]; then case $distro_shorthand in on|tiny) distro="Bedrock Linux" ;; *) distro=$(< /bedrock/etc/bedrock-release) @@ -1505,7 +1505,9 @@ get_packages() { # pac: If packages > 0, log package manager name. # tot: Count lines in command output. has() { type -p "$1" >/dev/null && manager=$1; } - dir() { ((packages+=$#)); pac "$(($#-pkgs_h))"; } + # globbing is intentional here + # shellcheck disable=SC2206 + dir() { pkgs=($@); ((packages+=${#pkgs[@]})); pac "$((${#pkgs[@]}-pkgs_h))"; } pac() { (($1 > 0)) && { managers+=("$1 (${manager})"); manager_string+="${manager}, "; }; } tot() { IFS=$'\n' read -d "" -ra pkgs <<< "$("$@")"; @@ -1513,14 +1515,22 @@ get_packages() { pac "$((${#pkgs[@]}-pkgs_h))"; } - # Redefine tot() for Bedrock Linux. + # Redefine tot() and dir() for Bedrock Linux. [[ -f /bedrock/etc/bedrock-release && $PATH == */bedrock/cross/* ]] && { + br_strata=$(brl list) tot() { - IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in $(brl list); do strat -r "$s" "$@"; done)" + IFS=$'\n' read -d "" -ra pkgs <<< "$(for s in ${br_strata}; do strat -r "$s" "$@"; done)" ((packages+="${#pkgs[@]}")) - pac "$((${#pkgs[@]}-pkgs_h))"; + pac "$((${#pkgs[@]}-pkgs_h))"; + } + dir() { + local pkgs=() + # globbing is intentional here + # shellcheck disable=SC2206 + for s in ${br_strata}; do pkgs+=(/bedrock/strata/$s/$@); done + ((packages+=${#pkgs[@]})) + pac "$((${#pkgs[@]}-pkgs_h))" } - br_prefix="/bedrock/strata/*" } case $os in @@ -1560,16 +1570,16 @@ get_packages() { # shellcheck disable=SC2086 { shopt -s nullglob - has brew && dir "$(brew --cellar)"/* - has emerge && dir ${br_prefix}/var/db/pkg/*/*/ - has Compile && dir ${br_prefix}/Programs/*/ - has eopkg && dir ${br_prefix}/var/lib/eopkg/package/* - has crew && dir ${br_prefix}/usr/local/etc/crew/meta/*.filelist - has pkgtool && dir ${br_prefix}/var/log/packages/* - has scratch && dir ${br_prefix}/var/lib/scratchpkg/index/*/.pkginfo - has kagami && dir ${br_prefix}/var/lib/kagami/pkgs/* - has cave && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ - ${br_prefix}/var/db/paludis/repositories/installed/data/*/ + has brew && dir "$(brew --cellar)/*" + has emerge && dir "/var/db/pkg/*/*" + has Compile && dir "/Programs/*/" + has eopkg && dir "/var/lib/eopkg/package/*" + has crew && dir "/usr/local/etc/crew/meta/*.filelist" + has pkgtool && dir "/var/log/packages/*" + has scratch && dir "/var/lib/scratchpkg/index/*/.pkginfo" + has kagami && dir "/var/lib/kagami/pkgs/*" + has cave && dir "/var/db/paludis/repositories/cross-installed/*/data/*/ \ + /var/db/paludis/repositories/installed/data/*/" shopt -u nullglob } From 528010e0456fd6fe5c23cb68e5333d7f72360def Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Fri, 11 Jun 2021 07:13:36 +0200 Subject: [PATCH 1053/1133] Add AlmaLinux logo (#1715) * Add AlmaLinux logo * Update AlmaLinux logo --- neofetch | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/neofetch b/neofetch index 42e35e900..8f176daf4 100755 --- a/neofetch +++ b/neofetch @@ -5504,6 +5504,32 @@ ${c1} EOF ;; + "AlmaLinux"*) + set_colors 1 3 4 2 6 + read -rd '' ascii_data <<'EOF' +${c1} 'c:. +${c1} lkkkx, .. ${c2}.. ,cc, +${c1} okkkk:ckkx' ${c2}.lxkkx.okkkkd +${c1} .:llcokkx' ${c2}:kkkxkko:xkkd, +${c1} .xkkkkdood: ${c2};kx, .lkxlll; +${c1} xkkx. ${c2}xk' xkkkkk: +${c1} 'xkx. ${c2}xd .....,. +${c3} .. ${c1}:xkl' ${c2}:c ..''.. +${c3} .dkx' ${c1}.:ldl:'. ${c2}' ${c4}':lollldkkxo; +${c3} .''lkkko' ${c4}ckkkx. +${c3}'xkkkd:kkd. .. ${c5};' ${c4}:kkxo. +${c3},xkkkd;kk' ,d; ${c5}ld. ${c4}':dkd::cc, +${c3} .,,.;xkko'.';lxo. ${c5}dx, ${c4}:kkk'xkkkkc +${c3} 'dkkkkkxo:. ${c5};kx ${c4}.kkk:;xkkd. +${c3} ..... ${c5}.;dk:. ${c5}lkk. ${c4}:;, + ${c5}:kkkkkkkdoxkkx + ,c,,;;;:xkkd. + ;kkkkl... + ;kkkkl + ,od; +EOF + ;; + "alpine_small") set_colors 4 7 read -rd '' ascii_data <<'EOF' From d16e6e36cac65415af54dd98be20bfbace4e2656 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:15:37 +0000 Subject: [PATCH 1054/1133] packages: use crew prefix. Closes #1697 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 83ff7168c..14cd4739e 100755 --- a/neofetch +++ b/neofetch @@ -1574,7 +1574,7 @@ get_packages() { has emerge && dir "/var/db/pkg/*/*" has Compile && dir "/Programs/*/" has eopkg && dir "/var/lib/eopkg/package/*" - has crew && dir "/usr/local/etc/crew/meta/*.filelist" + has crew && dir "${CREW_PREFIX:-/usr/local}/etc/crew/meta/*.filelist" has pkgtool && dir "/var/log/packages/*" has scratch && dir "/var/lib/scratchpkg/index/*/.pkginfo" has kagami && dir "/var/lib/kagami/pkgs/*" From df453e4f1bbb5d82b11db8910a19e49437eedef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=BCleyman=20Fatih=20=C5=9Eim=C5=9Fek?= <75628379+suleymanfatih@users.noreply.github.com> Date: Fri, 11 Jun 2021 08:17:02 +0300 Subject: [PATCH 1055/1133] added PNM Linux ascii art (#1695) --- neofetch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/neofetch b/neofetch index 14cd4739e..39911309a 100755 --- a/neofetch +++ b/neofetch @@ -9335,6 +9335,33 @@ ${c1} PPPPPPPPPPPPPP EOF ;; + "PNM Linux"* | "WHPNM Linux"*) + set_colors 33 9 15 202 + read -rd '' ascii_data <<'EOF' + +${c1} + ``.---..` `--` + ``.---........-:.${c2}-::`${c1} + ${c2}./::-${c1}........${c2}--::.````${c1} + ${c2}.:://:::${c1}----${c2}::::-..${c1} + ..${c2}--:::::--::::++-${c1}.` + ${c2}`-:-`${c1} .-ohy+::${c2}-:::${c1}/sdmdd:.${c2} `-:- + .-:::${c1}...${c3}sNNmds$y${c1}o/+${c3}sy+NN$m${c1}d+.`${c2}-:::-. + `.-:-${c1}./${c3}dN${c1}()${c3}yyooosd${c1}()${c3}$m${c1}dy${c2}-.::-.`${c1} + ${c2}`.${c1}-...-${c3}+hNdyyyyyydmy${c1}:......${c2}`${c1} + ``..--.....-${c3}yNNm${c4}hssssh${c3}mmdo${c1}.........``` +`-:://:.....${c3}hNNNNN${c4}mddm${c3}NNNmds${c1}.....//::--` + ```.:-...${c3}oNNNNNNNNNNNNNNmd/${c1}...:-.``` + .....${c3}hNNNNNNNNNNNNNNmds${c1}....` + --...${c3}hNNNNNNNNNNNNNNmdo${c1}..... + .:...${c3}/NNNNNNNNNNNNNNdd${c1}:....` + `-...${c3}+mNNNNNNNNNNNmh${c1}:...-. + ${c4}.:+o+/:-${c1}:+oo+///++o+/:-${c4}:/+ooo/:. + ${c4}+oo/:o- +oooooso.` + ${c4}.` ` `/ .-//- +EOF + ;; + "popos_small"* | "pop_os_small"*) set_colors 6 7 read -rd '' ascii_data <<'EOF' From 611117f4af527de3b81bc92c74ae976e130d39e6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:16:43 +0000 Subject: [PATCH 1056/1133] general: Fix indentation --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 39911309a..c5509a44d 100755 --- a/neofetch +++ b/neofetch @@ -9336,8 +9336,8 @@ EOF ;; "PNM Linux"* | "WHPNM Linux"*) - set_colors 33 9 15 202 - read -rd '' ascii_data <<'EOF' + set_colors 33 9 15 202 + read -rd '' ascii_data <<'EOF' ${c1} ``.---..` `--` From 55beea7b6f5f0811ac66a9273161a134ceb83435 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:19:46 +0000 Subject: [PATCH 1057/1133] os: Add CyberOS. Closes #1690 --- neofetch | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/neofetch b/neofetch index c5509a44d..2c39e7831 100755 --- a/neofetch +++ b/neofetch @@ -6819,6 +6819,27 @@ o/${c2}--...::-:/::/:-......-::::::-/-...-${c1}:/o EOF ;; + "CyberOS"*) + set_colors 50 32 57 + read -rd '' ascii_data <<'EOF' +${c3} !M$EEEEEEEEEEEP + .MMMMM000000Nr. + ${c3}&MMMMMM${c2}MMMMMMMMMMMMM9 + ${c3}~MMM${c1}MMMM${c2}MMMMMMMMMMMMC + ${c1}" ${c3}M${c1}MMMMMMM${c2}MMMMMMMMMMs + ${c1}iM${c2}MMM&&${c1}MMMMMMMM${c2}MMMMMMMM\\ + ${c1}BMMM${c2}MMMMM${c1}MMMMMMM${c2}MMMMMM${c3}" +${c1}9MMMMM${c2}MMMMMMM${c1}MMMM${c2}MMMM${c3}MMMf- + ${c2}sMMMMMMMM${c1}MM${c2}M${c3}MMMMMMMMM3_ + ${c2}+ffffffff${c1}P${c3}MMMMMMMMMMMM0 + ${c2}CMMMMMMMMMMM + }MMMMMMMMM + ~MMMMMMM + "RMMMM + .PMB +EOF + ;; + "dahlia"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' From f572fb37a01417c571f89ce7481b51e03cc614e3 Mon Sep 17 00:00:00 2001 From: Suleyman Poyraz <22801690+Zaryob@users.noreply.github.com> Date: Fri, 11 Jun 2021 08:24:32 +0300 Subject: [PATCH 1058/1133] Added PuffOS successfuly instead of #1659 (#1678) Co-authored-by: dylan --- neofetch | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 2c39e7831..942dfe69f 100755 --- a/neofetch +++ b/neofetch @@ -799,9 +799,9 @@ image_source="auto" # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, -# Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, -# Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rocky, -# Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, +# Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, +# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, +# Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, @@ -5089,7 +5089,7 @@ ASCII: openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, - Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, + Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, @@ -9491,6 +9491,25 @@ ${c1} /\\ EOF ;; + "PuffOS"*) + set_colors 3 + read -rd '' ascii_data <<'EOF' +${c1} + _,..._,m, + ,/' '""; + / ". + ,'mmmMMMMmm. \ + _/-"^^^^^"""%#%mm, ; + ,m,_,' "###) ;, +(###% \#/ ;##mm. + ^#/ __ ___ ; (######) + ; //.\\ //.\\ ; \####/ + _; (#\"// \\"/#) ; ,/ +@##\ \##/ = `"=" ,;mm/ +`\##>.____,...,____,<####@ +EOF + ;; + "Proxmox"*) set_colors 7 202 read -rd '' ascii_data <<'EOF' From 6b755b7ac69af5d7df648575e3d55fffbcd8101e Mon Sep 17 00:00:00 2001 From: Jonas Frei <8ec426b4-7173-428a-a6dc-3c520b45b0e2@wwsxrfc8.anonaddy.com> Date: Fri, 11 Jun 2021 07:24:51 +0200 Subject: [PATCH 1059/1133] Added 'hikari' to supported WMs (#1669) Co-authored-by: Jonas Frei --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 942dfe69f..a5f4314f0 100755 --- a/neofetch +++ b/neofetch @@ -1894,6 +1894,7 @@ get_wm() { -e gnome-shell \ -e greenfield \ -e grefsen \ + -e hikari \ -e kwin \ -e lipstick \ -e maynard \ From 3514e02d61a7ee880b325436e8454e5d56eb07df Mon Sep 17 00:00:00 2001 From: jrt Date: Fri, 11 Jun 2021 07:25:40 +0200 Subject: [PATCH 1060/1133] add AsteroidOS (#1676) --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index a5f4314f0..dfbe1404a 100755 --- a/neofetch +++ b/neofetch @@ -6149,6 +6149,29 @@ ${c1}:syyyyyy/ :yyyyyy/${c2}-yyo.:syyyyyyyyyyy EOF ;; + "AsteroidOS"*) + set_colors 160 208 202 214 + read -rd '' ascii_data <<'EOF' +${c1} *** +${c1} ***** +${c1} ********** +${c1} *************** +${c1} *///****////****////. +${c2} (/////// /////// ///////( +${c2} /(((((//* //, //((((((. +${c2} ((((((((((( ((( (((((((( +${c2} *((((((((((((((((((((((( (((((((( +${c3} (((((#(((((((#((((( ((#((((( +${c3} (#(#(#####(#(#, ####(#(# +${c3} ######### ######## +${c3} /######## ######## +${c4} #######%####### +${c4} (#%%%%%%%# +${c4} %%%%% +${c4} %%% +EOF + ;; + "Bedrock"*) set_colors 8 7 read -rd '' ascii_data <<'EOF' From 9b708d6e5fd4e0651fb218b7f63f9cbf14c6deda Mon Sep 17 00:00:00 2001 From: Tiny Date: Fri, 11 Jun 2021 05:25:57 +0000 Subject: [PATCH 1061/1133] fix:The main version file of GNU/Deepin Linux has been moved from /etc/deepin-version to /etc/os-version (#1667) Description: Log: --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index dfbe1404a..f3367be7f 100755 --- a/neofetch +++ b/neofetch @@ -1840,7 +1840,7 @@ get_de() { Xfce*) de_ver=$(xfce4-session --version) ;; GNOME*) de_ver=$(gnome-shell --version) ;; Cinnamon*) de_ver=$(cinnamon --version) ;; - Deepin*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;; + Deepin*) de_ver=$(awk -F'=' '/MajorVersion/ {print $2}' /etc/os-version) ;; Budgie*) de_ver=$(budgie-desktop --version) ;; LXQt*) de_ver=$(lxqt-session --version) ;; Lumina*) de_ver=$(lumina-desktop --version 2>&1) ;; From 13cda3f7e40a79e3f4e7d64d6f13e134c1f75c4a Mon Sep 17 00:00:00 2001 From: Ross Smith II Date: Thu, 10 Jun 2021 22:30:28 -0700 Subject: [PATCH 1062/1133] neofetch: Fix Terminal Font for mintty (#1641) * neofetch: Fix Terminal Font for mintty * Quiet shellcheck error --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f3367be7f..5cf2f5b10 100755 --- a/neofetch +++ b/neofetch @@ -3452,7 +3452,7 @@ END ;; "mintty") - term_font="$(awk -F '=' '!/^($|#)/ && /Font/ {printf $2; exit}' "${HOME}/.minttyrc")" + term_font="$(awk -F '=' '!/^($|#)/ && /^\\s*Font\\s*=/ {printf $2; exit}' "${HOME}/.minttyrc")" ;; "pantheon"*) From ec1fb325b0ea6324923d6b277a125efb86ebc17c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:39:31 +0000 Subject: [PATCH 1063/1133] misc: fix typo. Closes #1623 --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 2c39e7831..482711000 100755 --- a/neofetch +++ b/neofetch @@ -815,7 +815,7 @@ image_source="auto" # Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. # NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, # CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, -# Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, +# Artix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, # Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, # Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, # postmarketOS, and Void have a smaller logo variant. @@ -5110,7 +5110,7 @@ ASCII: NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, - Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, + Artix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, postmarketOS, and Void have a smaller logo variant. From 2491af5e58924cc2d6d9a11183de62c45bc165d9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:41:19 +0000 Subject: [PATCH 1064/1133] os: Add support for Mandrake. Closes #1625 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index a51ca9c54..c04ee1e3d 100755 --- a/neofetch +++ b/neofetch @@ -8323,7 +8323,7 @@ o00. k0O${c2}dddddd${c1}occ EOF ;; - "Mandriva"*) + "Mandriva"* | "Mandrake"*) set_colors 4 3 read -rd '' ascii_data <<'EOF' ${c2} `` From 64dd7b68eff2cac409e10f92ea7f6b5bc83ae8e6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:47:20 +0000 Subject: [PATCH 1065/1133] term: Add newgrp to blacklist. Closes #1635 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index c04ee1e3d..fccdef9b9 100755 --- a/neofetch +++ b/neofetch @@ -3245,7 +3245,7 @@ get_term() { name="$(get_process_name "$parent")" case ${name// } in - "${SHELL/*\/}"|*"sh"|"screen"|"su"*) ;; + "${SHELL/*\/}"|*"sh"|"screen"|"su"*|"newgrp") ;; "login"*|*"Login"*|"init"|"(init)") term="$(tty)" From 7de6bb8d2c4d817d67ce5e7c2f3f60897e37233d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 05:56:42 +0000 Subject: [PATCH 1066/1133] resolution: Fix truncation of drm modes. Closes #1639 --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index fccdef9b9..b2938644a 100755 --- a/neofetch +++ b/neofetch @@ -3047,7 +3047,8 @@ get_resolution() { ;; esac - resolution="${resolution%,*}" + resolution="${resolution%%,}" + resolution="${resolution%%, }" [[ -z "${resolution/x}" ]] && resolution= } From ab839cb9b01ca466212fc04b5285251bc2033575 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 06:14:10 +0000 Subject: [PATCH 1067/1133] os: Fix Chrome OS issue. Closes #1653 --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index b2938644a..e676aa1a0 100755 --- a/neofetch +++ b/neofetch @@ -1115,6 +1115,7 @@ get_distro() { tiny) distro="Chrome OS" ;; *) distro+=" on Chrome OS" ;; esac + distro=${distro## on } fi distro=$(trim_quotes "$distro") From 27277eac1dd18738bb51978fed3e750cf29b6c14 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 10 Jun 2021 23:18:31 -0700 Subject: [PATCH 1068/1133] os: fix syntax error introduced by celos logo (#1772) Signed-off-by: Christian Stewart --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index e676aa1a0..8f8d41598 100755 --- a/neofetch +++ b/neofetch @@ -6438,6 +6438,7 @@ ${c2} .......... ...',;;;;;;,,... ..... EOF + ;; "CelOS"*) @@ -6460,7 +6461,6 @@ EOF EOF ;; - ;; "centos_small"*) set_colors 3 2 4 5 7 From 1c954ec55652dc14a4d17408cd6170319290be54 Mon Sep 17 00:00:00 2001 From: Christian Stewart Date: Thu, 10 Jun 2021 23:19:21 -0700 Subject: [PATCH 1069/1133] Added support for SkiffOS (#1664) * os: fix syntax error introduced by celos logo Signed-off-by: Christian Stewart * Added support for SkiffOS https://github.com/skiffos/skiffos Fixes #1657 Signed-off-by: Christian Stewart --- neofetch | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8f8d41598..b525c857a 100755 --- a/neofetch +++ b/neofetch @@ -802,7 +802,7 @@ image_source="auto" # Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, # Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, -# SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, +# SereneLinux, SharkLinux, Siduction, SkiffOS, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, # Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, @@ -10292,6 +10292,22 @@ yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy EOF ;; + "SkiffOS"*) + set_colors 4 7 + read -rd '' ascii_data <<'EOF' +${c2} + ,@@@@@@@@@@@w,_ + ${c2}====~~~,,.${c2}A@@@@@@@@@@@@@@@@@W,_ + ${c1}`||||||||||||||L{${c2}"@$@@@@@@@@B" + ${c1}`|||||||||||||||||||||L{${c2}"$D + ${c2}@@@@@@@@@@@@@@@@@@@@@${c1}_||||}==, + ${c2}*@@@@@@@@@@@@@@@@@@@@@@@@@p${c1}||||==, + ${c1}`'||LLL{{""${c2}@$B@@@@@@@@@@@@@@@p${c1}|| + ${c1}`~=|||||||||||L"${c2}$@@@@@@@@@@@ + ${c1}````'"""""""${c2}'"""""""" +EOF + ;; + "Solus"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' From 06b1c77bb8311a91d09fbb2c11f9827a3570a97a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 07:03:16 +0000 Subject: [PATCH 1070/1133] gpu: Fix windows issue. See: #1759 --- neofetch | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index b525c857a..b735d5124 100755 --- a/neofetch +++ b/neofetch @@ -2561,12 +2561,14 @@ get_gpu() { while read -r line; do line=$(trim "$line") - [[ -z $win_gpu ]] || [[ -z "$line" ]] && { - win_gpu=1 - continue - } + case $line in + *Caption*|'') + continue - prin "${subtitle:+${subtitle}${gpu_name}}" "$line" + *) + prin "${subtitle:+${subtitle}${gpu_name}}" "$line" + ;; + esac done < <(wmic path Win32_VideoController get caption) ;; From bcc8d98df5ced8a773ef890747b10a176ba986df Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 07:05:57 +0000 Subject: [PATCH 1071/1133] os: Fix ubuntu studio. Closes #1733 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index b735d5124..39f376fcd 100755 --- a/neofetch +++ b/neofetch @@ -1124,12 +1124,12 @@ get_distro() { # Get Ubuntu flavor. if [[ $distro == "Ubuntu"* ]]; then case $XDG_CONFIG_DIRS in + *"studio"*) distro=${distro/Ubuntu/Ubuntu Studio} ;; *"plasma"*) distro=${distro/Ubuntu/Kubuntu} ;; *"mate"*) distro=${distro/Ubuntu/Ubuntu MATE} ;; *"xubuntu"*) distro=${distro/Ubuntu/Xubuntu} ;; *"Lubuntu"*) distro=${distro/Ubuntu/Lubuntu} ;; *"budgie"*) distro=${distro/Ubuntu/Ubuntu Budgie} ;; - *"studio"*) distro=${distro/Ubuntu/Ubuntu Studio} ;; *"cinnamon"*) distro=${distro/Ubuntu/Ubuntu Cinnamon} ;; esac fi From 4fbf8df1c80c49fdbef577e3723cc0d942c7eb31 Mon Sep 17 00:00:00 2001 From: Lorenzo Cauli Date: Fri, 11 Jun 2021 09:34:26 +0200 Subject: [PATCH 1072/1133] Edited PCLinuxOS logo for proper alignment. (#1685) Co-authored-by: Lorenzo Cauli --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 39f376fcd..34ee25034 100755 --- a/neofetch +++ b/neofetch @@ -9314,7 +9314,7 @@ EOF "PCLinuxOS"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' - ${c1}mhhhyyyyhhhdN +${c1} mhhhyyyyhhhdN dyssyhhhhhhhhhhhssyhN Nysyhhyo/:-.....-/oyhhhssd Nsshhy+. `/shhysm From 4b93d6824aaee58477569a88900505edc42acad3 Mon Sep 17 00:00:00 2001 From: Jaehee Hong Date: Fri, 11 Jun 2021 16:36:31 +0900 Subject: [PATCH 1073/1133] Fix Homebrew's Cellar path for brew package counts (#1656) From 0bbd6bff86da9c1fd016a86fd1557666b31bf5fb Mon Sep 17 00:00:00 2001 From: freddii Date: Fri, 11 Jun 2021 09:37:20 +0200 Subject: [PATCH 1074/1133] fixes spelling mistake (#1654) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 34ee25034..85473d295 100755 --- a/neofetch +++ b/neofetch @@ -158,7 +158,7 @@ uptime_shorthand="on" # Memory -# Show memory pecentage in output. +# Show memory percentage in output. # # Default: 'off' # Values: 'on', 'off' From 9b1108133caf38bcd8a19d4b96ebaa720caf0500 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charl=C3=A8ne?= Date: Fri, 11 Jun 2021 09:37:57 +0200 Subject: [PATCH 1075/1133] OpenBSD: change cpu count (#1650) Instead of using hw.ncpu, use hw.ncpuonline and hw.ncpufound, and check SMT status --- neofetch | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 85473d295..28900c8f9 100755 --- a/neofetch +++ b/neofetch @@ -2286,7 +2286,17 @@ get_cpu() { [[ -z "$speed" ]] && speed="$(sysctl -n hw.clockrate)" # Get CPU cores. - cores="$(sysctl -n hw.ncpu)" + case $kernel_name in + "OpenBSD"*) + [[ "$(sysctl -n hw.smt)" == "1" ]] && smt="on" || smt="off" + ncpufound="$(sysctl -n hw.ncpufound)" + ncpuonline="$(sysctl -n hw.ncpuonline)" + cores="${ncpuonline}/${ncpufound},\\xc2\\xa0SMT\\xc2\\xa0${smt}" + ;; + *) + cores="$(sysctl -n hw.ncpu)" + ;; + esac # Get CPU temp. case $kernel_name in From 219714c86ef298102ce7eb7bce1124ac9df9df68 Mon Sep 17 00:00:00 2001 From: Guanzhong Chen Date: Fri, 11 Jun 2021 03:39:07 -0400 Subject: [PATCH 1076/1133] Show GPU subsystem name if possible. Fixes #1490 (#1648) After this change, if a subsystem name exists for a GPU, we display that name instead of the device name. This should fix the issue mentioned in #1490. For example, a card that would be shown as: GPU: AMD ATI Radeon RX 470/480/570/570X/580/580X/590 before will now be shown as: GPU: AMD ATI Radeon RX 480 4GB This fallback logic is implemented in the `awk` command. Additionally, the PCI address is now stripped from the awk output because it never is desirable to print it. It is, however, still kept internally in `awk` to distinguish multiple cards of the same model. --- neofetch | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 28900c8f9..f93e1fea8 100755 --- a/neofetch +++ b/neofetch @@ -2449,9 +2449,17 @@ get_gpu() { case $os in "Linux") # Read GPUs into array. - gpu_cmd="$(lspci -mm | awk -F '\"|\" \"|\\(' \ - '/"Display|"3D|"VGA/ {a[$0] = $1 " " $3 " " $4} - END {for(i in a) {if(!seen[a[i]]++) print a[i]}}')" + gpu_cmd="$(lspci -mm | + awk -F '\"|\" \"|\\(' \ + '/"Display|"3D|"VGA/ { + a[$0] = $1 " " $3 " " ($7 ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $7) + } + END { for (i in a) { + if (!seen[a[i]]++) { + sub("^[^ ]+ ", "", a[i]); + print a[i] + } + }}')" IFS=$'\n' read -d "" -ra gpus <<< "$gpu_cmd" # Remove duplicate Intel Graphics outputs. From 07ae57453a5514e73a1c7c50b896b73f02532e9c Mon Sep 17 00:00:00 2001 From: kanashimia Date: Fri, 11 Jun 2021 10:41:32 +0300 Subject: [PATCH 1077/1133] Fix nix mistkae on darwin (#1628) See https://github.com/dylanaraps/neofetch/pull/1617#issuecomment-740655977 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f93e1fea8..e681598f5 100755 --- a/neofetch +++ b/neofetch @@ -1644,7 +1644,7 @@ get_packages() { nix-store -qR /etc/profiles/per-user/"$USER" } manager=nix-system && tot nix-store -qR /run/current-system/sw - manager=nix-user && tot nix-store -qR nix-user-pkgs + manager=nix-user && tot nix-user-pkgs } ;; From 70ad34e919b301f007fd18e5daf81120b45ce6db Mon Sep 17 00:00:00 2001 From: Koakuma Date: Fri, 11 Jun 2021 14:42:46 +0700 Subject: [PATCH 1078/1133] Fix CPU core/frequency reading on Linux/SPARC systems (#1643) --- neofetch | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index e681598f5..2f0bb9e69 100755 --- a/neofetch +++ b/neofetch @@ -2213,17 +2213,50 @@ get_cpu() { speed="$((speed / 1000))" else - speed="$(awk -F ': |\\.' '/cpu MHz|^clock/ {printf $2; exit}' "$cpu_file")" - speed="${speed/MHz}" + case $kernel_machine in + "sparc"*) + # SPARC systems use a different file to expose clock speed information. + speed_file="/sys/devices/system/cpu/cpu0/clock_tick" + speed="$(($(< "$speed_file") / 1000000))" + ;; + + *) + speed="$(awk -F ': |\\.' '/cpu MHz|^clock/ {printf $2; exit}' "$cpu_file")" + speed="${speed/MHz}" + ;; + esac fi # Get CPU temp. [[ -f "$temp_dir" ]] && deg="$(($(< "$temp_dir") * 100 / 10000))" # Get CPU cores. - case $cpu_cores in - "logical" | "on") cores="$(grep -c "^processor" "$cpu_file")" ;; - "physical") cores="$(awk '/^core id/&&!a[$0]++{++i} END {print i}' "$cpu_file")" ;; + case $kernel_machine in + "sparc"*) + case $cpu_cores in + # SPARC systems doesn't expose detailed topology information in + # /proc/cpuinfo so I have to use lscpu here. + "logical" | "on") + cores="$(lscpu | awk -F ': *' '/^CPU\(s\)/ {print $2}')" + ;; + "physical") + cores="$(lscpu | awk -F ': *' '/^Core\(s\) per socket/ {print $2}')" + sockets="$(lscpu | awk -F ': *' '/^Socket\(s\)/ {print $2}')" + cores="$((sockets * cores))" + ;; + esac + ;; + + *) + case $cpu_cores in + "logical" | "on") + cores="$(grep -c "^processor" "$cpu_file")" + ;; + "physical") + cores="$(awk '/^core id/&&!a[$0]++{++i} END {print i}' "$cpu_file")" + ;; + esac + ;; esac ;; From 77f0efea26115639110a42abc1803623a0b91b40 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 07:45:19 +0000 Subject: [PATCH 1079/1133] packages: Fix apt. Closes #1620 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 39f376fcd..4cd5b9bf5 100755 --- a/neofetch +++ b/neofetch @@ -1540,7 +1540,7 @@ get_packages() { has kiss && tot kiss l has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never - has apt && tot apt list --installed && ((packages-=1)) + has apt && pkgs_h=1 tot apt list --installed && ((packages-=1)) has xbps-query && tot xbps-query -l has apk && tot apk info has opkg && tot opkg list-installed From 010e3760581ea594a6871579f202c2bbb94f7ae5 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 07:48:16 +0000 Subject: [PATCH 1080/1133] packages: use dpkg --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 6cc306218..3c0a272c2 100755 --- a/neofetch +++ b/neofetch @@ -1540,7 +1540,7 @@ get_packages() { has kiss && tot kiss l has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never - has apt && pkgs_h=1 tot apt list --installed && ((packages-=1)) + has dpkg && pac "$(dpkg --list | grep -c ^ii)" has xbps-query && tot xbps-query -l has apk && tot apk info has opkg && tot opkg list-installed From 77cac59c84db2254c460c48a9c1a69c3b21b217a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 09:23:37 +0000 Subject: [PATCH 1081/1133] neofetch: Fix syntax error --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 3c0a272c2..d675de475 100755 --- a/neofetch +++ b/neofetch @@ -2615,6 +2615,7 @@ get_gpu() { case $line in *Caption*|'') continue + ;; *) prin "${subtitle:+${subtitle}${gpu_name}}" "$line" From 370a50c3e36b091dc2dc2f6cd9161477f3638b31 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Jun 2021 09:25:11 +0000 Subject: [PATCH 1082/1133] term: ignore bwrap --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d675de475..d3aeb96c5 100755 --- a/neofetch +++ b/neofetch @@ -3307,7 +3307,8 @@ get_term() { term="$(tty)" ;; - "ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*|"USER"*"PID"*|"kdeinit"*|"launchd"*) + "ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*| + "USER"*"PID"*|"kdeinit"*|"launchd"*|"bwrap") break ;; From bb974c77fc04a66f8d2f78335990fdb1066385bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Charl=C3=A8ne?= Date: Fri, 11 Jun 2021 12:28:24 +0200 Subject: [PATCH 1083/1133] Fix a wrong multiple line spanning (#1774) ./neofetch: line 3310: syntax error near unexpected token `newline' ./neofetch: line 3310: `"ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*|' --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d3aeb96c5..11c80ff56 100755 --- a/neofetch +++ b/neofetch @@ -3307,7 +3307,7 @@ get_term() { term="$(tty)" ;; - "ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*| + "ruby"|"1"|"tmux"*|"systemd"|"sshd"*|"python"*|\ "USER"*"PID"*|"kdeinit"*|"launchd"*|"bwrap") break ;; From 5e54a5e48b22fa316d1f35fe7b8470b9c01ba106 Mon Sep 17 00:00:00 2001 From: Gyro7 <65873913+Gyro7@users.noreply.github.com> Date: Fri, 11 Jun 2021 13:11:43 +0200 Subject: [PATCH 1084/1133] Add distribution AmogOS (#1773) * Add distribution AmogOS * Fixed indentation and removed unrelated changes * Added AmogOS to ascii art distros --- neofetch | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 11c80ff56..b0159927a 100755 --- a/neofetch +++ b/neofetch @@ -780,7 +780,7 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android, instantOS, +# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, AmogOS, Anarchy, Android, instantOS, # Antergos, antiX, "AOSC OS", "AOSC OS/Retro", Apricity, ArchCraft, # ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, @@ -5676,7 +5676,31 @@ dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd `-+shy shs+:` EOF ;; - + "AmogOS"*) + set_colors 6 6 7 1 + read -rd '' ascii_data <<'EOF' +${c1} ' +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣤⣤⣤⣀⣀⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⠟⠉⠉⠉⠉⠉⠉⠉⠙⠻⢶⣄⠀⠀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣾⡏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⣷⡀⠀⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣸⡟⠀⣠⣶⠛⠛⠛⠛⠛⠛⠳⣦⡀⠀⠘⣿⡄⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⠁⠀⢹⣿⣦⣀⣀⣀⣀⣀⣠⣼⡇⠀⠀⠸⣷⠀⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⠀⣼⡏⠀⠀⠀⠉⠛⠿⠿⠿⠿⠛⠋⠁⠀⠀⠀⠀⣿⡄ +⠀⠀ ⠀⠀⢠⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⡇⠀ + ⠀⠀⣸⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⡇⠀ +⠀⠀⠀⠀⠀⠀⠀⠀⣿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣧⠀ +⠀⠀⠀⠀⠀⠀⠀⢸⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⣿⠀ +⠀⠀⠀⠀⠀⠀⠀⣾⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀ +⠀⠀⠀⠀⠀⠀⠀⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀ +⠀⠀⠀⠀⠀⠀⢰⣿⠀⠀⠀⠀⣠⡶⠶⠿⠿⠿⠿⢷⣦⠀⠀⠀⠀⠀⠀⠀⣿⠀ +⠀⠀⣀⣀⣀⠀⣸⡇⠀⠀⠀⠀⣿⡀⠀⠀⠀⠀⠀⠀⣿⡇⠀⠀⠀⠀⠀⠀⣿⠀ +⣠⡿⠛⠛⠛⠛⠻⠀⠀⠀⠀⠀⢸⣇⠀⠀⠀⠀⠀⠀⣿⠇⠀⠀⠀⠀⠀⠀⣿⠀ +⢻⣇⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⡟⠀⠀⢀⣤⣤⣴⣿⠀⠀⠀⠀⠀⠀⠀⣿⠀ +⠈⠙⢷⣶⣦⣤⣤⣤⣴⣶⣾⠿⠛⠁⢀⣶⡟⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡟⠀ + ⠀⠀⠀⠀⠈⣿⣆⡀⠀⠀⠀⠀⠀⠀⢀⣠⣴⡾⠃⠀ +⠀ ⠀⠀⠀⠀⠀⠀⠈⠛⠻⢿⣿⣾⣿⡿⠿⠟⠋⠁⠀⠀⠀ +EOF + ;; "Anarchy"*) set_colors 7 4 read -rd '' ascii_data <<'EOF' From 25127b7793dc899fe03f06e564d64716de894556 Mon Sep 17 00:00:00 2001 From: Fritz Geib <30505127+Fr1tzBot@users.noreply.github.com> Date: Sat, 12 Jun 2021 03:47:27 -0400 Subject: [PATCH 1085/1133] fix package count not including brew casks (#1777) --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index b0159927a..f45092731 100755 --- a/neofetch +++ b/neofetch @@ -1571,7 +1571,7 @@ get_packages() { # shellcheck disable=SC2086 { shopt -s nullglob - has brew && dir "$(brew --cellar)/*" + has brew && dir "$(brew --cellar)/* $(brew --caskroom)/*" has emerge && dir "/var/db/pkg/*/*" has Compile && dir "/Programs/*/" has eopkg && dir "/var/lib/eopkg/package/*" @@ -1634,7 +1634,7 @@ get_packages() { "Mac OS X"|"macOS"|MINIX) has port && pkgs_h=1 tot port installed && ((packages-=1)) - has brew && dir "$(brew --cellar)"/* + has brew && dir "$(brew --cellar)/* $(brew --caskroom)/*" has pkgin && tot pkgin list has dpkg && tot dpkg-query -f '.\n' -W From 73ad76aa4be76fa78a2048075fb15d65e3aadbbd Mon Sep 17 00:00:00 2001 From: MrVeink <59528135+MrVeink@users.noreply.github.com> Date: Sat, 12 Jun 2021 10:48:38 +0300 Subject: [PATCH 1086/1133] Added iglunix to ascii art distros (#1775) --- neofetch | 138 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 78 insertions(+), 60 deletions(-) diff --git a/neofetch b/neofetch index f45092731..d9e86e42e 100755 --- a/neofetch +++ b/neofetch @@ -786,12 +786,12 @@ image_source="auto" # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, # bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, -# Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, +# Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, # DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, # gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, HydroOS -# Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, +# Hyperbola, iglunix, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, # KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, # Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, # Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, @@ -799,8 +799,8 @@ image_source="auto" # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, -# Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, -# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, +# Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, +# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, # Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SereneLinux, SharkLinux, Siduction, SkiffOS, Slackware, SliTaz, SmartOS, # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, @@ -5134,11 +5134,11 @@ ASCII: BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, - CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, + CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, - GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, janus, Kali, + GoboLinux, Grombyang, Guix, Haiku, Huayra, Hyperbola, iglunix, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, Korora, KSLinux, Kubuntu, LEDE, LaxerOS, LibreELEC, LFS, Linux_Lite, LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, Manjaro, TeArch, Maui, Mer, Minix, LinuxMint, @@ -6523,7 +6523,7 @@ EOF "CelOS"*) set_colors 3 2 4 5 7 read -rd '' ascii_data <<'EOF' - + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ @@@# @@@ @@ ,#%%%%%(. (@ @@ -7384,29 +7384,29 @@ ${c1} /:-------------:\\ :---------------------:// EOF ;; - + "Fedora"*) set_colors 12 7 read -rd '' ascii_data <<'EOF' ${c1} .',;::::;,'. - .';:cccccccccccc:;,. - .;cccccccccccccccccccccc;. - .:cccccccccccccccccccccccccc:. + .';:cccccccccccc:;,. + .;cccccccccccccccccccccc;. + .:cccccccccccccccccccccccccc:. .;ccccccccccccc;${c2}.:dddl:.${c1};ccccccc;. - .:ccccccccccccc;${c2}OWMKOOXMWd${c1};ccccccc:. + .:ccccccccccccc;${c2}OWMKOOXMWd${c1};ccccccc:. .:ccccccccccccc;${c2}KMMc${c1};cc;${c2}xMMc${c1};ccccccc:. ,cccccccccccccc;${c2}MMM.${c1};cc;${c2};WW:${c1};cccccccc, :cccccccccccccc;${c2}MMM.${c1};cccccccccccccccc: :ccccccc;${c2}oxOOOo${c1};${c2}MMM0OOk.${c1};cccccccccccc: cccccc;${c2}0MMKxdd:${c1};${c2}MMMkddc.${c1};cccccccccccc; ccccc;${c2}XM0'${c1};cccc;${c2}MMM.${c1};cccccccccccccccc' -ccccc;${c2}MMo${c1};ccccc;${c2}MMW.${c1};ccccccccccccccc; -ccccc;${c2}0MNc.${c1}ccc${c2}.xMMd${c1};ccccccccccccccc; -cccccc;${c2}dNMWXXXWM0:${c1};cccccccccccccc:, -cccccccc;${c2}.:odl:.${c1};cccccccccccccc:,. -:cccccccccccccccccccccccccccc:'. -.:cccccccccccccccccccccc:;,.. - '::cccccccccccccc::;,. +ccccc;${c2}MMo${c1};ccccc;${c2}MMW.${c1};ccccccccccccccc; +ccccc;${c2}0MNc.${c1}ccc${c2}.xMMd${c1};ccccccccccccccc; +cccccc;${c2}dNMWXXXWM0:${c1};cccccccccccccc:, +cccccccc;${c2}.:odl:.${c1};cccccccccccccc:,. +:cccccccccccccccccccccccccccc:'. +.:cccccccccccccccccccccc:;,.. + '::cccccccccccccc::;,. EOF ;; @@ -7895,6 +7895,24 @@ WW W EOF ;; + "iglunix"*|"iglu"*) + set_colors 8 + read -rd '' ascii_data <<'EOF' +${c1} | + | | + | +| ________ +| /\ | \ + / \ | \ | + / \ \ | +/ \________\ +\ / / + \ / / + \ / / + \/________/ +EOF + ;; + "januslinux"*|"janus"*|"Ataraxia Linux"*|"Ataraxia"*) set_colors 4 5 6 2 read -rd '' ascii_data <<'EOF' @@ -8461,27 +8479,27 @@ EOF "TeArch"*) set_colors 39 7 1 read -rd '' ascii_data <<'EOF' -${c1} @@@@@@@@@@@@@@ - @@@@@@@@@ @@@@@@ - @@@@@ @@@@@ - @@ @@ - @% @@ - @ @ - @@@@@@@@@@@@@@@@@@@@@@@@ @@ - .@@@@@@@@@@@@/@@@@@@@@@@@@ - @@@@@@@@@@@@///@@@@@@@@@@@@ - @@@@@@@@@@@@@((((@@@@@@@@@@@@ - @@@@@@@@@@@#(((((((#@@@@@@@@@@@ - @@@@@@@@@@@#//////////@@@@@@@@@@& - @@@@@@@@@@////@@@@@////@@@@@@@@@@ - @@@@@@@@//////@@@@@/////@@@@@@@@@ - @@@@@@@//@@@@@@@@@@@@@@@//@@@@@@@ +${c1} @@@@@@@@@@@@@@ + @@@@@@@@@ @@@@@@ + @@@@@ @@@@@ + @@ @@ + @% @@ + @ @ + @@@@@@@@@@@@@@@@@@@@@@@@ @@ + .@@@@@@@@@@@@/@@@@@@@@@@@@ + @@@@@@@@@@@@///@@@@@@@@@@@@ + @@@@@@@@@@@@@((((@@@@@@@@@@@@ + @@@@@@@@@@@#(((((((#@@@@@@@@@@@ + @@@@@@@@@@@#//////////@@@@@@@@@@& + @@@@@@@@@@////@@@@@////@@@@@@@@@@ + @@@@@@@@//////@@@@@/////@@@@@@@@@ + @@@@@@@//@@@@@@@@@@@@@@@//@@@@@@@ @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ @@ .@@@@@@@@@@@@@@@@@@@@@@@@@ @ @@@@@@ @@@. @@@@@@@ - @@@@@@@&@@@@@@@# #@@@@@@@@@@@@@@@@ - @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ - @@@@@@@@@@@@@@@@@@@@@ + @@@@@@@&@@@@@@@# #@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@@@@@@@@@ + @@@@@@@@@@@@@@@@@@@@@ EOF ;; @@ -9466,25 +9484,25 @@ EOF read -rd '' ascii_data <<'EOF' ${c1} - ``.---..` `--` - ``.---........-:.${c2}-::`${c1} - ${c2}./::-${c1}........${c2}--::.````${c1} - ${c2}.:://:::${c1}----${c2}::::-..${c1} - ..${c2}--:::::--::::++-${c1}.` - ${c2}`-:-`${c1} .-ohy+::${c2}-:::${c1}/sdmdd:.${c2} `-:- - .-:::${c1}...${c3}sNNmds$y${c1}o/+${c3}sy+NN$m${c1}d+.`${c2}-:::-. - `.-:-${c1}./${c3}dN${c1}()${c3}yyooosd${c1}()${c3}$m${c1}dy${c2}-.::-.`${c1} - ${c2}`.${c1}-...-${c3}+hNdyyyyyydmy${c1}:......${c2}`${c1} - ``..--.....-${c3}yNNm${c4}hssssh${c3}mmdo${c1}.........``` + ``.---..` `--` + ``.---........-:.${c2}-::`${c1} + ${c2}./::-${c1}........${c2}--::.````${c1} + ${c2}.:://:::${c1}----${c2}::::-..${c1} + ..${c2}--:::::--::::++-${c1}.` + ${c2}`-:-`${c1} .-ohy+::${c2}-:::${c1}/sdmdd:.${c2} `-:- + .-:::${c1}...${c3}sNNmds$y${c1}o/+${c3}sy+NN$m${c1}d+.`${c2}-:::-. + `.-:-${c1}./${c3}dN${c1}()${c3}yyooosd${c1}()${c3}$m${c1}dy${c2}-.::-.`${c1} + ${c2}`.${c1}-...-${c3}+hNdyyyyyydmy${c1}:......${c2}`${c1} + ``..--.....-${c3}yNNm${c4}hssssh${c3}mmdo${c1}.........``` `-:://:.....${c3}hNNNNN${c4}mddm${c3}NNNmds${c1}.....//::--` - ```.:-...${c3}oNNNNNNNNNNNNNNmd/${c1}...:-.``` - .....${c3}hNNNNNNNNNNNNNNmds${c1}....` - --...${c3}hNNNNNNNNNNNNNNmdo${c1}..... - .:...${c3}/NNNNNNNNNNNNNNdd${c1}:....` - `-...${c3}+mNNNNNNNNNNNmh${c1}:...-. - ${c4}.:+o+/:-${c1}:+oo+///++o+/:-${c4}:/+ooo/:. - ${c4}+oo/:o- +oooooso.` - ${c4}.` ` `/ .-//- + ```.:-...${c3}oNNNNNNNNNNNNNNmd/${c1}...:-.``` + .....${c3}hNNNNNNNNNNNNNNmds${c1}....` + --...${c3}hNNNNNNNNNNNNNNmdo${c1}..... + .:...${c3}/NNNNNNNNNNNNNNdd${c1}:....` + `-...${c3}+mNNNNNNNNNNNmh${c1}:...-. + ${c4}.:+o+/:-${c1}:+oo+///++o+/:-${c4}:/+ooo/:. + ${c4}+oo/:o- +oooooso.` + ${c4}.` ` `/ .-//- EOF ;; @@ -9597,14 +9615,14 @@ EOF ;; "PuffOS"*) - set_colors 3 + set_colors 3 read -rd '' ascii_data <<'EOF' ${c1} - _,..._,m, - ,/' '""; + _,..._,m, + ,/' '""; / ". - ,'mmmMMMMmm. \ - _/-"^^^^^"""%#%mm, ; + ,'mmmMMMMmm. \ + _/-"^^^^^"""%#%mm, ; ,m,_,' "###) ;, (###% \#/ ;##mm. ^#/ __ ___ ; (######) From 55cce2dfef4cdaf73c1541a906f0b2769c38454b Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Tue, 15 Jun 2021 06:15:36 +0200 Subject: [PATCH 1087/1133] Update ubuntu logo. Closes #1750 (#1779) --- neofetch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index d9e86e42e..029bf74ee 100755 --- a/neofetch +++ b/neofetch @@ -10886,26 +10886,26 @@ EOF "Ubuntu"* | "i3buntu"*) set_colors 1 7 3 read -rd '' ascii_data <<'EOF' -${c1} .-/+oossssoo+/-. - `:+ssssssssssssssssss+:` +${c1} .-/+oossssoo+\-. + ´:+ssssssssssssssssss+:` -+ssssssssssssssssssyyssss+- .ossssssssssssssssss${c2}dMMMNy${c1}sssso. - /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss/ + /sssssssssss${c2}hdmmNNmmyNMMMMh${c1}ssssss\ +sssssssss${c2}hm${c1}yd${c2}MMMMMMMNddddy${c1}ssssssss+ - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss/ + /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhmNMMMNh${c1}ssssssss\ .ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. +ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ oss${c2}yNMMMNyMMh${c1}ssssssssssssss${c2}hmmmh${c1}ssssssso oss${c2}yNMMMNyMMh${c1}sssssssssssssshmmmh${c1}ssssssso +ssss${c2}hhhyNMMNy${c1}ssssssssssss${c2}yNMMMy${c1}sssssss+ .ssssssss${c2}dMMMNh${c1}ssssssssss${c2}hNMMMd${c1}ssssssss. - /ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ + \ssssssss${c2}hNMMM${c1}yh${c2}hyyyyhdNMMMNh${c1}ssssssss/ +sssssssss${c2}dm${c1}yd${c2}MMMMMMMMddddy${c1}ssssssss+ - /sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ + \sssssssssss${c2}hdmNNNNmyNMMMMh${c1}ssssss/ .ossssssssssssssssss${c2}dMMMNy${c1}sssso. -+sssssssssssssssss${c2}yyy${c1}ssss+- `:+ssssssssssssssssss+:` - .-/+oossssoo+/-. + .-\+oossssoo+/-. EOF ;; From a980dc8e8be54e57a1c64518fb68c166b84cbd2c Mon Sep 17 00:00:00 2001 From: Biel Date: Tue, 15 Jun 2021 01:18:02 -0300 Subject: [PATCH 1088/1133] Add Aperio GNU/Linux information. (#1778) --- neofetch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/neofetch b/neofetch index 029bf74ee..f1b2d633d 100755 --- a/neofetch +++ b/neofetch @@ -5540,6 +5540,16 @@ h//NNNNh ossss` +h md- .hm/ `sNNNNN:+y EOF ;; + "Aperio GNU/Linux"*) + set_colors 255 + read -rd '' ascii_data <<'EOF' +${c2} + _.._ _ ._.. _ +(_][_)(/,[ |(_) + | GNU/Linux +EOF + ;; + "Hash"*) set_colors 123 read -rd '' ascii_data <<'EOF' From bc71e732a905e6f27518058970cfe5b789ef2e7f Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Thu, 17 Jun 2021 15:29:19 +0800 Subject: [PATCH 1089/1133] Add macOS 12 to version name list (#1783) --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index f1b2d633d..32a8e4bed 100755 --- a/neofetch +++ b/neofetch @@ -1151,6 +1151,7 @@ get_distro() { 10.15*) codename="macOS Catalina" ;; 10.16*) codename="macOS Big Sur" ;; 11.0*) codename="macOS Big Sur" ;; + 12.0*) codename="macOS Monterey" ;; *) codename=macOS ;; esac From bbbb68f8b2eb70651a6b33343f97eeb1b223a4b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Berk=20=C3=87akar?= Date: Tue, 22 Jun 2021 07:00:27 +0300 Subject: [PATCH 1090/1133] Added Pisi Linux support for Neofetch. (#1723) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added PiSi support * Add placeholder PiSi ascii art * Added actual PisiLinux logo * Colorize PisiLinux logo * Improvement in ascii art * Added Pisi to the list of supported distributions * Updated manpage * Fixed flaws in ascii art Co-authored-by: Berkan Şahin --- neofetch | 32 +++++++++++++++++++++++++++++--- neofetch.1 | 44 ++++++++++++++++++++++++++------------------ 2 files changed, 55 insertions(+), 21 deletions(-) diff --git a/neofetch b/neofetch index 32a8e4bed..d0830a2bd 100755 --- a/neofetch +++ b/neofetch @@ -798,7 +798,7 @@ image_source="auto" # Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, -# TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, +# TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, # Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, # Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, @@ -1554,6 +1554,7 @@ get_packages() { has alps && tot alps showinstalled has butch && tot butch list has swupd && tot swupd bundle-list --quiet + has pisi && tot pisi li # Using the dnf package cache is much faster than rpm. if has dnf && type -p sqlite3 >/dev/null && [[ -f /var/cache/dnf/packages.db ]]; then @@ -5147,7 +5148,7 @@ ASCII: NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, - PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, + PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, @@ -5550,7 +5551,7 @@ ${c2} | GNU/Linux EOF ;; - + "Hash"*) set_colors 123 read -rd '' ascii_data <<'EOF' @@ -9490,6 +9491,31 @@ ${c1} PPPPPPPPPPPPPP EOF ;; + "Pisi"*) + set_colors 12 7 6 1 8 + read -rd '' ascii_data <<'EOF' +${c1} \Fv/!- `:?lzC +${c1} Q!::=zFx! ${c2}`;v6WBCicl;` ${c1},vCC\!::#. +${c1} ,%:::,'` ${c2}+#%@@FQ@@. ,cF%i${c1}``-',::a? +${c1} +m:,'```${c2}}3,/@@Q\@@ "af-${c1} `-'"7f + =o'.` ${c2}/m' :Q@:Qg ,kl${c1} `.|o + :k` '${c2}$+ 'Narm >d,${c1} ii + #`${c2}!p. `C , 'd+${c1} %' +${c2} !0m `6Kv + =a m+ + !A !\L|: :|L\! $: + .8` Q''%Q#' '#Q%''Q `0- + :6 E|.6QQu uQQ6.|E p: + i{ \jts9? ?9stj\ u\ + |a` -''. `e> + ,m+ ${c1}'^ !`${c2}s@@@@a${c1}'"`+`${c2} >e' + !3|${c1}`|=>>r- ${c2}'U%:${c1} '>>>=:`\3! + 'xopE| ${c2}`'${c1} `ledoz- + `;=>>+`${c2}`^llci/|==|/iclc;`${c1}'>>>>: + `^`+~ ${c2}````${c1} !!-^ +EOF + ;; + "PNM Linux"* | "WHPNM Linux"*) set_colors 33 9 15 202 read -rd '' ascii_data <<'EOF' diff --git a/neofetch.1 b/neofetch.1 index 39676dfb6..0e5bffaaf 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.16. -.TH NEOFETCH "1" "August 2020" "Neofetch 7.1.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.3. +.TH NEOFETCH "1" "April 2021" "Neofetch 7.1.0" "User Commands" .SH NAME Neofetch \- A fast, highly customizable system info script .SH SYNOPSIS @@ -152,6 +152,9 @@ URL to query for public IP \fB\-\-ip_timeout\fR int Public IP timeout (in seconds). .TP +\fB\-\-ip_interface\fR value +Interface(s) to use for local IP +.TP \fB\-\-song_format\fR format Print the song data in a specific format (see config file). .TP @@ -215,10 +218,6 @@ Length in spaces to make the bars. Colors to make the bar. Set in this order: elapsed, total .TP -\fB\-\-cpu_display\fR mode -Bar mode. -Possible values: bar, infobar, barinfo, off -.TP \fB\-\-memory_display\fR mode Bar mode. Possible values: bar, infobar, barinfo, off @@ -234,8 +233,8 @@ Possible values: bar, infobar, barinfo, off .TP \fB\-\-backend\fR backend Which image backend to use. -Possible values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', -\&'off', 'sixel', 'tycat', 'w3m', 'kitty', 'ueberzug' +Possible values: 'ascii', 'caca', 'catimg', 'chafa', 'jp2a', +\&'iterm2', 'off', 'sixel', 'tycat', 'w3m', 'kitty', 'viu' .TP \fB\-\-source\fR source Which image or ascii file to use. @@ -250,6 +249,9 @@ NEW: neofetch \fB\-\-ascii\fR "$(fortune | cowsay \fB\-W\fR 30)" \fB\-\-caca\fR source Shortcut to use 'caca' backend. .TP +\fB\-\-catimg\fR source +Shortcut to use 'catimg' backend. +.TP \fB\-\-chafa\fR source Shortcut to use 'chafa' backend. .TP @@ -281,7 +283,10 @@ Shortcut to use 'tycat' backend. Shortcut to use 'w3m' backend. .TP \fB\-\-ueberzug\fR source -Shortcut to use 'ueberzug' backend. +Shortcut to use 'ueberzug' backend +.TP +\fB\-\-viu\fR source +Shortcut to use 'viu' backend .TP \fB\-\-off\fR Shortcut to use 'off' backend (Disable ascii art). @@ -314,15 +319,15 @@ Mer, Minix, LinuxMint, Live_Raizo, MX_Linux, Namib, Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, -TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS, +TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, -Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, -openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, -Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, -Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, +Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, +t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, +Ubuntu\-Cinnamon, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, +Ubuntu\-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. .IP NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. @@ -331,8 +336,8 @@ NOTE: Use '{distro name}_old' to use the old logos. .IP NOTE: Ubuntu has flavor variants. .TP -Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, -Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. +NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu\-GNOME, +Ubuntu\-Studio, Ubuntu\-Mate or Ubuntu\-Budgie to use the flavors. .TP NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, @@ -358,6 +363,9 @@ in some terminals emulators when using image mode. How to size the image. Possible values: auto, 00px, 00%, none .TP +\fB\-\-catimg_size\fR 1/2 +Change the resolution of catimg. +.TP \fB\-\-crop_mode\fR mode Which crop mode to use Takes the values: normal, fit, fill @@ -369,11 +377,11 @@ west, center, east, southwest, south, southeast .TP \fB\-\-xoffset\fR px How close the image will be to the left edge of the -window. This only works with w3m and ueberzug. +window. This only works with w3m. .TP \fB\-\-yoffset\fR px How close the image will be to the top edge of the -window. This only works with w3m and ueberzug. +window. This only works with w3m. .TP \fB\-\-bg_color\fR color Background color to display behind transparent image. From 8fc31ac001f800d4de1675e7af4caab096c28cde Mon Sep 17 00:00:00 2001 From: Fritz Geib <30505127+Fr1tzBot@users.noreply.github.com> Date: Wed, 23 Jun 2021 12:01:53 -0400 Subject: [PATCH 1091/1133] add windows 11 ascii art (#1793) --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index d0830a2bd..315f4c7af 100755 --- a/neofetch +++ b/neofetch @@ -11072,6 +11072,29 @@ ${c1} ,;::::; EOF ;; + *"[Windows 11]"*|*"on Windows 11"*|\ + "Windows 11"* |"windows11") + set_colors 6 7 + read -rd '' ascii_data <<'EOF' +${c1} +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ + +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ +################ ################ +EOF + ;; + *"[Windows 10]"*|*"on Windows 10"*|"Windows 8"*|\ "Windows 10"* |"windows10"|"windows8") set_colors 6 7 From cc39539c55c612ca8cfcd313cc8ccb84d89b0f82 Mon Sep 17 00:00:00 2001 From: Kid <44045911+kidonng@users.noreply.github.com> Date: Fri, 25 Jun 2021 15:10:22 +0800 Subject: [PATCH 1092/1133] Better kitty terminal font detection (#1795) * Better kitty terminal font detection * Fix indent --- neofetch | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/neofetch b/neofetch index 315f4c7af..c7f4860e0 100755 --- a/neofetch +++ b/neofetch @@ -3428,11 +3428,9 @@ END ;; "kitty"*) - kitty_config="$(kitty --debug-config)" - [[ "$kitty_config" != *font_family* ]] && return - - term_font="$(awk '/^font_family|^font_size/ {$1="";gsub("^ *","",$0);print $0}' \ - <<< "$kitty_config")" + term_font="from kitty.cli import *; o = create_default_opts(); \ + print(f'{o.font_family} {o.font_size}')" + term_font="$(kitty +runpy ''"$term_font"'')" ;; "konsole" | "yakuake") From 1096b22c18088da5fed025eebdc96facdc8b2e66 Mon Sep 17 00:00:00 2001 From: Guangyuan Yang Date: Sat, 26 Jun 2021 00:39:07 -0400 Subject: [PATCH 1093/1133] Fixes GPU info read error on MINGW64 (#1799) Closes #1798. --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index c7f4860e0..f084d7533 100755 --- a/neofetch +++ b/neofetch @@ -2611,7 +2611,7 @@ get_gpu() { ;; "Windows") - while read -r line; do + wmic path Win32_VideoController get caption | while read -r line; do line=$(trim "$line") case $line in @@ -2623,7 +2623,7 @@ get_gpu() { prin "${subtitle:+${subtitle}${gpu_name}}" "$line" ;; esac - done < <(wmic path Win32_VideoController get caption) + done ;; "Haiku") From dcd180cb6727fa8c8427a00694b82cd26764bceb Mon Sep 17 00:00:00 2001 From: lockheed3k <49485763+lockheed3k@users.noreply.github.com> Date: Sun, 27 Jun 2021 00:10:19 -0400 Subject: [PATCH 1094/1133] Update neofetch (#1801) Fix deformed Debian logo on line 6999 by adding 3 spaces before """Y$$.". --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index f084d7533..723574691 100755 --- a/neofetch +++ b/neofetch @@ -6996,7 +6996,7 @@ EOF read -rd '' ascii_data <<'EOF' ${c2} _,met$$$$$gg. ,g$$$$$$$$$$$$$$$P. - ,g$$P" """Y$$.". + ,g$$P" """Y$$.". ,$$P' `$$$. ',$$P ,ggs. `$$b: `d$$' ,$P"' ${c1}.${c2} $$$ From 5a436bd8be9248e4f6c839bfa1f3b8acfba2a039 Mon Sep 17 00:00:00 2001 From: Kevin Lapointe <80723850+klpnt@users.noreply.github.com> Date: Thu, 1 Jul 2021 01:10:34 -0300 Subject: [PATCH 1095/1133] Added new small Fedora ASCII art (#1806) --- neofetch | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index 723574691..28da670c8 100755 --- a/neofetch +++ b/neofetch @@ -7359,16 +7359,16 @@ EOF ;; "fedora_small") - set_colors 4 7 1 - read -rd '' ascii_data <<'EOF' -${c2} _____ - / __)${c1}\\${c2} - | / ${c1}\\ \\${c2} - ${c1}__${c2}_| |_${c1}_/ /${c2} - ${c1}/ ${c2}(_ _)${c1}_/${c2} -${c1}/ /${c2} | | -${c1}\\ \\${c2}__/ | - ${c1}\\${c2}(_____/ + set_colors 12 + read -rd '' ascii_data <<'EOF' +${c1} ...... + .' .. : + : : :.: + .....: :.. +.' ..:: ..: +: : : : +'. '...' .' + '.....' EOF ;; From 07770633fb570156cb1a86665bd4d4b54d48c533 Mon Sep 17 00:00:00 2001 From: Kevin Lapointe <80723850+klpnt@users.noreply.github.com> Date: Fri, 2 Jul 2021 00:27:26 -0300 Subject: [PATCH 1096/1133] Modified small Fedora ASCII art (#1807) * Added new small Fedora ASCII art * Modified ASCII art for small fedora * modified --- neofetch | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index 28da670c8..2743558a2 100755 --- a/neofetch +++ b/neofetch @@ -7361,14 +7361,15 @@ EOF "fedora_small") set_colors 12 read -rd '' ascii_data <<'EOF' -${c1} ...... - .' .. : - : : :.: - .....: :.. -.' ..:: ..: -: : : : -'. '...' .' - '.....' +${c1} ,'''''. + | ,. | + | | "_" + ,....| |.. +.' ,.'| ..' +| | | | +| ',_,' | + '. ,' + ''''' EOF ;; From e6499671c10a74bf6a6cf03f294212003e267bfb Mon Sep 17 00:00:00 2001 From: bejelentkezni <67395204+bejelentkezni@users.noreply.github.com> Date: Fri, 2 Jul 2021 15:41:35 -0600 Subject: [PATCH 1097/1133] Add ascii art for glaucus (#1809) * Update neofetch * Update neofetch * Update neofetch * Update neofetch * Update neofetch * Update neofetch --- neofetch | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 2743558a2..fb64a8654 100755 --- a/neofetch +++ b/neofetch @@ -7661,7 +7661,25 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM EOF ;; - + + "glaucus"*) + set_colors 5 + read -rd '' ascii_data <<'EOF' +${c1} ,, ,d88P + ,d8P ,ad8888* + ,888P d88888* ,,ad8888P* + d d888P a88888P* ,ad8888888* + .d8 d8888: d888888* ,d888888P* + .888; 88888b d8888888b8888888P + d8888J888888a88888888888888P* ,d + 88888888888888888888888888P ,,d8* + 888888888888888888888888888888888* + *8888888888888888888888888888888* + Y888888888P* `*``*888888888888* + *^888^* *Y888P** +EOF + ;; + "gNewSense"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' From 095fd04094a0bd0dd1f7e501cbe4085a631ffbf7 Mon Sep 17 00:00:00 2001 From: Fritz Geib <30505127+Fr1tzBot@users.noreply.github.com> Date: Mon, 5 Jul 2021 01:00:13 -0400 Subject: [PATCH 1098/1133] fix macos big sur and monterey not showing codenames (#1815) --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index fb64a8654..f45cf0616 100755 --- a/neofetch +++ b/neofetch @@ -1150,8 +1150,8 @@ get_distro() { 10.14*) codename="macOS Mojave" ;; 10.15*) codename="macOS Catalina" ;; 10.16*) codename="macOS Big Sur" ;; - 11.0*) codename="macOS Big Sur" ;; - 12.0*) codename="macOS Monterey" ;; + 11.*) codename="macOS Big Sur" ;; + 12.*) codename="macOS Monterey" ;; *) codename=macOS ;; esac From 798d587c9cbdf0b72afa0dfd496be2e97430f125 Mon Sep 17 00:00:00 2001 From: Kevin <80723850+klpnt@users.noreply.github.com> Date: Mon, 5 Jul 2021 14:14:42 -0400 Subject: [PATCH 1099/1133] minor ascii edit (#1816) --- neofetch | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index f45cf0616..8a3fea96f 100755 --- a/neofetch +++ b/neofetch @@ -7363,13 +7363,13 @@ EOF read -rd '' ascii_data <<'EOF' ${c1} ,'''''. | ,. | - | | "_" - ,....| |.. -.' ,.'| ..' -| | | | -| ',_,' | - '. ,' - ''''' + | | '_' + ,....| |.. +.' ,_;| ..' +| | | | +| ',_,' | + '. ,' + ''''' EOF ;; From 9e8ed741b38925455deb0ad1e6c31fe81074679f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 9 Jul 2021 10:52:10 +0300 Subject: [PATCH 1100/1133] neofetch: add -L to curl. Closes #1823 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 8a3fea96f..71a8043e5 100755 --- a/neofetch +++ b/neofetch @@ -3903,7 +3903,7 @@ get_public_ip() { fi if [[ -z "$public_ip" ]] && type -p curl >/dev/null; then - public_ip="$(curl --max-time "$public_ip_timeout" -w '\n' "$public_ip_host")" + public_ip="$(curl -L --max-time "$public_ip_timeout" -w '\n' "$public_ip_host")" fi if [[ -z "$public_ip" ]] && type -p wget >/dev/null; then From 65e01ab42131b849d10ac7212acf25ded9056159 Mon Sep 17 00:00:00 2001 From: zhullyb <43305366+zhullyb@users.noreply.github.com> Date: Wed, 14 Jul 2021 18:12:04 +0800 Subject: [PATCH 1101/1133] Update manjaro logo (#1825) Manjaro has changed its logo, see manjaro.org --- neofetch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 71a8043e5..4d4b677c1 100755 --- a/neofetch +++ b/neofetch @@ -8475,8 +8475,8 @@ EOF "manjaro_small"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}||||||||| |||| -||||||||| |||| +${c1}|||| |||| +|||| |||| |||| |||| |||| |||| |||| |||| |||| |||| @@ -8488,10 +8488,10 @@ EOF "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ -██████████████████ ████████ +${c1}████████ ████████ +████████ ████████ +████████ ████████ +████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ From c2c1cfbf4f6e34bf23dbb2df6740f32103ab3b32 Mon Sep 17 00:00:00 2001 From: zhullyb <43305366+zhullyb@users.noreply.github.com> Date: Wed, 14 Jul 2021 18:22:33 +0800 Subject: [PATCH 1102/1133] Fix manjaro logo (#1826) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 4d4b677c1..13f46438d 100755 --- a/neofetch +++ b/neofetch @@ -8488,7 +8488,7 @@ EOF "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}████████ ████████ +${c1}████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ From 38cbfeca5ae9f7715f792a9681b6c522a3f99789 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 14 Jul 2021 14:37:28 +0300 Subject: [PATCH 1103/1133] Revert "Fix manjaro logo (#1826)" This reverts commit c2c1cfbf4f6e34bf23dbb2df6740f32103ab3b32. --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 13f46438d..4d4b677c1 100755 --- a/neofetch +++ b/neofetch @@ -8488,7 +8488,7 @@ EOF "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}████████ ████████ +${c1}████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ From 7913ad35ffb5f76bec0b961d4ba94f3ad2eddf4a Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 14 Jul 2021 14:37:30 +0300 Subject: [PATCH 1104/1133] Revert "Update manjaro logo (#1825)" This reverts commit 65e01ab42131b849d10ac7212acf25ded9056159. --- neofetch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 4d4b677c1..71a8043e5 100755 --- a/neofetch +++ b/neofetch @@ -8475,8 +8475,8 @@ EOF "manjaro_small"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}|||| |||| -|||| |||| +${c1}||||||||| |||| +||||||||| |||| |||| |||| |||| |||| |||| |||| |||| |||| @@ -8488,10 +8488,10 @@ EOF "Manjaro"*) set_colors 2 7 read -rd '' ascii_data <<'EOF' -${c1}████████ ████████ -████████ ████████ -████████ ████████ -████████ ████████ +${c1}██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ +██████████████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ ████████ From 139b722c48f546ec2715d6b40c3756964fec0ed4 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 19 Jul 2021 16:57:41 +0300 Subject: [PATCH 1105/1133] neofetch: fix #1832 --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index 0e5bffaaf..f17a21be8 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -341,7 +341,7 @@ Ubuntu\-Studio, Ubuntu\-Mate or Ubuntu\-Budgie to use the flavors. .TP NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, -Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, +Artix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, postmarketOS, and Void have a smaller logo variant. From 017aa041d86340f2b4f82c765ba84aaa096136ec Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 19 Jul 2021 18:00:49 +0300 Subject: [PATCH 1106/1133] neofetch: Only try pkg if on a BSD. Closes #1834 --- neofetch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 71a8043e5..ee193cfbb 100755 --- a/neofetch +++ b/neofetch @@ -1608,13 +1608,15 @@ get_packages() { # TODO: Fix this somehow. has pkginfo && tot pkginfo -i - case $kernel_name in - FreeBSD|DragonFly) has pkg && tot pkg info ;; + case $os-$kernel_name in + BSD-FreeBSD|BSD-DragonFly) + has pkg && tot pkg info + ;; - *) + BSD-*) has pkg && dir /var/db/pkg/* - ((packages == 0)) && \ + ((packages == 0)) && has pkg && tot pkg list ;; esac From 0ce03cfd7e0899297403fbbb1f8db26a2c76dc4d Mon Sep 17 00:00:00 2001 From: omame Date: Mon, 26 Jul 2021 10:01:10 +0200 Subject: [PATCH 1107/1133] Update CyberOS logo to match downstream (#1846) Resolves #1845. --- neofetch | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/neofetch b/neofetch index ee193cfbb..ea17a5cb9 100755 --- a/neofetch +++ b/neofetch @@ -6936,24 +6936,24 @@ o/${c2}--...::-:/::/:-......-::::::-/-...-${c1}:/o EOF ;; - "CyberOS"*) - set_colors 50 32 57 - read -rd '' ascii_data <<'EOF' -${c3} !M$EEEEEEEEEEEP - .MMMMM000000Nr. - ${c3}&MMMMMM${c2}MMMMMMMMMMMMM9 - ${c3}~MMM${c1}MMMM${c2}MMMMMMMMMMMMC - ${c1}" ${c3}M${c1}MMMMMMM${c2}MMMMMMMMMMs - ${c1}iM${c2}MMM&&${c1}MMMMMMMM${c2}MMMMMMMM\\ - ${c1}BMMM${c2}MMMMM${c1}MMMMMMM${c2}MMMMMM${c3}" -${c1}9MMMMM${c2}MMMMMMM${c1}MMMM${c2}MMMM${c3}MMMf- - ${c2}sMMMMMMMM${c1}MM${c2}M${c3}MMMMMMMMM3_ - ${c2}+ffffffff${c1}P${c3}MMMMMMMMMMMM0 - ${c2}CMMMMMMMMMMM - }MMMMMMMMM - ~MMMMMMM - "RMMMM - .PMB + "CyberOS"*) + set_colors 50 32 57 + read -rd '' ascii_data <<'EOF' +${c3} !M$EEEEEEEEEEEP + .MMMMM000000Nr. + ${c3}&MMMMMM${c2}MMMMMMMMMMMMM9 + ${c3}~MMM${c1}MMMM${c2}MMMMMMMMMMMMC + ${c1}" ${c3}M${c1}MMMMMMM${c2}MMMMMMMMMMs + ${c1}iM${c2}MMM&&${c1}MMMMMMMM${c2}MMMMMMMM\\ + ${c1}BMMM${c2}MMMMM${c1}MMMMMMM${c2}MMMMMM${c3}" + ${c1}9MMMMM${c2}MMMMMMM${c1}MMMM${c2}MMMM${c3}MMMf- + ${c2}sMMMMMMMM${c1}MM${c2}M${c3}MMMMMMMMM3_ + ${c2}+ffffffff${c1}P${c3}MMMMMMMMMMMM0 + ${c2}CMMMMMMMMMMM + }MMMMMMMMM + ~MMMMMMM + "RMMMM + .PMB EOF ;; From 07822a3c42ea39098caf9165037bcb3bc7d7d6ed Mon Sep 17 00:00:00 2001 From: Hervy Qurrotul Ainur Date: Thu, 5 Aug 2021 11:06:06 +0700 Subject: [PATCH 1108/1133] Add LangitKetujuh OS (#1824) --- neofetch | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index ea17a5cb9..8bed79a5e 100755 --- a/neofetch +++ b/neofetch @@ -806,8 +806,8 @@ image_source="auto" # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, # Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, -# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, -# windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. +# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, LangitKetujuh, semc, +# Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. # NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. # NOTE: Ubuntu has flavor variants. @@ -5156,8 +5156,8 @@ ASCII: Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, - Ubuntu-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, - windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. + Ubuntu-Studio, Ubuntu, Univention, Venom, Void, LangitKetujuh, semc, + Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. @@ -11050,6 +11050,27 @@ EOF ;; + "LangitKetujuh"*) + set_colors 7 4 + read -rd '' ascii_data <<'EOF' +${c1} + L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L + 'L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L + L7L. 'L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L + L7L7L7L L7L7L7L + L7L7L7L L7L7L7L + L7L7L7L L7L7L7L7L7L7L7L7L7L7L7L + L7L7L7L 'L7L7L7L7L7L7L7L7L7L + L7L7L7L 'L7L7L7L7L7L7L7L + L7L7L7L L7L7L7L + L7L7L7L L7L7L7L + L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L. 'L7L + L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L. + L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L +${c2} +EOF + ;; + "semc"*) set_colors 2 8 1 read -rd '' ascii_data <<'EOF' From cf928f3b9b123cf8530114643d648a16e6d1941d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 5 Aug 2021 10:15:12 +0300 Subject: [PATCH 1109/1133] meta: fix makefile, closes #1858 --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4adbd5f6f..2b41f34f5 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -PREFIX ?= /usr -MANDIR ?= $(PREFIX)/share/man +PREFIX = /usr +MANDIR = $(PREFIX)/share/man all: @echo Run \'make install\' to install Neofetch. From bb272ac3e8ea534e50c1d716993f7670e3ae68eb Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 5 Aug 2021 16:02:29 +0200 Subject: [PATCH 1110/1133] Add Kaisen Linux (#1859) --- neofetch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/neofetch b/neofetch index 8bed79a5e..118c85f1d 100755 --- a/neofetch +++ b/neofetch @@ -7974,6 +7974,30 @@ ${c1} cooo: ${c2}coooooooooooooooooool EOF ;; + "Kaisen"*) + set_colors 1 7 3 + read -rd '' ascii_data <<'EOF' +${c1} ` + `:+oyyho. + `+:`sdddddd/ + `+` :ho oyo++ohds-` + .ho :dd. .: `sddddddhhyso+/- + ody.ddd-:yd- +hysssyhddddddddho` + yddddddhddd` ` `--` -+hddddddh. + hddy-+dddddy+ohh/..+sddddy/:::+ys + :ddd/sdddddddddd- oddddddd ` + `yddddddddddddddd/ /ddddddd/ +:. :ydddddddddddddddddo..sddddddy/` +odhdddddddo- `ddddh+-``....-+hdddddds. +-ddddddhd: /dddo -ydddddddhdddddddd- + /hdy:o - `:sddds .`./hdddddddddddddo + `/- `+hddyosy+ :dddddddy-.-od/ + :sydds -hddddddd` / + .+shd- `:ohddddddddd` + `:+ooooooooooooo: +EOF + ;; + "Kali"*) set_colors 4 8 read -rd '' ascii_data <<'EOF' From 733a7295391a917bf54eda595fa684795958dbc3 Mon Sep 17 00:00:00 2001 From: NeXT STEP <80169337+C47F15H@users.noreply.github.com> Date: Sat, 7 Aug 2021 08:29:50 +0530 Subject: [PATCH 1111/1133] Update CelOS (#1864) --- neofetch | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/neofetch b/neofetch index 118c85f1d..10a584147 100755 --- a/neofetch +++ b/neofetch @@ -6533,21 +6533,30 @@ EOF "CelOS"*) - set_colors 3 2 4 5 7 - read -rd '' ascii_data <<'EOF' + set_colors 4 6 0 5 + read -rd '' ascii_data <<'EOF' + +${c4} .,cmmmmmmmmmmmc,. + .,cmMMMMMMMMMMMMMMMMMMMMmc. + .cMMMMMMMMMMMMMMMMMMMMMMMMMMMmc. + .cMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMc. + ,:MMM ${c3}####################################${c4} + cMMMMMMmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmc. + .MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM. + .MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMc + "******************************MMMMMMMMMMMMMc: +${c3}#################################### ${c4}MMMMMMMMMMMMMc + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM: + "MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM" + 'MMMMMMMMM*******************************: + \"MMMMMM ${c3}##################################### + ${c4}`:MMMMMMmmmmmmmmmmmmmmmmmmmmmmmmmmmmm; + `"MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM" + `":MMMMMMMMMMMMMMMMMMMMMMMMM;' + `":MMMMMMMMMMMMMMMMMMM:" + "************" + -@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ -@@@# @@@ -@@ ,#%%%%%(. (@ -@# %%%%%%%%%%%%%%# @ -@# %%%%%%%%# %%%/ @ -@# #%%%%%%%%. #%%%* @ -@# %%%%%%%%%%%* (%%%%%# @ -@# #%%%% %%%%%%%%%%%, @ -@# #%%%%%%%%%%%%%%%%%, @ -@# #%%%%%%%%%%%%%* @ -@@ *##%#(, @@ -@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ EOF From 5db2127b7a24ee0978518f3aa954f954d8bdaa7a Mon Sep 17 00:00:00 2001 From: "Benjamin S. Osenbach" Date: Fri, 6 Aug 2021 23:00:17 -0400 Subject: [PATCH 1112/1133] fix issue #1757 (#1863) --- neofetch | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 10a584147..d96706dfe 100755 --- a/neofetch +++ b/neofetch @@ -784,7 +784,7 @@ image_source="auto" # Antergos, antiX, "AOSC OS", "AOSC OS/Retro", Apricity, ArchCraft, # ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, -# bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, +# Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, # Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, # DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, @@ -5133,7 +5133,7 @@ ASCII: instantOS, Antergos, antiX, \"AOSC OS\", \"AOSC OS/Retro\", Apricity, ArchCraft, ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig, - BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs, + BlackArch, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, @@ -6409,6 +6409,30 @@ ${c1} oMMNMMMMMMMMMMMMMMMMMMMMMM EOF ;; + "Bodhi"*) + set_colors 7 11 2 + read -rd '' ascii_data <<'EOF' +${c1}| ${c2},,mmKKKKKKKKWm,, + ${c1}' ${c2},aKKP${c1}LL**********|L*${c2}TKp, + ${c1}t ${c2}aKP${c1}L**``` ```**L${c2}*Kp + IX${c1}EL${c3}L,wwww, ${c1}``*||${c2}Kp + ,#P${c1}L|${c3}KKKpPP@IPPTKmw, ${c1}`*||${c2}K + ,K${c1}LL*${c3}{KKKKKKPPb$KPhpKKPKp ${c1}`||${c2}K + #${c1}PL ${c3}!KKKKKKPhKPPP$KKEhKKKKp ${c1}`||${c2}K +!H${c1}L* ${c3}1KKKKKKKphKbPKKKKKK$KKp ${c1}`|I${c2}W +$${c1}bL ${c3}KKKKKKKKBQKhKbKKKKKKKK ${c1}|I${c2}N +$${c1}bL ${c3}!KKKKKKKKKKNKKKKKKKPP` ${c1}|I${c2}b +TH${c1}L* ${c3}TKKKKKK##KKKN@KKKK^ ${c1}|I${c2}M + K@${c1}L ${c3}*KKKKKKKKKKKEKE5 ${c1}||${c2}K + `NL${c1}L ${c3}`KKKKKKKKKK"```|L ${c1}||${c2}#P + `K@${c1}LL ${c3}`"**"` ${c1}'. :||${c2}#P + Yp${c1}LL ${c1}' |L${c2}$M` + `Tp${c1}pLL, ,|||${c2}p'L + "Kpp${c1}LL++,., ,,|||$${c2}#K* ${c1}'. + ${c2}`"MKWpppppppp#KM"` ${c1}`h, +EOF + ;; + "bonsai"*) set_colors 6 2 3 read -rd '' ascii_data <<'EOF' From 547acd8d55b2e6b6c5b4f164756dbd336b72c4a4 Mon Sep 17 00:00:00 2001 From: RustedTerrier <58403628+RustedTerrier@users.noreply.github.com> Date: Wed, 11 Aug 2021 03:07:03 +0000 Subject: [PATCH 1113/1133] RiverWM support (#1870) * Feat: WM support for river. * Update neofetch --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index d96706dfe..e3ff4b501 100755 --- a/neofetch +++ b/neofetch @@ -1908,6 +1908,7 @@ get_wm() { -e orbital \ -e orbment \ -e perceptia \ + -e river \ -e rustland \ -e sway \ -e ulubis \ From 5dc9a2fa61719efc3e9614e44d9d8df5d9043c8d Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 15 Aug 2021 11:14:57 +0200 Subject: [PATCH 1114/1133] song: Switch cmus to get_song_dbus (#1875) --- neofetch | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/neofetch b/neofetch index e3ff4b501..9fd882475 100755 --- a/neofetch +++ b/neofetch @@ -2883,6 +2883,7 @@ get_song() { "gnome-music"*) get_song_dbus "GnomeMusic" ;; "lollypop"*) get_song_dbus "Lollypop" ;; "clementine"*) get_song_dbus "clementine" ;; + "cmus"*) get_song_dbus "cmus" ;; "juk"*) get_song_dbus "juk" ;; "bluemindo"*) get_song_dbus "Bluemindo" ;; "guayadeque"*) get_song_dbus "guayadeque" ;; @@ -2918,14 +2919,6 @@ get_song() { song="$(xmms2 current -f "\${artist}"$' \n'"\${album}"$' \n'"\${title}")" ;; - "cmus"*) - # NOTE: cmus >= 2.8.0 supports mpris2 - song="$(cmus-remote -Q | awk '/tag artist/ {$1=$2=""; a=$0} - /tag album / {$1=$2=""; b=$0} - /tag title/ {$1=$2=""; t=$0} - END {print a " \n" b " \n" t}')" - ;; - "spotify"*) case $os in "Linux") get_song_dbus "spotify" ;; From aa026545b963e54e22740fc6bf625a409a47567c Mon Sep 17 00:00:00 2001 From: Crestwave <35413013+Crestwave@users.noreply.github.com> Date: Wed, 25 Aug 2021 12:42:08 +0800 Subject: [PATCH 1115/1133] packages: fix dpkg (#1888) --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9fd882475..8ee14ba16 100755 --- a/neofetch +++ b/neofetch @@ -1541,7 +1541,7 @@ get_packages() { has kiss && tot kiss l has cpt-list && tot cpt-list has pacman-key && tot pacman -Qq --color never - has dpkg && pac "$(dpkg --list | grep -c ^ii)" + has dpkg && tot dpkg-query -f '.\n' -W has xbps-query && tot xbps-query -l has apk && tot apk info has opkg && tot opkg list-installed From b3e21d89cd4acb09cc89b1ae4aca0929111176c7 Mon Sep 17 00:00:00 2001 From: Angelo F Date: Sun, 29 Aug 2021 18:21:15 +0800 Subject: [PATCH 1116/1133] Modify the two "Darwin" Apple logos (#1892) Make them more consistent with the actual Apple logo modified: neofetch --- neofetch | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/neofetch b/neofetch index 8ee14ba16..a8c949848 100755 --- a/neofetch +++ b/neofetch @@ -8420,11 +8420,11 @@ EOF "mac"* | "Darwin") set_colors 2 3 1 1 5 4 read -rd '' ascii_data <<'EOF' -${c1} 'c. +${c1} c.' ,xNMM. .OMMMMo - OMMM0, - .;loddo:' loolloddol;. + lMM" + .;loddo:. .olloddol;. cKMMMMMMMMMMNWMMMMMMMMMM0: ${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. XMMMMMMMMMMMMMMMMMMMMMMMX. @@ -8432,11 +8432,11 @@ ${c3};MMMMMMMMMMMMMMMMMMMMMMMM: :MMMMMMMMMMMMMMMMMMMMMMMM: ${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c5}'XMMMMMMMMMMMMMMMMMMMMMMMMMMk + 'XMMMMMMMMMMMMMMMMMMMMMMMMK. ${c6}kMMMMMMMMMMMMMMMMMMMMMMd ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. + "cooc*" "*coo'" EOF ;; @@ -11336,11 +11336,11 @@ EOF "Darwin") set_colors 2 3 1 1 5 4 read -rd '' ascii_data <<'EOF' -${c1} 'c. +${c1} c.' ,xNMM. .OMMMMo - OMMM0, - .;loddo:' loolloddol;. + lMMM" + .;loddo:. .olloddol;. cKMMMMMMMMMMNWMMMMMMMMMM0: ${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd. XMMMMMMMMMMMMMMMMMMMMMMMX. @@ -11348,11 +11348,11 @@ ${c3};MMMMMMMMMMMMMMMMMMMMMMMM: :MMMMMMMMMMMMMMMMMMMMMMMM: ${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX. kMMMMMMMMMMMMMMMMMMMMMMMMWd. - ${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk - .XMMMMMMMMMMMMMMMMMMMMMMMMK. + ${c5}'XMMMMMMMMMMMMMMMMMMMMMMMMMMk + 'XMMMMMMMMMMMMMMMMMMMMMMMMK. ${c6}kMMMMMMMMMMMMMMMMMMMMMMd ;KMMMMMMMWXXWMMMMMMMk. - .cooc,. .,coo:. + "cooc*" "*coo'" EOF ;; From 7f7d824b4421662aea74c6f2833b8f82da5f9605 Mon Sep 17 00:00:00 2001 From: "Benjamin S. Osenbach" Date: Wed, 1 Sep 2021 15:14:10 -0400 Subject: [PATCH 1117/1133] Fix Haiku logo (#1812) (#1898) * Fix Haiku logo (#1812) * fixed padding and color --- neofetch | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/neofetch b/neofetch index a8c949848..616348d6e 100755 --- a/neofetch +++ b/neofetch @@ -7858,25 +7858,22 @@ EOF ;; "Haiku"*) - set_colors 2 8 + set_colors 1 3 7 2 read -rd '' ascii_data <<'EOF' -${c2} :dc' - 'l:;'${c1},${c2}'ck. .;dc:. - co ${c1}..${c2}k. .;; ':o. - co ${c1}..${c2}k. ol ${c1}.${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. - co ${c1}..${c2}k. oc ${c1}..${c2}0. -.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,. - ';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd; - ..${c1}oOolllllccccccc:::::${c2}od; - cx:ooc${c1}:::::::;${c2}cooolcX. - cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0. - cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0. - .::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0. - '::c'${c1}...${c2}do${c1}..... .${c2}K, - cd,.${c1}....:${c2}O,${c1} - ':clod:'${c1} - ${c1} +${c3} + + MMMM MMMM + MMMM MMMM + MMMM MMMM + MMMM MMMM + MMMM${c4} .ciO| /YMMMMM*" +${c3} MMMM${c4} .cOMMMMM|/MMMMM/` + , ,iMM|/MMMMMMMMMMMMMMM* + `*.__,-cMMMMMMMMMMMMMMMMM/`${c3}.MMM + MM${c4}MMMMMMM/`:MMM/ ${c3}MMMM + MMMM MMMM + MMMM MMMM + """" """" EOF ;; From 47f46834e788bfab383775ce9e2508c3d3827b28 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 4 Sep 2021 18:06:43 +0300 Subject: [PATCH 1118/1133] misc: nits --- neofetch | 53 ++++++++++++++--------------------------------------- 1 file changed, 14 insertions(+), 39 deletions(-) diff --git a/neofetch b/neofetch index 8bed79a5e..9eb6e5183 100755 --- a/neofetch +++ b/neofetch @@ -780,7 +780,7 @@ image_source="auto" # Default: 'auto' # Values: 'auto', 'distro_name' # Flag: --ascii_distro -# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, AmogOS, Anarchy, Android, instantOS, +# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android, instantOS, # Antergos, antiX, "AOSC OS", "AOSC OS/Retro", Apricity, ArchCraft, # ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch, # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, @@ -5686,31 +5686,6 @@ dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd .:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:. `.:+shNMMMMMh yMMMMMNhs+:`` `-+shy shs+:` -EOF - ;; - "AmogOS"*) - set_colors 6 6 7 1 - read -rd '' ascii_data <<'EOF' -${c1} ' -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣤⣤⣤⣀⣀⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⠟⠉⠉⠉⠉⠉⠉⠉⠙⠻⢶⣄⠀⠀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣾⡏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⣷⡀⠀⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣸⡟⠀⣠⣶⠛⠛⠛⠛⠛⠛⠳⣦⡀⠀⠘⣿⡄⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⠁⠀⢹⣿⣦⣀⣀⣀⣀⣀⣠⣼⡇⠀⠀⠸⣷⠀⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⠀⣼⡏⠀⠀⠀⠉⠛⠿⠿⠿⠿⠛⠋⠁⠀⠀⠀⠀⣿⡄ -⠀⠀ ⠀⠀⢠⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⡇⠀ - ⠀⠀⣸⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⡇⠀ -⠀⠀⠀⠀⠀⠀⠀⠀⣿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣧⠀ -⠀⠀⠀⠀⠀⠀⠀⢸⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⣿⠀ -⠀⠀⠀⠀⠀⠀⠀⣾⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀ -⠀⠀⠀⠀⠀⠀⠀⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀ -⠀⠀⠀⠀⠀⠀⢰⣿⠀⠀⠀⠀⣠⡶⠶⠿⠿⠿⠿⢷⣦⠀⠀⠀⠀⠀⠀⠀⣿⠀ -⠀⠀⣀⣀⣀⠀⣸⡇⠀⠀⠀⠀⣿⡀⠀⠀⠀⠀⠀⠀⣿⡇⠀⠀⠀⠀⠀⠀⣿⠀ -⣠⡿⠛⠛⠛⠛⠻⠀⠀⠀⠀⠀⢸⣇⠀⠀⠀⠀⠀⠀⣿⠇⠀⠀⠀⠀⠀⠀⣿⠀ -⢻⣇⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⡟⠀⠀⢀⣤⣤⣴⣿⠀⠀⠀⠀⠀⠀⠀⣿⠀ -⠈⠙⢷⣶⣦⣤⣤⣤⣴⣶⣾⠿⠛⠁⢀⣶⡟⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡟⠀ - ⠀⠀⠀⠀⠈⣿⣆⡀⠀⠀⠀⠀⠀⠀⢀⣠⣴⡾⠃⠀ -⠀ ⠀⠀⠀⠀⠀⠀⠈⠛⠻⢿⣿⣾⣿⡿⠿⠟⠋⠁⠀⠀⠀ EOF ;; "Anarchy"*) @@ -7663,25 +7638,25 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM EOF ;; - + "glaucus"*) set_colors 5 read -rd '' ascii_data <<'EOF' -${c1} ,, ,d88P - ,d8P ,ad8888* +${c1} ,, ,d88P + ,d8P ,ad8888* ,888P d88888* ,,ad8888P* - d d888P a88888P* ,ad8888888* - .d8 d8888: d888888* ,d888888P* - .888; 88888b d8888888b8888888P - d8888J888888a88888888888888P* ,d - 88888888888888888888888888P ,,d8* - 888888888888888888888888888888888* - *8888888888888888888888888888888* - Y888888888P* `*``*888888888888* + d d888P a88888P* ,ad8888888* + .d8 d8888: d888888* ,d888888P* + .888; 88888b d8888888b8888888P + d8888J888888a88888888888888P* ,d + 88888888888888888888888888P ,,d8* + 888888888888888888888888888888888* + *8888888888888888888888888888888* + Y888888888P* `*``*888888888888* *^888^* *Y888P** EOF ;; - + "gNewSense"*) set_colors 4 5 7 6 read -rd '' ascii_data <<'EOF' @@ -11124,7 +11099,7 @@ ${c1} ################ ################ ################ ################ ################ ################ - + ################ ################ ################ ################ ################ ################ From 1c62849a125fb48a30fd170fc8aa3ed8e0e919af Mon Sep 17 00:00:00 2001 From: Zayac-The-Engineer <50628024+Zayac-The-Engineer@users.noreply.github.com> Date: Sat, 11 Sep 2021 02:34:30 +0000 Subject: [PATCH 1119/1133] added pkgin to BSD case (#1906) --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index d4fe3d1b1..aa93ec098 100755 --- a/neofetch +++ b/neofetch @@ -1549,6 +1549,7 @@ get_packages() { has lvu && tot lvu installed has tce-status && tot tce-status -i has pkg_info && tot pkg_info + has pkgin && tot pkgin list has tazpkg && pkgs_h=6 tot tazpkg list && ((packages-=6)) has sorcery && tot gaze installed has alps && tot alps showinstalled From 429499e9b9b39127a8a781d135cafb6babdea631 Mon Sep 17 00:00:00 2001 From: jnats Date: Mon, 13 Sep 2021 04:37:06 +0100 Subject: [PATCH 1120/1133] CrystalUX to Crystal Linux rebrand (#1907) --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index aa93ec098..268b10aa4 100755 --- a/neofetch +++ b/neofetch @@ -786,7 +786,7 @@ image_source="auto" # Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight, # Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, # Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, -# Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, +# Container_Linux, Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin, # DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, # EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, # FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, @@ -5131,7 +5131,7 @@ ASCII: BlackArch, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux, - CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, + Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU, @@ -6887,7 +6887,7 @@ ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo EOF ;; - *"CrystalUX"*) + *"Crystal Linux"*) set_colors 13 5 read -rd '' ascii_data <<'EOF' ${c1} mysssym From 4b91c94360e4981ef36a96eb3266c616dc000ba3 Mon Sep 17 00:00:00 2001 From: gitfib Date: Fri, 24 Sep 2021 08:35:23 +0300 Subject: [PATCH 1121/1133] Improve GPU Reading on Linux (#1916) GPUs that have subsystem name but no revision number can be processed correctly by using $(NF-1) instead of $7 in the awk --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 268b10aa4..db47a4716 100755 --- a/neofetch +++ b/neofetch @@ -2491,7 +2491,7 @@ get_gpu() { gpu_cmd="$(lspci -mm | awk -F '\"|\" \"|\\(' \ '/"Display|"3D|"VGA/ { - a[$0] = $1 " " $3 " " ($7 ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $7) + a[$0] = $1 " " $3 " " ($(NF-1) ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $(NF-1)) } END { for (i in a) { if (!seen[a[i]]++) { From 222b1cd8d5203966e25a8f365d5ab21649a5fe04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=92riks=20Remess?= Date: Thu, 4 Nov 2021 05:20:01 +0200 Subject: [PATCH 1122/1133] /sys/devices/virtual/dmi/id/board_* for motherboard identification (#1943) --- neofetch | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/neofetch b/neofetch index db47a4716..f3907d329 100755 --- a/neofetch +++ b/neofetch @@ -1235,6 +1235,11 @@ get_model() { if [[ -d /system/app/ && -d /system/priv-app ]]; then model="$(getprop ro.product.brand) $(getprop ro.product.model)" + elif [[ -f /sys/devices/virtual/dmi/id/board_vendor || + -f /sys/devices/virtual/dmi/id/board_name ]]; then + model=$(< /sys/devices/virtual/dmi/id/board_vendor) + model+=" $(< /sys/devices/virtual/dmi/id/board_name)" + elif [[ -f /sys/devices/virtual/dmi/id/product_name || -f /sys/devices/virtual/dmi/id/product_version ]]; then model=$(< /sys/devices/virtual/dmi/id/product_name) From 3eb7e13e2757a003b7c6e9ea4f6d44d4532eb7f7 Mon Sep 17 00:00:00 2001 From: Th1nhhdk <58503327+th1nhhdk@users.noreply.github.com> Date: Mon, 8 Nov 2021 11:35:52 +0700 Subject: [PATCH 1123/1133] Added VNux GNU/Linux Neofetch Logo (#1937) --- neofetch | 31 +++++++++++++++++++++++++++++-- neofetch.1 | 2 +- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index f3907d329..003ab119e 100755 --- a/neofetch +++ b/neofetch @@ -806,7 +806,7 @@ image_source="auto" # Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, # openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, # Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, -# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, LangitKetujuh, semc, +# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, LangitKetujuh, semc, # Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. # NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. # Use '{distro name}_old' to use the old logos. @@ -5156,7 +5156,7 @@ ASCII: Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, - Ubuntu-Studio, Ubuntu, Univention, Venom, Void, LangitKetujuh, semc, + Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, LangitKetujuh, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. @@ -11078,6 +11078,33 @@ ${c1} -1vvnvv. `~+++` ++|+++ EOF ;; + + "VNux"*) + set_colors 11 8 15 1 7 + read -rd '' ascii_data <<'EOF' +${c1} ` + ^[XOx~. + ^_nwdbbkp0ti' + +${c2} _j>!vC1,, + ${c4},${c2} ,CY${c3}O${c2}t${c3}O${c2}1(l;" +`${c4}~-{r(1I${c2} ^${c1}/zmwJuc:${c2}I^ +'${c4}?)|${c1}U${c4}/}-${c2} ^${c3}f${c1}OCLLOw${c3}_${c2},; + ,${c4}i,``. ${c2}",${c3}k%ooW@$d"${c2}I,' + ' ;^${c3}u$$$$$$$$^<${c2}:^ + ` .>>${c3}($$${c5}$@@@@$$${c3}$nl${c2}[:: + `!}?${c3}B$${c5}%&WMMW&%$${c3}$1}-${c2}}": + ^?j${c3}Z$${c5}WMMWWWWMMW$${c3}ofc${c2};;` + <~x&${c3}$${c5}&MWWWWWWWWp${c3}-${c5}l>[< +${c1} 'ljmwn${c2}~tk8${c5}MWWWWM8O${c2}X${c1}r${c2}+]nC${c1}[ +!JZqwwdX${c2}:^C8${c5}#MMMM@${c2}X${c1}Odpdpq0< + ^x00J(" + ^" +EOF + + ;; "LangitKetujuh"*) set_colors 7 4 diff --git a/neofetch.1 b/neofetch.1 index f17a21be8..b90b57817 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -327,7 +327,7 @@ SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel, Ubuntu\-Cinnamon, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE, -Ubuntu\-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun, +Ubuntu\-Studio, Ubuntu, Univention, Venom, Void, VNux, semc, Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos. .IP NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants. From 0d08c130ff689389005dc8f6b0705f95480f2b52 Mon Sep 17 00:00:00 2001 From: Nathan Thomas Date: Tue, 9 Nov 2021 19:41:10 -0800 Subject: [PATCH 1124/1133] Add support for nushell (#1878) * Add support for nushell * Update neofetch Co-authored-by: Tyler J Russell Co-authored-by: Tyler J Russell --- neofetch | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/neofetch b/neofetch index 003ab119e..4d9015aa1 100755 --- a/neofetch +++ b/neofetch @@ -1744,6 +1744,12 @@ get_shell() { shell=${shell/ Yet another shell} shell=${shell/Copyright*} ;; + + nu) + shell+=$("$SHELL" -c "version | get version") + shell=${shell/ $shell_name} + ;; + *) shell+=$("$SHELL" --version 2>&1) From e784522206f4f60b37a4186574ba6b3bc3163247 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Thu, 11 Nov 2021 06:10:54 +0200 Subject: [PATCH 1125/1133] neofetch: minor cleanup --- neofetch | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/neofetch b/neofetch index 4d9015aa1..64fa042b9 100755 --- a/neofetch +++ b/neofetch @@ -8,7 +8,7 @@ # # The MIT License (MIT) # -# Copyright (c) 2015-2020 Dylan Araps +# Copyright (c) 2015-2021 Dylan Araps # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -1744,7 +1744,7 @@ get_shell() { shell=${shell/ Yet another shell} shell=${shell/Copyright*} ;; - + nu) shell+=$("$SHELL" -c "version | get version") shell=${shell/ $shell_name} @@ -11084,30 +11084,30 @@ ${c1} -1vvnvv. `~+++` ++|+++ EOF ;; - + "VNux"*) set_colors 11 8 15 1 7 read -rd '' ascii_data <<'EOF' -${c1} ` - ^[XOx~. - ^_nwdbbkp0ti' - -${c2} _j>!vC1,, - ${c4},${c2} ,CY${c3}O${c2}t${c3}O${c2}1(l;" -`${c4}~-{r(1I${c2} ^${c1}/zmwJuc:${c2}I^ -'${c4}?)|${c1}U${c4}/}-${c2} ^${c3}f${c1}OCLLOw${c3}_${c2},; - ,${c4}i,``. ${c2}",${c3}k%ooW@$d"${c2}I,' - ' ;^${c3}u$$$$$$$$^<${c2}:^ - ` .>>${c3}($$${c5}$@@@@$$${c3}$nl${c2}[:: - `!}?${c3}B$${c5}%&WMMW&%$${c3}$1}-${c2}}": - ^?j${c3}Z$${c5}WMMWWWWMMW$${c3}ofc${c2};;` - <~x&${c3}$${c5}&MWWWWWWWWp${c3}-${c5}l>[< -${c1} 'ljmwn${c2}~tk8${c5}MWWWWM8O${c2}X${c1}r${c2}+]nC${c1}[ -!JZqwwdX${c2}:^C8${c5}#MMMM@${c2}X${c1}Odpdpq0< +${c1} ` + ^[XOx~. + ^_nwdbbkp0ti' + +${c2} _j>!vC1,, + ${c4},${c2} ,CY${c3}O${c2}t${c3}O${c2}1(l;" +`${c4}~-{r(1I${c2} ^${c1}/zmwJuc:${c2}I^ +'${c4}?)|${c1}U${c4}/}-${c2} ^${c3}f${c1}OCLLOw${c3}_${c2},; + ,${c4}i,``. ${c2}",${c3}k%ooW@$d"${c2}I,' + ' ;^${c3}u$$$$$$$$^<${c2}:^ + ` .>>${c3}($$${c5}$@@@@$$${c3}$nl${c2}[:: + `!}?${c3}B$${c5}%&WMMW&%$${c3}$1}-${c2}}": + ^?j${c3}Z$${c5}WMMWWWWMMW$${c3}ofc${c2};;` + <~x&${c3}$${c5}&MWWWWWWWWp${c3}-${c5}l>[< +${c1} 'ljmwn${c2}~tk8${c5}MWWWWM8O${c2}X${c1}r${c2}+]nC${c1}[ +!JZqwwdX${c2}:^C8${c5}#MMMM@${c2}X${c1}Odpdpq0< ^x00J(" - ^" +?QOZmqqqpb${c2}t[run/?!${c1}0pwqqQj-, + ^:l<{nUUv> ^x00J(" + ^" EOF ;; From 24b1281f9a38d2ff94490adf7a7f720338e0eb15 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sun, 14 Nov 2021 10:53:00 +0100 Subject: [PATCH 1126/1133] docs: update (#1956) --- LICENSE.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE.md b/LICENSE.md index a4f19eb89..eeb066f76 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2015-2020 Dylan Araps +Copyright (c) 2015-2021 Dylan Araps Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From d4070d515d25402da06c2aea8ea04fe8f0dc3148 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Thu, 25 Nov 2021 04:17:34 +0100 Subject: [PATCH 1127/1133] Update openEuler logo (#1966) --- neofetch | 40 +++++++++++++++++++++++----------------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 64fa042b9..a15b0e547 100755 --- a/neofetch +++ b/neofetch @@ -9095,23 +9095,29 @@ EOF "openEuler"*) set_colors 4 7 1 read -rd '' ascii_data <<'EOF' -${c1} - (##### - (((######## ##### - ((( ########## __...__ - (((((((( ####### /((((((###\ - ((((((((((( ....... \(((((####/ - (((((( ((((######### ******* - %((((((# ((######## - /////((((( ### -/////(((((((# (((& - ((((((((((((( - (((((((((((( - ((((((((( ((((((### - /((((((###### - //((((((###### - /((((((##### - *********/ +${c1} `.cc.` + ``.cccccccc..` + `.cccccccccccccccc.` + ``.cccccccccccccccccccccc.`` + `..cccccccccccccccccccccccccccc..` +`.ccccccccccccccc${c2}/++/${c1}ccccccccccccccccc.` +.ccccccccccccccc${c2}mNMMNdo+oso+${c1}ccccccccccc. +.cccccccccc${c2}/++odms+//+mMMMMm/:+syso/${c1}cccc +.ccccccccc${c2}yNNMMMs:::/::+o+/:${c1}c${c2}dMMMMMm${c1}cccc +.ccccccc${c2}:+NmdyyhNNmNNNd:${c1}ccccc${c1}${c2}:oyyyo:${c1}cccc +.ccc${c2}:ohdmMs:${c1}cccc${c2}+mNMNmy${c1}ccccccccccccccccc +.cc${c2}/NMMMMMo////:${c1}c${c2}:///:${c1}cccccccccccccccccc +.cc${c2}:syysyNMNNNMNy${c1}ccccccccccccccccccccccc +.cccccccc${c2}+MMMMMNy${c1}c${c2}:/+++/${c1}cccccccccccccccc +.ccccccccc${c2}ohhhs/${c1}c${c2}omMMMMNh${c1}ccccccccccccccc +.ccccccccccccccc${c2}:MMMMMMMM/${c1}cccccccccccccc +.cccccccccccccccc${c2}sNNNNNd+${c1}cccccccccccccc. +`..cccccccccccccccc${c2}/+/:${c1}cccccccccccccc..` + ``.cccccccccccccccccccccccccccc.`` + `.cccccccccccccccccccccc.` + ``.cccccccccccccc.`` + `.cccccccc.` + `....` EOF ;; From c1c699378f6c94cd67be75aa2f20f2e4a79e4483 Mon Sep 17 00:00:00 2001 From: Stealth <67294868+ImNotStealth@users.noreply.github.com> Date: Sat, 27 Nov 2021 05:00:54 +0100 Subject: [PATCH 1128/1133] Added Qubyt OS Logo (#1969) --- neofetch | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index a15b0e547..69e9c1b5f 100755 --- a/neofetch +++ b/neofetch @@ -799,7 +799,7 @@ image_source="auto" # openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt, # osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, # TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, -# Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, +# Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, Quibian, Radix, Raspbian, # Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, # Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, # SereneLinux, SharkLinux, Siduction, SkiffOS, Slackware, SliTaz, SmartOS, @@ -5155,7 +5155,7 @@ ASCII: openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS, - Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS, + Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, Quibian, Radix, Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS, @@ -9837,6 +9837,27 @@ ${c1} `..--..` EOF ;; + "Qubyt"*) + set_colors 4 5 0 4 + read -rd '' ascii_data <<'EOF' +${c1} ########################${c2}(${c3}ooo +${c1} ########################${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo +${c1}###${c2}(${c3}ooo ${c1}##${c3}o ${c2}((((${c3}ooo +${c1}###${c2}(${c3}ooo o${c2}((${c1}### ${c3}oooooo +${c1}###${c2}(${c3}ooo oo${c2}((${c1}###${c3}o +${c1}###${c2}(${c3}ooo ooo${c2}((${c1}### +${c1}################${c2}(${c3}oo oo${c2}((((${c3}o +${c2}(((((((((((((((((${c3}ooo ooooo + oooooooooooooooooo o +EOF + ;; + "Quibian"*) set_colors 3 7 read -rd '' ascii_data <<'EOF' From c4fba8bb0b8b0e362555e5a7431a9767205047ec Mon Sep 17 00:00:00 2001 From: alexcoder04 <70093931+alexcoder04@users.noreply.github.com> Date: Tue, 30 Nov 2021 04:12:04 +0100 Subject: [PATCH 1129/1133] add CBL Mariner ascii art (#1972) --- neofetch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/neofetch b/neofetch index 69e9c1b5f..9fef38feb 100755 --- a/neofetch +++ b/neofetch @@ -6536,6 +6536,29 @@ ${c2} .......... EOF ;; + "CBL-Mariner"*) + set_colors 6 + read -rd '' ascii_data <<'EOF' +${c1} . + :- . + :==. .=: + :===: -==: + :-===: .====: + :-====- -=====: + -====== :=======: + -======. .=========: + -======: -==========. + -======- -===========. + :======- :===========. + :=======. .-==========. + :=======: -==========. + :=======- :==========. + :=======- .-========- +:--------. :========- + ..:::--=========- + ..::---================-=- +EOF + ;; "CelOS"*) set_colors 4 6 0 5 From aab631c7dd701ae35a70632a9672c8e9b18fe656 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 Dec 2021 05:31:15 +0200 Subject: [PATCH 1130/1133] neofetch: Fix WSL windows version. Closes #1848 --- neofetch | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 9fef38feb..85ccb8db8 100755 --- a/neofetch +++ b/neofetch @@ -1102,10 +1102,13 @@ get_distro() { fi if [[ $(< /proc/version) == *Microsoft* || $kernel_version == *Microsoft* ]]; then + windows_version=$(wmic os get Version) + windows_version=$(trim "${windows_version/Version}") + case $distro_shorthand in - on) distro+=" [Windows 10]" ;; - tiny) distro="Windows 10" ;; - *) distro+=" on Windows 10" ;; + on) distro+=" [Windows $windows_version]" ;; + tiny) distro="Windows ${windows_version::2}" ;; + *) distro+=" on Windows $windows_version" ;; esac elif [[ $(< /proc/version) == *chrome-bot* || -f /dev/cros_ec ]]; then From 7b1f0c275eba9d5681c647def3f8d845f43941a6 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Mon, 6 Dec 2021 06:36:44 +0200 Subject: [PATCH 1131/1133] neofetch: Fix windows detection --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 85ccb8db8..9db821849 100755 --- a/neofetch +++ b/neofetch @@ -1102,7 +1102,7 @@ get_distro() { fi if [[ $(< /proc/version) == *Microsoft* || $kernel_version == *Microsoft* ]]; then - windows_version=$(wmic os get Version) + windows_version=$(wmic.exe os get Version) windows_version=$(trim "${windows_version/Version}") case $distro_shorthand in From 3eaac2d9eec198e63e4904d46c6704ad7f5a2d87 Mon Sep 17 00:00:00 2001 From: The TwilightBlood Date: Wed, 8 Dec 2021 02:11:14 -0600 Subject: [PATCH 1132/1133] Add pacstall to package managers (#1979) * Add pacstall to package managers https://github.com/pacstall/pacstall * Fix indents on Pacstall * Fix tabbing again --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 9db821849..e6adbadee 100755 --- a/neofetch +++ b/neofetch @@ -1564,6 +1564,7 @@ get_packages() { has butch && tot butch list has swupd && tot swupd bundle-list --quiet has pisi && tot pisi li + has pacstall && tot pacstall -L # Using the dnf package cache is much faster than rpm. if has dnf && type -p sqlite3 >/dev/null && [[ -f /var/cache/dnf/packages.db ]]; then From 644f9d29eb9dd9f68b29f80f37fb4ad57236a67d Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 10 Dec 2021 08:41:28 +0200 Subject: [PATCH 1133/1133] neofetch: Fix #1989 --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9db821849..90bf09661 100755 --- a/neofetch +++ b/neofetch @@ -11577,7 +11577,7 @@ main() { err "Neofetch command: $0 $*" err "Neofetch version: $version" - [[ $verbose == on ]] && printf %b "$err" >&2 + [[ $verbose == on ]] && printf '%b\033[m' "$err" >&2 # If `--loop` was used, constantly redraw the image. while [[ $image_loop == on && $image_backend == w3m ]]; do