From 005a2e1472484182eec807fce9fa1137bd607c5e Mon Sep 17 00:00:00 2001
From: Tom Clegg <tom@curii.com>
Date: Thu, 30 Jun 2022 11:44:52 -0400
Subject: [PATCH] 16552: Add arvados-cli gem to arvados-server-easy package.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
---
 cmd/arvados-package/fpm.go |  2 ++
 lib/install/deps.go        | 34 +++++++++++++++++++++-------------
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/cmd/arvados-package/fpm.go b/cmd/arvados-package/fpm.go
index 4c9a00619e..9a20ec76fc 100644
--- a/cmd/arvados-package/fpm.go
+++ b/cmd/arvados-package/fpm.go
@@ -104,6 +104,8 @@ func fpm(ctx context.Context, opts opts, stdin io.Reader, stdout, stderr io.Writ
 		"/lib/systemd/system/arvados.service",
 		"/usr/bin/arvados-client",
 		"/usr/bin/arvados-server",
+		"/usr/bin/arv",
+		"/usr/bin/arv-tag",
 		"/var/lib/arvados",
 		"/var/www/.gem",
 		"/var/www/.passenger",
diff --git a/lib/install/deps.go b/lib/install/deps.go
index caecdd017d..017771b637 100644
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -578,19 +578,6 @@ yarn install
 			}
 		}
 
-		// Symlink user-facing Go programs /usr/bin/x ->
-		// /var/lib/arvados/bin/x
-		for _, prog := range []string{"arvados-client", "arvados-server"} {
-			err = os.Remove("/usr/bin/" + prog)
-			if err != nil && !errors.Is(err, os.ErrNotExist) {
-				return 1
-			}
-			err = os.Symlink("/var/lib/arvados/bin/"+prog, "/usr/bin/"+prog)
-			if err != nil {
-				return 1
-			}
-		}
-
 		// Copy assets from source tree to /var/lib/arvados/share
 		cmd := exec.Command("install", "-v", "-t", "/var/lib/arvados/share", filepath.Join(inst.SourcePath, "sdk/python/tests/nginx.conf"))
 		cmd.Stdout = stdout
@@ -676,6 +663,14 @@ rsync -a --delete-after build/ /var/lib/arvados/workbench2/
 			return 1
 		}
 
+		// Install arvados-cli gem (binaries go in
+		// /var/lib/arvados/bin)
+		if err = inst.runBash(`
+/var/lib/arvados/bin/gem install --conservative --no-document arvados-cli
+`, stdout, stderr); err != nil {
+			return 1
+		}
+
 		err = os.WriteFile("/lib/systemd/system/arvados.service", arvadosServiceFile, 0777)
 		if err != nil {
 			return 1
@@ -692,6 +687,19 @@ rsync -a --delete-after build/ /var/lib/arvados/workbench2/
 		if err != nil {
 			return 1
 		}
+
+		// Symlink user-facing programs /usr/bin/x ->
+		// /var/lib/arvados/bin/x
+		for _, prog := range []string{"arvados-client", "arvados-server", "arv", "arv-tag"} {
+			err = os.Remove("/usr/bin/" + prog)
+			if err != nil && !errors.Is(err, os.ErrNotExist) {
+				return 1
+			}
+			err = os.Symlink("/var/lib/arvados/bin/"+prog, "/usr/bin/"+prog)
+			if err != nil {
+				return 1
+			}
+		}
 	}
 
 	return 0
-- 
2.30.2