From 57ba17e1956c26915efcb73d310b98b17cc4c6d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20R=C3=BCedlinger?= Date: Fri, 11 Aug 2017 08:49:28 +0200 Subject: [PATCH 1/8] OS: add support for the siduction os MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexander Rüedlinger --- ascii/distro/siduction | 21 +++++++++++++++++++++ neofetch | 11 +++++++++++ 2 files changed, 32 insertions(+) create mode 100644 ascii/distro/siduction diff --git a/ascii/distro/siduction b/ascii/distro/siduction new file mode 100644 index 00000000..10a88ec6 --- /dev/null +++ b/ascii/distro/siduction @@ -0,0 +1,21 @@ +${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/neofetch b/neofetch index d34fad6e..57e393b6 100755 --- a/neofetch +++ b/neofetch @@ -78,6 +78,12 @@ get_distro() { *) 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" ;; + *) distro="Siduction ($(lsb_release -sic))" + esac + elif type -p lsb_release >/dev/null; then case "$distro_shorthand" in "on") lsb_flags="-sir" ;; @@ -3560,6 +3566,11 @@ get_distro_colors() { ascii_file="scientific" ;; + "Siduction"*) + set_colors 4 4 + ascii_file="siduction" + ;; + "Slackware"*) set_colors 4 7 1 ascii_file="slackware" From 0acd21732d9b54131a3d11826fc0c97be3bb4100 Mon Sep 17 00:00:00 2001 From: vaernil Date: Fri, 11 Aug 2017 21:31:16 +0200 Subject: [PATCH 2/8] Fix Terminal Font displaying incorrect information in urxvt, if one of the fonts has 'font' in its name --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d34fad6e..41d1b57a 100755 --- a/neofetch +++ b/neofetch @@ -1961,7 +1961,7 @@ get_term_font() { "urxvt" | "urxvtd" | "rxvt-unicode" | "xterm") term_font="$(grep -i -F "${term/d}*font" < <(xrdb -query))" - term_font="${term_font/*font:}" + term_font="${term_font/*"*font:"}" term_font="$(trim "$term_font")" # Xresources has two different font formats, this checks which From 422084e52a9071e6f2cf0e913668af63296f8753 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 12 Aug 2017 21:03:27 +1000 Subject: [PATCH 3/8] ascii: Remove leading whitespace from logo --- ascii/distro/siduction | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/ascii/distro/siduction b/ascii/distro/siduction index 10a88ec6..c9720a60 100644 --- a/ascii/distro/siduction +++ b/ascii/distro/siduction @@ -1,21 +1,21 @@ -${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} _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??" From 6d63a7f155eefb2b0aabdb4ab88428c5bda9e984 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 12 Aug 2017 21:04:13 +1000 Subject: [PATCH 4/8] docs: CHANGELOG --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7dd7aa24..ed24a4eb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ - **[@mstraube](https://github.com/mstraube)** - **[@dominiklohmann](https://github.com/dominiklohmann)** +- **[@lexruee](https://github.com/lexruee)** ## General @@ -21,6 +22,7 @@ - Added support for Artix Linux. - 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)** - Fixed Raspbian being detected as ChromeOS. From 837984b5b31ccf065a1565cc2715365a112f6db8 Mon Sep 17 00:00:00 2001 From: Michael Straube Date: Sat, 12 Aug 2017 19:14:12 +0200 Subject: [PATCH 5/8] OS: Add support for Nurunner --- ascii/distro/nurunner | 19 +++++++++++++++++++ neofetch | 5 +++++ 2 files changed, 24 insertions(+) create mode 100644 ascii/distro/nurunner diff --git a/ascii/distro/nurunner b/ascii/distro/nurunner new file mode 100644 index 00000000..e5529673 --- /dev/null +++ b/ascii/distro/nurunner @@ -0,0 +1,19 @@ +${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/neofetch b/neofetch index 541009a7..b5bc78e8 100755 --- a/neofetch +++ b/neofetch @@ -3426,6 +3426,11 @@ get_distro_colors() { ascii_file="nixos" ;; + "Nurunner"*) + set_colors 4 + ascii_file="nurunner" + ;; + "OBRevenge"*) set_colors 1 7 3 ascii_file="obrevenge" From 62824ad87e7872f9c5f23d1dbe37c3e8b8189ed7 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sun, 13 Aug 2017 00:50:17 +0700 Subject: [PATCH 6/8] Docs: CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed24a4eb..43d10ad7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,7 @@ - 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. From 89ce5a63780b1856c94436d577f9dcbb606b7df1 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 13 Aug 2017 16:37:27 +1000 Subject: [PATCH 7/8] docs: README --- README.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 770f23ba..16ad5e91 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ # Neofetch [![Gitter](https://badges.gitter.im/dylanaraps/fetch.svg)](https://gitter.im/dylanaraps/fetch?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) -[![Freenode](https://img.shields.io/badge/%23neofetch-%20on%20Freenode-brightgreen.svg)](http://irc.lc/freenode/neofetch) [![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. @@ -79,3 +79,13 @@ Thanks to: - Some of the ASCII logos. - [ufetch](https://github.com/jschx/ufetch): - Tiny ASCII logos + + + +## Donate + +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** From c108713b9153874b95c689cada38c156c53050bf Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 13 Aug 2017 20:01:20 +1000 Subject: [PATCH 8/8] resolution: Fix broken output. Closes #803 --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index b5bc78e8..e3632240 100755 --- a/neofetch +++ b/neofetch @@ -1577,7 +1577,8 @@ get_resolution() { "off") resolution="$(xrandr --nograb --current |\ - awk -F 'connected |\\+' '/ connected/ {printf $2 ", "}')" + awk -F 'connected |\\+|\\(' \ + '/ connected/ && $2 {printf $2 ", "}')" resolution="${resolution/primary }" ;; esac