@@ -77,7 +77,7 @@ To use a HTTP proxy, specify --proxy followed by the proxy server
7777defined by http://hostname:port
7878
7979This install script needs Ruby version 2.x installed as a prerequisite.
80- Currently recommanded Ruby versions are 2.0.0, 2.1.8, 2.2.4 and 2.3.0 , and 2.4.0 .
80+ Currently recommanded Ruby versions are 2.0.0, 2.1.8, 2.2.4, 2.3, 2.4 , and 2.5 .
8181If multiple Ruby versions are installed, the default ruby version will be used.
8282If the default ruby version does not satisfy reqirement, the newest version will be used.
8383If you do not have a supported Ruby version installed, please install one of them first.
9393 def check_ruby_version_and_symlink
9494 @log . info ( "Starting Ruby version check." )
9595 actual_ruby_version = RUBY_VERSION . split ( '.' ) . map { |s |s . to_i } [ 0 , 2 ]
96-
96+
9797 supported_ruby_versions . each do |version |
9898 if ( ( actual_ruby_version <=> version . split ( '.' ) . map { |s |s . to_i } ) == 0 )
9999 return File . join ( RbConfig ::CONFIG [ "bindir" ] , RbConfig ::CONFIG [ "RUBY_INSTALL_NAME" ] + RbConfig ::CONFIG [ "EXEEXT" ] )
@@ -109,13 +109,13 @@ EOF
109109 end
110110 end
111111
112- unsupported_ruby_version_error
112+ unsupported_ruby_version_error
113113 exit ( 1 )
114114 end
115115
116116 def unsupported_ruby_version_error
117117 @log . error ( "Current running Ruby version for " +ENV [ 'USER' ] +" is " +RUBY_VERSION +", but Ruby version 2.x needs to be installed." )
118- @log . error ( 'If you already have the proper Ruby version installed, please either create a symlink to /usr/bin/ruby2.x,' )
118+ @log . error ( 'If you already have the proper Ruby version installed, please either create a symlink to /usr/bin/ruby2.x,' )
119119 @log . error ( "or run this install script with right interpreter. Otherwise please install Ruby 2.x for " +ENV [ 'USER' ] +" user." )
120120 @log . error ( 'You can get more information by running the script with --help option.' )
121121 end
163163 # change interpreter when symlink /usr/bin/ruby2.x exists, but running with non-supported ruby version
164164 actual_ruby_version = RUBY_VERSION . split ( '.' ) . map { |s |s . to_i }
165165 left_bound = '2.0.0' . split ( '.' ) . map { |s |s . to_i }
166- right_bound = '2.5.1 ' . split ( '.' ) . map { |s |s . to_i }
166+ right_bound = '2.5.0 ' . split ( '.' ) . map { |s |s . to_i }
167167 if ( actual_ruby_version <=> left_bound ) < 0
168168 if ( !@reexeced )
169169 @log . info ( "The current Ruby version is not 2.x! Restarting the installer with #{ ruby_interpreter_path } " )
0 commit comments