Fix "bundle exec rails mastodon:setup" crashing in some circumstances (#16976)

Fix regression from #16896
This commit is contained in:
Claire 2021-11-11 14:00:30 +01:00 committed by GitHub
parent 1114935e64
commit 18b885ee3a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -350,11 +350,11 @@ namespace :mastodon do
end end
end.join("\n") end.join("\n")
generated_header = "# Generated with mastodon:setup on #{Time.now.utc}\n\n" generated_header = "# Generated with mastodon:setup on #{Time.now.utc}\n\n".dup
if incompatible_syntax if incompatible_syntax
generated_header << "Some variables in this file will be interpreted differently whether you are\n" generated_header << "# Some variables in this file will be interpreted differently whether you are\n"
generated_header << "using docker-compose or not.\n\n" generated_header << "# using docker-compose or not.\n\n"
end end
File.write(Rails.root.join('.env.production'), "#{generated_header}#{env_contents}\n") File.write(Rails.root.join('.env.production'), "#{generated_header}#{env_contents}\n")