Merge remote branch 'remotes/upstream/master'

[arvados.git] / lib / google / api_client / environment.rb

diff --git a/lib/google/api_client/environment.rb b/lib/google/api_client/environment.rb
index 488604866860b7463560ae21939c03691e094ea7..dbdb2d8ebeb53b187a841fcc9e02f9a3c3edf444 100644 (file)
--- a/lib/google/api_client/environment.rb
+++ b/lib/google/api_client/environment.rb
@@ -1,8 +1,11 @@
 module Google
   class APIClient
     module ENV
-      OS_VERSION = if RUBY_PLATFORM =~ /win32/
-        `ver`.sub(/\s*\[Version\s*/, '/').sub(']', '')
+      OS_VERSION = if RUBY_PLATFORM =~ /mswin|win32|mingw|bccwin|cygwin/
+        # TODO(bobaman)
+        # Confirm that all of these Windows environments actually have access
+        # to the `ver` command.
+        `ver`.sub(/\s*\[Version\s*/, '/').sub(']', '').strip
       elsif RUBY_PLATFORM =~ /darwin/i
         "Mac OS X/#{`sw_vers -productVersion`}"
       else