Merge pull request #929 from konimex/win10fix

OS: Separate Windows 10 and ChromeOS into its own if clause

CHANGELOG.md

@@ -36,6 +36,7 @@
 - Fixed detection bug with OpenWRT. [**@dawidd6**](https://github.com/dawidd6)
 - Fixed detection bug with LEDE. [**@dawidd6**](https://github.com/dawidd6)
 - Fixed detection bug with TrueOS. [**@dawidd6**](https://github.com/dawidd6)
+- Fixed detection bug with Windows Subsystem for Linux and Crouton when an OS without lsb_release is installed.
 
 
 ## General

neofetch

@@ -58,22 +58,7 @@ get_distro() {
 
     case "$os" in
         "Linux" | "BSD" | "MINIX")
-            if [[ "$(< /proc/version)" == *"Microsoft"* ||
+            if [[ -f "/etc/redstar-release" ]]; then
-                  "$kernel_version" == *"Microsoft"* ]]; then
-                case "$distro_shorthand" in
-                    "on")   distro="$(lsb_release -sir) [Windows 10]" ;;
-                    "tiny") distro="Windows 10" ;;
-                    *)      distro="$(lsb_release -sd) on Windows 10" ;;
-                esac
-
-            elif [[ "$(< /proc/version)" == *"chrome-bot"* || -f "/dev/cros_ec" ]]; then
-                case "$distro_shorthand" in
-                    "on")   distro="$(lsb_release -sir) [Chrome OS]" ;;
-                    "tiny") distro="Chrome OS" ;;
-                    *)      distro="$(lsb_release -sd) on Chrome OS" ;;
-                esac
-
-            elif [[ -f "/etc/redstar-release" ]]; then
                 case "$distro_shorthand" in
                     "on" | "tiny") distro="Red Star OS" ;;
                     *) distro="Red Star OS $(awk -F'[^0-9*]' '$0=$2' /etc/redstar-release)"
@@ -163,6 +148,23 @@ get_distro() {
                     [[ -f "/etc/pacbsd-release" ]] && distro="PacBSD"
                 fi
             fi
+
+            if [[ "$(< /proc/version)" == *"Microsoft"* ||
+                  "$kernel_version" == *"Microsoft"* ]]; then
+                case "$distro_shorthand" in
+                    "on")   distro+=" [Windows 10]" ;;
+                    "tiny") distro="Windows 10" ;;
+                    *)      distro+=" on Windows 10" ;;
+                esac
+
+            elif [[ "$(< /proc/version)" == *"chrome-bot"* || -f "/dev/cros_ec" ]]; then
+                case "$distro_shorthand" in
+                    "on")   distro+=" [Chrome OS]" ;;
+                    "tiny") distro="Chrome OS" ;;
+                    *)      distro+=" on Chrome OS" ;;
+                esac
+            fi
+
             distro="$(trim_quotes "$distro")"
             distro="${distro/'NAME='}"
         ;;