From bb1054c0e6a9bed14e593004f380111b2e948047 Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Mon, 17 Aug 2020 09:13:45 -0400 Subject: [PATCH] 16306: Update gem command line option spelling. Arvados-DCO-1.1-Signed-off-by: Tom Clegg --- cmd/arvados-dev/buildpackage.go | 2 +- lib/boot/passenger.go | 2 +- lib/install/deps.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/arvados-dev/buildpackage.go b/cmd/arvados-dev/buildpackage.go index aee955ea2e..00713550d1 100644 --- a/cmd/arvados-dev/buildpackage.go +++ b/cmd/arvados-dev/buildpackage.go @@ -62,7 +62,7 @@ func (bldr *builder) run(ctx context.Context, prog string, args []string, stdin return fmt.Errorf("arvados-server install failed: exit code %d", exitcode) } } - cmd := exec.Command("/var/lib/arvados/bin/gem", "install", "--user", "--no-rdoc", "--no-ri", "fpm") + cmd := exec.Command("/var/lib/arvados/bin/gem", "install", "--user", "--no-document", "fpm") cmd.Stdout = stdout cmd.Stderr = stderr err = cmd.Run() diff --git a/lib/boot/passenger.go b/lib/boot/passenger.go index 481300b45e..03464aaf7c 100644 --- a/lib/boot/passenger.go +++ b/lib/boot/passenger.go @@ -56,7 +56,7 @@ func (runner installPassenger) Run(ctx context.Context, fail func(error), super } for _, version := range []string{"1.16.6", "1.17.3", "2.0.2"} { if !strings.Contains(buf.String(), "("+version+")") { - err = super.RunProgram(ctx, runner.src, nil, nil, "gem", "install", "--user", "--conservative", "--no-rdoc", "--no-ri", "bundler:1.16.6", "bundler:1.17.3", "bundler:2.0.2") + err = super.RunProgram(ctx, runner.src, nil, nil, "gem", "install", "--user", "--conservative", "--no-document", "bundler:1.16.6", "bundler:1.17.3", "bundler:2.0.2") if err != nil { return err } diff --git a/lib/install/deps.go b/lib/install/deps.go index 7b22f45fdc..b39515cb14 100644 --- a/lib/install/deps.go +++ b/lib/install/deps.go @@ -431,7 +431,7 @@ rm ${zip} {"mkdir", "-p", "log", "tmp", ".bundle", "/var/www/.gem", "/var/www/.passenger"}, {"touch", "log/production.log"}, {"chown", "-R", "--from=root", "www-data:www-data", "/var/www/.gem", "/var/www/.passenger", "log", "tmp", ".bundle", "Gemfile.lock", "config.ru", "config/environment.rb"}, - {"sudo", "-u", "www-data", "/var/lib/arvados/bin/gem", "install", "--user", "--no-rdoc", "--no-ri", "--conservative", "bundler:1.16.6", "bundler:1.17.3", "bundler:2.0.2"}, + {"sudo", "-u", "www-data", "/var/lib/arvados/bin/gem", "install", "--user", "--conservative", "--no-document", "bundler:1.16.6", "bundler:1.17.3", "bundler:2.0.2"}, {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "install", "--deployment", "--jobs", "8", "--path", "/var/www/.gem"}, {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "exec", "passenger-config", "build-native-support"}, {"sudo", "-u", "www-data", "/var/lib/arvados/bin/bundle", "exec", "passenger-config", "install-standalone-runtime"}, -- 2.30.2