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

os: add cache_uname for Darwin (macOS/iOS)

Browse source
This commit is contained in:
Andrew Titmuss 2018-06-05 23:13:20 +10:00
parent e95776d40b
commit 428b73fc5a
No known key found for this signature in database
GPG key ID: 8AF42975C787E0B2
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
neofetch
View file

@ -774,7 +774,7 @@ get_os() {
# $kernel_name is set in a function called cache_uname and is # $kernel_name is set in a function called cache_uname and is
# just the output of "uname -s". # just the output of "uname -s".
case "$kernel_name" in case "$kernel_name" in
"Darwin"): "$(sw_vers -productName)" ;; "Darwin"): "$darwin_name" ;;
"SunOS"): "Solaris" ;; "SunOS"): "Solaris" ;;
"Haiku"): "Haiku" ;; "Haiku"): "Haiku" ;;
"MINIX"): "MINIX" ;; "MINIX"): "MINIX" ;;
@ -926,9 +926,6 @@ get_distro() {
;; ;;
"Mac OS X") "Mac OS X")
osx_version="$(sw_vers -productVersion)"
osx_build="$(sw_vers -buildVersion)"
case "$osx_version" in case "$osx_version" in
"10.4"*) codename="Mac OS X Tiger" ;; "10.4"*) codename="Mac OS X Tiger" ;;
"10.5"*) codename="Mac OS X Leopard" ;; "10.5"*) codename="Mac OS X Leopard" ;;
@ -959,7 +956,7 @@ get_distro() {
;; ;;
"iPhone OS") "iPhone OS")
distro="iOS $(sw_vers -productVersion)" distro="iOS $osx_version"
# "uname -m" doesn't print architecture on iOS so we force it off. # "uname -m" doesn't print architecture on iOS so we force it off.
os_arch="off" os_arch="off"
@ -4161,6 +4158,14 @@ cache_uname() {
kernel_name="${uname[0]}" kernel_name="${uname[0]}"
kernel_version="${uname[1]}" kernel_version="${uname[1]}"
kernel_machine="${uname[2]}" kernel_machine="${uname[2]}"
if [[ "$kernel_name" == "Darwin" ]]; then
IFS=$'\n' read -d "" -ra sw_vers < <(awk -F'<|>' '/string/ {print $3}' \
"/System/Library/CoreServices/SystemVersion.plist")
darwin_name="${sw_vers[2]}"
osx_version="${sw_vers[3]}"
osx_build="${sw_vers[0]}"
fi
} }
get_ppid() { get_ppid() {