kforney/hyfetch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #327 from konimex/distro_shorthand

Browse source 
Expanded distro_shorthand to support non-LSB solutions
This commit is contained in:
Dylan Araps 2016-09-03 02:17:42 +10:00 committed by GitHub
commit d1bab99b00
4 changed files with 36 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -369,8 +369,8 @@ alias neofetch2="neofetch \
--cpu_shorthand type Shorten the output of CPU --cpu_shorthand type Shorten the output of CPU
Possible values: name, speed, tiny, on, off Possible values: name, speed, tiny, on, off
--cpu_cores on/off Whether or not to display the number of CPU cores --cpu_cores on/off Whether or not to display the number of CPU cores
--distro_shorthand on/off Shorten the output of distro --distro_shorthand on/off Shorten the output of distro (tiny, on, off)
NOTE: This is only possible on Linux with lsb_release NOTE: This is only possible on Linux
--kernel_shorthand on/off Shorten the output of kernel --kernel_shorthand on/off Shorten the output of kernel
--uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off)
--refresh_rate on/off Whether to display the refresh rate of each monitor --refresh_rate on/off Whether to display the refresh rate of each monitor

4
config/config
View file

@ -61,8 +61,8 @@ kernel_shorthand="on"
# Distro # Distro
# Shorten the output of distro # Shorten the output of distro (tiny, on, off)
# NOTE: This is only possible on Linux with lsb_release # NOTE: This is only possible on Linux
distro_shorthand="off" distro_shorthand="off"
# Mac OS X hide/show build version # Mac OS X hide/show build version

41
neofetch
View file

@ -120,9 +120,9 @@ getdistro() {
"Linux" ) "Linux" )
if type -p lsb_release >/dev/null 2>&1; then if type -p lsb_release >/dev/null 2>&1; then
case "$distro_shorthand" in case "$distro_shorthand" in
"on") distro="$(lsb_release -sir 2>/dev/null)" ;; "on") distro="$(lsb_release -sir 2>/dev/null)" ;;
"off") distro="$(lsb_release -sd 2>/dev/null)" "tiny") distro="$(lsb_release -si 2>/dev/null)" ;;
distro="${distro//\"}" ;; *) distro="$(lsb_release -sd 2>/dev/null)" ;;
esac esac
elif type -p guix >/dev/null 2>&1; then elif type -p guix >/dev/null 2>&1; then
@ -130,16 +130,35 @@ getdistro() {
elif type -p crux >/dev/null 2>&1; then elif type -p crux >/dev/null 2>&1; then
distro="$(crux)" distro="$(crux)"
case "$distro_shorthand" in
"on") distro="${distro//version}" ;;
"tiny") distro="${distro//version*}" ;;
esac
else else
distro="$(awk -F 'NAME=' '/^NAME=/ {printf $2}' /etc/*ease)" # Workarounds are included in every shorthand option
distro="${distro//\"}" case "$distro_shorthand" in
"on")
distro="$(awk -F'=' '/^NAME|VERSION_ID=/ {print $2}' /etc/*ease)"
[ -z "$distro" ] && distro="$(awk -F'=' '/^DISTRIB_ID|DISTRIB_RELEASE=/ {print $2}' /etc/openwrt_release)"
;;
# Workaround for distros that store the value differently. "tiny")
[ -z "$distro" ] && distro="$(awk -F 'TAILS_PRODUCT_NAME="|"' '/^TAILS_PRODUCT_NAME=/ {printf $2}' /etc/*ease)" distro="$(awk -F'=' '/^NAME=/ {print $2}' /etc/*ease)"
[ -z "$distro" ] && distro="$(awk '/BLAG/ {print $1; exit}' /etc/*ease)" [ -z "$distro" ] && distro="$(awk -F'=' '/^TAILS_PRODUCT_NAME=/ {print $2}' /etc/*ease)"
[ -z "$distro" ] && distro="$(awk -F "'" '/^DISTRIB_DESCRIPTION/ {print $2}' /etc/openwrt_release)" [ -z "$distro" ] && distro="$(awk -F'=' '/^DISTRIB_ID=/ {print $2}' /etc/openwrt_release)"
;;
*)
distro="$(awk -F'=' '/^PRETTY_NAME=/ {print $2}' /etc/*ease)"
[ -z "$distro" ] && distro="$(awk -F'=' '{print $2}' /etc/*ease)"
[ -z "$distro" ] && distro="$(awk '/BLAG/ {print $1; exit}' /etc/*ease)"
[ -z "$distro" ] && distro="$(awk -F'=' '/^DISTRIB_DESCRIPTION=/ {print $2}' /etc/openwrt_release)"
;;
esac
fi fi
distro="${distro//\"}"
distro="${distro//\'}"
;; ;;
"Mac OS X") "Mac OS X")
@ -2771,8 +2790,8 @@ usage() { cat << EOF
--cpu_shorthand type Shorten the output of CPU --cpu_shorthand type Shorten the output of CPU
Possible values: name, speed, tiny, on, off Possible values: name, speed, tiny, on, off
--cpu_cores on/off Whether or not to display the number of CPU cores --cpu_cores on/off Whether or not to display the number of CPU cores
--distro_shorthand on/off Shorten the output of distro --distro_shorthand on/off Shorten the output of distro (tiny, on, off)
NOTE: This is only possible on Linux with lsb_release NOTE: This is only possible on Linux
--kernel_shorthand on/off Shorten the output of kernel --kernel_shorthand on/off Shorten the output of kernel
--uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off)
--refresh_rate on/off Whether to display the refresh rate of each monitor --refresh_rate on/off Whether to display the refresh rate of each monitor

4
neofetch.1
View file

@ -45,9 +45,9 @@ Possible values: name, speed, tiny, on, off
Whether or not to display the number of CPU cores Whether or not to display the number of CPU cores
.TP .TP
.B \--distro_shorthand 'on/off' .B \--distro_shorthand 'on/off'
Shorten the output of distro Shorten the output of distro (tiny, on, off)
.br .br
NOTE: This is only possible on Linux with lsb_release NOTE: This is only possible on Linux
.TP .TP
.B \--kernel_shorthand 'on/off' .B \--kernel_shorthand 'on/off'
Shorten the output of kernel Shorten the output of kernel