From 652c4ec8821fa7ce0d86f5dc0294b2ebbd0fe6b6 Mon Sep 17 00:00:00 2001 From: Law Zava Date: Thu, 6 Feb 2020 19:22:16 +0100 Subject: [PATCH 1/4] Regolith linux support --- neofetch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/neofetch b/neofetch index 59cfa1b3..ecf7594d 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 e9e70aeebd26d7ce077eb0db6a2c1b5658e4eacc Mon Sep 17 00:00:00 2001 From: Law Zava Date: Thu, 6 Feb 2020 20:02:57 +0100 Subject: [PATCH 2/4] regolith --- neofetch | 6 ------ 1 file changed, 6 deletions(-) diff --git a/neofetch b/neofetch index ecf7594d..69164c2b 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 3/4] handle regolith as DE --- neofetch | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index bd269051..eea06e8a 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 4/4] remove regolith from distro discovery --- neofetch | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/neofetch b/neofetch index eea06e8a..6bf0a596 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}