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

This commit is contained in:
Dylan Araps 2019-12-10 01:51:45 +00:00
commit 787b2352b5
2 changed files with 109 additions and 37 deletions

114
neofetch
View File

@ -383,6 +383,17 @@ public_ip_host="http://ident.me"
public_ip_timeout=2 public_ip_timeout=2
# Desktop Environment
# Show Desktop Environment version
#
# Default: 'off'
# Values: 'on', 'off'
# Flag: --de_version
de_version="off"
# Disk # Disk
@ -1584,20 +1595,37 @@ get_de() {
*xfce5*) de=Xfce5 ;; *xfce5*) de=Xfce5 ;;
*xfce*) de=Xfce ;; *xfce*) de=Xfce ;;
*mate*) de=MATE ;; *mate*) de=MATE ;;
*GNOME*) de=GNOME ;;
*MUFFIN*|Cinnamon) *MUFFIN*) de=Cinnamon ;;
de=$(cinnamon --version)
de=${de:-Cinnamon}
;;
*GNOME*)
de=$(gnome-shell --version)
de=${de/Shell }
;;
esac esac
((KDE_SESSION_VERSION >= 4)) && de=${de/KDE/Plasma} ((KDE_SESSION_VERSION >= 4)) && de=${de/KDE/Plasma}
if [[ $de_version == on && $de ]]; then
case $de in
"Plasma"*) de_ver=$(plasmashell --version) ;;
"MATE"*) de_ver=$(mate-session --version) ;;
"Xfce"*) de_ver=$(xfce4-session --version) ;;
"GNOME"*) de_ver=$(gnome-shell --version) ;;
"Cinnamon"*) de_ver=$(cinnamon --version) ;;
"Deepin"*) de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;;
"Budgie"*) de_ver=$(budgie-desktop --version) ;;
"LXQt"*) de_ver=$(lxqt-session --version) ;;
"Lumina"*) de_ver=$(lumina-desktop --version 2>&1) ;;
"Trinity"*) de_ver=$(tde-config --version) ;;
esac
de_ver=${de_ver/*TDE:}
de_ver=${de_ver/tde-config*}
de_ver=${de_ver/liblxqt*}
de_ver=${de_ver/Copyright*}
de_ver=${de_ver/)*}
de_ver=${de_ver/* }
de_ver=${de_ver//\"}
de="$de $de_ver"
fi
de_run=1 de_run=1
} }
@ -2751,6 +2779,9 @@ get_style() {
# Get DE if user has disabled the function. # Get DE if user has disabled the function.
((de_run != 1)) && get_de ((de_run != 1)) && get_de
# Remove version from '$de'.
[[ $de_version == on ]] && de=${de/ *}
# Check for DE Theme. # Check for DE Theme.
case $de in case $de in
"KDE"* | "Plasma"*) "KDE"* | "Plasma"*)
@ -4522,6 +4553,7 @@ INFO:
NOTE: This only supports Linux. NOTE: This only supports Linux.
--de_version on/off Show/Hide Desktop Environment version
--gtk_shorthand on/off Shorten output of gtk theme/icons --gtk_shorthand on/off Shorten output of gtk theme/icons
--gtk2 on/off Enable/Disable gtk2 theme/font/icons output --gtk2 on/off Enable/Disable gtk2 theme/font/icons output
--gtk3 on/off Enable/Disable gtk3 theme/font/icons output --gtk3 on/off Enable/Disable gtk3 theme/font/icons output
@ -4611,17 +4643,21 @@ ASCII:
--ascii_colors x x x x x x Colors to print the ascii art --ascii_colors x x x x x x Colors to print the ascii art
--ascii_distro distro Which Distro's ascii art to print --ascii_distro distro Which Distro's ascii art to print
NOTE: Arch and Ubuntu have 'old' logo variants. NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants.
NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. NOTE: Use '{distro name}_old' to use the old logos.
NOTE: Ubuntu has flavor variants. NOTE: Ubuntu has flavor variants.
NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu-GNOME', NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME,
'Ubuntu-Studio' or 'Ubuntu-Budgie' to use the flavors. Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors.
NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu,
OpenBSD, postmarketOS, and Void have a smaller logo variant. CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android,
Antrix, 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.
NOTE: Use '{distro name}_small' to use the small variants. NOTE: Use '{distro name}_small' to use the small variants.
@ -4693,6 +4729,7 @@ get_args() {
"--gpu_brand") gpu_brand="$2" ;; "--gpu_brand") gpu_brand="$2" ;;
"--gpu_type") gpu_type="$2" ;; "--gpu_type") gpu_type="$2" ;;
"--refresh_rate") refresh_rate="$2" ;; "--refresh_rate") refresh_rate="$2" ;;
"--de_version") de_version="$2" ;;
"--gtk_shorthand") gtk_shorthand="$2" ;; "--gtk_shorthand") gtk_shorthand="$2" ;;
"--gtk2") gtk2="$2" ;; "--gtk2") gtk2="$2" ;;
"--gtk3") gtk3="$2" ;; "--gtk3") gtk3="$2" ;;
@ -5926,7 +5963,7 @@ ${c1} `.--::::::--.`
EOF EOF
;; ;;
"Clear Linux OS"*) "Clear Linux OS"* | "Clear_Linux"*)
set_colors 4 3 7 6 set_colors 4 3 7 6
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} BBB ${c1} BBB
@ -6001,7 +6038,7 @@ ${c2}:sssssssssssso++${c1}${c3}`:/:--------.````````
EOF EOF
;; ;;
"Container Linux by CoreOS"*) "Container Linux by CoreOS"* | "Container_Linux"*)
set_colors 4 7 1 set_colors 4 7 1
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} ..... ${c1} .....
@ -6214,8 +6251,7 @@ EOF
"dragonfly_old"*) "dragonfly_old"*)
set_colors 1 7 3 set_colors 1 7 3
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} | ${c1} .-.
.-.
${c3} ()${c1}I${c3}() ${c3} ()${c1}I${c3}()
${c1} "==.__:-:__.==" ${c1} "==.__:-:__.=="
"==.__/~|~\__.==" "==.__/~|~\__.=="
@ -7118,7 +7154,7 @@ ${c2} \\
EOF EOF
;; ;;
"Linux Lite"*) "Linux Lite"* | "Linux_Lite"*)
set_colors 3 7 set_colors 3 7
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} ,xXc ${c1} ,xXc
@ -8153,7 +8189,7 @@ ${c1} PPPPPPPPPPPPPP
EOF EOF
;; ;;
"popos_small"*) "popos_small"* | "pop_os_small"*)
set_colors 6 7 set_colors 6 7
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1}______ ${c1}______
@ -8167,7 +8203,7 @@ ${c1}______
EOF EOF
;; ;;
"Pop!_OS"*) "Pop!_OS"* | "popos"* | "pop_os"*)
set_colors 6 7 set_colors 6 7
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} ///////////// ${c1} /////////////
@ -8507,7 +8543,7 @@ RRRR RRRRRRRRRRRRRRRRRRR R RRRR
EOF EOF
;; ;;
"redhat_old") "redhat_old" | "rhel_old"*)
set_colors 1 7 3 set_colors 1 7 3
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c1} `.-..........` ${c1} `.-..........`
@ -8553,7 +8589,7 @@ MMMMMMMMMMM. MMMM
EOF EOF
;; ;;
"Refracted Devuan"*) "Refracted Devuan"* | "Refracted_Devuan"*)
set_colors 8 7 set_colors 8 7
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c2} A ${c2} A
@ -8741,6 +8777,32 @@ M- ,=;;;#:, ,:#;;:=, ,@
EOF EOF
;; ;;
"Septor"*)
set_colors 4 7 4
read -rd '' ascii_data <<'EOF'
${c1}ssssssssssssssssssssssssssssssssssssssss
ssssssssssssssssssssssssssssssssssssssss
ssssssssssssssssssssssssssssssssssssssss
ssssssssssssssssssssssssssssssssssssssss
ssssssssss${c2};okOOOOOOOOOOOOOOko;${c1}ssssssssss
sssssssss${c2}oNWWWWWWWWWWWWWWWWWWNo${c1}sssssssss
ssssssss${c2}:WWWWWWWWWWWWWWWWWWWWWW:${c1}ssssssss
ssssssss${c2}lWWWWWk${c1}ssssssssss${c2}lddddd:${c1}ssssssss
ssssssss${c2}cWWWWWNKKKKKKKKKKKKOx:${c1}ssssssssss
${c3}yy${c1}sssssss${c2}OWWWWWWWWWWWWWWWWWWWWx${c1}sssssss${c3}yy
yyyyyyyyyy${c2}:kKNNNNNNNNNNNNWWWWWW:${c3}yyyyyyyy
yyyyyyyy${c2}sccccc;${c3}yyyyyyyyyy${c2}kWWWWW:${c3}yyyyyyyy
yyyyyyyy${c2}:WWWWWWNNNNNNNNNNWWWWWW;${c3}yyyyyyyy
yyyyyyyy${c2}.dWWWWWWWWWWWWWWWWWWWNd${c3}yyyyyyyyy
yyyyyyyyyy${c2}sdO0KKKKKKKKKKKK0Od;${c3}yyyyyyyyyy
yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
EOF
;;
"SharkLinux"*) "SharkLinux"*)
set_colors 4 7 set_colors 4 7
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
@ -8900,7 +8962,7 @@ ${c2} -```````````
EOF EOF
;; ;;
"Source Mage"*) "Source Mage"* | "Source_Mage"*)
set_colors 4 7 1 set_colors 4 7 1
read -rd '' ascii_data <<'EOF' read -rd '' ascii_data <<'EOF'
${c2} :ymNMNho. ${c2} :ymNMNho.

View File

@ -1,5 +1,5 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11. .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.11.
.TH NEOFETCH "1" "October 2019" "Neofetch 6.1.0" "User Commands" .TH NEOFETCH "1" "December 2019" "Neofetch 6.1.0" "User Commands"
.SH NAME .SH NAME
Neofetch \- A fast, highly customizable system info script Neofetch \- A fast, highly customizable system info script
.SH SYNOPSIS .SH SYNOPSIS
@ -104,6 +104,9 @@ Which GPU to display. (all, dedicated, integrated)
.IP .IP
NOTE: This only supports Linux. NOTE: This only supports Linux.
.TP .TP
\fB\-\-de_version\fR on/off
Show/Hide Desktop Environment version
.TP
\fB\-\-gtk_shorthand\fR on/off \fB\-\-gtk_shorthand\fR on/off
Shorten output of gtk theme/icons Shorten output of gtk theme/icons
.TP .TP
@ -175,6 +178,9 @@ Changes the default ':' separator to the specified string.
\fB\-\-color_blocks\fR on/off \fB\-\-color_blocks\fR on/off
Enable/Disable the color blocks Enable/Disable the color blocks
.TP .TP
\fB\-\-col_offset\fR auto/num
Left\-padding of color blocks
.TP
\fB\-\-block_width\fR num \fB\-\-block_width\fR num
Width of color blocks in spaces Width of color blocks in spaces
.TP .TP
@ -273,17 +279,21 @@ Colors to print the ascii art
\fB\-\-ascii_distro\fR distro \fB\-\-ascii_distro\fR distro
Which Distro's ascii art to print Which Distro's ascii art to print
.IP .IP
NOTE: Arch and Ubuntu have 'old' logo variants. NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants.
.IP .IP
NOTE: Use 'arch_old' or 'ubuntu_old' to use the old logos. NOTE: Use '{distro name}_old' to use the old logos.
.IP .IP
NOTE: Ubuntu has flavor variants. NOTE: Ubuntu has flavor variants.
.TP .TP
NOTE: Change this to 'Lubuntu', 'Xubuntu', 'Ubuntu\-GNOME', NOTE: Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu\-GNOME,
\&'Ubuntu\-Studio' or 'Ubuntu\-Budgie' to use the flavors. Ubuntu\-Studio, Ubuntu\-Mate or Ubuntu\-Budgie to use the flavors.
.TP .TP
NOTE: Alpine, Arch, CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu,
OpenBSD, postmarketOS, and Void have a smaller logo variant. CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android,
Antrix, 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.
.IP .IP
NOTE: Use '{distro name}_small' to use the small variants. NOTE: Use '{distro name}_small' to use the small variants.
.TP .TP