Solve conflicts/merge upstream
This commit is contained in:
Daniell Mesquita
commit
586c652eab
4 changed files with 310 additions and 152 deletions
|
|
@ -1,6 +1,6 @@
|
|||
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
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
|
|||
4
Makefile
4
Makefile
|
|
@ -1,5 +1,5 @@
|
|||
PREFIX ?= /usr
|
||||
MANDIR ?= $(PREFIX)/share/man
|
||||
PREFIX = /usr
|
||||
MANDIR = $(PREFIX)/share/man
|
||||
|
||||
all:
|
||||
@echo Run \'make install\' to install Neofetch.
|
||||
|
|
|
|||
414
neofetch
414
neofetch
|
|
@ -8,7 +8,7 @@
|
|||
#
|
||||
# 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
|
||||
# of this software and associated documentation files (the "Software"), to deal
|
||||
|
|
@ -780,13 +780,13 @@ image_source="auto"
|
|||
# Default: 'auto'
|
||||
# Values: 'auto', 'distro_name'
|
||||
# Flag: --ascii_distro
|
||||
# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, AmogOS, Anarchy, Android, instantOS,
|
||||
# NOTE: AIX, Hash, Alpine, AlterLinux, Amazon, Anarchy, Android, instantOS,
|
||||
# Antergos, antiX, "AOSC OS", "AOSC OS/Retro", Apricity, ArchCraft,
|
||||
# ArcoLinux, ArchBox, ARCHlabs, ArchStrike, XFerience, ArchMerge, Arch,
|
||||
# Artix, Arya, Bedrock, Bitrig, BlackArch, BLAG, BlankOn, BlueLight,
|
||||
# bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS,
|
||||
# Bodhi, bonsai, BSD, BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS,
|
||||
# Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, Condres,
|
||||
# Container_Linux, CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin,
|
||||
# Container_Linux, Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin,
|
||||
# DesaOS, Devuan, DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary,
|
||||
# EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD,
|
||||
# FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo,
|
||||
|
|
@ -799,15 +799,15 @@ image_source="auto"
|
|||
# openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt,
|
||||
# osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix,
|
||||
# TrueOS, PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS,
|
||||
# Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian,
|
||||
# Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, Quibian, Radix, Raspbian,
|
||||
# Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith,
|
||||
# Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor,
|
||||
# SereneLinux, SharkLinux, Siduction, SkiffOS, Slackware, SliTaz, SmartOS,
|
||||
# Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2,
|
||||
# openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,
|
||||
# Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE,
|
||||
# Ubuntu-Studio, Ubuntu, Floflis, Univention, Venom, Void, semc, Obarun,
|
||||
# windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos.
|
||||
# Ubuntu-Studio, Ubuntu, Floflis, Univention, Venom, Void, VNux, LangitKetujuh, semc,
|
||||
# Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos.
|
||||
# NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants.
|
||||
# Use '{distro name}_old' to use the old logos.
|
||||
# NOTE: Ubuntu has flavor variants.
|
||||
|
|
@ -1102,10 +1102,13 @@ get_distro() {
|
|||
fi
|
||||
|
||||
if [[ $(< /proc/version) == *Microsoft* || $kernel_version == *Microsoft* ]]; then
|
||||
windows_version=$(wmic.exe os get Version)
|
||||
windows_version=$(trim "${windows_version/Version}")
|
||||
|
||||
case $distro_shorthand in
|
||||
on) distro+=" [Windows 10]" ;;
|
||||
tiny) distro="Windows 10" ;;
|
||||
*) distro+=" on Windows 10" ;;
|
||||
on) distro+=" [Windows $windows_version]" ;;
|
||||
tiny) distro="Windows ${windows_version::2}" ;;
|
||||
*) distro+=" on Windows $windows_version" ;;
|
||||
esac
|
||||
|
||||
elif [[ $(< /proc/version) == *chrome-bot* || -f /dev/cros_ec ]]; then
|
||||
|
|
@ -1153,8 +1156,8 @@ get_distro() {
|
|||
10.14*) codename="macOS Mojave" ;;
|
||||
10.15*) codename="macOS Catalina" ;;
|
||||
10.16*) codename="macOS Big Sur" ;;
|
||||
11.0*) codename="macOS Big Sur" ;;
|
||||
12.0*) codename="macOS Monterey" ;;
|
||||
11.*) codename="macOS Big Sur" ;;
|
||||
12.*) codename="macOS Monterey" ;;
|
||||
*) codename=macOS ;;
|
||||
esac
|
||||
|
||||
|
|
@ -1238,6 +1241,11 @@ get_model() {
|
|||
if [[ -d /system/app/ && -d /system/priv-app ]]; then
|
||||
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 ||
|
||||
-f /sys/devices/virtual/dmi/id/product_version ]]; then
|
||||
model=$(< /sys/devices/virtual/dmi/id/product_name)
|
||||
|
|
@ -1544,7 +1552,7 @@ get_packages() {
|
|||
has kiss && tot kiss l
|
||||
has cpt-list && tot cpt-list
|
||||
has pacman-key && tot pacman -Qq --color never
|
||||
has dpkg && pac "$(dpkg --list | grep -c ^ii)"
|
||||
has dpkg && tot dpkg-query -f '.\n' -W
|
||||
has xbps-query && tot xbps-query -l
|
||||
has apk && tot apk info
|
||||
has opkg && tot opkg list-installed
|
||||
|
|
@ -1552,12 +1560,14 @@ get_packages() {
|
|||
has lvu && tot lvu installed
|
||||
has tce-status && tot tce-status -i
|
||||
has pkg_info && tot pkg_info
|
||||
has pkgin && tot pkgin list
|
||||
has tazpkg && pkgs_h=6 tot tazpkg list && ((packages-=6))
|
||||
has sorcery && tot gaze installed
|
||||
has alps && tot alps showinstalled
|
||||
has butch && tot butch list
|
||||
has swupd && tot swupd bundle-list --quiet
|
||||
has pisi && tot pisi li
|
||||
has pacstall && tot pacstall -L
|
||||
|
||||
# Using the dnf package cache is much faster than rpm.
|
||||
if has dnf && type -p sqlite3 >/dev/null && [[ -f /var/cache/dnf/packages.db ]]; then
|
||||
|
|
@ -1611,13 +1621,15 @@ get_packages() {
|
|||
# TODO: Fix this somehow.
|
||||
has pkginfo && tot pkginfo -i
|
||||
|
||||
case $kernel_name in
|
||||
FreeBSD|DragonFly) has pkg && tot pkg info ;;
|
||||
case $os-$kernel_name in
|
||||
BSD-FreeBSD|BSD-DragonFly)
|
||||
has pkg && tot pkg info
|
||||
;;
|
||||
|
||||
*)
|
||||
BSD-*)
|
||||
has pkg && dir /var/db/pkg/*
|
||||
|
||||
((packages == 0)) && \
|
||||
((packages == 0)) &&
|
||||
has pkg && tot pkg list
|
||||
;;
|
||||
esac
|
||||
|
|
@ -1740,6 +1752,12 @@ get_shell() {
|
|||
shell=${shell/Copyright*}
|
||||
;;
|
||||
|
||||
nu)
|
||||
shell+=$("$SHELL" -c "version | get version")
|
||||
shell=${shell/ $shell_name}
|
||||
;;
|
||||
|
||||
|
||||
*)
|
||||
shell+=$("$SHELL" --version 2>&1)
|
||||
shell=${shell/ $shell_name}
|
||||
|
|
@ -1909,6 +1927,7 @@ get_wm() {
|
|||
-e orbital \
|
||||
-e orbment \
|
||||
-e perceptia \
|
||||
-e river \
|
||||
-e rustland \
|
||||
-e sway \
|
||||
-e ulubis \
|
||||
|
|
@ -2490,7 +2509,7 @@ get_gpu() {
|
|||
gpu_cmd="$(lspci -mm |
|
||||
awk -F '\"|\" \"|\\(' \
|
||||
'/"Display|"3D|"VGA/ {
|
||||
a[$0] = $1 " " $3 " " ($7 ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $7)
|
||||
a[$0] = $1 " " $3 " " ($(NF-1) ~ /^$|^Device [[:xdigit:]]+$/ ? $4 : $(NF-1))
|
||||
}
|
||||
END { for (i in a) {
|
||||
if (!seen[a[i]]++) {
|
||||
|
|
@ -2883,6 +2902,7 @@ get_song() {
|
|||
"gnome-music"*) get_song_dbus "GnomeMusic" ;;
|
||||
"lollypop"*) get_song_dbus "Lollypop" ;;
|
||||
"clementine"*) get_song_dbus "clementine" ;;
|
||||
"cmus"*) get_song_dbus "cmus" ;;
|
||||
"juk"*) get_song_dbus "juk" ;;
|
||||
"bluemindo"*) get_song_dbus "Bluemindo" ;;
|
||||
"guayadeque"*) get_song_dbus "guayadeque" ;;
|
||||
|
|
@ -2918,14 +2938,6 @@ get_song() {
|
|||
song="$(xmms2 current -f "\${artist}"$' \n'"\${album}"$' \n'"\${title}")"
|
||||
;;
|
||||
|
||||
"cmus"*)
|
||||
# NOTE: cmus >= 2.8.0 supports mpris2
|
||||
song="$(cmus-remote -Q | awk '/tag artist/ {$1=$2=""; a=$0}
|
||||
/tag album / {$1=$2=""; b=$0}
|
||||
/tag title/ {$1=$2=""; t=$0}
|
||||
END {print a " \n" b " \n" t}')"
|
||||
;;
|
||||
|
||||
"spotify"*)
|
||||
case $os in
|
||||
"Linux") get_song_dbus "spotify" ;;
|
||||
|
|
@ -3906,7 +3918,7 @@ get_public_ip() {
|
|||
fi
|
||||
|
||||
if [[ -z "$public_ip" ]] && type -p curl >/dev/null; then
|
||||
public_ip="$(curl --max-time "$public_ip_timeout" -w '\n' "$public_ip_host")"
|
||||
public_ip="$(curl -L --max-time "$public_ip_timeout" -w '\n' "$public_ip_host")"
|
||||
fi
|
||||
|
||||
if [[ -z "$public_ip" ]] && type -p wget >/dev/null; then
|
||||
|
|
@ -5134,10 +5146,10 @@ ASCII:
|
|||
instantOS, Antergos, antiX, \"AOSC OS\", \"AOSC OS/Retro\",
|
||||
Apricity, ArchCraft, ArcoLinux, ArchBox, ARCHlabs, ArchStrike,
|
||||
XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, Bitrig,
|
||||
BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, BunsenLabs,
|
||||
BlackArch, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs,
|
||||
Calculate, Carbs, CentOS, Chakra, ChaletOS, Chapeau, Chrom,
|
||||
Cleanjaro, ClearOS, Clear_Linux, Clover, Condres, Container_Linux,
|
||||
CrystalUX, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan,
|
||||
Crystal Linux, CRUX, Cucumber, dahlia, Debian, Deepin, DesaOS, Devuan,
|
||||
DracOS, DarkOs, Itc, DragonFly, Drauger, Elementary, EndeavourOS, Endless,
|
||||
EuroLinux, Exherbo, Fedora, Feren, FreeBSD, FreeMiNT, Frugalware,
|
||||
Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, gNewSense, GNOME, GNU,
|
||||
|
|
@ -5150,15 +5162,15 @@ ASCII:
|
|||
openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle,
|
||||
OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS,
|
||||
PCLinuxOS, Pengwin, Peppermint, Pisi, popos, Porteus, PostMarketOS,
|
||||
Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS,
|
||||
Proxmox, PuffOS, Puppy, PureOS, Qubes, Qubyt, Quibian, Radix, Raspbian, Reborn_OS,
|
||||
Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa,
|
||||
sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor,
|
||||
SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS,
|
||||
Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap,
|
||||
t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,
|
||||
Ubuntu-Cinnamon, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE,
|
||||
Ubuntu-Studio, Ubuntu, Floflis, Univention, Venom, Void, semc, Obarun,
|
||||
windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos.
|
||||
Ubuntu-Studio, Ubuntu, Floflis, Univention, Venom, Void, VNux, LangitKetujuh, semc,
|
||||
Obarun, windows10, Windows7, Xubuntu, Zorin, and IRIX have ascii logos.
|
||||
|
||||
NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants.
|
||||
|
||||
|
|
@ -5687,31 +5699,6 @@ dMMMMMMMMMMMMMMMMh yMMMMMMMMMMMMMMMMd
|
|||
.:+ydNMMMMMMMMMMMh yMMMMMMMMMMMNdy+:.
|
||||
`.:+shNMMMMMh yMMMMMNhs+:``
|
||||
`-+shy shs+:`
|
||||
EOF
|
||||
;;
|
||||
"AmogOS"*)
|
||||
set_colors 6 6 7 1
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c1} '
|
||||
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣀⣤⣤⣤⣀⣀⣀⣀⡀⠀⠀⠀⠀⠀⠀⠀
|
||||
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⠟⠉⠉⠉⠉⠉⠉⠉⠙⠻⢶⣄⠀⠀⠀⠀⠀
|
||||
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣾⡏⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠙⣷⡀⠀⠀⠀
|
||||
⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣸⡟⠀⣠⣶⠛⠛⠛⠛⠛⠛⠳⣦⡀⠀⠘⣿⡄⠀⠀
|
||||
⠀⠀⠀⠀⠀⠀⠀⠀⠀⢠⣿⠁⠀⢹⣿⣦⣀⣀⣀⣀⣀⣠⣼⡇⠀⠀⠸⣷⠀⠀
|
||||
⠀⠀⠀⠀⠀⠀⠀⠀⠀⣼⡏⠀⠀⠀⠉⠛⠿⠿⠿⠿⠛⠋⠁⠀⠀⠀⠀⣿⡄
|
||||
⠀⠀ ⠀⠀⢠⣿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⡇⠀
|
||||
⠀⠀⣸⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⡇⠀
|
||||
⠀⠀⠀⠀⠀⠀⠀⠀⣿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣧⠀
|
||||
⠀⠀⠀⠀⠀⠀⠀⢸⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⣿⠀
|
||||
⠀⠀⠀⠀⠀⠀⠀⣾⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀
|
||||
⠀⠀⠀⠀⠀⠀⠀⣿⠃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣿⠀
|
||||
⠀⠀⠀⠀⠀⠀⢰⣿⠀⠀⠀⠀⣠⡶⠶⠿⠿⠿⠿⢷⣦⠀⠀⠀⠀⠀⠀⠀⣿⠀
|
||||
⠀⠀⣀⣀⣀⠀⣸⡇⠀⠀⠀⠀⣿⡀⠀⠀⠀⠀⠀⠀⣿⡇⠀⠀⠀⠀⠀⠀⣿⠀
|
||||
⣠⡿⠛⠛⠛⠛⠻⠀⠀⠀⠀⠀⢸⣇⠀⠀⠀⠀⠀⠀⣿⠇⠀⠀⠀⠀⠀⠀⣿⠀
|
||||
⢻⣇⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⣼⡟⠀⠀⢀⣤⣤⣴⣿⠀⠀⠀⠀⠀⠀⠀⣿⠀
|
||||
⠈⠙⢷⣶⣦⣤⣤⣤⣴⣶⣾⠿⠛⠁⢀⣶⡟⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡟⠀
|
||||
⠀⠀⠀⠀⠈⣿⣆⡀⠀⠀⠀⠀⠀⠀⢀⣠⣴⡾⠃⠀
|
||||
⠀ ⠀⠀⠀⠀⠀⠀⠈⠛⠻⢿⣿⣾⣿⡿⠿⠟⠋⠁⠀⠀⠀
|
||||
EOF
|
||||
;;
|
||||
"Anarchy"*)
|
||||
|
|
@ -6410,6 +6397,30 @@ ${c1} oMMNMMMMMMMMMMMMMMMMMMMMMM
|
|||
EOF
|
||||
;;
|
||||
|
||||
"Bodhi"*)
|
||||
set_colors 7 11 2
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c1}| ${c2},,mmKKKKKKKKWm,,
|
||||
${c1}' ${c2},aKKP${c1}LL**********|L*${c2}TKp,
|
||||
${c1}t ${c2}aKP${c1}L**``` ```**L${c2}*Kp
|
||||
IX${c1}EL${c3}L,wwww, ${c1}``*||${c2}Kp
|
||||
,#P${c1}L|${c3}KKKpPP@IPPTKmw, ${c1}`*||${c2}K
|
||||
,K${c1}LL*${c3}{KKKKKKPPb$KPhpKKPKp ${c1}`||${c2}K
|
||||
#${c1}PL ${c3}!KKKKKKPhKPPP$KKEhKKKKp ${c1}`||${c2}K
|
||||
!H${c1}L* ${c3}1KKKKKKKphKbPKKKKKK$KKp ${c1}`|I${c2}W
|
||||
$${c1}bL ${c3}KKKKKKKKBQKhKbKKKKKKKK ${c1}|I${c2}N
|
||||
$${c1}bL ${c3}!KKKKKKKKKKNKKKKKKKPP` ${c1}|I${c2}b
|
||||
TH${c1}L* ${c3}TKKKKKK##KKKN@KKKK^ ${c1}|I${c2}M
|
||||
K@${c1}L ${c3}*KKKKKKKKKKKEKE5 ${c1}||${c2}K
|
||||
`NL${c1}L ${c3}`KKKKKKKKKK"```|L ${c1}||${c2}#P
|
||||
`K@${c1}LL ${c3}`"**"` ${c1}'. :||${c2}#P
|
||||
Yp${c1}LL ${c1}' |L${c2}$M`
|
||||
`Tp${c1}pLL, ,|||${c2}p'L
|
||||
"Kpp${c1}LL++,., ,,|||$${c2}#K* ${c1}'.
|
||||
${c2}`"MKWpppppppp#KM"` ${c1}`h,
|
||||
EOF
|
||||
;;
|
||||
|
||||
"bonsai"*)
|
||||
set_colors 6 2 3
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
|
|
@ -6532,23 +6543,55 @@ ${c2} ..........
|
|||
EOF
|
||||
;;
|
||||
|
||||
"CBL-Mariner"*)
|
||||
set_colors 6
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c1} .
|
||||
:- .
|
||||
:==. .=:
|
||||
:===: -==:
|
||||
:-===: .====:
|
||||
:-====- -=====:
|
||||
-====== :=======:
|
||||
-======. .=========:
|
||||
-======: -==========.
|
||||
-======- -===========.
|
||||
:======- :===========.
|
||||
:=======. .-==========.
|
||||
:=======: -==========.
|
||||
:=======- :==========.
|
||||
:=======- .-========-
|
||||
:--------. :========-
|
||||
..:::--=========-
|
||||
..::---================-=-
|
||||
EOF
|
||||
;;
|
||||
|
||||
"CelOS"*)
|
||||
set_colors 3 2 4 5 7
|
||||
set_colors 4 6 0 5
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
|
||||
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
|
||||
@@@# @@@
|
||||
@@ ,#%%%%%(. (@
|
||||
@# %%%%%%%%%%%%%%# @
|
||||
@# %%%%%%%%# %%%/ @
|
||||
@# #%%%%%%%%. #%%%* @
|
||||
@# %%%%%%%%%%%* (%%%%%# @
|
||||
@# #%%%% %%%%%%%%%%%, @
|
||||
@# #%%%%%%%%%%%%%%%%%, @
|
||||
@# #%%%%%%%%%%%%%* @
|
||||
@@ *##%#(, @@
|
||||
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
|
||||
${c4} .,cmmmmmmmmmmmc,.
|
||||
.,cmMMMMMMMMMMMMMMMMMMMMmc.
|
||||
.cMMMMMMMMMMMMMMMMMMMMMMMMMMMmc.
|
||||
.cMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMc.
|
||||
,:MMM ${c3}####################################${c4}
|
||||
cMMMMMMmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmc.
|
||||
.MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM.
|
||||
.MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMc
|
||||
"******************************MMMMMMMMMMMMMc:
|
||||
${c3}#################################### ${c4}MMMMMMMMMMMMMc
|
||||
"MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM:
|
||||
"MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM"
|
||||
'MMMMMMMMM*******************************:
|
||||
\"MMMMMM ${c3}#####################################
|
||||
${c4}`:MMMMMMmmmmmmmmmmmmmmmmmmmmmmmmmmmmm;
|
||||
`"MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM"
|
||||
`":MMMMMMMMMMMMMMMMMMMMMMMMM;'
|
||||
`":MMMMMMMMMMMMMMMMMMM:"
|
||||
"************"
|
||||
|
||||
|
||||
|
||||
|
||||
EOF
|
||||
|
|
@ -6885,7 +6928,7 @@ ${c2} lodd${c1}dolccc${c2}ccox${c1}xoloo
|
|||
EOF
|
||||
;;
|
||||
|
||||
*"CrystalUX"*)
|
||||
*"Crystal Linux"*)
|
||||
set_colors 13 5
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c1} mysssym
|
||||
|
|
@ -7362,16 +7405,17 @@ EOF
|
|||
;;
|
||||
|
||||
"fedora_small")
|
||||
set_colors 4 7 1
|
||||
set_colors 12
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c2} _____
|
||||
/ __)${c1}\\${c2}
|
||||
| / ${c1}\\ \\${c2}
|
||||
${c1}__${c2}_| |_${c1}_/ /${c2}
|
||||
${c1}/ ${c2}(_ _)${c1}_/${c2}
|
||||
${c1}/ /${c2} | |
|
||||
${c1}\\ \\${c2}__/ |
|
||||
${c1}\\${c2}(_____/
|
||||
${c1} ,'''''.
|
||||
| ,. |
|
||||
| | '_'
|
||||
,....| |..
|
||||
.' ,_;| ..'
|
||||
| | | |
|
||||
| ',_,' |
|
||||
'. ,'
|
||||
'''''
|
||||
EOF
|
||||
;;
|
||||
|
||||
|
|
@ -7664,6 +7708,24 @@ MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
|
|||
EOF
|
||||
;;
|
||||
|
||||
"glaucus"*)
|
||||
set_colors 5
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c1} ,, ,d88P
|
||||
,d8P ,ad8888*
|
||||
,888P d88888* ,,ad8888P*
|
||||
d d888P a88888P* ,ad8888888*
|
||||
.d8 d8888: d888888* ,d888888P*
|
||||
.888; 88888b d8888888b8888888P
|
||||
d8888J888888a88888888888888P* ,d
|
||||
88888888888888888888888888P ,,d8*
|
||||
888888888888888888888888888888888*
|
||||
*8888888888888888888888888888888*
|
||||
Y888888888P* `*``*888888888888*
|
||||
*^888^* *Y888P**
|
||||
EOF
|
||||
;;
|
||||
|
||||
"gNewSense"*)
|
||||
set_colors 4 5 7 6
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
|
|
@ -7813,25 +7875,22 @@ EOF
|
|||
;;
|
||||
|
||||
"Haiku"*)
|
||||
set_colors 2 8
|
||||
set_colors 1 3 7 2
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c2} :dc'
|
||||
'l:;'${c1},${c2}'ck. .;dc:.
|
||||
co ${c1}..${c2}k. .;; ':o.
|
||||
co ${c1}..${c2}k. ol ${c1}.${c2}0.
|
||||
co ${c1}..${c2}k. oc ${c1}..${c2}0.
|
||||
co ${c1}..${c2}k. oc ${c1}..${c2}0.
|
||||
.Ol,. co ${c1}...''${c2}Oc;kkodxOdddOoc,.
|
||||
';lxxlxOdxkxk0kd${c1}oooll${c2}dl${c1}ccc:${c2}clxd;
|
||||
..${c1}oOolllllccccccc:::::${c2}od;
|
||||
cx:ooc${c1}:::::::;${c2}cooolcX.
|
||||
cd${c1}.${c2}''cloxdoollc' ${c1}...${c2}0.
|
||||
cd${c1}......${c2}k;${c1}.${c2}xl${c1}.... .${c2}0.
|
||||
.::c${c1};..${c2}cx;${c1}.${c2}xo${c1}..... .${c2}0.
|
||||
'::c'${c1}...${c2}do${c1}..... .${c2}K,
|
||||
cd,.${c1}....:${c2}O,${c1}
|
||||
':clod:'${c1}
|
||||
${c1}
|
||||
${c3}
|
||||
|
||||
MMMM MMMM
|
||||
MMMM MMMM
|
||||
MMMM MMMM
|
||||
MMMM MMMM
|
||||
MMMM${c4} .ciO| /YMMMMM*"
|
||||
${c3} MMMM${c4} .cOMMMMM|/MMMMM/`
|
||||
, ,iMM|/MMMMMMMMMMMMMMM*
|
||||
`*.__,-cMMMMMMMMMMMMMMMMM/`${c3}.MMM
|
||||
MM${c4}MMMMMMM/`:MMM/ ${c3}MMMM
|
||||
MMMM MMMM
|
||||
MMMM MMMM
|
||||
"""" """"
|
||||
EOF
|
||||
;;
|
||||
|
||||
|
|
@ -7956,6 +8015,30 @@ ${c1} cooo: ${c2}coooooooooooooooooool
|
|||
EOF
|
||||
;;
|
||||
|
||||
"Kaisen"*)
|
||||
set_colors 1 7 3
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c1} `
|
||||
`:+oyyho.
|
||||
`+:`sdddddd/
|
||||
`+` :ho oyo++ohds-`
|
||||
.ho :dd. .: `sddddddhhyso+/-
|
||||
ody.ddd-:yd- +hysssyhddddddddho`
|
||||
yddddddhddd` ` `--` -+hddddddh.
|
||||
hddy-+dddddy+ohh/..+sddddy/:::+ys
|
||||
:ddd/sdddddddddd- oddddddd `
|
||||
`yddddddddddddddd/ /ddddddd/
|
||||
:. :ydddddddddddddddddo..sddddddy/`
|
||||
odhdddddddo- `ddddh+-``....-+hdddddds.
|
||||
-ddddddhd: /dddo -ydddddddhdddddddd-
|
||||
/hdy:o - `:sddds .`./hdddddddddddddo
|
||||
`/- `+hddyosy+ :dddddddy-.-od/
|
||||
:sydds -hddddddd` /
|
||||
.+shd- `:ohddddddddd`
|
||||
`:+ooooooooooooo:
|
||||
EOF
|
||||
;;
|
||||
|
||||
"Kali"*)
|
||||
set_colors 4 8
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
|
|
@ -8351,11 +8434,11 @@ EOF
|
|||
"mac"* | "Darwin")
|
||||
set_colors 2 3 1 1 5 4
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c1} 'c.
|
||||
${c1} c.'
|
||||
,xNMM.
|
||||
.OMMMMo
|
||||
OMMM0,
|
||||
.;loddo:' loolloddol;.
|
||||
lMM"
|
||||
.;loddo:. .olloddol;.
|
||||
cKMMMMMMMMMMNWMMMMMMMMMM0:
|
||||
${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd.
|
||||
XMMMMMMMMMMMMMMMMMMMMMMMX.
|
||||
|
|
@ -8363,11 +8446,11 @@ ${c3};MMMMMMMMMMMMMMMMMMMMMMMM:
|
|||
:MMMMMMMMMMMMMMMMMMMMMMMM:
|
||||
${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX.
|
||||
kMMMMMMMMMMMMMMMMMMMMMMMMWd.
|
||||
${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk
|
||||
.XMMMMMMMMMMMMMMMMMMMMMMMMK.
|
||||
${c5}'XMMMMMMMMMMMMMMMMMMMMMMMMMMk
|
||||
'XMMMMMMMMMMMMMMMMMMMMMMMMK.
|
||||
${c6}kMMMMMMMMMMMMMMMMMMMMMMd
|
||||
;KMMMMMMMWXXWMMMMMMMk.
|
||||
.cooc,. .,coo:.
|
||||
"cooc*" "*coo'"
|
||||
EOF
|
||||
;;
|
||||
|
||||
|
|
@ -9042,23 +9125,29 @@ EOF
|
|||
"openEuler"*)
|
||||
set_colors 4 7 1
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c1}
|
||||
(#####
|
||||
(((######## #####
|
||||
((( ########## __...__
|
||||
(((((((( ####### /((((((###\
|
||||
((((((((((( ....... \(((((####/
|
||||
(((((( ((((######### *******
|
||||
%((((((# ((########
|
||||
/////((((( ###
|
||||
/////(((((((# (((&
|
||||
(((((((((((((
|
||||
((((((((((((
|
||||
((((((((( ((((((###
|
||||
/((((((######
|
||||
//((((((######
|
||||
/((((((#####
|
||||
*********/
|
||||
${c1} `.cc.`
|
||||
``.cccccccc..`
|
||||
`.cccccccccccccccc.`
|
||||
``.cccccccccccccccccccccc.``
|
||||
`..cccccccccccccccccccccccccccc..`
|
||||
`.ccccccccccccccc${c2}/++/${c1}ccccccccccccccccc.`
|
||||
.ccccccccccccccc${c2}mNMMNdo+oso+${c1}ccccccccccc.
|
||||
.cccccccccc${c2}/++odms+//+mMMMMm/:+syso/${c1}cccc
|
||||
.ccccccccc${c2}yNNMMMs:::/::+o+/:${c1}c${c2}dMMMMMm${c1}cccc
|
||||
.ccccccc${c2}:+NmdyyhNNmNNNd:${c1}ccccc${c1}${c2}:oyyyo:${c1}cccc
|
||||
.ccc${c2}:ohdmMs:${c1}cccc${c2}+mNMNmy${c1}ccccccccccccccccc
|
||||
.cc${c2}/NMMMMMo////:${c1}c${c2}:///:${c1}cccccccccccccccccc
|
||||
.cc${c2}:syysyNMNNNMNy${c1}ccccccccccccccccccccccc
|
||||
.cccccccc${c2}+MMMMMNy${c1}c${c2}:/+++/${c1}cccccccccccccccc
|
||||
.ccccccccc${c2}ohhhs/${c1}c${c2}omMMMMNh${c1}ccccccccccccccc
|
||||
.ccccccccccccccc${c2}:MMMMMMMM/${c1}cccccccccccccc
|
||||
.cccccccccccccccc${c2}sNNNNNd+${c1}cccccccccccccc.
|
||||
`..cccccccccccccccc${c2}/+/:${c1}cccccccccccccc..`
|
||||
``.cccccccccccccccccccccccccccc.``
|
||||
`.cccccccccccccccccccccc.`
|
||||
``.cccccccccccccc.``
|
||||
`.cccccccc.`
|
||||
`....`
|
||||
EOF
|
||||
;;
|
||||
|
||||
|
|
@ -9778,6 +9867,27 @@ ${c1} `..--..`
|
|||
EOF
|
||||
;;
|
||||
|
||||
"Qubyt"*)
|
||||
set_colors 4 5 0 4
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c1} ########################${c2}(${c3}ooo
|
||||
${c1} ########################${c2}(${c3}ooo
|
||||
${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo
|
||||
${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo
|
||||
${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo
|
||||
${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo
|
||||
${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo
|
||||
${c1}###${c2}(${c3}ooo ${c1}###${c2}(${c3}ooo
|
||||
${c1}###${c2}(${c3}ooo ${c1}##${c3}o ${c2}((((${c3}ooo
|
||||
${c1}###${c2}(${c3}ooo o${c2}((${c1}### ${c3}oooooo
|
||||
${c1}###${c2}(${c3}ooo oo${c2}((${c1}###${c3}o
|
||||
${c1}###${c2}(${c3}ooo ooo${c2}((${c1}###
|
||||
${c1}################${c2}(${c3}oo oo${c2}((((${c3}o
|
||||
${c2}(((((((((((((((((${c3}ooo ooooo
|
||||
oooooooooooooooooo o
|
||||
EOF
|
||||
;;
|
||||
|
||||
"Quibian"*)
|
||||
set_colors 3 7
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
|
|
@ -11057,6 +11167,54 @@ 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
|
||||
|
||||
;;
|
||||
|
||||
"LangitKetujuh"*)
|
||||
set_colors 7 4
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c1}
|
||||
L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L
|
||||
'L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L
|
||||
L7L. 'L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L
|
||||
L7L7L7L L7L7L7L
|
||||
L7L7L7L L7L7L7L
|
||||
L7L7L7L L7L7L7L7L7L7L7L7L7L7L7L
|
||||
L7L7L7L 'L7L7L7L7L7L7L7L7L7L
|
||||
L7L7L7L 'L7L7L7L7L7L7L7L
|
||||
L7L7L7L L7L7L7L
|
||||
L7L7L7L L7L7L7L
|
||||
L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L. 'L7L
|
||||
L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L.
|
||||
L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L7L
|
||||
${c2}
|
||||
EOF
|
||||
;;
|
||||
|
||||
"semc"*)
|
||||
set_colors 2 8 1
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
|
|
@ -11271,11 +11429,11 @@ EOF
|
|||
"Darwin")
|
||||
set_colors 2 3 1 1 5 4
|
||||
read -rd '' ascii_data <<'EOF'
|
||||
${c1} 'c.
|
||||
${c1} c.'
|
||||
,xNMM.
|
||||
.OMMMMo
|
||||
OMMM0,
|
||||
.;loddo:' loolloddol;.
|
||||
lMMM"
|
||||
.;loddo:. .olloddol;.
|
||||
cKMMMMMMMMMMNWMMMMMMMMMM0:
|
||||
${c2} .KMMMMMMMMMMMMMMMMMMMMMMMWd.
|
||||
XMMMMMMMMMMMMMMMMMMMMMMMX.
|
||||
|
|
@ -11283,11 +11441,11 @@ ${c3};MMMMMMMMMMMMMMMMMMMMMMMM:
|
|||
:MMMMMMMMMMMMMMMMMMMMMMMM:
|
||||
${c4}.MMMMMMMMMMMMMMMMMMMMMMMMX.
|
||||
kMMMMMMMMMMMMMMMMMMMMMMMMWd.
|
||||
${c5}.XMMMMMMMMMMMMMMMMMMMMMMMMMMk
|
||||
.XMMMMMMMMMMMMMMMMMMMMMMMMK.
|
||||
${c5}'XMMMMMMMMMMMMMMMMMMMMMMMMMMk
|
||||
'XMMMMMMMMMMMMMMMMMMMMMMMMK.
|
||||
${c6}kMMMMMMMMMMMMMMMMMMMMMMd
|
||||
;KMMMMMMMWXXWMMMMMMMk.
|
||||
.cooc,. .,coo:.
|
||||
"cooc*" "*coo'"
|
||||
EOF
|
||||
;;
|
||||
|
||||
|
|
@ -11448,7 +11606,7 @@ main() {
|
|||
err "Neofetch command: $0 $*"
|
||||
err "Neofetch version: $version"
|
||||
|
||||
[[ $verbose == on ]] && printf %b "$err" >&2
|
||||
[[ $verbose == on ]] && printf '%b\033[m' "$err" >&2
|
||||
|
||||
# If `--loop` was used, constantly redraw the image.
|
||||
while [[ $image_loop == on && $image_backend == w3m ]]; do
|
||||
|
|
|
|||
|
|
@ -327,7 +327,7 @@ SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS,
|
|||
Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap,
|
||||
t2, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,
|
||||
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.
|
||||
.IP
|
||||
NOTE: Arch, Ubuntu, Redhat, Fedora and Dragonfly have 'old' logo variants.
|
||||
|
|
@ -341,7 +341,7 @@ Ubuntu\-Studio, Ubuntu\-Mate or Ubuntu\-Budgie to use the flavors.
|
|||
.TP
|
||||
NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu,
|
||||
CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android,
|
||||
Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola,
|
||||
Artix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola,
|
||||
Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS,
|
||||
Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian,
|
||||
postmarketOS, and Void have a smaller logo variant.
|
||||
|
|
|
|||
Loading…
Reference in a new issue