Merge pull request #130 from ebastien/debian-config

Support for debconf control files in Debian target
jordansissel · Dec 5, 2011 · ee631b0 · ee631b0
2 parents 3fcde9f + 9876857
commit ee631b0
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 25 deletions.
diff --git a/lib/fpm/target/deb.rb b/lib/fpm/target/deb.rb
@@ -6,6 +6,16 @@
 
 class FPM::Target::Deb < FPM::Package
 
+  # Supported Debian control files
+  CONTROL_FILES = {
+    "pre-install"       => [:script, "preinst"],
+    "post-install"      => [:script, "postinst"],
+    "pre-uninstall"     => [:script, "prerm"],
+    "post-uninstall"    => [:script, "postrm"],
+    "debconf-config"    => [:script, "config"],
+    "debconf-templates" => [:text,   "templates"]
+  }
+
   def self.flags(opts, settings)
     settings.target[:deb] = "deb"
 
@@ -23,6 +33,18 @@ def self.flags(opts, settings)
             "Custom version of the Debian control file.") do |control|
       settings.target[:control] = File.expand_path(control)
     end
+
+    # Add custom debconf config file
+    opts.on("--config SCRIPTPATH",
+            "Add SCRIPTPATH as debconf config file.") do |config|
+      settings.scripts["debconf-config"] = File.expand_path(config)
+    end
+
+    # Add custom debconf templates file
+    opts.on("--templates FILEPATH",
+            "Add FILEPATH as debconf templates file.") do |templates|
+      settings.scripts["debconf-templates"] = File.expand_path(templates)
+    end
   end
 
   def needs_md5sums
@@ -90,23 +112,16 @@ def build!(params)
                    "template.") unless $?.exitstatus == 0
     end
 
-    # place the postinst prerm files
+    # place the control files
     self.scripts.each do |name, path|
-      case name
-        when "pre-install"
-          safesystem("cp", "#{path}", "./preinst")
-          control_files << "preinst"
-        when "post-install"
-          safesystem("cp", "#{path}", "./postinst")
-          control_files << "postinst"
-        when "pre-uninstall"
-          safesystem("cp", "#{path}", "./prerm")
-          control_files << "prerm"
-        when "post-uninstall"
-          safesystem("cp", "#{path}", "./postrm")
-          control_files << "postrm"
-        else raise "Unsupported script name '#{name}' (path: #{path})"
-      end # case name
+      ctrl_type, ctrl_file = CONTROL_FILES[name]
+      if ctrl_file
+        safesystem("cp",  path, "./#{ctrl_file}")
+        safesystem("chmod", "a+x", "./#{ctrl_file}") if ctrl_type == :script
+        control_files << ctrl_file
+      else
+        raise "Unsupported script name '#{name}' (path: #{path})"
+      end
     end # self.scripts.each
 
     if self.config_files.any?
@@ -115,7 +130,8 @@ def build!(params)
     end
 
     # Make the control
-    safesystem("tar", "-zcf", "control.tar.gz", *control_files)
+    safesystem("tar", "--numeric-owner", "--owner=root", "--group=root",
+               "-zcf", "control.tar.gz", *control_files)
 
     # create debian-binary
     File.open("debian-binary", "w") { |f| f.puts "2.0" }

diff --git a/test/dir-deb-with-debconf.out b/test/dir-deb-with-debconf.out
@@ -0,0 +1,2 @@
+       0 bytes,     0 lines   *  config               
+       0 bytes,     0 lines      templates            
diff --git a/test/dir-deb-with-debconf.test b/test/dir-deb-with-debconf.test
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+run() {
+  mkdir -p $tmpdir/prefix
+  touch $tmpdir/config
+  touch $tmpdir/templates
+
+  fpm -s dir -t deb -n testing -a all \
+  --deb-config $tmpdir/config \
+  --deb-templates $tmpdir/templates \
+  $tmpdir/prefix
+
+  file=testing_1.0_all.deb
+  dpkg -I $file | grep "\(config\)\|\(templates\)" > $output
+
+  rm $file
+}
diff --git a/test/dir-rpm-with-prefix.test b/test/dir-rpm-with-prefix.test
@@ -10,6 +10,6 @@ run() {
 
   fpm -s dir -t rpm -n testing -a all --prefix $prefix -C $tmpdir 
 
-  rpm -qlp testing-1.0.noarch.rpm > $output
-  rm testing-1.0.noarch.rpm
+  rpm -qlp testing-1.0-1.noarch.rpm > $output
+  rm testing-1.0-1.noarch.rpm
 }
diff --git a/test/dir-rpm.test b/test/dir-rpm.test
@@ -8,7 +8,7 @@ run() {
 
   fpm -s dir -t rpm -n testing -a all $tmpdir
 
-  file=testing-1.0.noarch.rpm
+  file=testing-1.0-1.noarch.rpm
   rpm -qlp $file > $output
   sed -e "s,TMPDIR,$(basename $tmpdir)," $expected.template > $expected
 

diff --git a/test/gem-deb.out b/test/gem-deb.out
@@ -5,12 +5,12 @@
 ./usr/lib/ruby/gems/1.8/
 ./usr/lib/ruby/gems/1.8/bin/
 ./usr/lib/ruby/gems/1.8/bin/rails
-./usr/lib/ruby/gems/1.8/specifications/
-./usr/lib/ruby/gems/1.8/specifications/rails-3.1.0.gemspec
+./usr/lib/ruby/gems/1.8/cache/
+./usr/lib/ruby/gems/1.8/cache/rails-3.1.0.gem
+./usr/lib/ruby/gems/1.8/doc/
 ./usr/lib/ruby/gems/1.8/gems/
 ./usr/lib/ruby/gems/1.8/gems/rails-3.1.0/
 ./usr/lib/ruby/gems/1.8/gems/rails-3.1.0/bin/
 ./usr/lib/ruby/gems/1.8/gems/rails-3.1.0/bin/rails
-./usr/lib/ruby/gems/1.8/doc/
-./usr/lib/ruby/gems/1.8/cache/
-./usr/lib/ruby/gems/1.8/cache/rails-3.1.0.gem
+./usr/lib/ruby/gems/1.8/specifications/
+./usr/lib/ruby/gems/1.8/specifications/rails-3.1.0.gemspec
diff --git a/test/gem-deb.test b/test/gem-deb.test
@@ -2,6 +2,9 @@
 RAILS_VERSION=3.1.0
 
 run() {
+  # Force the gem installation path to match the one of the expected output
+  export GEM_HOME=/usr/lib/ruby/gems/1.8
+
   fpm -s gem -t deb -v $RAILS_VERSION rails
 
   file=rubygem-rails_${RAILS_VERSION}_all.deb