Merge pull request #2065 from phillipp/main

Add support for .timer units to --deb-systemd
jordansissel · Sep 12, 2024 · 18e04a7 · 18e04a7
2 parents 9d3d96a + 6957220
commit 18e04a7
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/lib/fpm/package/deb.rb b/lib/fpm/package/deb.rb
@@ -517,14 +517,23 @@ def output(output_path)
 
     attributes[:deb_systemd] = []
     attributes.fetch(:deb_systemd_list, []).each do |systemd|
-      name = File.basename(systemd, ".service")
-      dest_systemd = staging_path("lib/systemd/system/#{name}.service")
+      name = File.basename(systemd)
+      extname = File.extname(name)
+
+      name_with_extension = if extname.empty?
+                              "#{name}.service"
+                            elsif [".service", ".timer"].include?(extname)
+                              name
+                            else
+                              raise ArgumentError, "Invalid systemd unit file extension: #{extname}. Expected .service or .timer, or no extension."
+                            end
+
+      dest_systemd = staging_path("lib/systemd/system/#{name_with_extension}")
       mkdir_p(File.dirname(dest_systemd))
       FileUtils.cp(systemd, dest_systemd)
       File.chmod(0644, dest_systemd)
 
-      # add systemd service name to attribute
-      attributes[:deb_systemd] << name
+      attributes[:deb_systemd] << name_with_extension
     end
 
     if script?(:before_upgrade) or script?(:after_upgrade) or attributes[:deb_systemd].any?
@@ -627,8 +636,11 @@ def output(output_path)
     end
 
     attributes.fetch(:deb_systemd_list, []).each do |systemd|
-      name = File.basename(systemd, ".service")
-      dest_systemd = staging_path("lib/systemd/system/#{name}.service")
+      name = File.basename(systemd)
+      extname = File.extname(systemd)
+      name_with_extension = extname.empty? ? "#{name}.service" : name
+
+      dest_systemd = staging_path("lib/systemd/system/#{name_with_extension}")
       mkdir_p(File.dirname(dest_systemd))
       FileUtils.cp(systemd, dest_systemd)
       File.chmod(0644, dest_systemd)