From 9e764431dc5e3b42eba5f5495b008625bf11d777 Mon Sep 17 00:00:00 2001 From: Lucas Di Pentima Date: Tue, 1 Nov 2022 14:59:05 -0300 Subject: [PATCH] 19683: Improves pattern matching on the arvados gem. Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- tools/arvbox/lib/arvbox/docker/common.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh index 80fb3fa820..ba81426f0b 100644 --- a/tools/arvbox/lib/arvbox/docker/common.sh +++ b/tools/arvbox/lib/arvbox/docker/common.sh @@ -75,9 +75,9 @@ run_bundler() { BUNDLER=$PWD/bin/bundle fi - if test -z "$(flock $GEMLOCK /var/lib/arvados/bin/gem list | grep arvados | grep dev)" ; then + if test -z "$(flock $GEMLOCK /var/lib/arvados/bin/gem list | grep 'arvados[[:blank:]].*[0-9.]*dev')" ; then (cd /usr/src/arvados/sdk/ruby && \ - /var/lib/arvados/bin/gem build arvados.gemspec && flock $GEMLOCK /var/lib/arvados/bin/gem install `ls -1 *.gem | sort -r | head -n1`) + /var/lib/arvados/bin/gem build arvados.gemspec && flock $GEMLOCK /var/lib/arvados/bin/gem install $(ls -1 *.gem | sort -r | head -n1)) fi if ! flock $GEMLOCK $BUNDLER install --verbose --local --no-deployment $frozen "$@" ; then flock $GEMLOCK $BUNDLER install --verbose --no-deployment $frozen "$@" -- 2.30.2