Merge pull request #148 from iandrewt/osx_buildver_fix

fixed osx_buildver option
This commit is contained in:
Dylan Araps 2016-03-15 18:00:27 +11:00
commit 430d084711

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")
@ -2741,6 +2740,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
# }}} # }}}
@ -2815,4 +2818,3 @@ if [ "$scrot" == "on" ]; then
fi fi
# }}} # }}}