Merge branch '18216-arvados-server-keepstore'

[arvados.git] / cmd / arvados-package / fpm.go

diff --git a/cmd/arvados-package/fpm.go b/cmd/arvados-package/fpm.go
index a862320360e94bc79e0c8faf2008e12ef3dd37c0..ca63929e9839a8e3e01aa14108c9a1b10b3d4dfb 100644 (file)
--- a/cmd/arvados-package/fpm.go
+++ b/cmd/arvados-package/fpm.go
@@ -5,6 +5,7 @@
 package main
 
 import (
+       "bytes"
        "context"
        "fmt"
        "io"
@@ -41,9 +42,17 @@ func fpm(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Writ
                return fmt.Errorf("gem install fpm: %w", err)
        }
 
-       if _, err := os.Stat("/root/.gem/ruby/2.5.0/gems/fpm-1.11.0/lib/fpm/package/deb.rb"); err == nil {
+       cmd = exec.Command("/var/lib/arvados/bin/gem", "env", "gempath")
+       cmd.Stderr = stderr
+       buf, err := cmd.Output() // /root/.gem/ruby/2.7.0:...
+       if err != nil || len(buf) == 0 {
+               return fmt.Errorf("gem env gempath: %w", err)
+       }
+       gempath := string(bytes.TrimRight(bytes.Split(buf, []byte{':'})[0], "\n"))
+
+       if _, err := os.Stat(gempath + "/gems/fpm-1.11.0/lib/fpm/package/deb.rb"); err == nil {
                // Workaround for fpm bug https://github.com/jordansissel/fpm/issues/1739
-               cmd = exec.Command("sed", "-i", `/require "digest"/a require "zlib"`, "/root/.gem/ruby/2.5.0/gems/fpm-1.11.0/lib/fpm/package/deb.rb")
+               cmd = exec.Command("sed", "-i", `/require "digest"/a require "zlib"`, gempath+"/gems/fpm-1.11.0/lib/fpm/package/deb.rb")
                cmd.Stdout = stdout
                cmd.Stderr = stderr
                err = cmd.Run()
@@ -66,10 +75,15 @@ func fpm(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Writ
        format := "deb" // TODO: rpm
        pkgfile := filepath.Join(opts.PackageDir, "arvados-server-easy_"+opts.PackageVersion+"_amd64."+format)
 
-       cmd = exec.Command("/root/.gem/ruby/2.5.0/bin/fpm",
+       cmd = exec.Command(gempath+"/bin/fpm",
                "--package", pkgfile,
                "--name", "arvados-server-easy",
                "--version", opts.PackageVersion,
+               "--url", "https://arvados.org",
+               "--maintainer", opts.Maintainer,
+               "--vendor", opts.Vendor,
+               "--license", "GNU Affero General Public License, version 3.0",
+               "--description", "platform for managing, processing, and sharing genomic and other large scientific and biomedical data",
                "--input-type", "dir",
                "--output-type", format)
        deps, err := install.ProductionDependencies()