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

This commit is contained in:
Dylan 2016-03-15 19:00:07 +11:00
commit b5c76c0dc3
2 changed files with 7 additions and 4 deletions

View File

@ -188,6 +188,7 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD
- `wget https://copr.fedorainfracloud.org/coprs/konimex/neofetch/repo/epel-7/konimex-neofetch-epel-7.repo` - `wget https://copr.fedorainfracloud.org/coprs/konimex/neofetch/repo/epel-7/konimex-neofetch-epel-7.repo`
3. Install the package 3. Install the package
- `sudo yum install neofetch` - `sudo yum install neofetch`
* NOTE: This will only work in RHEL/CentOS 7
### Mac OS X ### Mac OS X
1. Install `neofetch` with Homebrew 1. Install `neofetch` with Homebrew

View File

@ -469,6 +469,7 @@ case "$os" in
"Mac OS X") "Mac OS X")
osx_version=$(sw_vers -productVersion) 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" ;;
@ -481,9 +482,7 @@ case "$os" in
"10.11") codename="OS X El Capitan" ;; "10.11") codename="OS X El Capitan" ;;
*) codename="Mac OS X" ;; *) codename="Mac OS X" ;;
esac esac
distro="$codename $osx_version" distro="$codename $osx_version $osx_build"
[ "$osx_buildversion" == "on" ] && distro+=" $(sw_vers -buildVersion)"
;; ;;
"OpenBSD") "OpenBSD")
@ -2742,6 +2741,10 @@ case "$osx_codename" in
"off") distro=${distro/${codename}/Mac OS X} ;; "off") distro=${distro/${codename}/Mac OS X} ;;
esac esac
case "$osx_buildversion" in
"off") distro=${distro/ ${osx_build}} ;;
esac
# }}} # }}}
@ -2816,4 +2819,3 @@ if [ "$scrot" == "on" ]; then
fi fi
# }}} # }}}