When running in a jvm, get the OK name and version from java's system properties, to avoid exec'ing uname.
This commit is contained in:
		
							parent
							
								
									7545efddb6
								
							
						
					
					
						commit
						eec8c167cb
					
				|  | @ -24,6 +24,13 @@ module Google | |||
|           `ver`.sub(/\s*\[Version\s*/, '/').sub(']', '').strip | ||||
|         elsif RUBY_PLATFORM =~ /darwin/i | ||||
|           "Mac OS X/#{`sw_vers -productVersion`}" | ||||
|         elsif RUBY_PLATFORM == 'java' | ||||
|           # Get the information from java system properties to avoid spawning a | ||||
|           # sub-process, which is not friendly in some contexts (web servers). | ||||
|           require 'java' | ||||
|           name = java.lang.System.getProperty('os.name') | ||||
|           version = java.lang.System.getProperty('os.version') | ||||
|           "#{name} #{version}" | ||||
|         else | ||||
|           `uname -sr`.sub(' ', '/') | ||||
|         end | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue