Merge pull request #1115 from josegonzalez/patch-1

Drop duplicate .conf suffix
This commit is contained in:
Jordan Sissel 2016-05-18 09:59:51 -07:00
commit 20364dd305
1 changed files with 2 additions and 1 deletions

View File

@ -494,7 +494,8 @@ class FPM::Package::Deb < FPM::Package
attributes.fetch(:deb_upstart_list, []).each do |upstart|
name = File.basename(upstart, ".upstart")
dest_upstart = staging_path("etc/init/#{name}.conf")
name = "#{name}.conf" if !(name =~ /\.conf$/)
dest_upstart = staging_path("etc/init/#{name}")
mkdir_p(File.dirname(dest_upstart))
FileUtils.cp(upstart, dest_upstart)
File.chmod(0644, dest_upstart)