X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cd9e72bd95b32203231f6ccc96ddce9325b30a95..f159610ed02196b33fa30e1c3bba45fa947d48a9:/cmd/arvados-package/fpm.go

diff --git a/cmd/arvados-package/fpm.go b/cmd/arvados-package/fpm.go
index 9a20ec76fc..c26cbe8875 100644
--- a/cmd/arvados-package/fpm.go
+++ b/cmd/arvados-package/fpm.go
@@ -34,15 +34,7 @@ func fpm(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Writ
 		return fmt.Errorf("arvados-server install failed: exit code %d", exitcode)
 	}
 
-	cmd := exec.Command("/var/lib/arvados/bin/gem", "install", "--user", "--no-document", "fpm")
-	cmd.Stdout = stdout
-	cmd.Stderr = stderr
-	err := cmd.Run()
-	if err != nil {
-		return fmt.Errorf("gem install fpm: %w", err)
-	}
-
-	cmd = exec.Command("/var/lib/arvados/bin/gem", "env", "gempath")
+	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 {
@@ -50,6 +42,17 @@ func fpm(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Writ
 	}
 	gempath := string(bytes.TrimRight(bytes.Split(buf, []byte{':'})[0], "\n"))
 
+	cmd = exec.Command("/var/lib/arvados/bin/gem", "install", "--user", "--no-document", "fpm")
+	cmd.Stdout = stdout
+	cmd.Stderr = stderr
+	// Avoid "WARNING: You don't have [...] in your PATH, gem
+	// executables will not run"
+	cmd.Env = append(os.Environ(), "PATH="+os.Getenv("PATH")+":"+gempath)
+	err = cmd.Run()
+	if err != nil {
+		return fmt.Errorf("gem install fpm: %w", err)
+	}
+
 	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"`, gempath+"/gems/fpm-1.11.0/lib/fpm/package/deb.rb")
@@ -97,14 +100,14 @@ func fpm(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Writ
 		"--verbose",
 		"--deb-use-file-permissions",
 		"--rpm-use-file-permissions",
-		"--deb-systemd", "/etc/systemd/system/multi-user.target.wants/arvados.service",
+		"--deb-systemd", "/lib/systemd/system/arvados.service",
 		"--deb-systemd-enable",
 		"--no-deb-systemd-auto-start",
 		"--no-deb-systemd-restart-after-upgrade",
-		"/lib/systemd/system/arvados.service",
 		"/usr/bin/arvados-client",
 		"/usr/bin/arvados-server",
 		"/usr/bin/arv",
+		"/usr/bin/arv-ruby",
 		"/usr/bin/arv-tag",
 		"/var/lib/arvados",
 		"/var/www/.gem",