Merge branch 'dylanaraps:master' into master
This commit is contained in:
commit
b35ca2c919
3 changed files with 44 additions and 4 deletions
|
|
@ -1,6 +1,6 @@
|
||||||
The MIT License (MIT)
|
The MIT License (MIT)
|
||||||
|
|
||||||
Copyright (c) 2015-2020 Dylan Araps
|
Copyright (c) 2015-2021 Dylan Araps
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|
|
||||||
44
neofetch
44
neofetch
|
|
@ -8,7 +8,7 @@
|
||||||
#
|
#
|
||||||
# The MIT License (MIT)
|
# The MIT License (MIT)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2015-2020 Dylan Araps
|
# Copyright (c) 2015-2021 Dylan Araps
|
||||||
#
|
#
|
||||||
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
# of this software and associated documentation files (the "Software"), to deal
|
# of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|
@ -806,6 +806,8 @@ image_source="auto"
|
||||||
# Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2,
|
# Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2,
|
||||||
# openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,
|
# openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,
|
||||||
# Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE,
|
# Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE,
|
||||||
|
# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, yiffOS, VNux, LangitKetujuh, semc,
|
||||||
|
# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, LangitKetujuh, semc,
|
||||||
# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, yiffOS, LangitKetujuh, semc,
|
# Ubuntu-Studio, Ubuntu, Univention, Venom, Void, yiffOS, LangitKetujuh, semc,
|
||||||
# Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos.
|
# Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos.
|
||||||
# NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants.
|
# NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants.
|
||||||
|
|
@ -1235,6 +1237,11 @@ get_model() {
|
||||||
if [[ -d /system/app/ && -d /system/priv-app ]]; then
|
if [[ -d /system/app/ && -d /system/priv-app ]]; then
|
||||||
model="$(getprop ro.product.brand) $(getprop ro.product.model)"
|
model="$(getprop ro.product.brand) $(getprop ro.product.model)"
|
||||||
|
|
||||||
|
elif [[ -f /sys/devices/virtual/dmi/id/board_vendor ||
|
||||||
|
-f /sys/devices/virtual/dmi/id/board_name ]]; then
|
||||||
|
model=$(< /sys/devices/virtual/dmi/id/board_vendor)
|
||||||
|
model+=" $(< /sys/devices/virtual/dmi/id/board_name)"
|
||||||
|
|
||||||
elif [[ -f /sys/devices/virtual/dmi/id/product_name ||
|
elif [[ -f /sys/devices/virtual/dmi/id/product_name ||
|
||||||
-f /sys/devices/virtual/dmi/id/product_version ]]; then
|
-f /sys/devices/virtual/dmi/id/product_version ]]; then
|
||||||
model=$(< /sys/devices/virtual/dmi/id/product_name)
|
model=$(< /sys/devices/virtual/dmi/id/product_name)
|
||||||
|
|
@ -1741,6 +1748,12 @@ get_shell() {
|
||||||
shell=${shell/Copyright*}
|
shell=${shell/Copyright*}
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
nu)
|
||||||
|
shell+=$("$SHELL" -c "version | get version")
|
||||||
|
shell=${shell/ $shell_name}
|
||||||
|
;;
|
||||||
|
|
||||||
|
|
||||||
*)
|
*)
|
||||||
shell+=$("$SHELL" --version 2>&1)
|
shell+=$("$SHELL" --version 2>&1)
|
||||||
shell=${shell/ $shell_name}
|
shell=${shell/ $shell_name}
|
||||||
|
|
@ -5152,7 +5165,7 @@ ASCII:
|
||||||
Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap,
|
Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap,
|
||||||
t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,
|
t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,
|
||||||
Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE,
|
Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE,
|
||||||
Ubuntu-Studio, Ubuntu, Univention, Venom, Void, LangitKetujuh, semc,
|
Ubuntu-Studio, Ubuntu, Univention, Venom, Void, VNux, LangitKetujuh, semc,
|
||||||
Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos.
|
Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos.
|
||||||
|
|
||||||
NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants.
|
NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants.
|
||||||
|
|
@ -11073,6 +11086,33 @@ ${c1} -1vvnvv. `~+++` ++|+++
|
||||||
-~|{*l}*|~
|
-~|{*l}*|~
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
;;
|
||||||
|
|
||||||
|
"VNux"*)
|
||||||
|
set_colors 11 8 15 1 7
|
||||||
|
read -rd '' ascii_data <<'EOF'
|
||||||
|
${c1} `
|
||||||
|
^[XOx~.
|
||||||
|
^_nwdbbkp0ti'
|
||||||
|
<vJCZw0LQ0Uj>
|
||||||
|
${c2} _j>!vC1,,
|
||||||
|
${c4},${c2} ,CY${c3}O${c2}t${c3}O${c2}1(l;"
|
||||||
|
`${c4}~-{r(1I${c2} ^${c1}/zmwJuc:${c2}I^
|
||||||
|
'${c4}?)|${c1}U${c4}/}-${c2} ^${c3}f${c1}OCLLOw${c3}_${c2},;
|
||||||
|
,${c4}i,``. ${c2}",${c3}k%ooW@$d"${c2}I,'
|
||||||
|
' ;^${c3}u$$$$$$$$^<${c2}:^
|
||||||
|
` .>>${c3}($$${c5}$@@@@$$${c3}$nl${c2}[::
|
||||||
|
`!}?${c3}B$${c5}%&WMMW&%$${c3}$1}-${c2}}":
|
||||||
|
^?j${c3}Z$${c5}WMMWWWWMMW$${c3}ofc${c2};;`
|
||||||
|
<~x&${c3}$${c5}&MWWWWWWWWp${c3}-${c5}l>[<
|
||||||
|
${c1} 'ljmwn${c2}~tk8${c5}MWWWWM8O${c2}X${c1}r${c2}+]nC${c1}[
|
||||||
|
!JZqwwdX${c2}:^C8${c5}#MMMM@${c2}X${c1}Odpdpq0<
|
||||||
|
<wwwwmmpO${c2}1${c3}0@%%%%8${c2}d${c1}nqmwmqqqJl
|
||||||
|
?QOZmqqqpb${c2}t[run/?!${c1}0pwqqQj-,
|
||||||
|
^:l<{nUUv> ^x00J("
|
||||||
|
^"
|
||||||
|
EOF
|
||||||
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
"yiffOS"*)
|
"yiffOS"*)
|
||||||
|
|
|
||||||
|
|
@ -327,7 +327,7 @@ SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS,
|
||||||
Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap,
|
Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap,
|
||||||
t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,
|
t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,
|
||||||
Ubuntu\-Cinnamon, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE,
|
Ubuntu\-Cinnamon, Ubuntu\-Budgie, Ubuntu\-GNOME, Ubuntu\-MATE,
|
||||||
Ubuntu\-Studio, Ubuntu, Univention, Venom, Void, semc, Obarun,
|
Ubuntu\-Studio, Ubuntu, Univention, Venom, Void, VNux, semc, Obarun,
|
||||||
windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos.
|
windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos.
|
||||||
.IP
|
.IP
|
||||||
NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants.
|
NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants.
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue