From 90447980bd59a237384607b6ecf2dd4506d9c731 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 7 May 2016 20:39:00 +1000 Subject: [PATCH] Better OS detection and distro detection --- neofetch | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index 5560fb55..d0430b53 100755 --- a/neofetch +++ b/neofetch @@ -447,13 +447,12 @@ shopt -s nocasematch extglob # Operating System {{{ -case "$(uname -sm)" in - "Linux"*) os="Linux" ;; - *"iPhone"* | *"iPad"* | *"iPod"*) os="iOS" ;; - "Darwin"*) os="Mac OS X" ;; - "OpenBSD"*) os="OpenBSD" ;; - "FreeBSD"* | "NetBSD"*) os="BSD" ;; - "CYGWIN"*) os="Windows" ;; +case "$(uname)" in + "Linux") os="Linux" ;; + "Darwin") os="$(sw_vers -productName)" ;; + "OpenBSD") os="OpenBSD" ;; + *"BSD") os="BSD" ;; + "CYGWIN"*) os="Windows" ;; *) printf "%s\n" "Unknown OS detected: $(uname)"; exit 1 ;; esac @@ -501,6 +500,10 @@ getdistro () { distro="$codename $osx_version $osx_build" ;; + "iPhone OS") + distro="iOS $(sw_vers -productVersion)" + ;; + "OpenBSD") distro="OpenBSD" ;;