From 93522c0990325db4548d9ef538649209727c592f Mon Sep 17 00:00:00 2001 From: Myralllka Date: Sat, 12 Oct 2019 15:35:33 +0300 Subject: [PATCH 1/2] add EndeavourOS --- screenfetch-dev | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/screenfetch-dev b/screenfetch-dev index 45621090..4c1ae748 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -365,7 +365,7 @@ Fux, Gentoo, gNewSense, Guix System, Hyperbola GNU/Linux-libre, januslinux, Jiyu LinuxDeepin, Linux Mint, LMDE, Logos, Mageia, Mandriva/Mandrake, Manjaro, Mer, Netrunner, NixOS, OBRevenge, openSUSE, \ OS Elbrus, Oracle Linux, Parabola GNU/Linux-libre, Pardus, Parrot Security, PCLinuxOS, PeppermintOS, Proxmox VE, PureOS, Qubes OS, \ Raspbian, Red Hat Enterprise Linux, ROSA, Sabayon, SailfishOS, Scientific Linux, Siduction, Slackware, Solus, Source Mage GNU/Linux, \ -SparkyLinux, SteamOS, SUSE Linux Enterprise, SwagArch, TinyCore, Trisquel, Ubuntu, Viperr, Void and Zorin OS." +SparkyLinux, SteamOS, SUSE Linux Enterprise, SwagArch, TinyCore, Trisquel, Ubuntu, Viperr, Void and Zorin OS and EndeavourOS" supported_other="Dragonfly/Free/Open/Net BSD, Haiku, Mac OS X, Windows+Cygwin and Windows+MSYS2." @@ -852,6 +852,10 @@ detectdistro () { distro="DragonFlyBSD" fake_distro="${distro}" ;; + "EndeavourOS") + distro="EndeavourOS" + fake_distro="${distro}" + ;; "Msys") distro="Msys" fake_distro="${distro}" @@ -1242,6 +1246,7 @@ detectdistro () { viperr) distro="Viperr" ;; void*linux) distro="Void Linux" ;; zorin*) distro="Zorin OS" ;; + endeavour*) distro="EndeavourOS" ;; esac if grep -q -i 'Microsoft' /proc/version 2>/dev/null || \ grep -q -i 'Microsoft' /proc/sys/kernel/osrelease 2>/dev/null @@ -1334,7 +1339,7 @@ detectpkgs () { case "${distro}" in 'Alpine Linux') pkgs=$(apk info | wc -l) ;; 'Arch Linux'|'ArcoLinux'|'Parabola GNU/Linux-libre'|'Hyperbola GNU/Linux-libre'|'Chakra'|'Manjaro'|'Antergos'| \ - 'Netrunner'|'KaOS'|'Obarun'|'SwagArch'|'OBRevenge'|'Artix Linux') + 'Netrunner'|'KaOS'|'Obarun'|'SwagArch'|'OBRevenge'|'Artix Linux'|'EndeavourOS') pkgs=$(pacman -Qq | wc -l) ;; 'Chrome OS') if [ -d "/usr/local/lib/crew/packages" ]; then @@ -1439,7 +1444,7 @@ detectpkgs () { haikualpharelease="yes" pkgs=$(installoptionalpackage -l | sed -n '3p' | wc -w) fi - ;; + ;; esac if [[ "${OSTYPE}" =~ "linux" && -z "${wsl}" ]] && snap list >/dev/null 2>&1; then offset=1 @@ -5780,6 +5785,34 @@ asciiText () { "${c1} \|______________| %s" " %s") ;; + "EndeavourOS") + if [[ "$no_color" != "1" ]]; then + c1=$(getColor 'yellow') + c3=$(getColor 'purple') + c5=$(getColor 'cyan') + fi + if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; c3="${my_lcolor}"; c5="${my_lcolor}"; fi + startline="1" + logowidth="44" + fulloutput=("" +"${c1} +${c3}I${c5}+ %s" +"${c1} +${c3}777${c5}+ %s" +"${c1} +${c3}77777${c5}++ %s" +"${c1} +${c3}7777777${c5}++ %s" +"${c1} +${c3}7777777777${c5}++ %s" +"${c1} ++${c3}7777777777777${c5}++ %s" +"${c1} ++${c3}777777777777777${c5}+++ %s" +"${c1} ++${c3}77777777777777777${c5}++++ %s" +"${c1} ++${c3}7777777777777777777${c5}++++ %s" +"${c1} +++${c3}777777777777777777777${c5}++++ %s" +"${c1} ++++${c3}7777777777777777777777${c5}+++++ %s" +"${c1} ++++${c3}77777777777777777777777${c5}+++++ %s" +"${c1} +++++${c3}777777777777777777777777${c5}+++++ %s" +"${c5} +++++++${c3}7777777777777777${c5}++++++ %s" +"${c5} +++++++++++++++++++++++++++++ %s" +"${c5} +++++++++++++++++++++++++++ %s" +" %s" +);; *) if [[ "${kernel}" =~ "Linux" ]]; then @@ -6008,7 +6041,7 @@ infoDisplay () { "Obarun"|"Siduction"|"Solus"|"SwagArch"|"Parrot Security"|"Zorin OS") labelcolor=$(getColor 'light blue') ;; - "Arch Linux"|"Artix Linux"|"Frugalware"|"Mageia"|"Deepin"|"CRUX"|"OS Elbrus") + "Arch Linux"|"Artix Linux"|"Frugalware"|"Mageia"|"Deepin"|"CRUX"|"OS Elbrus"|"EndeavourOS") labelcolor=$(getColor 'light cyan') ;; "Mint"|"LMDE"|"KDE neon"|"openSUSE"|"SUSE Linux Enterprise"|"LinuxDeepin"|"DragonflyBSD"|"Manjaro"| \ From c7024cc4516784d6eb1221998daf9c84ca9ad577 Mon Sep 17 00:00:00 2001 From: Myralllka Date: Sat, 12 Oct 2019 21:43:26 +0300 Subject: [PATCH 2/2] fix spacing in detectdistro() function --- screenfetch-dev | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/screenfetch-dev b/screenfetch-dev index 4c1ae748..a0b047f7 100755 --- a/screenfetch-dev +++ b/screenfetch-dev @@ -852,10 +852,10 @@ detectdistro () { distro="DragonFlyBSD" fake_distro="${distro}" ;; - "EndeavourOS") - distro="EndeavourOS" - fake_distro="${distro}" - ;; + "EndeavourOS") + distro="EndeavourOS" + fake_distro="${distro}" + ;; "Msys") distro="Msys" fake_distro="${distro}"