rescue any error invoking external commands attempting to determine OS_VERSION; just return RUBY_PLATFORM on failure.
This commit is contained in:
parent
80c41c99fc
commit
b866e07d70
|
@ -16,7 +16,8 @@
|
||||||
module Google
|
module Google
|
||||||
class APIClient
|
class APIClient
|
||||||
module ENV
|
module ENV
|
||||||
OS_VERSION = if RUBY_PLATFORM =~ /mswin|win32|mingw|bccwin|cygwin/
|
OS_VERSION = begin
|
||||||
|
if RUBY_PLATFORM =~ /mswin|win32|mingw|bccwin|cygwin/
|
||||||
# TODO(bobaman)
|
# TODO(bobaman)
|
||||||
# Confirm that all of these Windows environments actually have access
|
# Confirm that all of these Windows environments actually have access
|
||||||
# to the `ver` command.
|
# to the `ver` command.
|
||||||
|
@ -26,6 +27,9 @@ module Google
|
||||||
else
|
else
|
||||||
`uname -sr`.sub(' ', '/')
|
`uname -sr`.sub(' ', '/')
|
||||||
end
|
end
|
||||||
|
rescue Exception
|
||||||
|
RUBY_PLATFORM
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue