Skip to content

Commit 5735566

Browse files
authored
Merge pull request #2560 from mhashizume/maint/main/revert-rubocop
(maint) Revert RuboCop changes for install.rb
2 parents 2191702 + 4df66cd commit 5735566

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

.rubocop.yml

+4
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ Naming/FileName:
127127
- 'lib/facter.rb'
128128
- 'agent/lib/facter-ng.rb'
129129

130+
Performance/RegexpMatch:
131+
Exclude:
132+
- 'install.rb'
133+
130134
RSpec/ExampleLength:
131135
Enabled: false
132136

install.rb

+3-3
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def prepare_installation
153153
# /System/Library/Frameworks/Ruby.framework/Versions/1.8/usr/bin
154154
# which is not generally where people expect executables to be installed
155155
# These settings are appropriate defaults for all OS X versions.
156-
RbConfig::CONFIG['bindir'] = '/usr/bin' if RUBY_PLATFORM.match?(/^universal-darwin[\d\.]+$/)
156+
RbConfig::CONFIG['bindir'] = '/usr/bin' if RUBY_PLATFORM =~ /^universal-darwin[\d\.]+$/
157157

158158
# if InstallOptions.configdir
159159
# configdir = InstallOptions.configdir
@@ -176,7 +176,7 @@ def prepare_installation
176176
sitelibdir = $LOAD_PATH.find { |x| x =~ /site_ruby/ }
177177
if sitelibdir.nil?
178178
sitelibdir = File.join(libdir, 'site_ruby')
179-
elsif !sitelibdir&.match?(Regexp.quote(version))
179+
elsif sitelibdir !~ Regexp.quote(version)
180180
sitelibdir = File.join(sitelibdir, version)
181181
end
182182
end
@@ -232,7 +232,7 @@ def install_binfile(from, op_file, target)
232232
File.open(tmp_file.path, 'w') do |op|
233233
op.puts "#!#{ruby}"
234234
contents = ip.readlines
235-
contents.shift if /^#!/.match?(contents[0])
235+
contents.shift if contents[0] =~ /^#!/
236236
op.write contents.join
237237
end
238238
end

0 commit comments

Comments
 (0)