Windows: OS now shows Windows edition (Windows 7 Ultimate, etc)

2016-02-01 08:16:47 +11:00 · 2016-02-01 08:16:47 +11:00 · 7b5b1b3a36
parent b16350893b
commit 7b5b1b3a36
1 changed files with 5 additions and 25 deletions
--- a/30
+++ b/30
@ -401,31 +401,11 @@ case "$os" in
    ;;

    "Windows")
-        case "$(cmd /c ver)" in
-            *"XP"*)
-                distro="Windows XP"
-            ;;
-
-            *"7"*)
-                distro="Windows 7"
-            ;;
-
-            *"8.1"*)
-                distro="Windows 8.1"
-            ;;
-
-            *"8"*)
-                distro="Windows 8"
-            ;;
-
-            *"10"*)
-                distro="Windows 10"
-            ;;
-
-            *)
-                distro="Windows"
-            ;;
-        esac
+        distro="$(wmic os get Caption /value)"
+        distro=${distro/Caption}
+        distro=${distro//[[:space:]]/ }
+        distro=${distro//  }
+        distro=${distro/Microsoft }
    ;;

    *)