Merge branch 'master' of https://github.com/dylanaraps/neofetch

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 - **[@mstraube](https://github.com/mstraube)**
 - **[@dominiklohmann](https://github.com/dominiklohmann)**
+- **[@lexruee](https://github.com/lexruee)**
 
 
 ## General
@@ -21,8 +22,10 @@
 - 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)**
+- Added support for Nurunner. **[@mstraube](https://github.com/mstraube)**
 - Fixed Raspbian being detected as ChromeOS.
 
 

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**

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.

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??"
+

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" ;;
@@ -1573,7 +1579,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
@@ -1963,7 +1970,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
@@ -3422,6 +3429,11 @@ get_distro_colors() {
             ascii_file="nixos"
         ;;
 
+        "Nurunner"*)
+            set_colors 4
+            ascii_file="nurunner"
+        ;;
+
         "OBRevenge"*)
             set_colors 1 7 3
             ascii_file="obrevenge"
@@ -3562,6 +3574,11 @@ get_distro_colors() {
             ascii_file="scientific"
         ;;
 
+	"Siduction"*)
+            set_colors 4 4
+            ascii_file="siduction"
+        ;;
+
         "Slackware"*)
             set_colors 4 7 1
             ascii_file="slackware"