Microsoft Linux, again

diff --git a/_webi/ua-detect.js b/_webi/ua-detect.js
index 5455d6cf17bc11276f87d2b201747691ad6545f5..b174fd4acf2d5bf59099876fb91e1cb50b56fea0 100644 (file)
--- a/_webi/ua-detect.js
+++ b/_webi/ua-detect.js
@@ -10,13 +10,11 @@ function getOs(ua) {
     return 'android';
   } else if (/iOS|iPhone|Macintosh|Darwin|OS\s*X|macOS|mac/i.test(ua)) {
     return 'macos';
-  } else if (/Microsoft\s*Linux/i.test(ua)) {
+  } else if (/^ms$|Microsoft|Windows|win32|win|PowerShell/i.test(ua)) {
     // It's the year of the Linux Desktop!
-    // WSL / WSL2
-    // (checking linux twice because I'm not sure about cygwin / msysgit)
+    // (TODO: what about cygwin / msysgit?)
     // See also http://www.mslinux.org/
-    return 'linux';
-  } else if (/^ms$|Microsoft|Windows|win32|win|PowerShell/i.test(ua)) {
+    // 'linux' must be tested before 'Microsoft' because WSL
     // 'win' must be tested after 'darwin'
     return 'windows';
   } else if (/Linux|curl|wget/i.test(ua)) {