Skip to content

Commit c9d84f0

Browse files
committed
Bugfix #18588: Fix regex and rubocop
1 parent 9ecf211 commit c9d84f0

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

resources/recipes/configure.rb

+6-6
Original file line numberDiff line numberDiff line change
@@ -240,13 +240,13 @@
240240
env_setting = "environment '#{node.chef_environment}'"
241241

242242
file_content = File.read(knife_rb_path)
243-
if file_content.match(/^environment\s+".+"/)
244-
new_content = file_content.gsub(/^environment\s+".+"/, env_setting)
245-
else
246-
new_content = file_content + "\n" + env_setting
247-
end
243+
new_content = if file_content.match(/\n*environment\s+'.+'/)
244+
file_content.gsub(/environment\s+'.+'/, env_setting)
245+
else
246+
"#{file_content}\n#{env_setting}"
247+
end
248248
File.write(knife_rb_path, new_content)
249249
end
250250
end
251251
action :run
252-
end
252+
end

0 commit comments

Comments
 (0)