Merge pull request #557 from dylanaraps/kernfix

Kernel: Simplify check
This commit is contained in:
Dylan Araps 2016-12-23 21:13:50 +11:00 committed by GitHub
commit 573db1adf5

View file

@ -262,7 +262,6 @@ get_model() {
model="$(wmic computersystem get manufacturer,model /value)" model="$(wmic computersystem get manufacturer,model /value)"
model="${model/Manufacturer'='}" model="${model/Manufacturer'='}"
model="${model/Model'='}" model="${model/Model'='}"
model="${model//*To Be Filled*}"
;; ;;
"Solaris") "Solaris")
@ -288,15 +287,13 @@ get_title() {
} }
get_kernel() { get_kernel() {
[[ "$os" == "MINIX" ]] && local os="BSD"
case "$kernel_shorthand" in case "$kernel_shorthand" in
"on") kernel="$kernel_version" ;; "on") kernel="$kernel_version" ;;
"off") kernel="$kernel_name $kernel_version" ;; "off") kernel="$kernel_name $kernel_version" ;;
esac esac
# Hide kernel info if it's identical to the distro info. # Hide kernel info if it's identical to the distro info.
if [[ "$os" == "BSD" && "$distro" == *"$kernel_name"* ]]; then if [[ "$os" =~ (BSD|MINIX) && "$distro" == *"$kernel_name"* ]]; then
case "$distro_shorthand" in case "$distro_shorthand" in
"on" | "tiny") kernel="$kernel_version" ;; "on" | "tiny") kernel="$kernel_version" ;;
*) unset kernel ;; *) unset kernel ;;