EvolutionOS
/
neofetch
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Dylan Araps 2019-06-28 14:54:09 +03:00
parent 5e55c4dd1d 175915d0a6
commit 1e0608f488
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
neofetch
View File

@ -883,12 +883,6 @@ get_distro() {
*) distro="GoboLinux $(< /etc/GoboLinuxVersion)" *) distro="GoboLinux $(< /etc/GoboLinuxVersion)"
esac 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 elif type -p crux >/dev/null; then
distro="$(crux)" distro="$(crux)"
case "$distro_shorthand" in case "$distro_shorthand" in
@ -928,6 +922,13 @@ get_distro() {
"tiny") distro="${NAME:-${DISTRIB_ID:-${TAILS_PRODUCT_NAME}}}" ;; "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 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 else
for release_file in /etc/*-release; do for release_file in /etc/*-release; do
distro+="$(< "$release_file")" distro+="$(< "$release_file")"
@ -1343,6 +1344,7 @@ get_packages() {
# $br_prefix is fixed and won't change based on user input so this is safe either way. # $br_prefix is fixed and won't change based on user input so this is safe either way.
# shellcheck disable=SC2086 # shellcheck disable=SC2086
{ {
shopt -s nullglob
has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/ has "emerge" && dir ${br_prefix}/var/db/pkg/*/*/
has "Compile" && dir ${br_prefix}/Programs/*/ has "Compile" && dir ${br_prefix}/Programs/*/
has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/* has "eopkg" && dir ${br_prefix}/var/lib/eopkg/package/*
@ -1350,6 +1352,7 @@ get_packages() {
has "pkgtool" && dir ${br_prefix}/var/log/packages/* has "pkgtool" && dir ${br_prefix}/var/log/packages/*
has "cave" && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \ has "cave" && dir ${br_prefix}/var/db/paludis/repositories/cross-installed/*/data/*/ \
${br_prefix}/var/db/paludis/repositories/installed/data/*/ ${br_prefix}/var/db/paludis/repositories/installed/data/*/
shopt -u nullglob
} }
# Other (Needs complex command) # Other (Needs complex command)
@ -1623,11 +1626,12 @@ get_wm() {
else else
case "$os" in case "$os" in
"Mac OS X") "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 case "$ps_line" in
*"chunkwm"*) wm="chunkwm" ;; *"chunkwm"*) wm="chunkwm" ;;
*"kwm"*) wm="Kwm" ;; *"kwm"*) wm="Kwm" ;;
*"yabai"*) wm="yabai" ;;
*"Amethyst"*) wm="Amethyst" ;; *"Amethyst"*) wm="Amethyst" ;;
*"Spectacle"*) wm="Spectacle" ;; *"Spectacle"*) wm="Spectacle" ;;
*) wm="Quartz Compositor" ;; *) wm="Quartz Compositor" ;;