17344: Install ruby arv as arv-ruby, and arvados-client as arv.

[arvados.git] / lib / install / deps.go

diff --git a/lib/install/deps.go b/lib/install/deps.go
index 11ce0f188fb18e1654f285d384020d0c5de41ff2..fb2de8a72dc09af9e6dd1d31bf9a0776c36b2679 100644 (file)
--- a/lib/install/deps.go
+++ b/lib/install/deps.go
@@ -621,8 +621,8 @@ yarn install
 
                                {"chown", "www-data:www-data", ".", "public/assets"},
                                // {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "config", "set", "--local", "system", "true"},
-                               {"sudo", "-u", "www-data", "ARVADOS_CONFIG=none", "RAILS_GROUPS=assets", "RAILS_ENV=production", "/var/lib/arvados/bin/bundle", "exec", "rake", "npm:install"},
-                               {"sudo", "-u", "www-data", "ARVADOS_CONFIG=none", "RAILS_GROUPS=assets", "RAILS_ENV=production", "/var/lib/arvados/bin/bundle", "exec", "rake", "assets:precompile"},
+                               {"sudo", "-u", "www-data", "ARVADOS_CONFIG=none", "RAILS_GROUPS=assets", "RAILS_ENV=production", "PATH=/var/lib/arvados/bin:" + os.Getenv("PATH"), "/var/lib/arvados/bin/bundle", "exec", "rake", "npm:install"},
+                               {"sudo", "-u", "www-data", "ARVADOS_CONFIG=none", "RAILS_GROUPS=assets", "RAILS_ENV=production", "PATH=/var/lib/arvados/bin:" + os.Getenv("PATH"), "/var/lib/arvados/bin/bundle", "exec", "rake", "assets:precompile"},
                                {"chown", "root:root", "."},
                                {"chown", "-R", "root:root", "public/assets", "vendor"},
 
@@ -692,12 +692,20 @@ rsync -a --delete-after build/ /var/lib/arvados/workbench2/
 
                // 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)
+               for _, srcdst := range [][]string{
+                       {"arvados-client", "arvados-client"},
+                       {"arvados-client", "arv"},
+                       {"arvados-server", "arvados-server"},
+                       {"arv", "arv-ruby"},
+                       {"arv-tag", "arv-tag"},
+               } {
+                       src := srcdst[0]
+                       dst := srcdst[1]
+                       err = os.Remove("/usr/bin/" + dst)
                        if err != nil && !errors.Is(err, os.ErrNotExist) {
                                return 1
                        }
-                       err = os.Symlink("/var/lib/arvados/bin/"+prog, "/usr/bin/"+prog)
+                       err = os.Symlink("/var/lib/arvados/bin/"+src, "/usr/bin/"+dst)
                        if err != nil {
                                return 1
                        }