From: Lucas Di Pentima <lucas.dipentima@curii.com>
Date: Tue, 1 Nov 2022 17:30:14 +0000 (-0300)
Subject: 19683: Improves code style.
X-Git-Tag: 2.5.0~46^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/f6c7741002f3855663bf9ac4aef4cbf86f3b5d51

19683: Improves code style.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima@curii.com>
---

diff --git a/tools/arvbox/lib/arvbox/docker/common.sh b/tools/arvbox/lib/arvbox/docker/common.sh
index 5db94aa5e1..80fb3fa820 100644
--- a/tools/arvbox/lib/arvbox/docker/common.sh
+++ b/tools/arvbox/lib/arvbox/docker/common.sh
@@ -75,10 +75,9 @@ run_bundler() {
 	BUNDLER=$PWD/bin/bundle
     fi
 
-    if test "$(flock $GEMLOCK /var/lib/arvados/bin/gem list | grep arvados | grep dev | wc -l)" = "0" ; 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`
-        cd -
+    if test -z "$(flock $GEMLOCK /var/lib/arvados/bin/gem list | grep arvados | grep 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`)
     fi
     if ! flock $GEMLOCK $BUNDLER install --verbose --local --no-deployment $frozen "$@" ; then
         flock $GEMLOCK $BUNDLER install --verbose --no-deployment $frozen "$@"